Commit 472c5783 authored by Unknown's avatar Unknown
Browse files

Merge remote-tracking branch 'origin/master'

parents 7a560776 d6c5c3f3
stages:
- License
- Build
- Build [Release]
- Deploy
- Release
variables:
PROJECT_NAME: "suck-it"
UNITY_VERSION: "2018.3.7f1"
NEXTCLOUD_SHARE_PATH: "$NEXTCLOUD_DEPLOY_BASE_PATH/$PROJECT_NAME"
NEXTCLOUD_DEPLOY_PATH: "$NEXTCLOUD_USERNAME/$NEXTCLOUD_DEPLOY_BASE_PATH/$PROJECT_NAME"
.non_release_build:
only:
variables:
- $RUN_NON_RELEASE_BUILDS
include:
# Base
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/build-base.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/license.yml
# Platforms
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/windows64.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/osx.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/linux.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/webgl.yml
# Deploy
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/deploy/all-to-nextcloud.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/deploy/webgl-to-pages.yml
# Release
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/release/all-nextcloud.yml
stages:
- License
- Build
- Build [Release]
- Deploy
- Release
variables:
PROJECT_NAME: "suck-it"
UNITY_VERSION: "2018.3.7f1"
NEXTCLOUD_FILE_BASE_URL: "$NEXTCLOUD_DOWNLOAD_BASE_URL/$PROJECT_NAME"
NEXTCLOUD_DEPLOY_PATH: "$NEXTCLOUD_USERNAME/$NEXTCLOUD_DEPLOY_BASE_PATH/$PROJECT_NAME"
.non_release_build:
only:
variables:
- $RUN_NON_RELEASE_BUILDS
include:
# Base
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/build-base.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/license.yml
# Platforms
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/windows64.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/osx.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/linux.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/webgl.yml
# Deploy
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/deploy/all-to-nextcloud.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/deploy/webgl-to-pages.yml
# Release
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/release/all-nextcloud-no-share.yml
......@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3}
propertyPath: m_Name
value: Air
value: AirElement
objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3}
......
......@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3}
propertyPath: m_Name
value: Earth
value: EarthElement
objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3}
......
......@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3}
propertyPath: m_Name
value: Fire
value: FireElement
objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3}
......
......@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3}
propertyPath: m_Name
value: Water
value: WaterElement
objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3}
......
......@@ -53,7 +53,7 @@ Rigidbody2D:
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_CollisionDetection: 1
m_Constraints: 0
--- !u!70 &70840632841850180
CapsuleCollider2D:
......
......@@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 52145075018362291}
- component: {fileID: 52145075018362284}
- component: {fileID: 52145075018362287}
m_Layer: 0
m_Layer: 10
m_Name: Player
m_TagString: Player
m_Icon: {fileID: 0}
......@@ -119,6 +119,8 @@ MonoBehaviour:
m_GroundedOffset: {x: 0, y: -1}
m_SecondsWaitToJump: 0.5
m_MaxJumpCount: 1
m_fallMultiplier: 2.5
m_lowJumpMultiplier: 2
OnLandEvent:
m_PersistentCalls:
m_Calls: []
......
......@@ -68,7 +68,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: ecc204495234d40f091d828790c56287, type: 3}
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -76,6 +76,6 @@ SpriteRenderer:
m_Size: {x: 2.875, y: 1.75}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
......@@ -167,6 +167,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 212219553255752332, guid: 49ad5eee708571d449789cb994b54fcb,
type: 3}
propertyPath: m_SortingLayerID
value: -614652393
objectReference: {fileID: 0}
- target: {fileID: 212219553255752332, guid: 49ad5eee708571d449789cb994b54fcb,
type: 3}
propertyPath: m_SortingLayer
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49ad5eee708571d449789cb994b54fcb, type: 3}
--- !u!1001 &252735506
......@@ -241,6 +251,16 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 105682324961186856, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_SortingLayerID
value: -614652393
objectReference: {fileID: 0}
- target: {fileID: 105682324961186856, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_SortingLayer
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1, type: 3}
--- !u!1001 &393328824
......@@ -258,12 +278,12 @@ PrefabInstance:
- target: {fileID: 7340435369038607274, guid: 938701439f7d9654da1b920d73ccf2cc,
type: 3}
propertyPath: m_LocalPosition.x
value: 13.45824
value: 8.68
objectReference: {fileID: 0}
- target: {fileID: 7340435369038607274, guid: 938701439f7d9654da1b920d73ccf2cc,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.8468156
value: 3.5
objectReference: {fileID: 0}
- target: {fileID: 7340435369038607274, guid: 938701439f7d9654da1b920d73ccf2cc,
type: 3}
......@@ -330,6 +350,16 @@ PrefabInstance:
propertyPath: Cooldown
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7340435369038607269, guid: 938701439f7d9654da1b920d73ccf2cc,
type: 3}
propertyPath: m_SortingLayerID
value: -614652393
objectReference: {fileID: 0}
- target: {fileID: 7340435369038607269, guid: 938701439f7d9654da1b920d73ccf2cc,
type: 3}
propertyPath: m_SortingLayer
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 938701439f7d9654da1b920d73ccf2cc, type: 3}
--- !u!1 &438036704
......@@ -559,21 +589,21 @@ SpriteShapeRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -614652393
m_SortingLayer: 4
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: ba99f04fad336dc4cae4bc02a82688c1, type: 3}
m_Sprites:
- {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}
- {fileID: 21300000, guid: fee06510a1f7a83439b28ea3c2c45c47, type: 3}
- {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3}
- {fileID: 21300000, guid: e876b7a7d77efce479e91dd5bdd9c801, type: 3}
- {fileID: 21300000, guid: 8e00a1a482dd4b246b7304f2b325dc1f, type: 3}
- {fileID: 21300000, guid: 7a6e3bcd9bf346243afec76782b04456, type: 3}
- {fileID: 21300000, guid: 7a33ec8d81f8de84e9bcee25c84a0a68, type: 3}
- {fileID: 21300000, guid: 12ccb39abf7fdde4489b45f7dc2ddb95, type: 3}
- {fileID: 21300000, guid: 32f1aa5b812a2a349afca26ff07162f8, type: 3}
- {fileID: 21300000, guid: 8def5351e5bb6664eb4d57cf426463d9, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
......@@ -705,6 +735,16 @@ PrefabInstance:
propertyPath: chillTime
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 212219553255752332, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: m_SortingLayerID
value: -614652393
objectReference: {fileID: 0}
- target: {fileID: 212219553255752332, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: m_SortingLayer
value: 4
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114692363085912100, guid: 6cd7f8e10f89642fd88661db0d3f3827, type: 3}
- {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827, type: 3}
......@@ -855,21 +895,21 @@ SpriteShapeRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -614652393
m_SortingLayer: 4
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: ba99f04fad336dc4cae4bc02a82688c1, type: 3}
m_Sprites:
- {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}
- {fileID: 21300000, guid: fee06510a1f7a83439b28ea3c2c45c47, type: 3}
- {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3}
- {fileID: 21300000, guid: e876b7a7d77efce479e91dd5bdd9c801, type: 3}
- {fileID: 21300000, guid: 8e00a1a482dd4b246b7304f2b325dc1f, type: 3}
- {fileID: 21300000, guid: 7a6e3bcd9bf346243afec76782b04456, type: 3}
- {fileID: 21300000, guid: 7a33ec8d81f8de84e9bcee25c84a0a68, type: 3}
- {fileID: 21300000, guid: 12ccb39abf7fdde4489b45f7dc2ddb95, type: 3}
- {fileID: 21300000, guid: 32f1aa5b812a2a349afca26ff07162f8, type: 3}
- {fileID: 21300000, guid: 8def5351e5bb6664eb4d57cf426463d9, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
......@@ -970,7 +1010,8 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8.23, y: 4.14, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 1034831102}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1056,6 +1097,85 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1034831100
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1034831102}
- component: {fileID: 1034831101}
m_Layer: 0
m_Name: New Sprite
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!212 &1034831101
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1034831100}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1309380763
m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 8e160a2a620644cd6afef9119dad1093, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 21.333334, y: 13.333333}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &1034831102
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1034831100}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.349, y: -1.147, z: 9.783643}
m_LocalScale: {x: 2.311536, y: 2.5124075, z: 1}
m_Children: []
m_Father: {fileID: 731052802}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1052745736
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -1123,6 +1243,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3962879857309384165, guid: 926b80f66a4f61b428fa10deff5f7842,
type: 3}
propertyPath: m_SortingLayerID
value: -614652393
objectReference: {fileID: 0}
- target: {fileID: 3962879857309384165, guid: 926b80f66a4f61b428fa10deff5f7842,
type: 3}
propertyPath: m_SortingLayer
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 926b80f66a4f61b428fa10deff5f7842, type: 3}
--- !u!1 &1156108368
......@@ -1289,28 +1419,28 @@ SpriteShapeRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -614652393
m_SortingLayer: 4
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: ba99f04fad336dc4cae4bc02a82688c1, 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: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
- {fileID: 21300000, guid: fee06510a1f7a83439b28ea3c2c45c47, type: 3}
- {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3}
- {fileID: 21300000, guid: e876b7a7d77efce479e91dd5bdd9c801, type: 3}
- {fileID: 21300000, guid: 8e00a1a482dd4b246b7304f2b325dc1f, type: 3}
- {fileID: 21300000, guid: 7a6e3bcd9bf346243afec76782b04456, type: 3}
- {fileID: 21300000, guid: 7a33ec8d81f8de84e9bcee25c84a0a68, type: 3}
- {fileID: 21300000, guid: 12ccb39abf7fdde4489b45f7dc2ddb95, type: 3}
- {fileID: 21300000, guid: 32f1aa5b812a2a349afca26ff07162f8, type: 3}
- {fileID: 21300000, guid: 8def5351e5bb6664eb4d57cf426463d9, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 8.789512, y: 10.025252, z: -0.003}
m_Extent: {x: 14.252393, y: 9.947997, z: 0.003}
m_Center: {x: 8.787528, y: 10.004696, z: -0.003}
m_Extent: {x: 14.22487, y: 9.894186, z: 0.003}
--- !u!4 &1523356287
Transform:
m_ObjectHideFlags: 0
......@@ -1435,21 +1565,21 @@ SpriteShapeRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -614652393
m_SortingLayer: 4
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: ba99f04fad336dc4cae4bc02a82688c1, type: 3}
m_Sprites:
- {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}
- {fileID: 21300000, guid: fee06510a1f7a83439b28ea3c2c45c47, type: 3}
- {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3}
- {fileID: 21300000, guid: e876b7a7d77efce479e91dd5bdd9c801, type: 3}
- {fileID: 21300000, guid: 8e00a1a482dd4b246b7304f2b325dc1f, type: 3}
- {fileID: 21300000, guid: 7a6e3bcd9bf346243afec76782b04456, type: 3}
- {fileID: 21300000, guid: 7a33ec8d81f8de84e9bcee25c84a0a68, type: 3}
- {fileID: 21300000, guid: 12ccb39abf7fdde4489b45f7dc2ddb95, type: 3}
- {fileID: 21300000, guid: 32f1aa5b812a2a349afca26ff07162f8, type: 3}
- {fileID: 21300000, guid: 8def5351e5bb6664eb4d57cf426463d9, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
......@@ -1599,28 +1729,28 @@ SpriteShapeRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -614652393
m_SortingLayer: 4
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: ba99f04fad336dc4cae4bc02a82688c1, 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: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
- {fileID: 21300000, guid: fee06510a1f7a83439b28ea3c2c45c47, type: 3}
- {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3}
- {fileID: 21300000, guid: e876b7a7d77efce479e91dd5bdd9c801, type: 3}
- {fileID: 21300000, guid: 8e00a1a482dd4b246b7304f2b325dc1f, type: 3}
- {fileID: 21300000, guid: 7a6e3bcd9bf346243afec76782b04456, type: 3}
- {fileID: 21300000, guid: 7a33ec8d81f8de84e9bcee25c84a0a68, type: 3}
- {fileID: 21300000, guid: 12ccb39abf7fdde4489b45f7dc2ddb95, type: 3}
- {fileID: 21300000, guid: 32f1aa5b812a2a349afca26ff07162f8, type: 3}
- {fileID: 21300000, guid: 8def5351e5bb6664eb4d57cf426463d9, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: -0.66746855, y: 13.07561, z: -0.0025000002}
m_Extent: {x: 5.4537463, y: 12.956489, z: 0.0025000002}
m_Center: {x: -0.6698246, y: 13.055054, z: -0.0025000002}
m_Extent: {x: 5.4258513, y: 12.902678, z: 0.0025000002}
--- !u!4 &1855488232
Transform:
m_ObjectHideFlags: 0
......@@ -1707,6 +1837,16 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2918200888185297756, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_SortingLayerID
value: -614652393
objectReference: {fileID: 0}
- target: {fileID: 2918200888185297756, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_SortingLayer
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4512b8eb550115443bbba2ecd59a960c, type: 3}
--- !u!4 &1997262710 stripped
......@@ -1934,21 +2074,21 @@ SpriteShapeRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -614652393
m_SortingLayer: 4
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: ba99f04fad336dc4cae4bc02a82688c1, type: 3}
m_Sprites:
- {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}
- {fileID: 21300000, guid: fee06510a1f7a83439b28ea3c2c45c47