Commit 0c4186c8 authored by Christopher Benes's avatar Christopher Benes
Browse files

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

parents 54a22828 472c5783
stages: stages:
- License - License
- Build - Build
- Build [Release] - Build [Release]
- Deploy - Deploy
- Release - Release
variables: variables:
PROJECT_NAME: "suck-it" PROJECT_NAME: "suck-it"
UNITY_VERSION: "2018.3.7f1" UNITY_VERSION: "2018.3.7f1"
NEXTCLOUD_SHARE_PATH: "$NEXTCLOUD_DEPLOY_BASE_PATH/$PROJECT_NAME" NEXTCLOUD_FILE_BASE_URL: "$NEXTCLOUD_DOWNLOAD_BASE_URL/$PROJECT_NAME"
NEXTCLOUD_DEPLOY_PATH: "$NEXTCLOUD_USERNAME/$NEXTCLOUD_DEPLOY_BASE_PATH/$PROJECT_NAME" NEXTCLOUD_DEPLOY_PATH: "$NEXTCLOUD_USERNAME/$NEXTCLOUD_DEPLOY_BASE_PATH/$PROJECT_NAME"
.non_release_build: .non_release_build:
only: only:
variables: variables:
- $RUN_NON_RELEASE_BUILDS - $RUN_NON_RELEASE_BUILDS
include: include:
# Base # 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/build-base.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/license.yml - https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/license.yml
# Platforms # 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/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/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/linux.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/webgl.yml - https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/webgl.yml
# Deploy # 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/all-to-nextcloud.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/deploy/webgl-to-pages.yml - https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/deploy/webgl-to-pages.yml
# Release # Release
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/release/all-nextcloud.yml - https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/release/all-nextcloud-no-share.yml
...@@ -10,7 +10,7 @@ PrefabInstance: ...@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Air value: AirElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
......
...@@ -10,7 +10,7 @@ PrefabInstance: ...@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Earth value: EarthElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
......
...@@ -10,7 +10,7 @@ PrefabInstance: ...@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Fire value: FireElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
......
...@@ -10,7 +10,7 @@ PrefabInstance: ...@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Water value: WaterElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
......
...@@ -53,7 +53,7 @@ Rigidbody2D: ...@@ -53,7 +53,7 @@ Rigidbody2D:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Interpolate: 0 m_Interpolate: 0
m_SleepingMode: 1 m_SleepingMode: 1
m_CollisionDetection: 0 m_CollisionDetection: 1
m_Constraints: 0 m_Constraints: 0
--- !u!70 &70840632841850180 --- !u!70 &70840632841850180
CapsuleCollider2D: CapsuleCollider2D:
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &100393043881132458
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 100393043881132463}
- component: {fileID: 100393043881132462}
- component: {fileID: 100393043881132461}
- component: {fileID: 100393043881132460}
- component: {fileID: 100393043881132459}
m_Layer: 4
m_Name: Water
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &100393043881132463
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100393043881132458}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 20, y: 10, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &100393043881132462
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100393043881132458}
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: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: d0cee4e8b659c5646ac1e205b88a3256, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &100393043881132461
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100393043881132458}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 1
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!253 &100393043881132460
BuoyancyEffector2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100393043881132458}
m_Enabled: 1
m_UseColliderMask: 1
m_ColliderMask:
serializedVersion: 2
m_Bits: 1024
m_SurfaceLevel: 0.5
m_Density: 2
m_LinearDrag: 5
m_AngularDrag: 5
m_FlowAngle: 0
m_FlowMagnitude: 0
m_FlowVariation: 0
--- !u!114 &100393043881132459
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100393043881132458}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e31800f7f0977471d9d711952e21cec3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_CharacterLayer: 10
fileFormatVersion: 2
guid: e9f234b3fda124fe29a2b937c13c099e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -14,7 +14,7 @@ GameObject: ...@@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 52145075018362291} - component: {fileID: 52145075018362291}
- component: {fileID: 52145075018362284} - component: {fileID: 52145075018362284}
- component: {fileID: 52145075018362287} - component: {fileID: 52145075018362287}
m_Layer: 0 m_Layer: 10
m_Name: Player m_Name: Player
m_TagString: Player m_TagString: Player
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
...@@ -119,6 +119,8 @@ MonoBehaviour: ...@@ -119,6 +119,8 @@ MonoBehaviour:
m_GroundedOffset: {x: 0, y: -1} m_GroundedOffset: {x: 0, y: -1}
m_SecondsWaitToJump: 0.5 m_SecondsWaitToJump: 0.5
m_MaxJumpCount: 1 m_MaxJumpCount: 1
m_fallMultiplier: 2.5
m_lowJumpMultiplier: 2
OnLandEvent: OnLandEvent:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
......
...@@ -167,6 +167,16 @@ PrefabInstance: ...@@ -167,6 +167,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 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_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49ad5eee708571d449789cb994b54fcb, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 49ad5eee708571d449789cb994b54fcb, type: 3}
--- !u!1001 &252735506 --- !u!1001 &252735506
...@@ -241,6 +251,16 @@ PrefabInstance: ...@@ -241,6 +251,16 @@ PrefabInstance:
propertyPath: m_IsTrigger propertyPath: m_IsTrigger
value: 1 value: 1
objectReference: {fileID: 0} 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_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1, type: 3}
--- !u!1001 &393328824 --- !u!1001 &393328824
...@@ -258,12 +278,12 @@ PrefabInstance: ...@@ -258,12 +278,12 @@ PrefabInstance:
- target: {fileID: 7340435369038607274, guid: 938701439f7d9654da1b920d73ccf2cc, - target: {fileID: 7340435369038607274, guid: 938701439f7d9654da1b920d73ccf2cc,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 13.45824 value: 8.68
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7340435369038607274, guid: 938701439f7d9654da1b920d73ccf2cc, - target: {fileID: 7340435369038607274, guid: 938701439f7d9654da1b920d73ccf2cc,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 1.8468156 value: 3.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7340435369038607274, guid: 938701439f7d9654da1b920d73ccf2cc, - target: {fileID: 7340435369038607274, guid: 938701439f7d9654da1b920d73ccf2cc,
type: 3} type: 3}
...@@ -330,6 +350,16 @@ PrefabInstance: ...@@ -330,6 +350,16 @@ PrefabInstance:
propertyPath: Cooldown propertyPath: Cooldown
value: 2 value: 2
objectReference: {fileID: 0} 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_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 938701439f7d9654da1b920d73ccf2cc, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 938701439f7d9654da1b920d73ccf2cc, type: 3}
--- !u!1 &438036704 --- !u!1 &438036704
...@@ -559,21 +589,21 @@ SpriteShapeRenderer: ...@@ -559,21 +589,21 @@ SpriteShapeRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: -614652393
m_SortingLayer: 0 m_SortingLayer: 4
m_SortingOrder: 0 m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0 m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3} m_ShapeTexture: {fileID: 2800000, guid: ba99f04fad336dc4cae4bc02a82688c1, type: 3}
m_Sprites: m_Sprites:
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3} - {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3} - {fileID: 21300000, guid: e876b7a7d77efce479e91dd5bdd9c801, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3} - {fileID: 21300000, guid: 8e00a1a482dd4b246b7304f2b325dc1f, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3} - {fileID: 21300000, guid: 7a6e3bcd9bf346243afec76782b04456, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3} - {fileID: 21300000, guid: 7a33ec8d81f8de84e9bcee25c84a0a68, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3} - {fileID: 21300000, guid: 12ccb39abf7fdde4489b45f7dc2ddb95, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3} - {fileID: 21300000, guid: 32f1aa5b812a2a349afca26ff07162f8, type: 3}
- {fileID: 21300000, guid: fee06510a1f7a83439b28ea3c2c45c47, type: 3} - {fileID: 21300000, guid: 8def5351e5bb6664eb4d57cf426463d9, type: 3}
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
...@@ -705,6 +735,16 @@ PrefabInstance: ...@@ -705,6 +735,16 @@ PrefabInstance:
propertyPath: chillTime propertyPath: chillTime
value: 0.5 value: 0.5
objectReference: {fileID: 0} 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: m_RemovedComponents:
- {fileID: 114692363085912100, guid: 6cd7f8e10f89642fd88661db0d3f3827, type: 3} - {fileID: 114692363085912100, guid: 6cd7f8e10f89642fd88661db0d3f3827, type: 3}
- {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827, type: 3} - {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827, type: 3}
...@@ -855,21 +895,21 @@ SpriteShapeRenderer: ...@@ -855,21 +895,21 @@ SpriteShapeRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: -614652393
m_SortingLayer: 0 m_SortingLayer: 4
m_SortingOrder: 0 m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0 m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: bbbee504ca5b9034f94dbc6c64b62877, type: 3} m_ShapeTexture: {fileID: 2800000, guid: ba99f04fad336dc4cae4bc02a82688c1, type: 3}
m_Sprites: m_Sprites:
- {fileID: 21300000, guid: 2238c7878c4b23b48a3aa52f356962d2, type: 3} - {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3}
- {fileID: 21300000, guid: 9e68dcf94290ab646af7072b23d8cd7f, type: 3} - {fileID: 21300000, guid: e876b7a7d77efce479e91dd5bdd9c801, type: 3}
- {fileID: 21300000, guid: f2f0cc268901fba43b70ea0b37036728, type: 3} - {fileID: 21300000, guid: 8e00a1a482dd4b246b7304f2b325dc1f, type: 3}
- {fileID: 21300000, guid: e898c995de9f2b345b1c2f2eb23b4e22, type: 3} - {fileID: 21300000, guid: 7a6e3bcd9bf346243afec76782b04456, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3} - {fileID: 21300000, guid: 7a33ec8d81f8de84e9bcee25c84a0a68, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3} - {fileID: 21300000, guid: 12ccb39abf7fdde4489b45f7dc2ddb95, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3} - {fileID: 21300000, guid: 32f1aa5b812a2a349afca26ff07162f8, type: 3}
- {fileID: 21300000, guid: fee06510a1f7a83439b28ea3c2c45c47, type: 3} - {fileID: 21300000, guid: 8def5351e5bb6664eb4d57cf426463d9, type: 3}
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
...@@ -970,7 +1010,8 @@ Transform: ...@@ -970,7 +1010,8 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8.23, y: 4.14, z: -10} m_LocalPosition: {x: 8.23, y: 4.14, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 1034831102}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -1056,6 +1097,85 @@ Transform: ...@@ -1056,6 +1097,85 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} 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}