Skip to content

Commit 30db760

Browse files
2004seraph2004seraph
committedJan 10, 2023
[Sync]
·
1.0
1 parent 0195774 commit 30db760

File tree

4 files changed

+26
-85
lines changed

4 files changed

+26
-85
lines changed
 

‎Assets/Prefabs/Game/Map.prefab

+5-5
Original file line numberDiff line numberDiff line change
@@ -5873,13 +5873,13 @@ MonoBehaviour:
58735873
rockTilemap: {fileID: 6006534327195894770}
58745874
wheatTileMap: {fileID: 4768176161150930586}
58755875
rockTiles:
5876-
- {fileID: 0}
5877-
- {fileID: 0}
5878-
- {fileID: 0}
5879-
- {fileID: 0}
5876+
- {fileID: 11400000, guid: d9b75bb571484c043adcdcceb2c2c5d9, type: 2}
5877+
- {fileID: 11400000, guid: 27971c75d880a1543b12bee3bed983f3, type: 2}
5878+
- {fileID: 11400000, guid: f5a7d1c9d8a575e40a714ab1bf1760be, type: 2}
5879+
- {fileID: 11400000, guid: 6e9ba5fe4e2900a45b183eb72f729ffa, type: 2}
58805880
rockGameObject: {fileID: 2209802244628092795, guid: 6e5d84bb061bcbd498f30340e21c82e3, type: 3}
58815881
rockSpawnArea: {fileID: 4921224599330009608}
5882-
spawnChancePerTileRow: 0.001
5882+
spawnChancePerTileRow: 0.00046
58835883
--- !u!61 &279286572
58845884
BoxCollider2D:
58855885
m_ObjectHideFlags: 0

‎Assets/Scenes/Level_1.unity

+1-64
Original file line numberDiff line numberDiff line change
@@ -128,28 +128,6 @@ Transform:
128128
m_CorrespondingSourceObject: {fileID: 4554809320267970908, guid: 85f0273fa1c0f324081175b46d5adfa2, type: 3}
129129
m_PrefabInstance: {fileID: 1235662130}
130130
m_PrefabAsset: {fileID: 0}
131-
--- !u!1 &279286566 stripped
132-
GameObject:
133-
m_CorrespondingSourceObject: {fileID: 4768176161849923041, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
134-
m_PrefabInstance: {fileID: 802907102}
135-
m_PrefabAsset: {fileID: 0}
136-
--- !u!114 &279286579
137-
MonoBehaviour:
138-
m_ObjectHideFlags: 0
139-
m_CorrespondingSourceObject: {fileID: 0}
140-
m_PrefabInstance: {fileID: 0}
141-
m_PrefabAsset: {fileID: 0}
142-
m_GameObject: {fileID: 279286566}
143-
m_Enabled: 1
144-
m_EditorHideFlags: 0
145-
m_Script: {fileID: 11500000, guid: 5805f4af29a55564a9459b6450058f39, type: 3}
146-
m_Name:
147-
m_EditorClassIdentifier:
148-
wheatBladePrefab: {fileID: 7935303435112670419, guid: 1b4d360529222484596d0cc254391d05, type: 3}
149-
amount: 250
150-
wheatDirectionForce: 5
151-
leftAngleLimit: 0.2
152-
rightAngleLimit: 0.2
153131
--- !u!4 &326689193 stripped
154132
Transform:
155133
m_CorrespondingSourceObject: {fileID: 257517336259343599, guid: c892409fe84a0b843a522d9f743a7a83, type: 3}
@@ -162,14 +140,6 @@ PrefabInstance:
162140
m_Modification:
163141
m_TransformParent: {fileID: 0}
164142
m_Modifications:
165-
- target: {fileID: 266212013, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
166-
propertyPath: rockSpawnArea
167-
value:
168-
objectReference: {fileID: 1943259753}
169-
- target: {fileID: 266212013, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
170-
propertyPath: spawnChancePerTileRow
171-
value: 0.00046
172-
objectReference: {fileID: 0}
173143
- target: {fileID: 52253893229775212, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
174144
propertyPath: m_LocalPosition.x
175145
value: -83.51
@@ -186,22 +156,6 @@ PrefabInstance:
186156
propertyPath: m_IsActive
187157
value: 0
188158
objectReference: {fileID: 0}
189-
- target: {fileID: 4768176161150930585, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
190-
propertyPath: m_Size.x
191-
value: 164.63153
192-
objectReference: {fileID: 0}
193-
- target: {fileID: 4768176161150930585, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
194-
propertyPath: m_Size.y
195-
value: 62.449554
196-
objectReference: {fileID: 0}
197-
- target: {fileID: 4768176161150930585, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
198-
propertyPath: m_Offset.x
199-
value: -1.442276
200-
objectReference: {fileID: 0}
201-
- target: {fileID: 4768176161150930585, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
202-
propertyPath: m_Offset.y
203-
value: -37.701828
204-
objectReference: {fileID: 0}
205159
- target: {fileID: 4768176161150930586, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
206160
propertyPath: m_Size.x
207161
value: 161
@@ -427598,14 +427552,6 @@ PrefabInstance:
427598427552
propertyPath: m_Tiles.Array.data[17789].second.m_TileObjectToInstantiateIndex
427599427553
value: 65535
427600427554
objectReference: {fileID: 0}
427601-
- target: {fileID: 4768176161150930587, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
427602-
propertyPath: m_Enabled
427603-
value: 1
427604-
objectReference: {fileID: 0}
427605-
- target: {fileID: 4768176161150930587, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
427606-
propertyPath: m_UsedByComposite
427607-
value: 0
427608-
objectReference: {fileID: 0}
427609427555
- target: {fileID: 4768176161237209988, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
427610427556
propertyPath: m_SizeDelta.x
427611427557
value: 162.5345
@@ -1396082,11 +1396028,7 @@ PrefabInstance:
13960821396028
propertyPath: m_Tiles.Array.data[12496].second.m_TileObjectToInstantiateIndex
13960831396029
value: 65535
13960841396030
objectReference: {fileID: 0}
1396085-
m_RemovedComponents:
1396086-
- {fileID: 4358546731332531823, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
1396087-
- {fileID: 3473995788189136852, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
1396088-
- {fileID: 2430896694066947161, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
1396089-
- {fileID: 4768176161150930582, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
1396031+
m_RemovedComponents: []
13960901396032
m_SourcePrefab: {fileID: 100100000, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
13960911396033
--- !u!1001 &1024977483
13960921396034
PrefabInstance:
@@ -1396701,11 +1396643,6 @@ Tilemap:
13967011396643
m_CorrespondingSourceObject: {fileID: 4768176162178232429, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
13967021396644
m_PrefabInstance: {fileID: 802907102}
13967031396645
m_PrefabAsset: {fileID: 0}
1396704-
--- !u!224 &1943259753 stripped
1396705-
RectTransform:
1396706-
m_CorrespondingSourceObject: {fileID: 4921224599330009608, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
1396707-
m_PrefabInstance: {fileID: 802907102}
1396708-
m_PrefabAsset: {fileID: 0}
13967091396646
--- !u!1001 &2000045594
13967101396647
PrefabInstance:
13967111396648
m_ObjectHideFlags: 0

‎Assets/Scenes/Level_2.unity

+15-11
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,7 @@ NavMeshSettings:
123123
debug:
124124
m_Flags: 0
125125
m_NavMeshData: {fileID: 0}
126-
--- !u!4 &194373126 stripped
127-
Transform:
128-
m_CorrespondingSourceObject: {fileID: 4554809320267970908, guid: 85f0273fa1c0f324081175b46d5adfa2, type: 3}
129-
m_PrefabInstance: {fileID: 1235662130}
130-
m_PrefabAsset: {fileID: 0}
131-
--- !u!4 &326689193 stripped
132-
Transform:
133-
m_CorrespondingSourceObject: {fileID: 257517336259343599, guid: c892409fe84a0b843a522d9f743a7a83, type: 3}
134-
m_PrefabInstance: {fileID: 1024977483}
135-
m_PrefabAsset: {fileID: 0}
136-
--- !u!43 &693917815
126+
--- !u!43 &9419090
137127
Mesh:
138128
m_ObjectHideFlags: 0
139129
m_CorrespondingSourceObject: {fileID: 0}
@@ -297,13 +287,27 @@ Mesh:
297287
offset: 0
298288
size: 0
299289
path:
290+
--- !u!4 &194373126 stripped
291+
Transform:
292+
m_CorrespondingSourceObject: {fileID: 4554809320267970908, guid: 85f0273fa1c0f324081175b46d5adfa2, type: 3}
293+
m_PrefabInstance: {fileID: 1235662130}
294+
m_PrefabAsset: {fileID: 0}
295+
--- !u!4 &326689193 stripped
296+
Transform:
297+
m_CorrespondingSourceObject: {fileID: 257517336259343599, guid: c892409fe84a0b843a522d9f743a7a83, type: 3}
298+
m_PrefabInstance: {fileID: 1024977483}
299+
m_PrefabAsset: {fileID: 0}
300300
--- !u!1001 &802907102
301301
PrefabInstance:
302302
m_ObjectHideFlags: 0
303303
serializedVersion: 2
304304
m_Modification:
305305
m_TransformParent: {fileID: 0}
306306
m_Modifications:
307+
- target: {fileID: 266212013, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
308+
propertyPath: spawnChancePerTileRow
309+
value: 0.001
310+
objectReference: {fileID: 0}
307311
- target: {fileID: 4768176161849923041, guid: 6490d75fec24bde4db1e6aafc8599889, type: 3}
308312
propertyPath: m_Name
309313
value: Map

‎UserSettings/EditorUserSettings.asset

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ EditorUserSettings:
2121
value: 55040c0701500b0c5456087a41750e44424f1b28797e7e642f784a36b3e2613a
2222
flags: 0
2323
RecentlyUsedSceneGuid-5:
24-
value: 0053060056575c035a5f582744735e444715192e2e70206975714d31b2e26d61
24+
value: 5704570356510f585f0d54264674074415164b2b757025647b704963e3e1313d
2525
flags: 0
2626
RecentlyUsedSceneGuid-6:
27-
value: 5308560354515a0b5b59552049700c44134f4879287d7f65747f4860b3b6353e
27+
value: 0105560555065d0b09595c7b157a5b44144f1c7b792c76602c2d1c61b3b5366b
2828
flags: 0
2929
RecentlyUsedSceneGuid-7:
30-
value: 5704570356510f585f0d54264674074415164b2b757025647b704963e3e1313d
30+
value: 56550754075059595d0b587a46220b4440164f2b7e717f662f701e6abbb16c6c
3131
flags: 0
3232
RecentlyUsedSceneGuid-8:
33-
value: 0105560555065d0b09595c7b157a5b44144f1c7b792c76602c2d1c61b3b5366b
33+
value: 5308560354515a0b5b59552049700c44134f4879287d7f65747f4860b3b6353e
3434
flags: 0
3535
RecentlyUsedSceneGuid-9:
36-
value: 56550754075059595d0b587a46220b4440164f2b7e717f662f701e6abbb16c6c
36+
value: 0053060056575c035a5f582744735e444715192e2e70206975714d31b2e26d61
3737
flags: 0
3838
UnityEditor.ShaderGraph.Blackboard:
3939
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7

0 commit comments

Comments
 (0)