From 695e267d7c68330cd577bba168e2388dd874ff0d Mon Sep 17 00:00:00 2001 From: Triceraptodactyl Date: Mon, 23 Apr 2018 17:17:26 +0200 Subject: [PATCH 1/7] Door Textur (sieht nicht toll aus) und Ground Textur --- Assets/Prefabs/Tiles/doorInner.prefab | 10 +- Assets/Prefabs/Tiles/doorOuter.prefab | 10 +- .../textures/FixedObjects/Door/doorInner.png | Bin 8056 -> 27823 bytes .../FixedObjects/Door/doorInner.png.meta | 113 +++++++++++++++++- .../textures/FixedObjects/Door/doorOuter.png | Bin 8453 -> 30704 bytes .../FixedObjects/Door/doorOuter.png.meta | 113 +++++++++++++++++- .../textures/FixedObjects/Ground/ground3.png | Bin 8525 -> 10371 bytes 7 files changed, 228 insertions(+), 18 deletions(-) diff --git a/Assets/Prefabs/Tiles/doorInner.prefab b/Assets/Prefabs/Tiles/doorInner.prefab index 3f3640d..d738515 100644 --- a/Assets/Prefabs/Tiles/doorInner.prefab +++ b/Assets/Prefabs/Tiles/doorInner.prefab @@ -59,8 +59,8 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 10, y: 10} - newSize: {x: 10, y: 10} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 @@ -84,8 +84,8 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 10, y: 10} - newSize: {x: 10, y: 10} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 @@ -145,7 +145,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 10, y: 10} + m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/Prefabs/Tiles/doorOuter.prefab b/Assets/Prefabs/Tiles/doorOuter.prefab index 411185a..aad2537 100644 --- a/Assets/Prefabs/Tiles/doorOuter.prefab +++ b/Assets/Prefabs/Tiles/doorOuter.prefab @@ -59,8 +59,8 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 10, y: 10} - newSize: {x: 10, y: 10} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 @@ -84,8 +84,8 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 10, y: 10} - newSize: {x: 10, y: 10} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 @@ -145,7 +145,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 10, y: 10} + m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/graphics/textures/FixedObjects/Door/doorInner.png b/Assets/graphics/textures/FixedObjects/Door/doorInner.png index ef0e8c1d5f0a0387f0b2d0789df021d317840183..d25f8045122663b5f605668647c18bc31e0d9be7 100644 GIT binary patch literal 27823 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 literal 8056 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 A=Kufz diff --git a/Assets/graphics/textures/FixedObjects/Door/doorInner.png.meta b/Assets/graphics/textures/FixedObjects/Door/doorInner.png.meta index d4d94e0..5bf9b96 100644 --- a/Assets/graphics/textures/FixedObjects/Door/doorInner.png.meta +++ b/Assets/graphics/textures/FixedObjects/Door/doorInner.png.meta @@ -1,7 +1,12 @@ fileFormatVersion: 2 guid: c859997db2d488d42a8189791f73e0fb TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: doorInner_0 + 21300002: doorInner_1 + 21300004: doorInner_2 + 21300006: doorInner_3 + 21300008: doorInner_4 externalObjects: {} serializedVersion: 5 mipmaps: @@ -38,9 +43,9 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 1000 @@ -80,7 +85,107 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: doorInner_0 + rect: + serializedVersion: 2 + x: 1 + y: 0 + width: 1000 + height: 1000 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ff24c891c98e210409333a11c14c9871 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: doorInner_1 + rect: + serializedVersion: 2 + x: 1001 + y: 0 + width: 1000 + height: 1000 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7bdb864aee9485148bde8d3cfbbbdc5f + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: doorInner_2 + rect: + serializedVersion: 2 + x: 2001 + y: 0 + width: 1000 + height: 1000 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f94cbef5cf2971d44894e9de89fe745f + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: doorInner_3 + rect: + serializedVersion: 2 + x: 3001 + y: 0 + width: 1000 + height: 1000 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ca69375da37546d4ebefe163f8eaecf0 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: doorInner_4 + rect: + serializedVersion: 2 + x: 4001 + y: 0 + width: 1000 + height: 1000 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 658408fbabe66cd4098f1f5cd14458dc + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/graphics/textures/FixedObjects/Door/doorOuter.png b/Assets/graphics/textures/FixedObjects/Door/doorOuter.png index 6bb130dea32e9ea1ac46dd60e07e3bb5405be155..eeaf77b19f770a2fc410ba62049b46fb6ce6f0b2 100644 GIT binary patch literal 30704 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 Mjek$wVEyO+0h?TEtN;K2 literal 8453 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 diff --git a/Assets/graphics/textures/FixedObjects/Door/doorOuter.png.meta b/Assets/graphics/textures/FixedObjects/Door/doorOuter.png.meta index b522d10..3717335 100644 --- a/Assets/graphics/textures/FixedObjects/Door/doorOuter.png.meta +++ b/Assets/graphics/textures/FixedObjects/Door/doorOuter.png.meta @@ -1,7 +1,12 @@ fileFormatVersion: 2 guid: d9380a46a795012449f336288fbd1854 TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: doorOuter_0 + 21300002: doorOuter_1 + 21300004: doorOuter_2 + 21300006: doorOuter_3 + 21300008: doorOuter_4 externalObjects: {} serializedVersion: 5 mipmaps: @@ -38,9 +43,9 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 1000 @@ -80,7 +85,107 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: doorOuter_0 + rect: + serializedVersion: 2 + x: 1 + y: 0 + width: 1000 + height: 1000 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 92fa8f89d0bd20545a9f309dbb60b579 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: doorOuter_1 + rect: + serializedVersion: 2 + x: 1001 + y: 0 + width: 1000 + height: 1000 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dcc900c022bf81f4698d78422c95505b + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: doorOuter_2 + rect: + serializedVersion: 2 + x: 2001 + y: 0 + width: 1000 + height: 1000 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 33bc4d994b6971845931299c722b6092 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: doorOuter_3 + rect: + serializedVersion: 2 + x: 3001 + y: 0 + width: 1000 + height: 1000 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b6d2defddd3098d4185e6c978f4fb690 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: doorOuter_4 + rect: + serializedVersion: 2 + x: 4001 + y: 0 + width: 1000 + height: 1000 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0a609f92ee6fdf94887b453284b21310 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/graphics/textures/FixedObjects/Ground/ground3.png b/Assets/graphics/textures/FixedObjects/Ground/ground3.png index f49d21770b4a39d8fdd6b804389773b5645db446..85d08b972f73c8b9a52ae975cc73a0a73e1fe41e 100644 GIT binary patch literal 10371 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 literal 8525 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 From 463db2640a01ff0207af7043ac053de1c47f2e8e Mon Sep 17 00:00:00 2001 From: Triceraptodactyl Date: Mon, 23 Apr 2018 18:18:33 +0200 Subject: [PATCH 2/7] Player Wheel Animations --- Assets/Prefabs/Player.prefab | 382 +++++++++++++++++- .../{textures/car.meta => Animations.meta} | 2 +- .../graphics/Animations/FrontWheel.controller | 69 ++++ .../Animations/FrontWheel.controller.meta | 8 + Assets/graphics/Animations/frontWheel.anim | 71 ++++ .../graphics/Animations/frontWheel.anim.meta | 8 + .../Entities/Player/wheelFront.png.meta | 65 ++- 7 files changed, 595 insertions(+), 10 deletions(-) rename Assets/graphics/{textures/car.meta => Animations.meta} (77%) create mode 100644 Assets/graphics/Animations/FrontWheel.controller create mode 100644 Assets/graphics/Animations/FrontWheel.controller.meta create mode 100644 Assets/graphics/Animations/frontWheel.anim create mode 100644 Assets/graphics/Animations/frontWheel.anim.meta diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 9d4b7fb..756763c 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -41,6 +41,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1558237419353188 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4101200868763574} + - component: {fileID: 212320174034956936} + - component: {fileID: 95687212090133466} + m_Layer: 0 + m_Name: FrontWheelR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1617822722507322 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4657713072822580} + - component: {fileID: 212215143549797738} + - component: {fileID: 95169228929848266} + m_Layer: 0 + m_Name: FrontWheelL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1679161327080020 GameObject: m_ObjectHideFlags: 0 @@ -60,6 +94,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1709068619391894 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4003745050112744} + - component: {fileID: 212490515716475022} + - component: {fileID: 95990386212065172} + m_Layer: 0 + m_Name: BackWheelR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1758904900417062 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4419674733586242} + - component: {fileID: 212405423396070976} + - component: {fileID: 95925817463806754} + m_Layer: 0 + m_Name: BackWheelL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1934109991614250 GameObject: m_ObjectHideFlags: 1 @@ -93,6 +161,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &4003745050112744 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1709068619391894} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.54, y: -3.5, z: -0.07459692} + m_LocalScale: {x: 25, y: 25, z: 1} + m_Children: [] + m_Father: {fileID: 4079161515917916} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4079161515917916 Transform: m_ObjectHideFlags: 1 @@ -103,11 +184,28 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} m_Children: + - {fileID: 4657713072822580} + - {fileID: 4101200868763574} + - {fileID: 4419674733586242} + - {fileID: 4003745050112744} - {fileID: 4830909199357604} - {fileID: 4676354101874032} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4101200868763574 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1558237419353188} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.76, y: 0.24, z: -0.07459692} + m_LocalScale: {x: 15, y: 15, z: 1} + m_Children: [] + m_Father: {fileID: 4079161515917916} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4240907079511616 Transform: m_ObjectHideFlags: 1 @@ -121,6 +219,19 @@ Transform: m_Father: {fileID: 4830909199357604} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90.00001, y: 0, z: 0} +--- !u!4 &4419674733586242 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1758904900417062} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.41, y: -3.5, z: -0.07459692} + m_LocalScale: {x: 25, y: 25, z: 1} + m_Children: [] + m_Father: {fileID: 4079161515917916} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4564951497896744 Transform: m_ObjectHideFlags: 1 @@ -134,6 +245,19 @@ Transform: m_Father: {fileID: 4830909199357604} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4657713072822580 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1617822722507322} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.87, y: 0.24, z: -0.07459692} + m_LocalScale: {x: 15, y: 15, z: 1} + m_Children: [] + m_Father: {fileID: 4079161515917916} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4676354101874032 Transform: m_ObjectHideFlags: 1 @@ -145,7 +269,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4079161515917916} - m_RootOrder: 1 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4830909199357604 Transform: @@ -160,7 +284,7 @@ Transform: - {fileID: 4564951497896744} - {fileID: 4240907079511616} m_Father: {fileID: 4079161515917916} - m_RootOrder: 0 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &50783223838863924 Rigidbody2D: @@ -225,6 +349,78 @@ PolygonCollider2D: - {x: 1.6383212, y: -4.7778616} - {x: 1.6429812, y: -1.803915} - {x: 0.98120594, y: -0.9873648} +--- !u!95 &95169228929848266 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1617822722507322} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7f2e5fc83474b1a49bf900f3e32076f3, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!95 &95687212090133466 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1558237419353188} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7f2e5fc83474b1a49bf900f3e32076f3, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!95 &95925817463806754 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1758904900417062} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7f2e5fc83474b1a49bf900f3e32076f3, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!95 &95990386212065172 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1709068619391894} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7f2e5fc83474b1a49bf900f3e32076f3, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &114835806183609276 MonoBehaviour: m_ObjectHideFlags: 1 @@ -442,7 +638,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 0.6603774, g: 0.37068352, b: 0.37068352, a: 1} + maxColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -4843,6 +5039,51 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!212 &212215143549797738 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1617822722507322} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + 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: 1 + m_Sprite: {fileID: 21300000, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.031, y: 0.085} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!212 &212241819326847048 SpriteRenderer: m_ObjectHideFlags: 1 @@ -4888,3 +5129,138 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!212 &212320174034956936 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1558237419353188} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + 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: 1 + m_Sprite: {fileID: 21300000, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.031, y: 0.085} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!212 &212405423396070976 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1758904900417062} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + 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: 1 + m_Sprite: {fileID: 21300000, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.031, y: 0.085} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!212 &212490515716475022 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1709068619391894} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + 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: 1 + m_Sprite: {fileID: 21300000, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.031, y: 0.085} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/Assets/graphics/textures/car.meta b/Assets/graphics/Animations.meta similarity index 77% rename from Assets/graphics/textures/car.meta rename to Assets/graphics/Animations.meta index 8504594..a6bc4f1 100644 --- a/Assets/graphics/textures/car.meta +++ b/Assets/graphics/Animations.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9ec323b9157704d00a3409f8ea6e46b2 +guid: 0659f7196542f6b40bc557f4d21d2245 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/graphics/Animations/FrontWheel.controller b/Assets/graphics/Animations/FrontWheel.controller new file mode 100644 index 0000000..9b92991 --- /dev/null +++ b/Assets/graphics/Animations/FrontWheel.controller @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: FrontWheel + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107176370106302356} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102681561812433936 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: frontWheel + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: e7d011113e91d3447a3d35e2ba4dfb8a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107176370106302356 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102681561812433936} + m_Position: {x: 276, y: 48, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 180, y: 240, z: 0} + m_EntryPosition: {x: 300, y: -60, z: 0} + m_ExitPosition: {x: 408, y: 240, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102681561812433936} diff --git a/Assets/graphics/Animations/FrontWheel.controller.meta b/Assets/graphics/Animations/FrontWheel.controller.meta new file mode 100644 index 0000000..373dac2 --- /dev/null +++ b/Assets/graphics/Animations/FrontWheel.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f2e5fc83474b1a49bf900f3e32076f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/frontWheel.anim b/Assets/graphics/Animations/frontWheel.anim new file mode 100644 index 0000000..664c097 --- /dev/null +++ b/Assets/graphics/Animations/frontWheel.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: frontWheel + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0.05 + value: {fileID: 21300000, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} + - time: 0.11666667 + value: {fileID: 21300002, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} + - {fileID: 21300002, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.13333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/graphics/Animations/frontWheel.anim.meta b/Assets/graphics/Animations/frontWheel.anim.meta new file mode 100644 index 0000000..f638d5e --- /dev/null +++ b/Assets/graphics/Animations/frontWheel.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7d011113e91d3447a3d35e2ba4dfb8a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/textures/Entities/Player/wheelFront.png.meta b/Assets/graphics/textures/Entities/Player/wheelFront.png.meta index 6d3754f..8a50f4f 100644 --- a/Assets/graphics/textures/Entities/Player/wheelFront.png.meta +++ b/Assets/graphics/textures/Entities/Player/wheelFront.png.meta @@ -1,7 +1,9 @@ fileFormatVersion: 2 guid: 7b233f3621c89564e8e5464f0cb73b5b TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: wheelFront_0 + 21300002: wheelFront_1 externalObjects: {} serializedVersion: 5 mipmaps: @@ -29,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -1 wrapU: 1 @@ -38,12 +40,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 1000 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -67,9 +69,60 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: wheelFront_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 31 + height: 85 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a25d831f6563aa940bb1ab65acb3b5a4 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: wheelFront_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 31 + height: 85 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2ce52aaabb11dbe4b8bc43ac3d5cce81 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] From 2864b2d304090c96aed03593c2eb0717b1bd9552 Mon Sep 17 00:00:00 2001 From: Triceraptodactyl Date: Mon, 23 Apr 2018 19:39:18 +0200 Subject: [PATCH 3/7] Door Animation --- Assets/Prefabs/Tiles/doorInner.prefab | 23 +- Assets/Prefabs/Tiles/doorOuter.prefab | 23 +- Assets/Scripts/Door.cs | 6 +- .../graphics/Animations/doorInner.controller | 253 ++++++++++++++++++ .../Animations/doorInner.controller.meta | 8 + .../graphics/Animations/doorInnerClosed.anim | 68 +++++ .../Animations/doorInnerClosed.anim.meta | 8 + .../graphics/Animations/doorInnerClosing.anim | 83 ++++++ .../Animations/doorInnerClosing.anim.meta | 8 + Assets/graphics/Animations/doorInnerOpen.anim | 68 +++++ .../Animations/doorInnerOpen.anim.meta | 8 + .../graphics/Animations/doorInnerOpening.anim | 83 ++++++ .../Animations/doorInnerOpening.anim.meta | 8 + .../graphics/Animations/doorOuter.controller | 253 ++++++++++++++++++ .../Animations/doorOuter.controller.meta | 8 + .../graphics/Animations/doorOuterClosed.anim | 68 +++++ .../Animations/doorOuterClosed.anim.meta | 8 + .../graphics/Animations/doorOuterClosing.anim | 83 ++++++ .../Animations/doorOuterClosing.anim.meta | 8 + Assets/graphics/Animations/doorOuterOpen.anim | 53 ++++ .../Animations/doorOuterOpen.anim.meta | 8 + .../graphics/Animations/doorOuterOpening.anim | 83 ++++++ .../Animations/doorOuterOpening.anim.meta | 8 + Assets/graphics/Animations/frontWheel.anim | 9 +- .../textures/Entities/Player/wheelFront.png | Bin 570 -> 546 bytes .../FixedObjects/Door/doorInner.png.meta | 2 +- .../FixedObjects/Door/doorOuter.png.meta | 2 +- 27 files changed, 1230 insertions(+), 10 deletions(-) create mode 100644 Assets/graphics/Animations/doorInner.controller create mode 100644 Assets/graphics/Animations/doorInner.controller.meta create mode 100644 Assets/graphics/Animations/doorInnerClosed.anim create mode 100644 Assets/graphics/Animations/doorInnerClosed.anim.meta create mode 100644 Assets/graphics/Animations/doorInnerClosing.anim create mode 100644 Assets/graphics/Animations/doorInnerClosing.anim.meta create mode 100644 Assets/graphics/Animations/doorInnerOpen.anim create mode 100644 Assets/graphics/Animations/doorInnerOpen.anim.meta create mode 100644 Assets/graphics/Animations/doorInnerOpening.anim create mode 100644 Assets/graphics/Animations/doorInnerOpening.anim.meta create mode 100644 Assets/graphics/Animations/doorOuter.controller create mode 100644 Assets/graphics/Animations/doorOuter.controller.meta create mode 100644 Assets/graphics/Animations/doorOuterClosed.anim create mode 100644 Assets/graphics/Animations/doorOuterClosed.anim.meta create mode 100644 Assets/graphics/Animations/doorOuterClosing.anim create mode 100644 Assets/graphics/Animations/doorOuterClosing.anim.meta create mode 100644 Assets/graphics/Animations/doorOuterOpen.anim create mode 100644 Assets/graphics/Animations/doorOuterOpen.anim.meta create mode 100644 Assets/graphics/Animations/doorOuterOpening.anim create mode 100644 Assets/graphics/Animations/doorOuterOpening.anim.meta diff --git a/Assets/Prefabs/Tiles/doorInner.prefab b/Assets/Prefabs/Tiles/doorInner.prefab index d738515..3723f80 100644 --- a/Assets/Prefabs/Tiles/doorInner.prefab +++ b/Assets/Prefabs/Tiles/doorInner.prefab @@ -23,6 +23,7 @@ GameObject: - component: {fileID: 61866627210428188} - component: {fileID: 114053119853995034} - component: {fileID: 61243635969098510} + - component: {fileID: 95497231115638686} m_Layer: 0 m_Name: doorInner m_TagString: door @@ -36,8 +37,8 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1065161683117842} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -93,6 +94,24 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!95 &95497231115638686 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1065161683117842} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 3c94375a71a4f8b4cafdcc56d9095295, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &114053119853995034 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Tiles/doorOuter.prefab b/Assets/Prefabs/Tiles/doorOuter.prefab index aad2537..ca413ab 100644 --- a/Assets/Prefabs/Tiles/doorOuter.prefab +++ b/Assets/Prefabs/Tiles/doorOuter.prefab @@ -23,6 +23,7 @@ GameObject: - component: {fileID: 61252126965124090} - component: {fileID: 114203808595097248} - component: {fileID: 61597103562615806} + - component: {fileID: 95237938444101396} m_Layer: 0 m_Name: doorOuter m_TagString: door @@ -36,8 +37,8 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1575370008060226} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -93,6 +94,24 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!95 &95237938444101396 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1575370008060226} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a009ee739710f0f4a94cbfca5cf53e21, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &114203808595097248 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Scripts/Door.cs b/Assets/Scripts/Door.cs index 65e5489..ec61c79 100644 --- a/Assets/Scripts/Door.cs +++ b/Assets/Scripts/Door.cs @@ -2,6 +2,7 @@ [RequireComponent(typeof(SpriteRenderer))] public class Door : MonoBehaviour { private bool locked = false; + private Animator animator; [SerializeField] Room parent; @@ -12,6 +13,7 @@ public class Door : MonoBehaviour { // Use this for initialization void Awake() { BoxCollider2D[] colliders = GetComponents(); + animator = GetComponent(); foreach ( BoxCollider2D collider in colliders ) { if ( collider.isTrigger ) { triggerBox = collider; @@ -30,11 +32,12 @@ public class Door : MonoBehaviour { public void SetParent(Room room) { this.parent = room; } - + /// /// Locks the door. /// public void Lock() { + animator.SetBool("open", false); locked = true; boundingBox.enabled = true; triggerBox.enabled = false; @@ -45,6 +48,7 @@ public class Door : MonoBehaviour { /// Unlocks the door. /// public void Unlock() { + animator.SetBool("open", true); locked = false; boundingBox.enabled = false; triggerBox.enabled = true; diff --git a/Assets/graphics/Animations/doorInner.controller b/Assets/graphics/Animations/doorInner.controller new file mode 100644 index 0000000..d17eae1 --- /dev/null +++ b/Assets/graphics/Animations/doorInner.controller @@ -0,0 +1,253 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorInner + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: open + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 1 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107387124837383864} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1101264152120807612 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: open + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102890209287877762} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101367902061491896 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102528310069999234} + m_Solo: 1 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101881240310320098 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102890284555953346} + m_Solo: 1 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101922952207817586 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: open + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102216784250618962} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102216784250618962 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorInnerOpening + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101367902061491896} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: a7251f210054ec5499840e549a33aac4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102528310069999234 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorInnerOpen + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101264152120807612} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 4651fe249217e2e4694dcbaf56661a53, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102890209287877762 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorInnerClosing + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101881240310320098} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 6fa36b87b8e7bbc44aca3f72a7286a1e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102890284555953346 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorInnerClosed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101922952207817586} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: fec50bad5a5a2e94c889d103ea4048fa, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107387124837383864 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102528310069999234} + m_Position: {x: 240, y: -24, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102890284555953346} + m_Position: {x: 456, y: 36, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102216784250618962} + m_Position: {x: 240, y: 36, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102890209287877762} + m_Position: {x: 456, y: -24, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 240, y: -120, z: 0} + m_EntryPosition: {x: 240, y: -72, z: 0} + m_ExitPosition: {x: 240, y: 96, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102528310069999234} diff --git a/Assets/graphics/Animations/doorInner.controller.meta b/Assets/graphics/Animations/doorInner.controller.meta new file mode 100644 index 0000000..b21b1f3 --- /dev/null +++ b/Assets/graphics/Animations/doorInner.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c94375a71a4f8b4cafdcc56d9095295 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/doorInnerClosed.anim b/Assets/graphics/Animations/doorInnerClosed.anim new file mode 100644 index 0000000..e7b08fb --- /dev/null +++ b/Assets/graphics/Animations/doorInnerClosed.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorInnerClosed + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300008, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300008, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/graphics/Animations/doorInnerClosed.anim.meta b/Assets/graphics/Animations/doorInnerClosed.anim.meta new file mode 100644 index 0000000..198f669 --- /dev/null +++ b/Assets/graphics/Animations/doorInnerClosed.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fec50bad5a5a2e94c889d103ea4048fa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/doorInnerClosing.anim b/Assets/graphics/Animations/doorInnerClosing.anim new file mode 100644 index 0000000..9c19947 --- /dev/null +++ b/Assets/graphics/Animations/doorInnerClosing.anim @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorInnerClosing + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - time: 0.16666667 + value: {fileID: 21300002, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - time: 0.33333334 + value: {fileID: 21300004, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - time: 0.5 + value: {fileID: 21300006, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - time: 0.6666667 + value: {fileID: 21300008, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - time: 0.81666666 + value: {fileID: 21300008, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - {fileID: 21300002, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - {fileID: 21300004, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - {fileID: 21300006, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - {fileID: 21300008, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - {fileID: 21300008, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/graphics/Animations/doorInnerClosing.anim.meta b/Assets/graphics/Animations/doorInnerClosing.anim.meta new file mode 100644 index 0000000..3f1a0a0 --- /dev/null +++ b/Assets/graphics/Animations/doorInnerClosing.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6fa36b87b8e7bbc44aca3f72a7286a1e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/doorInnerOpen.anim b/Assets/graphics/Animations/doorInnerOpen.anim new file mode 100644 index 0000000..38851aa --- /dev/null +++ b/Assets/graphics/Animations/doorInnerOpen.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorInnerOpen + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/graphics/Animations/doorInnerOpen.anim.meta b/Assets/graphics/Animations/doorInnerOpen.anim.meta new file mode 100644 index 0000000..8e308df --- /dev/null +++ b/Assets/graphics/Animations/doorInnerOpen.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4651fe249217e2e4694dcbaf56661a53 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/doorInnerOpening.anim b/Assets/graphics/Animations/doorInnerOpening.anim new file mode 100644 index 0000000..15305fb --- /dev/null +++ b/Assets/graphics/Animations/doorInnerOpening.anim @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorInnerOpening + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300008, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - time: 0.16666667 + value: {fileID: 21300006, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - time: 0.33333334 + value: {fileID: 21300004, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - time: 0.5 + value: {fileID: 21300002, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - time: 0.81666666 + value: {fileID: 21300000, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300008, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - {fileID: 21300006, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - {fileID: 21300004, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - {fileID: 21300002, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - {fileID: 21300000, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + - {fileID: 21300000, guid: c859997db2d488d42a8189791f73e0fb, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/graphics/Animations/doorInnerOpening.anim.meta b/Assets/graphics/Animations/doorInnerOpening.anim.meta new file mode 100644 index 0000000..e942b38 --- /dev/null +++ b/Assets/graphics/Animations/doorInnerOpening.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a7251f210054ec5499840e549a33aac4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/doorOuter.controller b/Assets/graphics/Animations/doorOuter.controller new file mode 100644 index 0000000..b69ab93 --- /dev/null +++ b/Assets/graphics/Animations/doorOuter.controller @@ -0,0 +1,253 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuter + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: open + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 1 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107943283646818384} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1101129100735222018 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: open + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102939526012972808} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101591872035396538 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102989137786363650} + m_Solo: 1 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7058823 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101624744802708874 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: open + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102228485895363028} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101629471958861096 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102275838657248328} + m_Solo: 1 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102228485895363028 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuterOpening + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101629471958861096} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d212d01be5f890c4f9a3bc81def5b173, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102275838657248328 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuterOpen + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101129100735222018} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 26eec1f5d8eb171469d6d0f5997233c1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102939526012972808 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuterClosing + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101591872035396538} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 923b20c761d280a4f99bbf184df29e0b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102989137786363650 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuterClosed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101624744802708874} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 98935a01456c94549a4100daedd5676e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107943283646818384 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102275838657248328} + m_Position: {x: 204, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102989137786363650} + m_Position: {x: 420, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102939526012972808} + m_Position: {x: 420, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102228485895363028} + m_Position: {x: 204, y: 60, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 204, y: -96, z: 0} + m_EntryPosition: {x: 204, y: -48, z: 0} + m_ExitPosition: {x: 204, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102275838657248328} diff --git a/Assets/graphics/Animations/doorOuter.controller.meta b/Assets/graphics/Animations/doorOuter.controller.meta new file mode 100644 index 0000000..3aefe84 --- /dev/null +++ b/Assets/graphics/Animations/doorOuter.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a009ee739710f0f4a94cbfca5cf53e21 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/doorOuterClosed.anim b/Assets/graphics/Animations/doorOuterClosed.anim new file mode 100644 index 0000000..6322d3f --- /dev/null +++ b/Assets/graphics/Animations/doorOuterClosed.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuterClosed + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300008, guid: d9380a46a795012449f336288fbd1854, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300008, guid: d9380a46a795012449f336288fbd1854, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/graphics/Animations/doorOuterClosed.anim.meta b/Assets/graphics/Animations/doorOuterClosed.anim.meta new file mode 100644 index 0000000..e12dd93 --- /dev/null +++ b/Assets/graphics/Animations/doorOuterClosed.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98935a01456c94549a4100daedd5676e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/doorOuterClosing.anim b/Assets/graphics/Animations/doorOuterClosing.anim new file mode 100644 index 0000000..ba3a616 --- /dev/null +++ b/Assets/graphics/Animations/doorOuterClosing.anim @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuterClosing + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: d9380a46a795012449f336288fbd1854, type: 3} + - time: 0.16666667 + value: {fileID: 21300002, guid: d9380a46a795012449f336288fbd1854, type: 3} + - time: 0.33333334 + value: {fileID: 21300004, guid: d9380a46a795012449f336288fbd1854, type: 3} + - time: 0.5 + value: {fileID: 21300006, guid: d9380a46a795012449f336288fbd1854, type: 3} + - time: 0.6666667 + value: {fileID: 21300008, guid: d9380a46a795012449f336288fbd1854, type: 3} + - time: 0.8333333 + value: {fileID: 21300008, guid: d9380a46a795012449f336288fbd1854, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: d9380a46a795012449f336288fbd1854, type: 3} + - {fileID: 21300002, guid: d9380a46a795012449f336288fbd1854, type: 3} + - {fileID: 21300004, guid: d9380a46a795012449f336288fbd1854, type: 3} + - {fileID: 21300006, guid: d9380a46a795012449f336288fbd1854, type: 3} + - {fileID: 21300008, guid: d9380a46a795012449f336288fbd1854, type: 3} + - {fileID: 21300008, guid: d9380a46a795012449f336288fbd1854, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.84999996 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/graphics/Animations/doorOuterClosing.anim.meta b/Assets/graphics/Animations/doorOuterClosing.anim.meta new file mode 100644 index 0000000..9ce211a --- /dev/null +++ b/Assets/graphics/Animations/doorOuterClosing.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 923b20c761d280a4f99bbf184df29e0b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/doorOuterOpen.anim b/Assets/graphics/Animations/doorOuterOpen.anim new file mode 100644 index 0000000..738a6b1 --- /dev/null +++ b/Assets/graphics/Animations/doorOuterOpen.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuterOpen + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/graphics/Animations/doorOuterOpen.anim.meta b/Assets/graphics/Animations/doorOuterOpen.anim.meta new file mode 100644 index 0000000..6fcc14e --- /dev/null +++ b/Assets/graphics/Animations/doorOuterOpen.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26eec1f5d8eb171469d6d0f5997233c1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/doorOuterOpening.anim b/Assets/graphics/Animations/doorOuterOpening.anim new file mode 100644 index 0000000..6379849 --- /dev/null +++ b/Assets/graphics/Animations/doorOuterOpening.anim @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuterOpening + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300008, guid: d9380a46a795012449f336288fbd1854, type: 3} + - time: 0.16666667 + value: {fileID: 21300006, guid: d9380a46a795012449f336288fbd1854, type: 3} + - time: 0.33333334 + value: {fileID: 21300004, guid: d9380a46a795012449f336288fbd1854, type: 3} + - time: 0.5 + value: {fileID: 21300002, guid: d9380a46a795012449f336288fbd1854, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: d9380a46a795012449f336288fbd1854, type: 3} + - time: 0.81666666 + value: {fileID: 21300000, guid: d9380a46a795012449f336288fbd1854, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300008, guid: d9380a46a795012449f336288fbd1854, type: 3} + - {fileID: 21300006, guid: d9380a46a795012449f336288fbd1854, type: 3} + - {fileID: 21300004, guid: d9380a46a795012449f336288fbd1854, type: 3} + - {fileID: 21300002, guid: d9380a46a795012449f336288fbd1854, type: 3} + - {fileID: 21300000, guid: d9380a46a795012449f336288fbd1854, type: 3} + - {fileID: 21300000, guid: d9380a46a795012449f336288fbd1854, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/graphics/Animations/doorOuterOpening.anim.meta b/Assets/graphics/Animations/doorOuterOpening.anim.meta new file mode 100644 index 0000000..a00f6b1 --- /dev/null +++ b/Assets/graphics/Animations/doorOuterOpening.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d212d01be5f890c4f9a3bc81def5b173 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/Animations/frontWheel.anim b/Assets/graphics/Animations/frontWheel.anim index 664c097..25ed27b 100644 --- a/Assets/graphics/Animations/frontWheel.anim +++ b/Assets/graphics/Animations/frontWheel.anim @@ -18,9 +18,11 @@ AnimationClip: m_FloatCurves: [] m_PPtrCurves: - curve: - - time: 0.05 - value: {fileID: 21300000, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} + - time: 0 + value: {fileID: 21300002, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} - time: 0.11666667 + value: {fileID: 21300000, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} + - time: 0.25 value: {fileID: 21300002, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} attribute: m_Sprite path: @@ -41,6 +43,7 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: + - {fileID: 21300002, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} - {fileID: 21300000, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} - {fileID: 21300002, guid: 7b233f3621c89564e8e5464f0cb73b5b, type: 3} m_AnimationClipSettings: @@ -48,7 +51,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.13333334 + m_StopTime: 0.26666668 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/graphics/textures/Entities/Player/wheelFront.png b/Assets/graphics/textures/Entities/Player/wheelFront.png index b3fc4bf7a7681ecb9bd4b4f8fd6187f9aca3814f..3ff1f330ceefd8d42cb87ed9b941b44e01570bcc 100644 GIT binary patch delta 438 zcmV;n0ZIP41fm3xBqttFOjJb_6chje01yxm85tQMARs6xC^9lKKR-WDPfufGV;!3E zO_5G52p13<5oxWUmXU)je_=^PK~zY`<(4sW#2^es*&A4%wGC~~k}Ko@X|_+bwYzO8 zbK3}zjfBCF4U@@CRM`H1o>`5?3tuS(u?D4%`oavzX#RqKCDmw*FH{6bjVoSXsoa{W zb}MpYNVNl|H!1>T6EHGhL?F=$t}x%I@Oeme12C~)oDi58Fa=<_e^U`4w1Sx#GXjZz z3W()_g#il!iEacw+4d3yQ$z zz)26$_(OoL0C8}6cz_Kq3-G~ZKbU=RzxBcV>wkAwAioudOK~gS=28ISTv~Vg9%t6w z9Y-Z#4hNb)*m|A336MSgsV9mDA}@qIf#N;niKd7WD+^Rp&@o2|ol9aeXkDan%yQK< gSkIHyL|VzTU(v6m9C8;;o&W#<07*qoM6N<$g4i{(0RR91 delta 463 zcmV;=0Wkie1iA!}Bq||LOjJbx0000001yxm6ciL085tlTASfs(GBPqhKR-`TPh(?a z6X?`CkxMNI77;leXUvw4k$^0Jc1c7*R7l6=mhW+cFbu`r4S+Vb;bT|n3h4;#2K_TZ zoK65?0*)yw+X7@q#~G1U#WUP!XU4Ao8L-l1Fv03!b_K)#|ppb4M>i2O$2WDiUO%6wcv#vo8%P!kXob^=-hnt+-BH2^i~spf&e zZwB0{X#hHE0Z9SMINO>Z_3&k2Zkh*3(-vq(6au<)Zs<}#;P(I;R~THO0iYp3GXq24 ztpYxKE(|L$D@{wnr! zNnXX%ToS-Cm#w$`9y{v{E9*T4xIGE(Pa3?T Date: Mon, 23 Apr 2018 19:49:48 +0200 Subject: [PATCH 4/7] Door animation --- Assets/Scenes/CodeDEV.unity | 2 +- .../Animations/doorOuter 1.controller | 66 +++++++++++++++++++ .../Animations/doorOuter 1.controller.meta | 8 +++ Assets/graphics/textures/Particles.meta | 2 +- .../textures/{tmp.meta => UI/Particles.meta} | 2 +- 5 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 Assets/graphics/Animations/doorOuter 1.controller create mode 100644 Assets/graphics/Animations/doorOuter 1.controller.meta rename Assets/graphics/textures/{tmp.meta => UI/Particles.meta} (77%) diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index ff3d5fc..8c4c7e6 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -976,7 +976,7 @@ Prefab: - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchoredPosition.x - value: 63.233368 + value: 66.77419 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} diff --git a/Assets/graphics/Animations/doorOuter 1.controller b/Assets/graphics/Animations/doorOuter 1.controller new file mode 100644 index 0000000..1087f80 --- /dev/null +++ b/Assets/graphics/Animations/doorOuter 1.controller @@ -0,0 +1,66 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuter 1 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107360434456921914} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102983496189128836 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: doorOuterOpen + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 26eec1f5d8eb171469d6d0f5997233c1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107360434456921914 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} diff --git a/Assets/graphics/Animations/doorOuter 1.controller.meta b/Assets/graphics/Animations/doorOuter 1.controller.meta new file mode 100644 index 0000000..24280e2 --- /dev/null +++ b/Assets/graphics/Animations/doorOuter 1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30eba153b7f8bd644a1da6c49171c0bc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/textures/Particles.meta b/Assets/graphics/textures/Particles.meta index 90927cf..280e6ff 100644 --- a/Assets/graphics/textures/Particles.meta +++ b/Assets/graphics/textures/Particles.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 344607e4adabd53428aa359d92c5daf0 +guid: ba8ba7ae81462c94b81d2eab8e138627 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/graphics/textures/tmp.meta b/Assets/graphics/textures/UI/Particles.meta similarity index 77% rename from Assets/graphics/textures/tmp.meta rename to Assets/graphics/textures/UI/Particles.meta index 7ebab68..90927cf 100644 --- a/Assets/graphics/textures/tmp.meta +++ b/Assets/graphics/textures/UI/Particles.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: df6e7833427b5497b92308fb6f54e552 +guid: 344607e4adabd53428aa359d92c5daf0 folderAsset: yes DefaultImporter: externalObjects: {} From 1fab4820dea8cbe7d6907c0f9c09633c71d50c5c Mon Sep 17 00:00:00 2001 From: Piegames <14054505+piegamesde@users.noreply.github.com> Date: Mon, 23 Apr 2018 20:37:21 +0200 Subject: [PATCH 5/7] Player speed state --- Assets/Scripts/PlayerMovement.cs | 57 ++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 50ca0c1..bfd35f0 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -15,12 +15,25 @@ public class PlayerMovement : MonoBehaviour { [SerializeField] public float brake = 2f; + // The time of the acceleration/deceleration sounds in seconds + public double accelerationTime; + public double decelerationTime; + + public enum SpeedState + { + SLOW, FASTER, FAST, SLOWER + } + + public SpeedState state; + public double changeTime; + Rigidbody2D rb; // Use this for initialization void Start() { rb = GetComponent(); messagePosted = false; + state = SpeedState.SLOW; } void Update() { @@ -30,6 +43,8 @@ public class PlayerMovement : MonoBehaviour { } if ( !firstKeyPressed && Input.anyKey ) { firstKeyPressed = true; + state = SpeedState.FASTER; + changeTime = Time.time; } } @@ -40,15 +55,53 @@ public class PlayerMovement : MonoBehaviour { Vector3 speedVec = new Vector3(rb.velocity.x, rb.velocity.y, 0); float speed = speedVec.magnitude; + bool braking = Input.GetAxis("Vertical") < 0; + if (braking) { + switch (state) { + case SpeedState.FASTER: + if (Time.time - changeTime > accelerationTime) + state = SpeedState.SLOWER; + break; + case SpeedState.FAST: + changeTime = Time.time; + state = SpeedState.SLOWER; + break; + case SpeedState.SLOWER: + if (Time.time - changeTime > decelerationTime) + state = SpeedState.SLOW; + break; + case SpeedState.SLOW: + break; + } + } else { + switch (state) + { + case SpeedState.FASTER: + if (Time.time - changeTime > accelerationTime) + state = SpeedState.FAST; + break; + case SpeedState.FAST: + break; + case SpeedState.SLOWER: + if (Time.time - changeTime > decelerationTime) + state = SpeedState.FASTER; + break; + case SpeedState.SLOW: + changeTime = Time.time; + state = SpeedState.FASTER; + break; + } + } + { // Forward Vector3 acc = transform.up * acceleration; - if (Input.GetAxis("Vertical") < 0) + if (braking) acc *= 0; rb.AddForce(acc); } {// Drag Vector3 drag = speedVec.normalized * speed * speed * friction * -1; - if (Input.GetAxis("Vertical") < 0) { + if (braking) { drag *= brake; drag *= speed; } From 19b05321b7d74d0fbe6f56f811fd224b303b75d6 Mon Sep 17 00:00:00 2001 From: Triceraptodactyl Date: Mon, 23 Apr 2018 21:14:04 +0200 Subject: [PATCH 6/7] =?UTF-8?q?BrakeBar=20zu=20UI=20hinzugef=C3=BCgt=20(no?= =?UTF-8?q?ch=20nicht=20funktional)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prefabs/HealthBar.prefab | 354 --------------------------- Assets/Prefabs/HealthBar.prefab.meta | 8 - Assets/Prefabs/UI.prefab | 232 +++++++++++++++++- Assets/Scripts/BrakeBarController.cs | 55 ++--- Assets/Scripts/GameController.cs | 7 +- Assets/Scripts/UIController.cs | 8 +- 6 files changed, 257 insertions(+), 407 deletions(-) delete mode 100644 Assets/Prefabs/HealthBar.prefab delete mode 100644 Assets/Prefabs/HealthBar.prefab.meta diff --git a/Assets/Prefabs/HealthBar.prefab b/Assets/Prefabs/HealthBar.prefab deleted file mode 100644 index 0ae681f..0000000 --- a/Assets/Prefabs/HealthBar.prefab +++ /dev/null @@ -1,354 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1874613395391886} - m_IsPrefabParent: 1 ---- !u!1 &1275305989310704 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224164241202895738} - - component: {fileID: 222317657359142688} - - component: {fileID: 114033798755836782} - m_Layer: 0 - m_Name: Pointer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1730178688501482 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224985788887394804} - - component: {fileID: 223874505735571352} - - component: {fileID: 114938029598329918} - - component: {fileID: 114158644844654540} - m_Layer: 0 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1769303886924724 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224405087110538214} - - component: {fileID: 222887696722208392} - - component: {fileID: 114602871030768052} - m_Layer: 5 - m_Name: Healthbar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1874613395391886 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4747773548423212} - - component: {fileID: 114033126972021110} - m_Layer: 0 - m_Name: HealthBar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1968092576684628 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224066913994418724} - - component: {fileID: 222688251583601748} - - component: {fileID: 114214034073823864} - m_Layer: 0 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4747773548423212 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1874613395391886} - 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_Children: - - {fileID: 224985788887394804} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &114033126972021110 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1874613395391886} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 0} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &114033798755836782 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1275305989310704} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114158644844654540 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1730178688501482} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &114214034073823864 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1968092576684628} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114602871030768052 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1769303886924724} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114938029598329918 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1730178688501482} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!222 &222317657359142688 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1275305989310704} ---- !u!222 &222688251583601748 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1968092576684628} ---- !u!222 &222887696722208392 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1769303886924724} ---- !u!223 &223874505735571352 -Canvas: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1730178688501482} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &224066913994418724 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1968092576684628} - 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_Children: - - {fileID: 224405087110538214} - - {fileID: 224164241202895738} - m_Father: {fileID: 224985788887394804} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.1, y: 0.15} - m_AnchoredPosition: {x: 747, y: 382.5} - m_SizeDelta: {x: 1494, y: 765} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224164241202895738 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1275305989310704} - 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_Children: [] - m_Father: {fileID: 224066913994418724} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224405087110538214 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1769303886924724} - 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_Children: [] - m_Father: {fileID: 224066913994418724} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -780, y: -400} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224985788887394804 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1730178688501482} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 224066913994418724} - m_Father: {fileID: 4747773548423212} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} diff --git a/Assets/Prefabs/HealthBar.prefab.meta b/Assets/Prefabs/HealthBar.prefab.meta deleted file mode 100644 index 468e296..0000000 --- a/Assets/Prefabs/HealthBar.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 743adb597a8a14d7ba3c90d0eed3d2ed -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/UI.prefab b/Assets/Prefabs/UI.prefab index 8a875ee..7baf3ff 100644 --- a/Assets/Prefabs/UI.prefab +++ b/Assets/Prefabs/UI.prefab @@ -28,6 +28,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1118501802334006 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224351136746992674} + - component: {fileID: 222022790769267342} + - component: {fileID: 114417389946489904} + - component: {fileID: 114745107968250074} + m_Layer: 5 + m_Name: Pointer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1160732466323946 GameObject: m_ObjectHideFlags: 1 @@ -62,6 +80,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1418161294528772 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224609935718604692} + - component: {fileID: 222274365175932308} + - component: {fileID: 114414092698709752} + m_Layer: 5 + m_Name: Scala + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1491047117667172 GameObject: m_ObjectHideFlags: 1 @@ -150,6 +185,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1773834359136924 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224654647045080780} + - component: {fileID: 222969496077047604} + - component: {fileID: 114060586777901180} + m_Layer: 5 + m_Name: BrakeBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1776649970698928 GameObject: m_ObjectHideFlags: 1 @@ -254,7 +306,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224011665836974194} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114013939794050082 MonoBehaviour: @@ -344,6 +396,33 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &114060586777901180 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1773834359136924} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114132931230075030 MonoBehaviour: m_ObjectHideFlags: 1 @@ -559,6 +638,60 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: Test +--- !u!114 &114414092698709752 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1418161294528772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: cff6992dca838e9489cf342128410d5e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &114417389946489904 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1118501802334006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f7cbbdc07a7d45e468493d5b9b1d5307, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114441665907648238 MonoBehaviour: m_ObjectHideFlags: 1 @@ -694,6 +827,17 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114745107968250074 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1118501802334006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d819f21fefea9da4199b468cca99e711, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &114750232192698844 MonoBehaviour: m_ObjectHideFlags: 1 @@ -762,6 +906,7 @@ MonoBehaviour: notifications: {fileID: 114700265308343224} restartUIPanel: {fileID: 1604998495297016} healthcontroller: {fileID: 114617351635937986} + brakeBarController: {fileID: 0} mainMenuSceneIndex: 0 --- !u!114 &114930219842054174 MonoBehaviour: @@ -863,6 +1008,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!222 &222022790769267342 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1118501802334006} --- !u!222 &222162700033887782 CanvasRenderer: m_ObjectHideFlags: 1 @@ -887,6 +1038,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1738841749900334} +--- !u!222 &222274365175932308 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1418161294528772} --- !u!222 &222407216902702286 CanvasRenderer: m_ObjectHideFlags: 1 @@ -929,6 +1086,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1604998495297016} +--- !u!222 &222969496077047604 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1773834359136924} --- !u!223 &223682460758231866 Canvas: m_ObjectHideFlags: 1 @@ -959,6 +1122,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 224654647045080780} - {fileID: 224688961504123188} - {fileID: 4168470803218780} - {fileID: 224035875368067210} @@ -983,7 +1147,7 @@ RectTransform: m_Children: - {fileID: 224150154901314796} m_Father: {fileID: 224011665836974194} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1059,7 +1223,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 64.16286, y: 0} + m_AnchoredPosition: {x: 66.52695, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!224 &224218339018349506 @@ -1081,6 +1245,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -219} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224351136746992674 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1118501802334006} + m_LocalRotation: {x: 0, y: 0, z: 0.76604444, w: 0.64278764} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.49999988, y: 0.49999988, z: 1} + m_Children: [] + m_Father: {fileID: 224609935718604692} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 100} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -7.3055115, y: -3.7793121} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.05, y: 0.05} --- !u!224 &224484966753135898 RectTransform: m_ObjectHideFlags: 1 @@ -1095,7 +1277,7 @@ RectTransform: - {fileID: 224827547678119310} - {fileID: 224218339018349506} m_Father: {fileID: 224011665836974194} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1120,6 +1302,44 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -94.8} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224609935718604692 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1418161294528772} + 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_Children: + - {fileID: 224351136746992674} + m_Father: {fileID: 224654647045080780} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 60, y: 120} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224654647045080780 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1773834359136924} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 0.9999999} + m_Children: + - {fileID: 224609935718604692} + m_Father: {fileID: 224011665836974194} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 120, y: 120} + m_Pivot: {x: 0, y: 0} --- !u!224 &224688961504123188 RectTransform: m_ObjectHideFlags: 1 @@ -1132,11 +1352,11 @@ RectTransform: m_Children: - {fileID: 224833383346886274} m_Father: {fileID: 224011665836974194} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 85, y: 0} m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 0, y: 0} --- !u!224 &224827547678119310 diff --git a/Assets/Scripts/BrakeBarController.cs b/Assets/Scripts/BrakeBarController.cs index 5ecfdb0..774a104 100644 --- a/Assets/Scripts/BrakeBarController.cs +++ b/Assets/Scripts/BrakeBarController.cs @@ -1,46 +1,31 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; public class BrakeBarController : MonoBehaviour { - - int BrakeAmount = 100; + float currentRotation; + float maxRotation; private Player player; - float firstTime; - float secondTime; - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { + // Update is called once per frame + void Update() { // if player alive and spawned - if (player != null) - { - UpdatePointer(); + if ( player != null ) { + UpdatePointer(maxRotation); + } else if (currentRotation != 0) { + //if player dead or not spawned + UpdatePointer(0); } - - } - - - private void UpdatePointer() - { - while (Input.GetKey(KeyCode.S)) - { - firstTime += 1; - } - - if (Input.GetKeyUp(KeyCode.S)) - { - - gameObject.transform.Rotate(Vector3.forward, firstTime); - } - - - } - } + private void UpdatePointer(float brakesLeft) { + float offset = brakesLeft - currentRotation; + gameObject.transform.Rotate(Vector3.forward, offset); + currentRotation += offset; + } + + public void SetPlayer(Player ply) { + player = ply; + } +} diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs index 0b92843..ece099c 100644 --- a/Assets/Scripts/GameController.cs +++ b/Assets/Scripts/GameController.cs @@ -209,9 +209,9 @@ public class GameController : MonoBehaviour { spawn.transform.SetParent(spawnpointRoot.transform); spawn.transform.position = new Vector3(dg.start.GetCenter().x, dg.start.GetCenter().y, 0); start.SetSpawnPointsRootObject(spawnpointRoot); - + start.Reload(); - + start.transform.SetParent(mapRoot.transform); // Finish room @@ -276,7 +276,7 @@ public class GameController : MonoBehaviour { } private void Starting() { - + StartObjective goal = new StartObjective(start, playerPrefab); start.SetObjective(goal); start.OnPlayerEnter(player); @@ -284,6 +284,7 @@ public class GameController : MonoBehaviour { if ( player != null ) { cam.GetComponent().SetFollow(player.gameObject); GetUI().InitHealthController(player); + GetUI().InitBrakeController(player); } else { Debug.Log("No Player spawned!"); } diff --git a/Assets/Scripts/UIController.cs b/Assets/Scripts/UIController.cs index 2568df7..7784f11 100644 --- a/Assets/Scripts/UIController.cs +++ b/Assets/Scripts/UIController.cs @@ -19,6 +19,9 @@ public class UIController : MonoBehaviour [SerializeField] HealthbarController healthcontroller; + [SerializeField] + BrakeBarController brakeBarController; + [SerializeField] int mainMenuSceneIndex = 0; int firstSceneIndex = 1; @@ -70,8 +73,11 @@ public class UIController : MonoBehaviour healthcontroller.SetPlayer(ply); } + public void InitBrakeController(Player ply) { + brakeBarController.SetPlayer(ply); + } + public NotificationManager GetNotificationManager() { return notifications; } } - From bfa790adb6438d44736acad345a632a44d524b07 Mon Sep 17 00:00:00 2001 From: Piegames <14054505+piegamesde@users.noreply.github.com> Date: Mon, 23 Apr 2018 21:30:31 +0200 Subject: [PATCH 7/7] Player brake time --- Assets/Scripts/PlayerMovement.cs | 24 ++++++++++++++++--- .../textures/{UI/Particles.meta => car.meta} | 2 +- Assets/graphics/textures/tmp.meta | 8 +++++++ 3 files changed, 30 insertions(+), 4 deletions(-) rename Assets/graphics/textures/{UI/Particles.meta => car.meta} (77%) create mode 100644 Assets/graphics/textures/tmp.meta diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index bfd35f0..c0ca462 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -14,11 +14,16 @@ public class PlayerMovement : MonoBehaviour { public float drift = 1f; [SerializeField] public float brake = 2f; + [SerializeField] + public float maxBrakeTime = 30f; // The time of the acceleration/deceleration sounds in seconds public double accelerationTime; public double decelerationTime; + public float brakeTime; + public float lastFrame; + public enum SpeedState { SLOW, FASTER, FAST, SLOWER @@ -34,6 +39,8 @@ public class PlayerMovement : MonoBehaviour { rb = GetComponent(); messagePosted = false; state = SpeedState.SLOW; + brakeTime = 0; + lastFrame = Time.time; } void Update() { @@ -56,7 +63,12 @@ public class PlayerMovement : MonoBehaviour { float speed = speedVec.magnitude; bool braking = Input.GetAxis("Vertical") < 0; + if (brakeTime > maxBrakeTime) { + brakeTime = maxBrakeTime; + braking = false; + } if (braking) { + brakeTime += Time.time - lastFrame; switch (state) { case SpeedState.FASTER: if (Time.time - changeTime > accelerationTime) @@ -135,8 +147,14 @@ public class PlayerMovement : MonoBehaviour { Debug.DrawLine(transform.position, transform.position + speedVec, Color.magenta, 0.01f, false); Debug.DrawLine(transform.position, transform.position + transform.localRotation * Vector3.up, Color.yellow, 0.01f, false); - //Debug.Log(transform.localRotation.eulerAngles); - //Debug.Log(transform.localRotation * Vector3.up); - //Debug.Log(curspeed); + //Debug.Log(transform.localRotation.eulerAngles); + //Debug.Log(transform.localRotation * Vector3.up); + //Debug.Log(curspeed); + lastFrame = Time.time; } + + /// The time in seconds the player was braking + public float GetBrakeTime() { + return brakeTime; + } } diff --git a/Assets/graphics/textures/UI/Particles.meta b/Assets/graphics/textures/car.meta similarity index 77% rename from Assets/graphics/textures/UI/Particles.meta rename to Assets/graphics/textures/car.meta index 90927cf..8504594 100644 --- a/Assets/graphics/textures/UI/Particles.meta +++ b/Assets/graphics/textures/car.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 344607e4adabd53428aa359d92c5daf0 +guid: 9ec323b9157704d00a3409f8ea6e46b2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/graphics/textures/tmp.meta b/Assets/graphics/textures/tmp.meta new file mode 100644 index 0000000..7ebab68 --- /dev/null +++ b/Assets/graphics/textures/tmp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df6e7833427b5497b92308fb6f54e552 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: