Commit f0377d2b authored by Michael But's avatar Michael But
Browse files

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it

# Conflicts:
#	Assets/_Game/Scripts/Player/PlayerAttacks/Fire/PlayerFireAttack.cs.meta
#	Assets/_Game/Scripts/Player/PlayerAttacks/Fire/PlayerFireProjectile.cs.meta
#	Assets/_Game/Scripts/Player/PlayerAttacks/Player_FireAttack.cs.meta
#	Assets/_Game/Scripts/Player/PlayerAttacks/Player_FireProjectile.cs.meta
parents 69a10905 710506f3
......@@ -9,7 +9,7 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 0}
m_Script: {fileID: 11500000, guid: d3ce1e10b2e79864eb493cdf9d78e741, type: 3}
m_Name: Movement States
m_EditorClassIdentifier: Assembly-CSharp:_Game.Scripts.Scriptable_Object:MovementStates
airMoveState:
......
......@@ -12,13 +12,15 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 353b156b7c59b1c45a8767d7500b31fb, type: 3}
m_Name: PlayerState
m_EditorClassIdentifier:
currentInfusedElement: 0
currentMoveState: {fileID: 11400000, guid: 11203796b90159848b6c5f4217eed3ec, type: 2}
airMoveState: {fileID: 11400000, guid: d8ddf6924a883e94583c59a55fd11f8d, type: 2}
earthMoveState: {fileID: 11400000, guid: 92286a125406f3643b98aa3f886d53b1, type: 2}
fireMoveState: {fileID: 11400000, guid: 805f35d42b113b841b2c8f64adf50f4a, type: 2}
waterMoveState: {fileID: 11400000, guid: b76e74a09da3f224f99559ac3d31fc0c, type: 2}
defaultMoveState: {fileID: 11400000, guid: 11203796b90159848b6c5f4217eed3ec, type: 2}
currentMoveState:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
movementStates: {fileID: 11400000, guid: c757aad6925b37a46b916f609fa9012b, type: 2}
currentJumpForce: 0
currentSmoothing: 0
currentAirControl: 0
......
......@@ -12,9 +12,10 @@ GameObject:
- component: {fileID: 8382647395794564539}
- component: {fileID: 707565156377968333}
- component: {fileID: 6258883857105394474}
m_Layer: 0
- component: {fileID: 3289220650684677341}
m_Layer: 12
m_Name: WaterAttack
m_TagString: Untagged
m_TagString: Water
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -28,7 +29,7 @@ Transform:
m_GameObject: {fileID: 7588789901055592565}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1.5, y: 1.5, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
......@@ -126,5 +127,18 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.0001, y: 0.0001}
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!114 &3289220650684677341
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7588789901055592565}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: de4023dc2d7d96345a45b29dd765644a, type: 3}
m_Name:
m_EditorClassIdentifier:
destroyTime: 2
......@@ -13,6 +13,7 @@ GameObject:
- component: {fileID: 61920140733709488}
- component: {fileID: 212219553255752332}
- component: {fileID: 114326583413855364}
- component: {fileID: 5987062824809259808}
- component: {fileID: 114716552753954768}
- component: {fileID: 114692363085912100}
- component: {fileID: 879798643589630551}
......@@ -148,6 +149,24 @@ MonoBehaviour:
detectionRange: 10
isInCombat: 0
desiredAction: []
--- !u!114 &5987062824809259808
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1634356314439590}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ba7900644f41dc6449121167e141a03b, type: 3}
m_Name:
m_EditorClassIdentifier:
weight: 0
isPerformingAction: 0
targetPos: {fileID: 0}
speed: 0
smoothTime: 0
groundDetection: {fileID: 0}
--- !u!114 &114716552753954768
MonoBehaviour:
m_ObjectHideFlags: 0
......
......@@ -564,12 +564,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -579,8 +579,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: -57.418484, y: 23.11382, z: -0.007}
m_Extent: {x: 61.361393, y: 18.694569, z: 0.007}
m_Center: {x: -57.421417, y: 23.093266, z: -0.007}
m_Extent: {x: 61.332924, y: 18.640759, z: 0.007}
--- !u!4 &438036707
Transform:
m_ObjectHideFlags: 0
......@@ -650,6 +650,26 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114692363085912100, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: weight
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: targetPos
value:
objectReference: {fileID: 1156108369}
- target: {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: smoothTime
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6cd7f8e10f89642fd88661db0d3f3827, type: 3}
--- !u!1 &719626315
......@@ -803,12 +823,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -818,8 +838,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: -19.186058, y: 10.159601, z: -0.0035}
m_Extent: {x: 34.539246, y: 15.721901, z: 0.0035}
m_Center: {x: -19.188976, y: 10.139042, z: -0.0035}
m_Extent: {x: 34.510788, y: 15.668093, z: 0.0035}
--- !u!4 &719626318
Transform:
m_ObjectHideFlags: 0
......@@ -1068,6 +1088,36 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 926b80f66a4f61b428fa10deff5f7842, type: 3}
--- !u!1 &1156108368
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1156108369}
m_Layer: 0
m_Name: PatrolSpot1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1156108369
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1156108368}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 15.84, y: 5.81, z: -0.21635683}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1475208694 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7340435369038607268, guid: 938701439f7d9654da1b920d73ccf2cc,
......@@ -1353,12 +1403,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -1368,8 +1418,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 0.015774608, y: 1.5293293, z: -0.002}
m_Extent: {x: 2.6183825, y: 1.1922958, z: 0.002}
m_Center: {x: 0.012822509, y: 1.5087739, z: -0.002}
m_Extent: {x: 2.589953, y: 1.1384853, z: 0.002}
--- !u!4 &1561658105
Transform:
m_ObjectHideFlags: 0
......@@ -1852,12 +1902,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -1867,8 +1917,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 32.08577, y: 5.665845, z: -0.008}
m_Extent: {x: 38.403244, y: 12.123242, z: 0.008}
m_Center: {x: 32.082836, y: 5.6452894, z: -0.008}
m_Extent: {x: 38.374775, y: 12.06943, z: 0.008}
--- !u!4 &2027679588
Transform:
m_ObjectHideFlags: 0
......
......@@ -452,12 +452,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -467,8 +467,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 1.7343783, y: 1.3796239, z: -0.002}
m_Extent: {x: 3.0256586, y: 1.3420053, z: 0.002}
m_Center: {x: 1.7314906, y: 1.3590682, z: -0.002}
m_Extent: {x: 2.9972425, y: 1.2881944, z: 0.002}
--- !u!4 &171962111
Transform:
m_ObjectHideFlags: 0
......@@ -725,12 +725,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -740,8 +740,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: -73.73873, y: 31.37173, z: -0.007}
m_Extent: {x: 41.41925, y: 12.819116, z: 0.007}
m_Center: {x: -73.73411, y: 31.351196, z: -0.007}
m_Extent: {x: 41.39833, y: 12.765331, z: 0.007}
--- !u!4 &438036707
Transform:
m_ObjectHideFlags: 0
......@@ -1434,12 +1434,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -1449,8 +1449,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 1.7343783, y: 1.3796239, z: -0.002}
m_Extent: {x: 3.0256586, y: 1.3420053, z: 0.002}
m_Center: {x: 1.7314906, y: 1.3590682, z: -0.002}
m_Extent: {x: 2.9972425, y: 1.2881944, z: 0.002}
--- !u!4 &469738028
Transform:
m_ObjectHideFlags: 0
......@@ -1535,17 +1535,22 @@ PrefabInstance:
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalScale.y
value: 4
value: 1
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalScale.x
value: 4
value: 1
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_GroundedRadius
value: 1.02
value: 1.24
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_GroundedOffset.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
......@@ -1773,12 +1778,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -1788,8 +1793,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 0.93691444, y: 11.389301, z: -0.0065}
m_Extent: {x: 54.597687, y: 16.132572, z: 0.0065}
m_Center: {x: 0.93398476, y: 11.368745, z: -0.0065}
m_Extent: {x: 54.569214, y: 16.078762, z: 0.0065}
--- !u!4 &719626318
Transform:
m_ObjectHideFlags: 0
......@@ -2908,12 +2913,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -2923,8 +2928,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 40.377125, y: 13.912304, z: -0.004}
m_Extent: {x: 46.906963, y: 5.6973033, z: 0.004}
m_Center: {x: 40.37442, y: 13.89175, z: -0.004}
m_Extent: {x: 46.878723, y: 5.643495, z: 0.004}
--- !u!4 &1025537130
Transform:
m_ObjectHideFlags: 0
......@@ -3593,12 +3598,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -3608,8 +3613,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 10.545332, y: 11.3079405, z: -0.003}
m_Extent: {x: 16.66773, y: 15.218499, z: 0.003}
m_Center: {x: 10.542403, y: 11.287395, z: -0.003}
m_Extent: {x: 16.639263, y: 15.164699, z: 0.003}
--- !u!4 &1334142119
Transform:
m_ObjectHideFlags: 0
......@@ -3971,12 +3976,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -3986,8 +3991,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: -0.27724838, y: 3.452533, z: -0.0035}
m_Extent: {x: 6.2040353, y: 3.935531, z: 0.0035}
m_Center: {x: -0.2787404, y: 3.4319797, z: -0.0035}
m_Extent: {x: 6.1770067, y: 3.881722, z: 0.0035}
--- !u!4 &1373053038
Transform:
m_ObjectHideFlags: 0
......@@ -4136,12 +4141,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
......@@ -4151,8 +4156,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 8.217659, y: 7.3102655, z: -0.003}
m_Extent: {x: 13.77669, y: 7.2330112, z: 0.003}
m_Center: {x: 8.215726, y: 7.289709, z: -0.003}
m_Extent: {x: 13.749217, y: 7.1792, z: 0.003}
--- !u!4 &1523356287
Transform:
m_ObjectHideFlags: 0
......@@ -4463,12 +4468,12 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}