Skip to content

Commit 46184e2

Browse files
committed
new ver
fixed some bugs
1 parent 3f410fd commit 46184e2

File tree

1,497 files changed

+265793
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,497 files changed

+265793
-0
lines changed

.gitignore

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<<<<<<< HEAD
2+
=======
3+
# This .gitignore file should be placed at the root of your Unity project directory
4+
#
5+
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
6+
#
7+
/[Ll]ibrary/
8+
/[Tt]emp/
9+
/[Oo]bj/
10+
/[Bb]uild/
11+
/[Bb]uilds/
12+
/[Ll]ogs/
13+
/[Mm]emoryCaptures/
14+
15+
# Asset meta data should only be ignored when the corresponding asset is also ignored
16+
!/[Aa]ssets/**/*.meta
17+
18+
# Uncomment this line if you wish to ignore the asset store tools plugin
19+
# /[Aa]ssets/AssetStoreTools*
20+
21+
# Autogenerated Jetbrains Rider plugin
22+
[Aa]ssets/Plugins/Editor/JetBrains*
23+
24+
# Visual Studio cache directory
25+
.vs/
26+
27+
# Gradle cache directory
28+
.gradle/
29+
30+
# Autogenerated VS/MD/Consulo solution and project files
31+
ExportedObj/
32+
.consulo/
33+
*.csproj
34+
*.unityproj
35+
*.sln
36+
*.suo
37+
*.tmp
38+
*.user
39+
*.userprefs
40+
*.pidb
41+
*.booproj
42+
*.svd
43+
*.pdb
44+
*.mdb
45+
*.opendb
46+
*.VC.db
47+
48+
# Unity3D generated meta files
49+
*.pidb.meta
50+
*.pdb.meta
51+
*.mdb.meta
52+
*.phg.meta
53+
54+
# Unity3D generated file on crash reports
55+
sysinfo.txt
56+
57+
# Builds
58+
*.apk
59+
*.unitypackage
60+
61+
# Crashlytics generated file
62+
crashlytics-build.properties
63+
>>>>>>> 475fce4 (no message)

Assets/Scenes.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)