diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.meta b/MuseumGame/Assets/Animations.meta similarity index 77% rename from MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.meta rename to MuseumGame/Assets/Animations.meta index 69dcdc7..575ab9d 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.meta +++ b/MuseumGame/Assets/Animations.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41d473eb3c6144dea821fb331d67b9fe +guid: b5d9b68effe6f402c85af498d86dd4a8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/MuseumGame/Assets/Animations/Protagonist Run Cycle_0 1.controller b/MuseumGame/Assets/Animations/Protagonist Run Cycle_0 1.controller new file mode 100644 index 0000000..50c9146 --- /dev/null +++ b/MuseumGame/Assets/Animations/Protagonist Run Cycle_0 1.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-4055533887326873892 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Protagonist + 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: 6b3961fa7e2cf4b08a137897f56e70f9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-141165159691384577 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -4055533887326873892} + m_Position: {x: 200, y: 0, z: 0} + 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: -4055533887326873892} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Protagonist Run Cycle_0 1 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -141165159691384577} + 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} diff --git a/MuseumGame/Assets/Animations/Protagonist Run Cycle_0 1.controller.meta b/MuseumGame/Assets/Animations/Protagonist Run Cycle_0 1.controller.meta new file mode 100644 index 0000000..15ecd62 --- /dev/null +++ b/MuseumGame/Assets/Animations/Protagonist Run Cycle_0 1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a914ea3ffe8c4d8898074d4c86688c1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Animations/Protagonist Run Cycle_0.controller b/MuseumGame/Assets/Animations/Protagonist Run Cycle_0.controller new file mode 100644 index 0000000..2e1c392 --- /dev/null +++ b/MuseumGame/Assets/Animations/Protagonist Run Cycle_0.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-121783143131200048 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 4373299920423650963} + m_Position: {x: 200, y: 0, z: 0} + 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: 4373299920423650963} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Protagonist Run Cycle_0 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -121783143131200048} + 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 &4373299920423650963 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Protagonist + 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: 6b3961fa7e2cf4b08a137897f56e70f9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/MuseumGame/Assets/Animations/Protagonist Run Cycle_0.controller.meta b/MuseumGame/Assets/Animations/Protagonist Run Cycle_0.controller.meta new file mode 100644 index 0000000..c0237b0 --- /dev/null +++ b/MuseumGame/Assets/Animations/Protagonist Run Cycle_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 595d666e40a994834bfe08a798144e52 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Animations/Protagonist.anim b/MuseumGame/Assets/Animations/Protagonist.anim new file mode 100644 index 0000000..5c446e0 --- /dev/null +++ b/MuseumGame/Assets/Animations/Protagonist.anim @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Protagonist + 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: 3414590551313872308, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - time: 0.083333336 + value: {fileID: -9078287128096680265, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - time: 0.16666667 + value: {fileID: 7895595074744493000, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - time: 0.25 + value: {fileID: -5715771815500869336, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - time: 0.33333334 + value: {fileID: -3918516384220020871, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - time: 0.41666666 + value: {fileID: -959615308757023407, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - time: 0.5 + value: {fileID: -5290080247100859323, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - time: 0.5833333 + value: {fileID: 4841072226229164717, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - time: 0.6666667 + value: {fileID: -5051691819673034895, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - time: 0.75 + value: {fileID: -5753741807421615432, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + 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: 3414590551313872308, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - {fileID: -9078287128096680265, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - {fileID: 7895595074744493000, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - {fileID: -5715771815500869336, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - {fileID: -3918516384220020871, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - {fileID: -959615308757023407, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - {fileID: -5290080247100859323, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - {fileID: 4841072226229164717, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - {fileID: -5051691819673034895, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + - {fileID: -5753741807421615432, guid: 6d9d4073bdd0c8e4493ef71737f810e3, 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_Events: [] diff --git a/MuseumGame/Assets/Animations/Protagonist.anim.meta b/MuseumGame/Assets/Animations/Protagonist.anim.meta new file mode 100644 index 0000000..573c520 --- /dev/null +++ b/MuseumGame/Assets/Animations/Protagonist.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b3961fa7e2cf4b08a137897f56e70f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/Player.prefab b/MuseumGame/Assets/Prefabs/Player.prefab index f1fc7fb..6393f7f 100644 --- a/MuseumGame/Assets/Prefabs/Player.prefab +++ b/MuseumGame/Assets/Prefabs/Player.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 374150667840124765} - component: {fileID: 374150667840124764} - component: {fileID: 374150667840124768} + - component: {fileID: 874665671871151636} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -29,7 +30,7 @@ Transform: m_GameObject: {fileID: 374150667840124763} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.9691858, y: -0.41703698, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.125, y: 0.125, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -74,12 +75,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: db750325989564987a34393247d883b4, type: 3} + m_Sprite: {fileID: 3414590551313872308, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 9.75, y: 11.35} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -123,14 +124,14 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} + oldSize: {x: 9.75, y: 11.35} + newSize: {x: 9.75, y: 11.35} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1} + m_Size: {x: 9.75, y: 11.35} m_EdgeRadius: 0 --- !u!114 &374150667840124768 MonoBehaviour: @@ -152,3 +153,22 @@ MonoBehaviour: _MinAcc: -1 _Deceleration: 2 jumpForce: 350 +--- !u!95 &874665671871151636 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374150667840124763} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 0a914ea3ffe8c4d8898074d4c86688c1, 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 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index f8de8d0..6fb33ff 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -174,7 +174,7 @@ TilemapRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 01be44825856f4b3d97c71eb85510a3e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -194,7 +194,7 @@ TilemapRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} m_MaxChunkCount: 16 @@ -3772,17 +3772,65 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 374150667840124763, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124764, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_Size.x + value: 9.75 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124764, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_Size.y + value: 11.35 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124764, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 9.75 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124764, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 11.35 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124764, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 9.75 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124764, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 11.35 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124766, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_Size.x + value: 9.75 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124766, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_Size.y + value: 11.35 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124766, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 3414590551313872308, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_LocalScale.x + value: 0.125 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_LocalScale.y + value: 0.125 + objectReference: {fileID: 0} - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalPosition.x value: -1.9691858 objectReference: {fileID: 0} - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalPosition.y - value: -0.41703698 + value: -2.14 objectReference: {fileID: 0} - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalPosition.z @@ -3816,5 +3864,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 874665671871151636, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 0a914ea3ffe8c4d8898074d4c86688c1, type: 2} + - target: {fileID: 6475376253315993612, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 595d666e40a994834bfe08a798144e52, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity index 0f64a90..6f55212 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity @@ -2160,63 +2160,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1409295857 +--- !u!1001 &743161377 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 374150667840124763, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124763, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalPosition.x - value: 5.3 + value: 5.177637 objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalPosition.y - value: -2.32 + value: -2.2001011 objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d09540dbafa36436c910a9a2fbf9c191, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} --- !u!1 &1935037035 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Player.prefab b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Player.prefab deleted file mode 100644 index e1d017f..0000000 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Player.prefab +++ /dev/null @@ -1,154 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &374150667840124763 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 374150667840124767} - - component: {fileID: 374150667840124766} - - component: {fileID: 374150667840124765} - - component: {fileID: 374150667840124764} - - component: {fileID: 374150667840124768} - m_Layer: 0 - m_Name: Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &374150667840124767 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 374150667840124763} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.9691858, y: -0.41703698, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &374150667840124766 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 374150667840124763} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: ca56d5d33ad1745678743a84795d3ee6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!50 &374150667840124765 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 374150667840124763} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 ---- !u!61 &374150667840124764 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 374150667840124763} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!114 &374150667840124768 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 374150667840124763} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ae152fc78d6362b4ea5f1111aad0b919, type: 3} - m_Name: - m_EditorClassIdentifier: - _Velocity: 0 - _MaxVelocity: 3 - _Acc: 0 - _AccSpeed: 0.4 - _MaxAcc: 1 - _MinAcc: -1 - _Deceleration: 2 - jumpForce: 350 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Square.png b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Square.png deleted file mode 100644 index 1886700..0000000 Binary files a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Square.png and /dev/null differ diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Square.png.meta b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Square.png.meta deleted file mode 100644 index 38ad0a7..0000000 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Square.png.meta +++ /dev/null @@ -1,160 +0,0 @@ -fileFormatVersion: 2 -guid: ca56d5d33ad1745678743a84795d3ee6 -TextureImporter: - internalIDToNameTable: - - first: - 213: 7482667652216324306 - second: Square - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 256 - spriteBorder: {x: 4, y: 4, z: 4, w: 4} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: 0 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: Square - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 256 - height: 256 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 2d009a6b596c7d760800000000000000 - internalID: 7482667652216324306 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: - - - {x: -128, y: 128} - - {x: -128, y: -128} - - {x: 128, y: -128} - - {x: 128, y: 128} - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity index 3a80e86..ebf7ba9 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity @@ -3779,6 +3779,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 874665671871151636, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 0a914ea3ffe8c4d8898074d4c86688c1, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} --- !u!1 &1991976499 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Player.prefab.meta b/MuseumGame/Assets/Sprites/Materials.meta similarity index 57% rename from MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Player.prefab.meta rename to MuseumGame/Assets/Sprites/Materials.meta index a3fee42..0590c34 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene/Player.prefab.meta +++ b/MuseumGame/Assets/Sprites/Materials.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: d09540dbafa36436c910a9a2fbf9c191 -PrefabImporter: +guid: 919717ff696b742ed856166d0c179f88 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/MuseumGame/Assets/Sprites/Materials/Protagonist Run Cycle.mat b/MuseumGame/Assets/Sprites/Materials/Protagonist Run Cycle.mat new file mode 100644 index 0000000..1b4fa68 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Materials/Protagonist Run Cycle.mat @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Protagonist Run Cycle + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 6d9d4073bdd0c8e4493ef71737f810e3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/MuseumGame/Assets/Sprites/Materials/Protagonist Run Cycle.mat.meta b/MuseumGame/Assets/Sprites/Materials/Protagonist Run Cycle.mat.meta new file mode 100644 index 0000000..8d3590b --- /dev/null +++ b/MuseumGame/Assets/Sprites/Materials/Protagonist Run Cycle.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01be44825856f4b3d97c71eb85510a3e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/Protagonist Run Cycle.png.meta b/MuseumGame/Assets/Sprites/Protagonist Run Cycle.png.meta index 90cbdd1..bb5f210 100644 --- a/MuseumGame/Assets/Sprites/Protagonist Run Cycle.png.meta +++ b/MuseumGame/Assets/Sprites/Protagonist Run Cycle.png.meta @@ -1,7 +1,37 @@ fileFormatVersion: 2 guid: 6d9d4073bdd0c8e4493ef71737f810e3 TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: 3414590551313872308 + second: Protagonist Run Cycle_0 + - first: + 213: -9078287128096680265 + second: Protagonist Run Cycle_1 + - first: + 213: 7895595074744493000 + second: Protagonist Run Cycle_2 + - first: + 213: -5715771815500869336 + second: Protagonist Run Cycle_3 + - first: + 213: -3918516384220020871 + second: Protagonist Run Cycle_4 + - first: + 213: -959615308757023407 + second: Protagonist Run Cycle_5 + - first: + 213: -5290080247100859323 + second: Protagonist Run Cycle_6 + - first: + 213: 4841072226229164717 + second: Protagonist Run Cycle_7 + - first: + 213: -5051691819673034895 + second: Protagonist Run Cycle_8 + - first: + 213: -5753741807421615432 + second: Protagonist Run Cycle_9 externalObjects: {} serializedVersion: 11 mipmaps: @@ -32,7 +62,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: 1 @@ -41,7 +71,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -68,7 +98,31 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -77,7 +131,217 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Protagonist Run Cycle_0 + rect: + serializedVersion: 2 + x: 187 + y: 3937 + width: 975 + height: 1135 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4b5f770e300136f20800000000000000 + internalID: 3414590551313872308 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Protagonist Run Cycle_1 + rect: + serializedVersion: 2 + x: 1527 + y: 3937 + width: 765 + height: 1135 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7b6dbc0b4f1730280800000000000000 + internalID: -9078287128096680265 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Protagonist Run Cycle_2 + rect: + serializedVersion: 2 + x: 2917 + y: 3937 + width: 625 + height: 1135 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8c3287843e9c29d60800000000000000 + internalID: 7895595074744493000 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Protagonist Run Cycle_3 + rect: + serializedVersion: 2 + x: 357 + y: 2657 + width: 755 + height: 1135 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 82191e731df7da0b0800000000000000 + internalID: -5715771815500869336 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Protagonist Run Cycle_4 + rect: + serializedVersion: 2 + x: 1417 + y: 2657 + width: 985 + height: 1135 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 97f74081c12ae99c0800000000000000 + internalID: -3918516384220020871 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Protagonist Run Cycle_5 + rect: + serializedVersion: 2 + x: 2777 + y: 2737 + width: 975 + height: 1055 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 155c28006f2cea2f0800000000000000 + internalID: -959615308757023407 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Protagonist Run Cycle_6 + rect: + serializedVersion: 2 + x: 247 + y: 1377 + width: 765 + height: 1135 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 54c1e361b0cd596b0800000000000000 + internalID: -5290080247100859323 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Protagonist Run Cycle_7 + rect: + serializedVersion: 2 + x: 1637 + y: 1377 + width: 575 + height: 1135 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: daa16686a81fe2340800000000000000 + internalID: 4841072226229164717 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Protagonist Run Cycle_8 + rect: + serializedVersion: 2 + x: 2937 + y: 1377 + width: 625 + height: 1135 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 17f54a51e09c4e9b0800000000000000 + internalID: -5051691819673034895 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Protagonist Run Cycle_9 + rect: + serializedVersion: 2 + x: 137 + y: 97 + width: 945 + height: 1135 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8b2125f8f4a9620b0800000000000000 + internalID: -5753741807421615432 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 52756a5..0944dba 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,31 +6,31 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620d183eedcc312ee7eb78fce9332b25 + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c6c001f1c1d3823272b7e38271427fb + value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620d183eedd43b2fe7f578fce9332b25 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e52637edea78fce9332b25 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620d183eedd43b2fe7f578fce9332b25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e52637edea78fce9332b25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b