Skip to content

Commit d5f131a

Browse files
Merge branch 'release/3.0.0'
2 parents de40faf + cc560b8 commit d5f131a

40 files changed

+10203
-88
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,4 @@ sysinfo.txt
5858
# Crashlytics generated file
5959
crashlytics-build.properties
6060

61+
GameManager/UserSettings
Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &5166479687787623328
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 6486160882458499023}
12+
- component: {fileID: 5024527664607517038}
13+
- component: {fileID: 8397185713902054875}
14+
- component: {fileID: 3899286836475884979}
15+
m_Layer: 0
16+
m_Name: Floor
17+
m_TagString: Untagged
18+
m_Icon: {fileID: 0}
19+
m_NavMeshLayer: 0
20+
m_StaticEditorFlags: 0
21+
m_IsActive: 1
22+
--- !u!4 &6486160882458499023
23+
Transform:
24+
m_ObjectHideFlags: 0
25+
m_CorrespondingSourceObject: {fileID: 0}
26+
m_PrefabInstance: {fileID: 0}
27+
m_PrefabAsset: {fileID: 0}
28+
m_GameObject: {fileID: 5166479687787623328}
29+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
30+
m_LocalPosition: {x: 0, y: 0, z: 0}
31+
m_LocalScale: {x: 1, y: 1, z: 1}
32+
m_Children:
33+
- {fileID: 3942603140928442393}
34+
- {fileID: 9001595817168728514}
35+
m_Father: {fileID: 8053255074471948672}
36+
m_RootOrder: 0
37+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
38+
--- !u!33 &5024527664607517038
39+
MeshFilter:
40+
m_ObjectHideFlags: 0
41+
m_CorrespondingSourceObject: {fileID: 0}
42+
m_PrefabInstance: {fileID: 0}
43+
m_PrefabAsset: {fileID: 0}
44+
m_GameObject: {fileID: 5166479687787623328}
45+
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
46+
--- !u!23 &8397185713902054875
47+
MeshRenderer:
48+
m_ObjectHideFlags: 0
49+
m_CorrespondingSourceObject: {fileID: 0}
50+
m_PrefabInstance: {fileID: 0}
51+
m_PrefabAsset: {fileID: 0}
52+
m_GameObject: {fileID: 5166479687787623328}
53+
m_Enabled: 1
54+
m_CastShadows: 1
55+
m_ReceiveShadows: 1
56+
m_DynamicOccludee: 1
57+
m_MotionVectors: 1
58+
m_LightProbeUsage: 1
59+
m_ReflectionProbeUsage: 1
60+
m_RayTracingMode: 2
61+
m_RayTraceProcedural: 0
62+
m_RenderingLayerMask: 1
63+
m_RendererPriority: 0
64+
m_Materials:
65+
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
66+
m_StaticBatchInfo:
67+
firstSubMesh: 0
68+
subMeshCount: 0
69+
m_StaticBatchRoot: {fileID: 0}
70+
m_ProbeAnchor: {fileID: 0}
71+
m_LightProbeVolumeOverride: {fileID: 0}
72+
m_ScaleInLightmap: 1
73+
m_ReceiveGI: 1
74+
m_PreserveUVs: 0
75+
m_IgnoreNormalsForChartDetection: 0
76+
m_ImportantGI: 0
77+
m_StitchLightmapSeams: 1
78+
m_SelectedEditorRenderState: 3
79+
m_MinimumChartSize: 4
80+
m_AutoUVMaxDistance: 0.5
81+
m_AutoUVMaxAngle: 89
82+
m_LightmapParameters: {fileID: 0}
83+
m_SortingLayerID: 0
84+
m_SortingLayer: 0
85+
m_SortingOrder: 0
86+
m_AdditionalVertexStreams: {fileID: 0}
87+
--- !u!64 &3899286836475884979
88+
MeshCollider:
89+
m_ObjectHideFlags: 0
90+
m_CorrespondingSourceObject: {fileID: 0}
91+
m_PrefabInstance: {fileID: 0}
92+
m_PrefabAsset: {fileID: 0}
93+
m_GameObject: {fileID: 5166479687787623328}
94+
m_Material: {fileID: 0}
95+
m_IsTrigger: 0
96+
m_Enabled: 1
97+
serializedVersion: 4
98+
m_Convex: 0
99+
m_CookingOptions: 30
100+
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
101+
--- !u!1 &7246886673919818794
102+
GameObject:
103+
m_ObjectHideFlags: 0
104+
m_CorrespondingSourceObject: {fileID: 0}
105+
m_PrefabInstance: {fileID: 0}
106+
m_PrefabAsset: {fileID: 0}
107+
serializedVersion: 6
108+
m_Component:
109+
- component: {fileID: 3942603140928442393}
110+
m_Layer: 0
111+
m_Name: DummyPlacement1
112+
m_TagString: Untagged
113+
m_Icon: {fileID: 0}
114+
m_NavMeshLayer: 0
115+
m_StaticEditorFlags: 0
116+
m_IsActive: 1
117+
--- !u!4 &3942603140928442393
118+
Transform:
119+
m_ObjectHideFlags: 0
120+
m_CorrespondingSourceObject: {fileID: 0}
121+
m_PrefabInstance: {fileID: 0}
122+
m_PrefabAsset: {fileID: 0}
123+
m_GameObject: {fileID: 7246886673919818794}
124+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
125+
m_LocalPosition: {x: 0, y: 0.2, z: -1.48}
126+
m_LocalScale: {x: 1, y: 1, z: 1}
127+
m_Children: []
128+
m_Father: {fileID: 6486160882458499023}
129+
m_RootOrder: 0
130+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
131+
--- !u!1 &8345176460015995102
132+
GameObject:
133+
m_ObjectHideFlags: 0
134+
m_CorrespondingSourceObject: {fileID: 0}
135+
m_PrefabInstance: {fileID: 0}
136+
m_PrefabAsset: {fileID: 0}
137+
serializedVersion: 6
138+
m_Component:
139+
- component: {fileID: 8053255074471948672}
140+
- component: {fileID: 8222125869813640134}
141+
m_Layer: 0
142+
m_Name: MyLevelSceneBase
143+
m_TagString: Untagged
144+
m_Icon: {fileID: 0}
145+
m_NavMeshLayer: 0
146+
m_StaticEditorFlags: 0
147+
m_IsActive: 1
148+
--- !u!4 &8053255074471948672
149+
Transform:
150+
m_ObjectHideFlags: 0
151+
m_CorrespondingSourceObject: {fileID: 0}
152+
m_PrefabInstance: {fileID: 0}
153+
m_PrefabAsset: {fileID: 0}
154+
m_GameObject: {fileID: 8345176460015995102}
155+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
156+
m_LocalPosition: {x: 0, y: 0, z: 0}
157+
m_LocalScale: {x: 1, y: 1, z: 1}
158+
m_Children:
159+
- {fileID: 6486160882458499023}
160+
m_Father: {fileID: 0}
161+
m_RootOrder: 0
162+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
163+
--- !u!114 &8222125869813640134
164+
MonoBehaviour:
165+
m_ObjectHideFlags: 0
166+
m_CorrespondingSourceObject: {fileID: 0}
167+
m_PrefabInstance: {fileID: 0}
168+
m_PrefabAsset: {fileID: 0}
169+
m_GameObject: {fileID: 8345176460015995102}
170+
m_Enabled: 1
171+
m_EditorHideFlags: 0
172+
m_Script: {fileID: 11500000, guid: 5929b1764bb82485f999481497b2470c, type: 3}
173+
m_Name:
174+
m_EditorClassIdentifier:
175+
dummyPlacement1: {fileID: 3942603140928442393}
176+
dummyPlacement2: {fileID: 9001595817168728514}
177+
--- !u!1 &8403408784546045614
178+
GameObject:
179+
m_ObjectHideFlags: 0
180+
m_CorrespondingSourceObject: {fileID: 0}
181+
m_PrefabInstance: {fileID: 0}
182+
m_PrefabAsset: {fileID: 0}
183+
serializedVersion: 6
184+
m_Component:
185+
- component: {fileID: 9001595817168728514}
186+
m_Layer: 0
187+
m_Name: DummyPlacement2
188+
m_TagString: Untagged
189+
m_Icon: {fileID: 0}
190+
m_NavMeshLayer: 0
191+
m_StaticEditorFlags: 0
192+
m_IsActive: 1
193+
--- !u!4 &9001595817168728514
194+
Transform:
195+
m_ObjectHideFlags: 0
196+
m_CorrespondingSourceObject: {fileID: 0}
197+
m_PrefabInstance: {fileID: 0}
198+
m_PrefabAsset: {fileID: 0}
199+
m_GameObject: {fileID: 8403408784546045614}
200+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
201+
m_LocalPosition: {x: 1.81, y: 0.2, z: 2.21}
202+
m_LocalScale: {x: 1, y: 1, z: 1}
203+
m_Children: []
204+
m_Father: {fileID: 6486160882458499023}
205+
m_RootOrder: 1
206+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

GameManager/Assets/Joyixir/GameManager/Demo/Prefabs/MyLevelSceneBase.prefab.meta

Lines changed: 7 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)