diff --git a/Assets/InputSystem_Actions.cs b/Assets/InputSystem_Actions.cs index 9083576..431efe1 100644 --- a/Assets/InputSystem_Actions.cs +++ b/Assets/InputSystem_Actions.cs @@ -136,6 +136,15 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable ""processors"": """", ""interactions"": """", ""initialStateCheck"": true + }, + { + ""name"": ""CameraUp"", + ""type"": ""Value"", + ""id"": ""5e173d4c-43c5-4ea7-b9e2-fe228d4812ea"", + ""expectedControlType"": """", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": true } ], ""bindings"": [ @@ -186,7 +195,7 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable { ""name"": """", ""id"": ""1c04ea5f-b012-41d1-a6f7-02e963b52893"", - ""path"": ""/upArrow"", + ""path"": ""/f"", ""interactions"": """", ""processors"": """", ""groups"": ""Keyboard&Mouse"", @@ -215,6 +224,17 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable ""action"": ""CameraDown"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""718f409e-4c3a-4ed8-8209-a84172dc60ac"", + ""path"": ""/upArrow"", + ""interactions"": """", + ""processors"": """", + ""groups"": "";Keyboard&Mouse"", + ""action"": ""CameraUp"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] }, @@ -688,6 +708,7 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable m_Player_Jump = m_Player.FindAction("Jump", throwIfNotFound: true); m_Player_Retry = m_Player.FindAction("Retry", throwIfNotFound: true); m_Player_CameraDown = m_Player.FindAction("CameraDown", throwIfNotFound: true); + m_Player_CameraUp = m_Player.FindAction("CameraUp", throwIfNotFound: true); // UI m_UI = asset.FindActionMap("UI", throwIfNotFound: true); m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true); @@ -791,6 +812,7 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable private readonly InputAction m_Player_Jump; private readonly InputAction m_Player_Retry; private readonly InputAction m_Player_CameraDown; + private readonly InputAction m_Player_CameraUp; /// /// Provides access to input actions defined in input action map "Player". /// @@ -823,6 +845,10 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable /// public InputAction @CameraDown => m_Wrapper.m_Player_CameraDown; /// + /// Provides access to the underlying input action "Player/CameraUp". + /// + public InputAction @CameraUp => m_Wrapper.m_Player_CameraUp; + /// /// Provides access to the underlying input action map instance. /// public InputActionMap Get() { return m_Wrapper.m_Player; } @@ -863,6 +889,9 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable @CameraDown.started += instance.OnCameraDown; @CameraDown.performed += instance.OnCameraDown; @CameraDown.canceled += instance.OnCameraDown; + @CameraUp.started += instance.OnCameraUp; + @CameraUp.performed += instance.OnCameraUp; + @CameraUp.canceled += instance.OnCameraUp; } /// @@ -889,6 +918,9 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable @CameraDown.started -= instance.OnCameraDown; @CameraDown.performed -= instance.OnCameraDown; @CameraDown.canceled -= instance.OnCameraDown; + @CameraUp.started -= instance.OnCameraUp; + @CameraUp.performed -= instance.OnCameraUp; + @CameraUp.canceled -= instance.OnCameraUp; } /// @@ -1331,6 +1363,13 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable /// /// void OnCameraDown(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "CameraUp" is either , or . + /// + /// + /// + /// + void OnCameraUp(InputAction.CallbackContext context); } /// /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "UI" which allows adding and removing callbacks. diff --git a/Assets/InputSystem_Actions.inputactions b/Assets/InputSystem_Actions.inputactions index 427f12f..1ba9fed 100644 --- a/Assets/InputSystem_Actions.inputactions +++ b/Assets/InputSystem_Actions.inputactions @@ -50,6 +50,15 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "CameraUp", + "type": "Value", + "id": "5e173d4c-43c5-4ea7-b9e2-fe228d4812ea", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": true } ], "bindings": [ @@ -100,7 +109,7 @@ { "name": "", "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", - "path": "/upArrow", + "path": "/f", "interactions": "", "processors": "", "groups": "Keyboard&Mouse", @@ -129,6 +138,17 @@ "action": "CameraDown", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "718f409e-4c3a-4ed8-8209-a84172dc60ac", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "CameraUp", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/Resources/Animation/Mouse/Cheese.anim b/Assets/Resources/Animation/Mouse/Cheese.anim deleted file mode 100644 index 642bf55..0000000 --- a/Assets/Resources/Animation/Mouse/Cheese.anim +++ /dev/null @@ -1,232 +0,0 @@ -%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: Cheese - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 3.64, y: 0.61, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.3333334 - value: {x: 3.64, y: 0.91, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 2.6666667 - value: {x: 3.64, y: 0.61, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - serializedVersion: 2 - curve: - - time: 0 - value: {fileID: -542032092, guid: e994df514718d2242828c449672f005f, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - flags: 2 - 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: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: - - {fileID: -542032092, guid: e994df514718d2242828c449672f005f, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 2.6666667 - 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: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 3.64 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 3.64 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.6666667 - value: 3.64 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.61 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 0.91 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.6666667 - value: 0.61 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: - classID: 4 - script: {fileID: 0} - flags: 0 - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 1 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Animation/Mouse/Cheese.controller b/Assets/Resources/Animation/Mouse/Cheese.controller deleted file mode 100644 index 960ef43..0000000 --- a/Assets/Resources/Animation/Mouse/Cheese.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-2019926265777506834 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Cheese - 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: 220137a746bc56c4ab055bae416572b9, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Cheese - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 3431133180412913870} - 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!1107 &3431133180412913870 -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: -2019926265777506834} - m_Position: {x: 270, y: 110, 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: -2019926265777506834} diff --git a/Assets/Resources/Animation/Mouse/Die.anim b/Assets/Resources/Animation/Mouse/Die.anim index 58c11f8..336598a 100644 --- a/Assets/Resources/Animation/Mouse/Die.anim +++ b/Assets/Resources/Animation/Mouse/Die.anim @@ -21,15 +21,15 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: -247415032, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 761548840272236359, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.083333336 - value: {fileID: -1781702475, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 7102123539417337067, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.16666667 - value: {fileID: -2142620005, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: -6844375794152627625, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.25 - value: {fileID: -2087859330, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 4619293468511892420, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.33333334 - value: {fileID: -786537470, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 101476075425412524, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} attribute: m_Sprite path: classID: 212 @@ -52,11 +52,11 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: -247415032, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -1781702475, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -2142620005, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -2087859330, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -786537470, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + - {fileID: 761548840272236359, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 7102123539417337067, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: -6844375794152627625, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 4619293468511892420, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 101476075425412524, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Animation/Mouse/Run1.anim b/Assets/Resources/Animation/Mouse/Eat.anim similarity index 65% rename from Assets/Resources/Animation/Mouse/Run1.anim rename to Assets/Resources/Animation/Mouse/Eat.anim index 9e3ea20..354eab6 100644 --- a/Assets/Resources/Animation/Mouse/Run1.anim +++ b/Assets/Resources/Animation/Mouse/Eat.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Run1 + m_Name: Eat serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -21,15 +21,15 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 3530181641709833563, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 6479334591738097801, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.083333336 - value: {fileID: 3536596213578576996, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 1865243544143020502, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.16666667 - value: {fileID: 8806845766619534263, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 8260863368990568797, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.25 - value: {fileID: 1588605042201044809, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: -1204461050872685235, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.33333334 - value: {fileID: 1162754355, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 7564491659451218746, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} attribute: m_Sprite path: classID: 212 @@ -52,11 +52,11 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 3530181641709833563, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 3536596213578576996, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 8806845766619534263, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 1588605042201044809, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 1162754355, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + - {fileID: 6479334591738097801, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 1865243544143020502, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 8260863368990568797, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: -1204461050872685235, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 7564491659451218746, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Animation/Mouse/Idle1.anim.meta b/Assets/Resources/Animation/Mouse/Eat.anim.meta similarity index 79% rename from Assets/Resources/Animation/Mouse/Idle1.anim.meta rename to Assets/Resources/Animation/Mouse/Eat.anim.meta index 305650e..0f07fe9 100644 --- a/Assets/Resources/Animation/Mouse/Idle1.anim.meta +++ b/Assets/Resources/Animation/Mouse/Eat.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e9c08fb3127e1344fb08915fc90c366e +guid: 07b18af52d449bd4fbafbf17a5e1474f NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Animation/Mouse/Run2.anim b/Assets/Resources/Animation/Mouse/Idle.anim similarity index 69% rename from Assets/Resources/Animation/Mouse/Run2.anim rename to Assets/Resources/Animation/Mouse/Idle.anim index 974f540..2b1b404 100644 --- a/Assets/Resources/Animation/Mouse/Run2.anim +++ b/Assets/Resources/Animation/Mouse/Idle.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Run2 + m_Name: Idle serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -21,13 +21,13 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: -1316217478, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 8271730618534065979, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.083333336 - value: {fileID: -2126649614, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: -946889411211178367, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.16666667 - value: {fileID: -619376401, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 5648282429771809655, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.25 - value: {fileID: -871524625, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 318761232798241317, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} attribute: m_Sprite path: classID: 212 @@ -50,10 +50,10 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: -1316217478, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -2126649614, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -619376401, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -871524625, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + - {fileID: 8271730618534065979, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: -946889411211178367, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 5648282429771809655, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 318761232798241317, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Animation/Mouse/Cheese.anim.meta b/Assets/Resources/Animation/Mouse/Idle.anim.meta similarity index 79% rename from Assets/Resources/Animation/Mouse/Cheese.anim.meta rename to Assets/Resources/Animation/Mouse/Idle.anim.meta index bc16f19..5b988c7 100644 --- a/Assets/Resources/Animation/Mouse/Cheese.anim.meta +++ b/Assets/Resources/Animation/Mouse/Idle.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 220137a746bc56c4ab055bae416572b9 +guid: 51c28a564e85db94798780ce74d120b7 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Animation/Mouse/Idle3.anim b/Assets/Resources/Animation/Mouse/Idle3.anim deleted file mode 100644 index b3a2cfa..0000000 --- a/Assets/Resources/Animation/Mouse/Idle3.anim +++ /dev/null @@ -1,87 +0,0 @@ -%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: Idle3 - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - serializedVersion: 2 - curve: - - time: 0 - value: {fileID: 3729000224583566431, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - time: 0.083333336 - value: {fileID: 1487519846930642061, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - time: 0.16666667 - value: {fileID: -164532561428888824, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - time: 0.25 - value: {fileID: 5995383764169713386, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - time: 0.33333334 - value: {fileID: -7600786821318931842, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - time: 0.41666666 - value: {fileID: 8329367835443354831, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - flags: 2 - 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 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: - - {fileID: 3729000224583566431, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 1487519846930642061, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -164532561428888824, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 5995383764169713386, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -7600786821318931842, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 8329367835443354831, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.5 - 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/Assets/Resources/Animation/Mouse/Jump.anim b/Assets/Resources/Animation/Mouse/Jump.anim index 788fdf3..d2d6a0d 100644 --- a/Assets/Resources/Animation/Mouse/Jump.anim +++ b/Assets/Resources/Animation/Mouse/Jump.anim @@ -21,13 +21,15 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 1542763265, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: -1439413755333219960, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.083333336 - value: {fileID: -1757244022, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 890703992906616541, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.16666667 - value: {fileID: 1870237373, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - time: 0.25 - value: {fileID: 1404678384, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: -2267987124739465942, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - time: 0.33333334 + value: {fileID: -7595055785199937025, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - time: 0.5 + value: {fileID: -1411271313352943364, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} attribute: m_Sprite path: classID: 212 @@ -50,16 +52,17 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 1542763265, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -1757244022, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 1870237373, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 1404678384, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + - {fileID: -1439413755333219960, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 890703992906616541, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: -2267987124739465942, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: -7595055785199937025, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: -1411271313352943364, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.33333334 + m_StopTime: 0.5833333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/Animation/Mouse/Land.anim b/Assets/Resources/Animation/Mouse/Land.anim index a8ffec0..948f14f 100644 --- a/Assets/Resources/Animation/Mouse/Land.anim +++ b/Assets/Resources/Animation/Mouse/Land.anim @@ -21,9 +21,11 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: -818654935, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: -288870946302740210, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.083333336 - value: {fileID: -407098019, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 2241534038247644364, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - time: 0.16666667 + value: {fileID: 4892329051279089382, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} attribute: m_Sprite path: classID: 212 @@ -46,14 +48,15 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: -818654935, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -407098019, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + - {fileID: -288870946302740210, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 2241534038247644364, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 4892329051279089382, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.16666667 + m_StopTime: 0.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/Animation/Mouse/Idle2.anim b/Assets/Resources/Animation/Mouse/LookDown.anim similarity index 63% rename from Assets/Resources/Animation/Mouse/Idle2.anim rename to Assets/Resources/Animation/Mouse/LookDown.anim index f0a2bc1..e4163db 100644 --- a/Assets/Resources/Animation/Mouse/Idle2.anim +++ b/Assets/Resources/Animation/Mouse/LookDown.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle2 + m_Name: LookDown serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -21,15 +21,13 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 3797421006285777406, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: -6388538189476022493, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.083333336 - value: {fileID: -4587410544167001974, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: -8267016419655954318, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.16666667 - value: {fileID: 3150361506335799294, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: -7343027077163780408, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.25 - value: {fileID: 1749099844710903520, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - time: 0.33333334 - value: {fileID: -8383248538994392880, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 6910278550469672390, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} attribute: m_Sprite path: classID: 212 @@ -52,17 +50,16 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 3797421006285777406, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -4587410544167001974, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 3150361506335799294, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 1749099844710903520, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -8383248538994392880, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + - {fileID: -6388538189476022493, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: -8267016419655954318, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: -7343027077163780408, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 6910278550469672390, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.4166667 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/Animation/Mouse/Idle2.anim.meta b/Assets/Resources/Animation/Mouse/LookDown.anim.meta similarity index 79% rename from Assets/Resources/Animation/Mouse/Idle2.anim.meta rename to Assets/Resources/Animation/Mouse/LookDown.anim.meta index 7addd73..a41635a 100644 --- a/Assets/Resources/Animation/Mouse/Idle2.anim.meta +++ b/Assets/Resources/Animation/Mouse/LookDown.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b9f3cd9e31e46df479056bfc18eadffa +guid: 73c0e42803fc47f479d9497ff7c22840 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Animation/Mouse/Idle1.anim b/Assets/Resources/Animation/Mouse/LookUp.anim similarity index 69% rename from Assets/Resources/Animation/Mouse/Idle1.anim rename to Assets/Resources/Animation/Mouse/LookUp.anim index e0bebd9..63321e2 100644 --- a/Assets/Resources/Animation/Mouse/Idle1.anim +++ b/Assets/Resources/Animation/Mouse/LookUp.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle1 + m_Name: LookUp serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -21,13 +21,13 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: -294635626386517778, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 7537839686730537662, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.083333336 - value: {fileID: 1931949401953633163, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 1239280665345744727, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.16666667 - value: {fileID: -2064239488583408458, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 5636048464562277397, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} - time: 0.25 - value: {fileID: -8313113455799937248, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + value: {fileID: 549814031662270217, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} attribute: m_Sprite path: classID: 212 @@ -50,10 +50,10 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: -294635626386517778, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: 1931949401953633163, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -2064239488583408458, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} - - {fileID: -8313113455799937248, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + - {fileID: 7537839686730537662, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 1239280665345744727, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 5636048464562277397, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 549814031662270217, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Animation/Mouse/Idle3.anim.meta b/Assets/Resources/Animation/Mouse/LookUp.anim.meta similarity index 79% rename from Assets/Resources/Animation/Mouse/Idle3.anim.meta rename to Assets/Resources/Animation/Mouse/LookUp.anim.meta index 76c1f58..30b093d 100644 --- a/Assets/Resources/Animation/Mouse/Idle3.anim.meta +++ b/Assets/Resources/Animation/Mouse/LookUp.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 56fbc1ccb13a5ca44b10512c966ce0e5 +guid: 9d4763220f4f66145bc68bdfdc34bd39 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Animation/Mouse/PlayerAnimator.controller b/Assets/Resources/Animation/Mouse/PlayerController.controller similarity index 66% rename from Assets/Resources/Animation/Mouse/PlayerAnimator.controller rename to Assets/Resources/Animation/Mouse/PlayerController.controller index 77ce4f1..0931647 100644 --- a/Assets/Resources/Animation/Mouse/PlayerAnimator.controller +++ b/Assets/Resources/Animation/Mouse/PlayerController.controller @@ -1,6 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-8984981443715152757 +--- !u!1102 &-8812198203721263299 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Eat + 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: 07b18af52d449bd4fbafbf17a5e1474f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-8627159932891616111 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -9,13 +35,10 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 2 - m_ConditionEvent: isGround - m_EventTreshold: 0 - - m_ConditionMode: 3 - m_ConditionEvent: yVelocity + m_ConditionEvent: isLookUp m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 4959519653747877424} + m_DstState: {fileID: 8012128199095846532} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -28,35 +51,7 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-7533465186219130520 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: isGround - m_EventTreshold: 0 - - m_ConditionMode: 3 - m_ConditionEvent: yVelocity - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 4959519653747877424} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-7482574358468332168 +--- !u!1101 &-7754299696593197537 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -71,7 +66,7 @@ AnimatorStateTransition: m_ConditionEvent: yVelocity m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 2501522105203427731} + m_DstState: {fileID: -3964554050524632436} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -84,7 +79,113 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-6062550324130978237 +--- !u!1101 &-7350161253500737229 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isGround + m_EventTreshold: 0 + - m_ConditionMode: 3 + m_ConditionEvent: yVelocity + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8900625474813099795} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6242579532069259651 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isSleeping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3131176091492439480} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6239579089940001843 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isSleeping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8012128199095846532} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6217820444707719070 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isGround + m_EventTreshold: 0 + - m_ConditionMode: 4 + m_ConditionEvent: yVelocity + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3964554050524632436} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-5511658742677600423 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -96,48 +197,20 @@ AnimatorStateTransition: m_ConditionEvent: isRun m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1996606871534316786} + m_DstState: {fileID: 8012128199095846532} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.25 + m_ExitTime: 0 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-5831670171908107190 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isGround - m_EventTreshold: 0 - - m_ConditionMode: 1 - m_ConditionEvent: isRun - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -408166766160254214} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.25 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &-4365829144205788106 +--- !u!1102 &-5021171880381140995 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -145,7 +218,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Die - m_Speed: 0.5 + m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -163,7 +236,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-3604185045389587182 +--- !u!1101 &-4717423011382200772 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -171,80 +244,81 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isGround - m_EventTreshold: 0 - m_ConditionMode: 2 - m_ConditionEvent: isRun - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1996606871534316786} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-3070672657498400280 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Eat - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 7135535112721335543} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-2773274383473946797 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 m_ConditionEvent: isGround m_EventTreshold: 0 - - m_ConditionMode: 1 - m_ConditionEvent: isRun + - m_ConditionMode: 3 + m_ConditionEvent: yVelocity m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -408166766160254214} + m_DstState: {fileID: 8900625474813099795} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0 + m_ExitTime: 0.25 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-1658535337212434661 +--- !u!1102 &-3964554050524632436 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Land + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 480034858270933836} + 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: a827406269c75b84fa39e80dec1e0b1f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-3254952816643296810 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LookDown + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4884934010620772917} + 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: 73c0e42803fc47f479d9497ff7c22840, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-2281880959810638375 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -256,7 +330,7 @@ AnimatorStateTransition: m_ConditionEvent: Die m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -4365829144205788106} + m_DstState: {fileID: -5021171880381140995} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -265,46 +339,17 @@ AnimatorStateTransition: m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &-408166766160254214 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Run2 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: -6062550324130978237} - - {fileID: 4312547204456355584} - - {fileID: -8984981443715152757} - 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: fca3e9f554059d8409760b3f23f22a24, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: PlayerAnimator + m_Name: PlayerController serializedVersion: 5 m_AnimatorParameters: - m_Name: isRun @@ -319,6 +364,24 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: isLookDown + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isLookUp + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isSleeping + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} - m_Name: yVelocity m_Type: 1 m_DefaultFloat: 0 @@ -337,10 +400,22 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: Jump + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Land + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer - m_StateMachine: {fileID: 1232751881755462291} + m_StateMachine: {fileID: 3254549623102223603} m_Mask: {fileID: 0} m_Motions: [] m_Behaviours: [] @@ -350,7 +425,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &352921014699293172 +--- !u!1101 &480034858270933836 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -361,11 +436,8 @@ AnimatorStateTransition: - m_ConditionMode: 1 m_ConditionEvent: isGround m_EventTreshold: 0 - - m_ConditionMode: 2 - m_ConditionEvent: isRun - m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1996606871534316786} + m_DstState: {fileID: 8012128199095846532} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -374,11 +446,88 @@ AnimatorStateTransition: m_TransitionOffset: 0 m_ExitTime: 0.25 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1107 &1232751881755462291 +--- !u!1101 &2512774197409817360 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isLookDown + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3254952816643296810} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &3131176091492439480 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sleeping + m_Speed: 0.5 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6239579089940001843} + 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: bceb1c4d8ce494845b7c86c46a703a29, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &3249854147785557595 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isRun + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4041814910633895349} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &3254549623102223603 AnimatorStateMachine: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -388,81 +537,58 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: -4365829144205788106} - m_Position: {x: 260, y: 20, z: 0} + m_State: {fileID: 8012128199095846532} + m_Position: {x: 280, y: 120, z: 0} - serializedVersion: 1 - m_State: {fileID: 1996606871534316786} - m_Position: {x: 240, y: 120, z: 0} + m_State: {fileID: 4041814910633895349} + m_Position: {x: 20, y: 220, z: 0} - serializedVersion: 1 - m_State: {fileID: 4959519653747877424} - m_Position: {x: 570, y: 30, z: 0} + m_State: {fileID: -5021171880381140995} + m_Position: {x: 240, y: -100, z: 0} - serializedVersion: 1 - m_State: {fileID: 2501522105203427731} - m_Position: {x: 570, y: 440, z: 0} + m_State: {fileID: 8900625474813099795} + m_Position: {x: 120, y: 340, z: 0} - serializedVersion: 1 - m_State: {fileID: -408166766160254214} - m_Position: {x: 240, y: 340, z: 0} + m_State: {fileID: -3964554050524632436} + m_Position: {x: 470, y: 340, z: 0} - serializedVersion: 1 - m_State: {fileID: 7135535112721335543} - m_Position: {x: 250, y: -50, z: 0} + m_State: {fileID: -3254952816643296810} + m_Position: {x: 580, y: 30, z: 0} - serializedVersion: 1 - m_State: {fileID: 8527039898309416944} - m_Position: {x: -10, y: 240, z: 0} + m_State: {fileID: 6822791037890048043} + m_Position: {x: 580, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8812198203721263299} + m_Position: {x: 350, y: -20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3131176091492439480} + m_Position: {x: 540, y: 220, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - - {fileID: -1658535337212434661} - - {fileID: -3070672657498400280} + - {fileID: -2281880959810638375} + - {fileID: 8935225291960203566} 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: 270, y: -130, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1996606871534316786} ---- !u!1102 &1996606871534316786 + m_DefaultState: {fileID: 8012128199095846532} +--- !u!1102 &4041814910633895349 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle1 - m_Speed: 0.87 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 6562219259105078373} - - {fileID: 2995960753939682143} - - {fileID: -7482574358468332168} - 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: e9c08fb3127e1344fb08915fc90c366e, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &2501522105203427731 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Land + m_Name: Run m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -2773274383473946797} - - {fileID: -3604185045389587182} - - {fileID: -7533465186219130520} + - {fileID: -5511658742677600423} + - {fileID: -4717423011382200772} + - {fileID: -6217820444707719070} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -472,13 +598,13 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: a827406269c75b84fa39e80dec1e0b1f, type: 2} + m_Motion: {fileID: 7400000, guid: 1b6d8291999ae7f419d66fb79e050d9f, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &2995960753939682143 +--- !u!1101 &4884934010620772917 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -487,13 +613,10 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 2 - m_ConditionEvent: isGround - m_EventTreshold: 0 - - m_ConditionMode: 3 - m_ConditionEvent: yVelocity + m_ConditionEvent: isLookDown m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 4959519653747877424} + m_DstState: {fileID: 8012128199095846532} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -506,7 +629,91 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &4312547204456355584 +--- !u!1101 &5551127868217755000 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isLookUp + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6822791037890048043} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &6822791037890048043 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LookUp + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8627159932891616111} + 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: 9d4763220f4f66145bc68bdfdc34bd39, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8012128199095846532 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 0.5 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3249854147785557595} + - {fileID: -6242579532069259651} + - {fileID: -7350161253500737229} + - {fileID: -7754299696593197537} + - {fileID: 2512774197409817360} + - {fileID: 5551127868217755000} + 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: 51c28a564e85db94798780ce74d120b7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8693762042499261950 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -521,20 +728,20 @@ AnimatorStateTransition: m_ConditionEvent: yVelocity m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 2501522105203427731} + m_DstState: {fileID: -3964554050524632436} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.25 + m_ExitTime: 0.5 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &4959519653747877424 +--- !u!1102 &8900625474813099795 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -545,9 +752,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -5831670171908107190} - - {fileID: 352921014699293172} - - {fileID: 6786280886738392539} + - {fileID: 8693762042499261950} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -563,7 +768,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &6562219259105078373 +--- !u!1101 &8935225291960203566 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -572,99 +777,19 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: isRun + m_ConditionEvent: Eat m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -408166766160254214} + m_DstState: {fileID: -8812198203721263299} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.25 + m_ExitTime: 0.75 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &6786280886738392539 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: isGround - m_EventTreshold: 0 - - m_ConditionMode: 4 - m_ConditionEvent: yVelocity - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 2501522105203427731} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &7135535112721335543 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle2 - m_Speed: 0.7 - 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: b9f3cd9e31e46df479056bfc18eadffa, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &8527039898309416944 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle3 - 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: 56fbc1ccb13a5ca44b10512c966ce0e5, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Resources/Animation/Mouse/PlayerAnimator.controller.meta b/Assets/Resources/Animation/Mouse/PlayerController.controller.meta similarity index 79% rename from Assets/Resources/Animation/Mouse/PlayerAnimator.controller.meta rename to Assets/Resources/Animation/Mouse/PlayerController.controller.meta index e75d08a..cb34d5a 100644 --- a/Assets/Resources/Animation/Mouse/PlayerAnimator.controller.meta +++ b/Assets/Resources/Animation/Mouse/PlayerController.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2d7f1d9ef37bcd34da74318c207cb6ac +guid: da85e8d22f6d34d4894572485c8c5996 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/Resources/Images/Props/Rat.png b/Assets/Resources/Animation/Mouse/Rat.png similarity index 100% rename from Assets/Resources/Images/Props/Rat.png rename to Assets/Resources/Animation/Mouse/Rat.png diff --git a/Assets/Resources/Images/Props/Rat.png.meta b/Assets/Resources/Animation/Mouse/Rat.png.meta similarity index 72% rename from Assets/Resources/Images/Props/Rat.png.meta rename to Assets/Resources/Animation/Mouse/Rat.png.meta index 874525f..47247f2 100644 --- a/Assets/Resources/Images/Props/Rat.png.meta +++ b/Assets/Resources/Animation/Mouse/Rat.png.meta @@ -298,7 +298,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -312,7 +312,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -336,7 +336,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -378,11 +378,11 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 191 - width: 65 - height: 11 + y: 192 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -399,12 +399,12 @@ TextureImporter: name: Rat_1 rect: serializedVersion: 2 - x: 68 - y: 196 - width: 10 - height: 8 + x: 16 + y: 192 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -421,12 +421,12 @@ TextureImporter: name: Rat_2 rect: serializedVersion: 2 - x: 77 - y: 196 - width: 6 - height: 7 + x: 32 + y: 192 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -443,12 +443,12 @@ TextureImporter: name: Rat_3 rect: serializedVersion: 2 - x: 86 - y: 196 - width: 12 - height: 8 + x: 48 + y: 192 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -465,12 +465,12 @@ TextureImporter: name: Rat_4 rect: serializedVersion: 2 - x: 97 - y: 196 - width: 6 - height: 7 + x: 64 + y: 192 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -487,12 +487,12 @@ TextureImporter: name: Rat_5 rect: serializedVersion: 2 - x: 102 - y: 195 - width: 6 - height: 8 + x: 80 + y: 192 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -509,12 +509,12 @@ TextureImporter: name: Rat_6 rect: serializedVersion: 2 - x: 0 - y: 175 - width: 65 - height: 11 + x: 96 + y: 192 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -531,12 +531,12 @@ TextureImporter: name: Rat_7 rect: serializedVersion: 2 - x: 68 - y: 179 - width: 10 - height: 8 + x: 0 + y: 176 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -553,12 +553,12 @@ TextureImporter: name: Rat_8 rect: serializedVersion: 2 - x: 77 - y: 179 - width: 6 - height: 7 + x: 16 + y: 176 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -575,12 +575,12 @@ TextureImporter: name: Rat_9 rect: serializedVersion: 2 - x: 86 - y: 179 - width: 6 - height: 7 + x: 32 + y: 176 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -597,12 +597,12 @@ TextureImporter: name: Rat_10 rect: serializedVersion: 2 - x: 91 - y: 179 - width: 10 - height: 7 + x: 48 + y: 176 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -619,12 +619,12 @@ TextureImporter: name: Rat_11 rect: serializedVersion: 2 - x: 100 - y: 179 - width: 9 - height: 7 + x: 64 + y: 176 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -641,12 +641,12 @@ TextureImporter: name: Rat_12 rect: serializedVersion: 2 - x: 108 - y: 179 - width: 8 - height: 8 + x: 80 + y: 176 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -663,12 +663,12 @@ TextureImporter: name: Rat_13 rect: serializedVersion: 2 - x: 0 - y: 159 - width: 17 - height: 12 + x: 96 + y: 176 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -685,12 +685,12 @@ TextureImporter: name: Rat_14 rect: serializedVersion: 2 - x: 15 - y: 159 - width: 50 - height: 13 + x: 112 + y: 176 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -707,12 +707,12 @@ TextureImporter: name: Rat_15 rect: serializedVersion: 2 - x: 68 - y: 163 - width: 6 - height: 8 + x: 0 + y: 160 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -729,12 +729,12 @@ TextureImporter: name: Rat_16 rect: serializedVersion: 2 - x: 73 - y: 163 - width: 6 - height: 7 + x: 16 + y: 160 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -751,12 +751,12 @@ TextureImporter: name: Rat_17 rect: serializedVersion: 2 - x: 78 - y: 163 - width: 13 - height: 8 + x: 32 + y: 160 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -773,12 +773,12 @@ TextureImporter: name: Rat_18 rect: serializedVersion: 2 - x: 97 - y: 162 - width: 13 - height: 13 + x: 48 + y: 160 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -795,12 +795,12 @@ TextureImporter: name: Rat_19 rect: serializedVersion: 2 - x: 0 - y: 143 - width: 17 - height: 12 + x: 64 + y: 160 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -817,12 +817,12 @@ TextureImporter: name: Rat_20 rect: serializedVersion: 2 - x: 15 - y: 143 - width: 50 - height: 13 + x: 80 + y: 160 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -839,12 +839,12 @@ TextureImporter: name: Rat_21 rect: serializedVersion: 2 - x: 68 - y: 147 - width: 6 - height: 8 + x: 96 + y: 160 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -861,12 +861,12 @@ TextureImporter: name: Rat_22 rect: serializedVersion: 2 - x: 73 - y: 147 - width: 6 - height: 7 + x: 0 + y: 144 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -883,12 +883,12 @@ TextureImporter: name: Rat_23 rect: serializedVersion: 2 - x: 78 - y: 147 - width: 6 - height: 7 + x: 16 + y: 144 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -905,12 +905,12 @@ TextureImporter: name: Rat_24 rect: serializedVersion: 2 - x: 87 - y: 147 - width: 6 - height: 8 + x: 32 + y: 144 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -927,12 +927,12 @@ TextureImporter: name: Rat_25 rect: serializedVersion: 2 - x: 0 - y: 127 - width: 17 - height: 12 + x: 48 + y: 144 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -949,12 +949,12 @@ TextureImporter: name: Rat_26 rect: serializedVersion: 2 - x: 15 - y: 127 - width: 34 - height: 11 + x: 64 + y: 144 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -971,12 +971,12 @@ TextureImporter: name: Rat_27 rect: serializedVersion: 2 - x: 47 - y: 127 - width: 34 - height: 12 + x: 80 + y: 144 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -993,12 +993,12 @@ TextureImporter: name: Rat_28 rect: serializedVersion: 2 - x: 83 - y: 130 - width: 9 - height: 8 + x: 0 + y: 128 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1015,12 +1015,12 @@ TextureImporter: name: Rat_29 rect: serializedVersion: 2 - x: 91 - y: 130 - width: 9 - height: 7 + x: 16 + y: 128 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1037,12 +1037,12 @@ TextureImporter: name: Rat_30 rect: serializedVersion: 2 - x: 99 - y: 130 - width: 6 - height: 7 + x: 32 + y: 128 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1059,12 +1059,12 @@ TextureImporter: name: Rat_31 rect: serializedVersion: 2 - x: 108 - y: 130 - width: 7 - height: 8 + x: 48 + y: 128 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1081,12 +1081,12 @@ TextureImporter: name: Rat_32 rect: serializedVersion: 2 - x: 114 - y: 130 - width: 9 - height: 8 + x: 64 + y: 128 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1103,12 +1103,12 @@ TextureImporter: name: Rat_33 rect: serializedVersion: 2 - x: 0 - y: 111 - width: 17 - height: 10 + x: 80 + y: 128 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1125,12 +1125,12 @@ TextureImporter: name: Rat_34 rect: serializedVersion: 2 - x: 16 - y: 111 - width: 17 - height: 11 + x: 96 + y: 128 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1147,12 +1147,12 @@ TextureImporter: name: Rat_35 rect: serializedVersion: 2 - x: 33 - y: 111 + x: 112 + y: 128 width: 16 - height: 12 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1169,12 +1169,12 @@ TextureImporter: name: Rat_36 rect: serializedVersion: 2 - x: 49 - y: 111 + x: 0 + y: 112 width: 16 - height: 15 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1191,12 +1191,12 @@ TextureImporter: name: Rat_37 rect: serializedVersion: 2 - x: 64 - y: 111 - width: 33 - height: 15 + x: 16 + y: 112 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1213,12 +1213,12 @@ TextureImporter: name: Rat_38 rect: serializedVersion: 2 - x: 100 - y: 115 - width: 9 - height: 8 + x: 32 + y: 112 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1235,12 +1235,12 @@ TextureImporter: name: Rat_39 rect: serializedVersion: 2 - x: 108 - y: 115 - width: 9 - height: 7 + x: 48 + y: 112 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1257,12 +1257,12 @@ TextureImporter: name: Rat_40 rect: serializedVersion: 2 - x: 116 - y: 114 - width: 9 - height: 8 + x: 64 + y: 112 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1279,12 +1279,12 @@ TextureImporter: name: Rat_41 rect: serializedVersion: 2 - x: 131 - y: 113 - width: 13 - height: 13 + x: 80 + y: 112 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1301,12 +1301,12 @@ TextureImporter: name: Rat_42 rect: serializedVersion: 2 - x: 0 - y: 95 - width: 17 - height: 10 + x: 96 + y: 112 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1323,12 +1323,12 @@ TextureImporter: name: Rat_43 rect: serializedVersion: 2 - x: 16 - y: 95 - width: 17 - height: 11 + x: 112 + y: 112 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1345,12 +1345,12 @@ TextureImporter: name: Rat_44 rect: serializedVersion: 2 - x: 33 - y: 95 + x: 128 + y: 112 width: 16 - height: 12 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1367,12 +1367,12 @@ TextureImporter: name: Rat_45 rect: serializedVersion: 2 - x: 49 - y: 95 + x: 0 + y: 96 width: 16 - height: 15 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1389,12 +1389,12 @@ TextureImporter: name: Rat_46 rect: serializedVersion: 2 - x: 64 - y: 95 - width: 17 - height: 15 + x: 16 + y: 96 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1411,12 +1411,12 @@ TextureImporter: name: Rat_47 rect: serializedVersion: 2 - x: 80 + x: 32 y: 96 - width: 17 - height: 14 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1433,12 +1433,12 @@ TextureImporter: name: Rat_48 rect: serializedVersion: 2 - x: 97 - y: 95 + x: 48 + y: 96 width: 16 - height: 15 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1455,12 +1455,12 @@ TextureImporter: name: Rat_49 rect: serializedVersion: 2 - x: 114 - y: 95 - width: 15 - height: 15 + x: 64 + y: 96 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1477,12 +1477,12 @@ TextureImporter: name: Rat_50 rect: serializedVersion: 2 - x: 130 - y: 95 - width: 31 - height: 15 + x: 80 + y: 96 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1499,12 +1499,12 @@ TextureImporter: name: Rat_51 rect: serializedVersion: 2 - x: 163 - y: 100 - width: 9 - height: 8 + x: 96 + y: 96 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1521,12 +1521,12 @@ TextureImporter: name: Rat_52 rect: serializedVersion: 2 - x: 171 - y: 100 - width: 9 - height: 7 + x: 112 + y: 96 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1543,12 +1543,12 @@ TextureImporter: name: Rat_53 rect: serializedVersion: 2 - x: 179 - y: 99 - width: 6 - height: 8 + x: 128 + y: 96 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1565,12 +1565,12 @@ TextureImporter: name: Rat_54 rect: serializedVersion: 2 - x: 184 - y: 100 - width: 6 - height: 8 + x: 144 + y: 96 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1587,12 +1587,12 @@ TextureImporter: name: Rat_55 rect: serializedVersion: 2 - x: 0 - y: 79 - width: 17 - height: 10 + x: 160 + y: 96 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1609,12 +1609,12 @@ TextureImporter: name: Rat_56 rect: serializedVersion: 2 - x: 15 - y: 79 - width: 50 - height: 10 + x: 176 + y: 96 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1631,12 +1631,12 @@ TextureImporter: name: Rat_57 rect: serializedVersion: 2 - x: 66 - y: 83 - width: 6 - height: 8 + x: 0 + y: 80 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1653,12 +1653,12 @@ TextureImporter: name: Rat_58 rect: serializedVersion: 2 - x: 71 - y: 83 - width: 6 - height: 7 + x: 16 + y: 80 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1675,12 +1675,12 @@ TextureImporter: name: Rat_59 rect: serializedVersion: 2 - x: 76 - y: 83 - width: 6 - height: 7 + x: 32 + y: 80 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1697,12 +1697,12 @@ TextureImporter: name: Rat_60 rect: serializedVersion: 2 - x: 81 - y: 83 - width: 6 - height: 8 + x: 48 + y: 80 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1719,12 +1719,12 @@ TextureImporter: name: Rat_61 rect: serializedVersion: 2 - x: 90 - y: 83 - width: 6 - height: 8 + x: 64 + y: 80 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1741,12 +1741,12 @@ TextureImporter: name: Rat_62 rect: serializedVersion: 2 - x: 95 - y: 83 - width: 6 - height: 7 + x: 80 + y: 80 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1763,12 +1763,12 @@ TextureImporter: name: Rat_63 rect: serializedVersion: 2 - x: 100 - y: 83 - width: 7 - height: 7 + x: 96 + y: 80 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1785,12 +1785,12 @@ TextureImporter: name: Rat_64 rect: serializedVersion: 2 - x: 106 - y: 83 - width: 6 - height: 7 + x: 0 + y: 64 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1807,12 +1807,12 @@ TextureImporter: name: Rat_65 rect: serializedVersion: 2 - x: 0 - y: 63 - width: 33 - height: 12 + x: 16 + y: 64 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1829,12 +1829,12 @@ TextureImporter: name: Rat_66 rect: serializedVersion: 2 - x: 31 - y: 63 - width: 18 - height: 12 + x: 32 + y: 64 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1851,12 +1851,12 @@ TextureImporter: name: Rat_67 rect: serializedVersion: 2 - x: 47 - y: 63 - width: 18 - height: 12 + x: 48 + y: 64 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1873,12 +1873,12 @@ TextureImporter: name: Rat_68 rect: serializedVersion: 2 - x: 66 - y: 67 - width: 6 - height: 8 + x: 64 + y: 64 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1895,12 +1895,12 @@ TextureImporter: name: Rat_69 rect: serializedVersion: 2 - x: 71 - y: 67 - width: 6 - height: 7 + x: 80 + y: 64 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1917,12 +1917,12 @@ TextureImporter: name: Rat_70 rect: serializedVersion: 2 - x: 76 - y: 67 - width: 6 - height: 7 + x: 96 + y: 64 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1939,12 +1939,12 @@ TextureImporter: name: Rat_71 rect: serializedVersion: 2 - x: 81 - y: 67 - width: 6 - height: 8 + x: 0 + y: 48 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1961,12 +1961,12 @@ TextureImporter: name: Rat_72 rect: serializedVersion: 2 - x: 90 - y: 67 - width: 6 - height: 8 + x: 16 + y: 48 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -1983,12 +1983,12 @@ TextureImporter: name: Rat_73 rect: serializedVersion: 2 - x: 95 - y: 66 - width: 6 - height: 8 + x: 32 + y: 48 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2005,12 +2005,12 @@ TextureImporter: name: Rat_74 rect: serializedVersion: 2 - x: 0 - y: 47 - width: 17 - height: 12 + x: 48 + y: 48 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2027,12 +2027,12 @@ TextureImporter: name: Rat_75 rect: serializedVersion: 2 - x: 15 - y: 47 - width: 34 - height: 11 + x: 64 + y: 48 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2049,12 +2049,12 @@ TextureImporter: name: Rat_76 rect: serializedVersion: 2 - x: 47 - y: 47 - width: 34 - height: 12 + x: 80 + y: 48 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2071,12 +2071,12 @@ TextureImporter: name: Rat_77 rect: serializedVersion: 2 - x: 83 - y: 52 - width: 6 - height: 8 + x: 0 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2093,12 +2093,12 @@ TextureImporter: name: Rat_78 rect: serializedVersion: 2 - x: 88 - y: 52 - width: 9 - height: 8 + x: 16 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2115,12 +2115,12 @@ TextureImporter: name: Rat_79 rect: serializedVersion: 2 - x: 4 - y: 8 - width: 20 - height: 31 + x: 32 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2137,12 +2137,12 @@ TextureImporter: name: Rat_80 rect: serializedVersion: 2 - x: 23 - y: 6 - width: 40 - height: 32 + x: 48 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2159,12 +2159,12 @@ TextureImporter: name: Rat_81 rect: serializedVersion: 2 - x: 70 - y: 27 - width: 23 - height: 10 + x: 64 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2181,12 +2181,12 @@ TextureImporter: name: Rat_82 rect: serializedVersion: 2 - x: 102 - y: 26 - width: 25 - height: 12 + x: 80 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2203,12 +2203,12 @@ TextureImporter: name: Rat_83 rect: serializedVersion: 2 - x: 134 - y: 27 - width: 18 - height: 12 + x: 96 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2225,12 +2225,12 @@ TextureImporter: name: Rat_84 rect: serializedVersion: 2 - x: 163 - y: 26 - width: 12 - height: 11 + x: 112 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2247,12 +2247,12 @@ TextureImporter: name: Rat_85 rect: serializedVersion: 2 - x: 174 - y: 26 - width: 8 - height: 6 + x: 128 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2269,12 +2269,12 @@ TextureImporter: name: Rat_86 rect: serializedVersion: 2 - x: 181 - y: 18 - width: 11 - height: 17 + x: 144 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2291,12 +2291,12 @@ TextureImporter: name: Rat_87 rect: serializedVersion: 2 - x: 82 - y: 2 - width: 9 - height: 14 + x: 160 + y: 32 + width: 16 + height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -2309,11 +2309,407 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: Rat_88 + rect: + serializedVersion: 2 + x: 176 + y: 32 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c2860d686c2e7b14c9649c24f841d3ea + internalID: -32010535 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_89 + rect: + serializedVersion: 2 + x: 0 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 851e0beafaa534c44bdecce803a2194f + internalID: 623196387 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_90 + rect: + serializedVersion: 2 + x: 16 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9eecef6a092008b4d91d2ce9a47e3e43 + internalID: 1104497958 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_91 + rect: + serializedVersion: 2 + x: 32 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6749b3b8164a19848906ce2ac629d672 + internalID: 1590652771 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_92 + rect: + serializedVersion: 2 + x: 48 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e512fdc8dc1f11247bc78eec91f6caba + internalID: 654150209 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_93 + rect: + serializedVersion: 2 + x: 64 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0e5f921f0ca2e3a42af3952ea455564c + internalID: 262462416 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_94 + rect: + serializedVersion: 2 + x: 80 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6f9775253210c4e44800646cec91ea38 + internalID: 1204062679 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_95 + rect: + serializedVersion: 2 + x: 96 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a61e233fae9a32f43b52bf8e839c0c30 + internalID: 1074698535 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_96 + rect: + serializedVersion: 2 + x: 112 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9c0a5580af0a74840b50a1bea8137d43 + internalID: -645398883 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_97 + rect: + serializedVersion: 2 + x: 128 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5a4e2b191329bff42a92309c74cc6f01 + internalID: -1706281011 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_98 + rect: + serializedVersion: 2 + x: 144 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f9a152ff41b1aa942bbd02690f70e557 + internalID: -162453595 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_99 + rect: + serializedVersion: 2 + x: 160 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 601f32b12e5795e468921e08b54b8d62 + internalID: -563481175 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_100 + rect: + serializedVersion: 2 + x: 176 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4ca24c1e120da6941a6a21a240be4348 + internalID: 1107745332 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_101 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d2cd5d0f6786d7d4baab5c28a32cb8c6 + internalID: -1868229502 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_102 + rect: + serializedVersion: 2 + x: 16 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5da88a148d8d9fe4bad076cfdf7cea80 + internalID: 825421499 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_103 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 66d50f5997172c64081e1bbbd7f7ca36 + internalID: -194033262 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_104 + rect: + serializedVersion: 2 + x: 48 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6d799dbbe56c5bb47aa4e475798b5f6c + internalID: 575058156 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rat_105 + rect: + serializedVersion: 2 + x: 80 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 97cc7677677c4884c9ed94283b479f5d + internalID: -1595569508 + vertices: [] + indices: + edges: [] + weights: [] outline: [] customData: physicsShape: [] bones: [] - spriteID: + spriteID: cb1bf9d3a202b414fbbd2047cdb8ed56 internalID: 0 vertices: [] indices: @@ -2321,11 +2717,19 @@ TextureImporter: weights: [] secondaryTextures: [] spriteCustomMetadata: - entries: [] + entries: + - key: SpriteEditor.SliceSettings + value: '{"sliceOnImport":false,"gridCellCount":{"x":16.0,"y":16.0},"gridSpriteSize":{"x":16.0,"y":16.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.5},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"pivotUnitMode":0,"slicingType":1,"keepEmptyRects":false,"isAlternate":false}' nameFileIdTable: Rat_0: -3578019587575532720 Rat_1: 1672560098795496602 Rat_10: 318761232798241317 + Rat_100: 1107745332 + Rat_101: -1868229502 + Rat_102: 825421499 + Rat_103: -194033262 + Rat_104: 575058156 + Rat_105: -1595569508 Rat_11: 68643178835443084 Rat_12: 7798674910781926164 Rat_13: 597286638434954613 @@ -2410,7 +2814,19 @@ TextureImporter: Rat_85: 4322812729335615394 Rat_86: -7795503146582253752 Rat_87: -3145974864447850378 + Rat_88: -32010535 + Rat_89: 623196387 Rat_9: 5648282429771809655 + Rat_90: 1104497958 + Rat_91: 1590652771 + Rat_92: 654150209 + Rat_93: 262462416 + Rat_94: 1204062679 + Rat_95: 1074698535 + Rat_96: -645398883 + Rat_97: -1706281011 + Rat_98: -162453595 + Rat_99: -563481175 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Resources/Animation/Mouse/RatMouse.png b/Assets/Resources/Animation/Mouse/RatMouse.png deleted file mode 100644 index 2d0d0e9..0000000 Binary files a/Assets/Resources/Animation/Mouse/RatMouse.png and /dev/null differ diff --git a/Assets/Resources/Animation/Mouse/RatMouse.png.meta b/Assets/Resources/Animation/Mouse/RatMouse.png.meta deleted file mode 100644 index 34c81d3..0000000 --- a/Assets/Resources/Animation/Mouse/RatMouse.png.meta +++ /dev/null @@ -1,981 +0,0 @@ -fileFormatVersion: 2 -guid: 56667cee0ad347b4e98e35e520efa044 -TextureImporter: - internalIDToNameTable: - - first: - 213: -294635626386517778 - second: RatMouse_0 - - first: - 213: 1931949401953633163 - second: RatMouse_1 - - first: - 213: -2064239488583408458 - second: RatMouse_2 - - first: - 213: -8313113455799937248 - second: RatMouse_3 - - first: - 213: 3797421006285777406 - second: RatMouse_4 - - first: - 213: -4587410544167001974 - second: RatMouse_5 - - first: - 213: 3150361506335799294 - second: RatMouse_6 - - first: - 213: 1749099844710903520 - second: RatMouse_7 - - first: - 213: -8383248538994392880 - second: RatMouse_8 - - first: - 213: 3729000224583566431 - second: RatMouse_9 - - first: - 213: 1487519846930642061 - second: RatMouse_10 - - first: - 213: -164532561428888824 - second: RatMouse_11 - - first: - 213: 5995383764169713386 - second: RatMouse_12 - - first: - 213: -7600786821318931842 - second: RatMouse_13 - - first: - 213: 8329367835443354831 - second: RatMouse_14 - - first: - 213: 3530181641709833563 - second: RatMouse_15 - - first: - 213: 3536596213578576996 - second: RatMouse_16 - - first: - 213: 8806845766619534263 - second: RatMouse_17 - - first: - 213: 1588605042201044809 - second: RatMouse_18 - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 0 - aniso: 1 - mipBias: 0 - 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: 16 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: RatMouse_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: ee09e07757e39ebf0800000000000000 - internalID: -294635626386517778 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_1 - rect: - serializedVersion: 2 - x: 16 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: b838973ceb9afca10800000000000000 - internalID: 1931949401953633163 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_2 - rect: - serializedVersion: 2 - x: 32 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 6b4e6a73f195a53e0800000000000000 - internalID: -2064239488583408458 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_3 - rect: - serializedVersion: 2 - x: 48 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 02756815b53e1ac80800000000000000 - internalID: -8313113455799937248 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_4 - rect: - serializedVersion: 2 - x: 64 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: ef9254e194623b430800000000000000 - internalID: 3797421006285777406 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_5 - rect: - serializedVersion: 2 - x: 80 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: a806b0c4a6e3650c0800000000000000 - internalID: -4587410544167001974 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_6 - rect: - serializedVersion: 2 - x: 96 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: ef7b533491558bb20800000000000000 - internalID: 3150361506335799294 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_7 - rect: - serializedVersion: 2 - x: 112 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 0ee2fa8aa0d064810800000000000000 - internalID: 1749099844710903520 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_8 - rect: - serializedVersion: 2 - x: 128 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 0d04d61ced7b8ab80800000000000000 - internalID: -8383248538994392880 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_9 - rect: - serializedVersion: 2 - x: 144 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: f54c7a972f110c330800000000000000 - internalID: 3729000224583566431 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_10 - rect: - serializedVersion: 2 - x: 160 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: d84f4a86b6bb4a410800000000000000 - internalID: 1487519846930642061 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_11 - rect: - serializedVersion: 2 - x: 176 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 803cb02d18677bdf0800000000000000 - internalID: -164532561428888824 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_12 - rect: - serializedVersion: 2 - x: 192 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: ae6ea73c4c1e33350800000000000000 - internalID: 5995383764169713386 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_13 - rect: - serializedVersion: 2 - x: 208 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: e7a80dd18a4948690800000000000000 - internalID: -7600786821318931842 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_14 - rect: - serializedVersion: 2 - x: 224 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: fcc5a2b5aebd79370800000000000000 - internalID: 8329367835443354831 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_15 - rect: - serializedVersion: 2 - x: 240 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: b5d48badf79bdf030800000000000000 - internalID: 3530181641709833563 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_16 - rect: - serializedVersion: 2 - x: 256 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 464b750c483841130800000000000000 - internalID: 3536596213578576996 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_17 - rect: - serializedVersion: 2 - x: 272 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 7b392076093383a70800000000000000 - internalID: 8806845766619534263 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_18 - rect: - serializedVersion: 2 - x: 288 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 947a9cc7edbdb0610800000000000000 - internalID: 1588605042201044809 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_19 - rect: - serializedVersion: 2 - x: 304 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 6696f6dd45de1e8468c55e7c71396407 - internalID: 1162754355 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_20 - rect: - serializedVersion: 2 - x: 320 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 97d0afb9e4253ab4080e41a19d9207d3 - internalID: -1316217478 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_21 - rect: - serializedVersion: 2 - x: 336 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 441492d8fc7ff0846b338ec17cc4cb80 - internalID: -2126649614 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_22 - rect: - serializedVersion: 2 - x: 352 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 05f6f7da4417d0240b7049e0b8d1e632 - internalID: -619376401 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_23 - rect: - serializedVersion: 2 - x: 368 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 1c8d5ecbcd0b97c4eb2e9f9286c5e05c - internalID: -871524625 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_24 - rect: - serializedVersion: 2 - x: 384 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 6eeb153e6a2cb1743ab8525f7c2de686 - internalID: -247415032 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_25 - rect: - serializedVersion: 2 - x: 400 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 2fa886dbbdf60a348b0000f3412e69d6 - internalID: -1781702475 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_26 - rect: - serializedVersion: 2 - x: 416 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c5e7c942b32c2dd4fa10d4abf27dca48 - internalID: -2142620005 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_27 - rect: - serializedVersion: 2 - x: 432 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 992a95f4be854b34cb7c6e49c14ff938 - internalID: -2087859330 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_28 - rect: - serializedVersion: 2 - x: 448 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: d84168ccd4ed4a248b55b63be3c87905 - internalID: -786537470 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_29 - rect: - serializedVersion: 2 - x: 464 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 17d8673ddf6a674428d986acb536443b - internalID: 1542763265 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_30 - rect: - serializedVersion: 2 - x: 480 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a9d59fdbc63c4494390833cdbb1dfab4 - internalID: -1757244022 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_31 - rect: - serializedVersion: 2 - x: 496 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 011bf06d495eecd4eba0d523ffe37593 - internalID: 1870237373 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_32 - rect: - serializedVersion: 2 - x: 512 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 21e16e28ed920544bbb8e3e73e77b852 - internalID: 1404678384 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_33 - rect: - serializedVersion: 2 - x: 528 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 76356d34d434fa8469cb3e9729aeb318 - internalID: -818654935 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: RatMouse_34 - rect: - serializedVersion: 2 - x: 544 - y: 0 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 32d72e219aa11704b9092432ffafd815 - internalID: -407098019 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 55ea033809b46cf42977473512a486fd - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: - - key: SpriteEditor.SliceSettings - value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":16.0,"y":16.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.5},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"pivotUnitMode":0,"slicingType":1,"keepEmptyRects":false,"isAlternate":false}' - nameFileIdTable: - RatMouse_0: -294635626386517778 - RatMouse_1: 1931949401953633163 - RatMouse_10: 1487519846930642061 - RatMouse_11: -164532561428888824 - RatMouse_12: 5995383764169713386 - RatMouse_13: -7600786821318931842 - RatMouse_14: 8329367835443354831 - RatMouse_15: 3530181641709833563 - RatMouse_16: 3536596213578576996 - RatMouse_17: 8806845766619534263 - RatMouse_18: 1588605042201044809 - RatMouse_19: 1162754355 - RatMouse_2: -2064239488583408458 - RatMouse_20: -1316217478 - RatMouse_21: -2126649614 - RatMouse_22: -619376401 - RatMouse_23: -871524625 - RatMouse_24: -247415032 - RatMouse_25: -1781702475 - RatMouse_26: -2142620005 - RatMouse_27: -2087859330 - RatMouse_28: -786537470 - RatMouse_29: 1542763265 - RatMouse_3: -8313113455799937248 - RatMouse_30: -1757244022 - RatMouse_31: 1870237373 - RatMouse_32: 1404678384 - RatMouse_33: -818654935 - RatMouse_34: -407098019 - RatMouse_4: 3797421006285777406 - RatMouse_5: -4587410544167001974 - RatMouse_6: 3150361506335799294 - RatMouse_7: 1749099844710903520 - RatMouse_8: -8383248538994392880 - RatMouse_9: 3729000224583566431 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Animation/Mouse/Run.anim b/Assets/Resources/Animation/Mouse/Run.anim new file mode 100644 index 0000000..8cc205b --- /dev/null +++ b/Assets/Resources/Animation/Mouse/Run.anim @@ -0,0 +1,81 @@ +%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: Run + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 5216390004458164737, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - time: 0.083333336 + value: {fileID: 2111868921171472450, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - time: 0.16666667 + value: {fileID: -1882835724111804820, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - time: 0.25 + value: {fileID: 7333014126430177225, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + 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 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 5216390004458164737, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 2111868921171472450, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: -1882835724111804820, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 7333014126430177225, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.33333334 + 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/Assets/Resources/Animation/Mouse/Run.anim.meta b/Assets/Resources/Animation/Mouse/Run.anim.meta new file mode 100644 index 0000000..15336b0 --- /dev/null +++ b/Assets/Resources/Animation/Mouse/Run.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b6d8291999ae7f419d66fb79e050d9f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Animation/Mouse/Run1.anim.meta b/Assets/Resources/Animation/Mouse/Run1.anim.meta deleted file mode 100644 index 154eb4e..0000000 --- a/Assets/Resources/Animation/Mouse/Run1.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6b69fbf04115f91439ab5749e5b9d861 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Animation/Mouse/Run2.anim.meta b/Assets/Resources/Animation/Mouse/Run2.anim.meta deleted file mode 100644 index d4ba7d1..0000000 --- a/Assets/Resources/Animation/Mouse/Run2.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fca3e9f554059d8409760b3f23f22a24 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Animation/Mouse/Sleeping.anim b/Assets/Resources/Animation/Mouse/Sleeping.anim new file mode 100644 index 0000000..860a4cc --- /dev/null +++ b/Assets/Resources/Animation/Mouse/Sleeping.anim @@ -0,0 +1,81 @@ +%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: Sleeping + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -3578019587575532720, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - time: 0.083333336 + value: {fileID: 1672560098795496602, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - time: 0.16666667 + value: {fileID: 6736303707625017609, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - time: 0.25 + value: {fileID: -6618852924029874831, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + 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 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -3578019587575532720, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 1672560098795496602, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: 6736303707625017609, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + - {fileID: -6618852924029874831, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.33333334 + 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/Assets/Resources/Animation/Mouse/Sleeping.anim.meta b/Assets/Resources/Animation/Mouse/Sleeping.anim.meta new file mode 100644 index 0000000..0e75132 --- /dev/null +++ b/Assets/Resources/Animation/Mouse/Sleeping.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bceb1c4d8ce494845b7c86c46a703a29 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/LevelData/TestLevel.asset b/Assets/Resources/LevelData/TestLevel.asset index e87e90e..59f62a5 100644 --- a/Assets/Resources/LevelData/TestLevel.asset +++ b/Assets/Resources/LevelData/TestLevel.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5087a0fc59fa2114bb1b856716323530, type: 3} m_Name: TestLevel m_EditorClassIdentifier: Assembly-CSharp::LevelData - levelID: 999 + levelID: 6 timeLimit: 9999 maxReplyCount: 9999 nextLevelData: {fileID: 0} diff --git a/Assets/Resources/Images/UI.meta b/Assets/Resources/LevelData/UI.meta similarity index 100% rename from Assets/Resources/Images/UI.meta rename to Assets/Resources/LevelData/UI.meta diff --git a/Assets/Resources/Images/UI/Loop.png b/Assets/Resources/LevelData/UI/Loop.png similarity index 100% rename from Assets/Resources/Images/UI/Loop.png rename to Assets/Resources/LevelData/UI/Loop.png diff --git a/Assets/Resources/Images/UI/Loop.png.meta b/Assets/Resources/LevelData/UI/Loop.png.meta similarity index 94% rename from Assets/Resources/Images/UI/Loop.png.meta rename to Assets/Resources/LevelData/UI/Loop.png.meta index 24ec9ff..1bff536 100644 --- a/Assets/Resources/Images/UI/Loop.png.meta +++ b/Assets/Resources/LevelData/UI/Loop.png.meta @@ -111,6 +111,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Images/UI/Time.png b/Assets/Resources/LevelData/UI/Time.png similarity index 100% rename from Assets/Resources/Images/UI/Time.png rename to Assets/Resources/LevelData/UI/Time.png diff --git a/Assets/Resources/Images/UI/Time.png.meta b/Assets/Resources/LevelData/UI/Time.png.meta similarity index 90% rename from Assets/Resources/Images/UI/Time.png.meta rename to Assets/Resources/LevelData/UI/Time.png.meta index 66c58d6..6a5775c 100644 --- a/Assets/Resources/Images/UI/Time.png.meta +++ b/Assets/Resources/LevelData/UI/Time.png.meta @@ -96,6 +96,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Images/UI/UI.png b/Assets/Resources/LevelData/UI/UI.png similarity index 100% rename from Assets/Resources/Images/UI/UI.png rename to Assets/Resources/LevelData/UI/UI.png diff --git a/Assets/Resources/Images/UI/UI.png.meta b/Assets/Resources/LevelData/UI/UI.png.meta similarity index 98% rename from Assets/Resources/Images/UI/UI.png.meta rename to Assets/Resources/LevelData/UI/UI.png.meta index 4460379..e7812cb 100644 --- a/Assets/Resources/Images/UI/UI.png.meta +++ b/Assets/Resources/LevelData/UI/UI.png.meta @@ -195,6 +195,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Prefabs/Player/FloatingEmoji.prefab b/Assets/Resources/Prefabs/Player/FloatingEmoji.prefab new file mode 100644 index 0000000..7d7cfdf --- /dev/null +++ b/Assets/Resources/Prefabs/Player/FloatingEmoji.prefab @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3792189731970215545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4991132632576125489} + - component: {fileID: 6276916068132957524} + - component: {fileID: 3108905770988020964} + m_Layer: 0 + m_Name: FloatingEmoji + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4991132632576125489 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3792189731970215545} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -15.79652, y: 2.10158, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6276916068132957524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3792189731970215545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d402d2a24e1b0b4eb329f7460c8de2d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::FloatingEmoji + floatSpeed: 0.5 + swayAmplitude: 0.2 + swayFrequency: 2.5 + lifetime: 2.5 + shrinkDuration: 0.235 +--- !u!212 &3108905770988020964 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3792189731970215545} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 8 + m_MaskInteraction: 0 + m_Sprite: {fileID: 21300000, guid: 9c07ce5e36a084e479cf29ab78f499dd, 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_SpriteSortPoint: 0 diff --git a/Assets/Resources/Animation/Mouse/Cheese.controller.meta b/Assets/Resources/Prefabs/Player/FloatingEmoji.prefab.meta similarity index 52% rename from Assets/Resources/Animation/Mouse/Cheese.controller.meta rename to Assets/Resources/Prefabs/Player/FloatingEmoji.prefab.meta index f00b532..0352d1d 100644 --- a/Assets/Resources/Animation/Mouse/Cheese.controller.meta +++ b/Assets/Resources/Prefabs/Player/FloatingEmoji.prefab.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 5040515beeadef74eaa187851bf0e404 -NativeFormatImporter: +guid: 1f6434b3634f84945be1a9427ddc43ac +PrefabImporter: externalObjects: {} - mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Player/Ghost.prefab b/Assets/Resources/Prefabs/Player/Ghost.prefab index b42c6b7..238a7cc 100644 --- a/Assets/Resources/Prefabs/Player/Ghost.prefab +++ b/Assets/Resources/Prefabs/Player/Ghost.prefab @@ -17,7 +17,7 @@ GameObject: - component: {fileID: 2679968176235668756} m_Layer: 7 m_Name: Ghost - m_TagString: Untagged + m_TagString: Ghost m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -31,7 +31,7 @@ Transform: m_GameObject: {fileID: 306704792185372058} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.44, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -85,9 +85,9 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 6 m_MaskInteraction: 0 - m_Sprite: {fileID: 3797421006285777406, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + m_Sprite: {fileID: 8271730618534065979, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0.42745098} m_FlipX: 0 m_FlipY: 0 @@ -197,6 +197,10 @@ MonoBehaviour: m_Bits: 512 hangingWallCollider: {fileID: 0} hangingWallRigidBody: {fileID: 0} + footstepRate: 0.3 + sleepClipTransTime: 5 + sleepEmojiSpawnRate: 3 + sleepEmojiPrefab: {fileID: 3792189731970215545, guid: 1f6434b3634f84945be1a9427ddc43ac, type: 3} --- !u!95 &676705953958797541 Animator: serializedVersion: 7 @@ -207,7 +211,7 @@ Animator: m_GameObject: {fileID: 306704792185372058} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 2d7f1d9ef37bcd34da74318c207cb6ac, type: 2} + m_Controller: {fileID: 9100000, guid: da85e8d22f6d34d4894572485c8c5996, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/Resources/Prefabs/Player/Player.prefab b/Assets/Resources/Prefabs/Player/Player.prefab index 4acb85c..70cd46a 100644 --- a/Assets/Resources/Prefabs/Player/Player.prefab +++ b/Assets/Resources/Prefabs/Player/Player.prefab @@ -33,7 +33,7 @@ Transform: m_GameObject: {fileID: 306704792185372058} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.44, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -87,9 +87,9 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 4 m_MaskInteraction: 0 - m_Sprite: {fileID: 3797421006285777406, guid: 56667cee0ad347b4e98e35e520efa044, type: 3} + m_Sprite: {fileID: 8271730618534065979, guid: 3994f202971bb7b40949ddc94ef4fd0e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -153,6 +153,10 @@ MonoBehaviour: m_Bits: 512 hangingWallCollider: {fileID: 0} hangingWallRigidBody: {fileID: 0} + footstepRate: 0.3 + sleepClipTransTime: 5 + sleepEmojiSpawnRate: 3 + sleepEmojiPrefab: {fileID: 3792189731970215545, guid: 1f6434b3634f84945be1a9427ddc43ac, type: 3} --- !u!114 &7321184312672384639 MonoBehaviour: m_ObjectHideFlags: 0 @@ -217,7 +221,7 @@ Animator: m_GameObject: {fileID: 306704792185372058} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 2d7f1d9ef37bcd34da74318c207cb6ac, type: 2} + m_Controller: {fileID: 9100000, guid: da85e8d22f6d34d4894572485c8c5996, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/Resources/Prefabs/Props/Ball_1.prefab b/Assets/Resources/Prefabs/Props/Ball_1.prefab index 3694ef8..c251ecd 100644 --- a/Assets/Resources/Prefabs/Props/Ball_1.prefab +++ b/Assets/Resources/Prefabs/Props/Ball_1.prefab @@ -46,9 +46,9 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 100 + m_Mass: 3 m_LinearDamping: 1 - m_AngularDamping: 1 + m_AngularDamping: 0.3 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: diff --git a/Assets/Resources/Prefabs/Props/Box_1.prefab b/Assets/Resources/Prefabs/Props/Box_1.prefab index 6fce45e..6385b20 100644 --- a/Assets/Resources/Prefabs/Props/Box_1.prefab +++ b/Assets/Resources/Prefabs/Props/Box_1.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9178017188456113784} + - component: {fileID: 3122479105197115366} m_Layer: 3 m_Name: Box_1 m_TagString: Untagged @@ -25,7 +26,7 @@ Transform: m_GameObject: {fileID: 2859706750180037266} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8.94, y: 1.5, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -33,6 +34,33 @@ Transform: - {fileID: 8754984866814149435} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &3122479105197115366 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2859706750180037266} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 5 + m_LinearDamping: 3 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 --- !u!1 &3382175217183170877 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Props/Box_2.prefab b/Assets/Resources/Prefabs/Props/Box_2.prefab index ae17a36..81da39f 100644 --- a/Assets/Resources/Prefabs/Props/Box_2.prefab +++ b/Assets/Resources/Prefabs/Props/Box_2.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9178017188456113784} + - component: {fileID: -6836880349797288280} m_Layer: 3 m_Name: Box_2 m_TagString: Untagged @@ -25,7 +26,7 @@ Transform: m_GameObject: {fileID: 2859706750180037266} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8.94, y: 1.5, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -33,6 +34,33 @@ Transform: - {fileID: 8754984866814149435} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &-6836880349797288280 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2859706750180037266} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 5 + m_LinearDamping: 3 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 --- !u!1 &3382175217183170877 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Props/Box_3.prefab b/Assets/Resources/Prefabs/Props/Box_3.prefab index 4c0b29a..084d553 100644 --- a/Assets/Resources/Prefabs/Props/Box_3.prefab +++ b/Assets/Resources/Prefabs/Props/Box_3.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9178017188456113784} + - component: {fileID: -7278386872373851796} m_Layer: 3 m_Name: Box_3 m_TagString: Untagged @@ -33,6 +34,33 @@ Transform: - {fileID: 8754984866814149435} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &-7278386872373851796 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2859706750180037266} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 5 + m_LinearDamping: 3 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 --- !u!1 &3382175217183170877 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Props/Box_4.prefab b/Assets/Resources/Prefabs/Props/Box_4.prefab index 934dba5..3dc6f54 100644 --- a/Assets/Resources/Prefabs/Props/Box_4.prefab +++ b/Assets/Resources/Prefabs/Props/Box_4.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9178017188456113784} + - component: {fileID: -5594139308370636022} m_Layer: 3 m_Name: Box_4 m_TagString: Untagged @@ -33,6 +34,33 @@ Transform: - {fileID: 8754984866814149435} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &-5594139308370636022 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2859706750180037266} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 5 + m_LinearDamping: 3 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 --- !u!1 &3382175217183170877 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Cheese.prefab b/Assets/Resources/Prefabs/Props/Cheese.prefab similarity index 100% rename from Assets/Resources/Prefabs/Cheese.prefab rename to Assets/Resources/Prefabs/Props/Cheese.prefab diff --git a/Assets/Resources/Prefabs/Cheese.prefab.meta b/Assets/Resources/Prefabs/Props/Cheese.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/Cheese.prefab.meta rename to Assets/Resources/Prefabs/Props/Cheese.prefab.meta diff --git a/Assets/Resources/Prefabs/Props/Green_Book.prefab b/Assets/Resources/Prefabs/Props/Green_Book.prefab index 6e0bd29..a20998b 100644 --- a/Assets/Resources/Prefabs/Props/Green_Book.prefab +++ b/Assets/Resources/Prefabs/Props/Green_Book.prefab @@ -306,10 +306,10 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_GravityScale: 1 + m_Mass: 9 + m_LinearDamping: 3 + m_AngularDamping: 1.74 + m_GravityScale: 3.3 m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 diff --git a/Assets/Resources/Prefabs/Props/WaterBlock.prefab b/Assets/Resources/Prefabs/Props/WaterBlock.prefab index 1efe280..5261e52 100644 --- a/Assets/Resources/Prefabs/Props/WaterBlock.prefab +++ b/Assets/Resources/Prefabs/Props/WaterBlock.prefab @@ -30,7 +30,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.54, y: -5.99, z: 0} - m_LocalScale: {x: 6.96, y: 3.87, z: 1} + m_LocalScale: {x: 5, y: 4, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -128,7 +128,7 @@ BoxCollider2D: m_UsedByEffector: 1 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.51} + m_Offset: {x: 0, y: -0.05} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -138,7 +138,7 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 1, y: 1.94} + m_Size: {x: 1, y: 0.95} m_EdgeRadius: 0 --- !u!253 &1879493985501473224 BuoyancyEffector2D: @@ -153,7 +153,7 @@ BuoyancyEffector2D: m_ColliderMask: serializedVersion: 2 m_Bits: 4294967295 - m_SurfaceLevel: 0.51 + m_SurfaceLevel: 0.55 m_Density: 2 m_LinearDamping: 10.46 m_AngularDamping: 5 diff --git a/Assets/Resources/Prefabs/Props/WaterBottle.prefab b/Assets/Resources/Prefabs/Props/WaterBottle.prefab index 17f1362..13ba1b1 100644 --- a/Assets/Resources/Prefabs/Props/WaterBottle.prefab +++ b/Assets/Resources/Prefabs/Props/WaterBottle.prefab @@ -100,6 +100,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 301985566009357442} + - component: {fileID: 3463427468868971412} m_Layer: 3 m_Name: WaterBottle m_TagString: Untagged @@ -117,13 +118,40 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1349406757471945978} - {fileID: 7312502842212486922} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &3463427468868971412 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8266930110130702034} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 2.5 + m_LinearDamping: 1.61 + m_AngularDamping: 1.39 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &8914435354015782613 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Scenes/LevelScene/ExampleScene.unity b/Assets/Resources/Scenes/LevelScene/ExampleScene.unity index d6f587c..5e07cbc 100644 --- a/Assets/Resources/Scenes/LevelScene/ExampleScene.unity +++ b/Assets/Resources/Scenes/LevelScene/ExampleScene.unity @@ -4923,7 +4923,7 @@ CompositeCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: 0.05} m_GeometryType: 0 m_GenerationType: 0 m_EdgeRadius: 0 @@ -4940,10 +4940,10 @@ CompositeCollider2D: Y: -90000000 m_CompositePaths: m_Paths: - - - {x: 23.999971, y: -9} - - {x: 23.999971, y: 0} - - {x: -26, y: -0.000029300001} - - {x: -25.999971, y: -9} + - - {x: 23.999971, y: -8.95} + - {x: 23.999971, y: 0.05} + - {x: -26, y: 0.0499707} + - {x: -25.999971, y: -8.95} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 m_UseDelaunayMesh: 0 @@ -5274,9 +5274,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1c367f7ce16fad44a8c04ccebbd8a354, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::CameraEffect - smoothTime: 0.3 + smoothTime: 0.15 lookDownAmount: 4 - offset: {x: 0, y: 2, z: -10} + lookUpAmount: 4 + offset: {x: 0, y: 0, z: -10} --- !u!1 &1105961119 GameObject: m_ObjectHideFlags: 0 @@ -5771,8 +5772,136 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9771706} + - {fileID: 1923492424} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1923492423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1923492424} + - component: {fileID: 1923492426} + - component: {fileID: 1923492425} + m_Layer: 4 + m_Name: Water + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1923492424 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1923492423} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1893744574} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1923492425 +TilemapRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1923492423} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 +--- !u!1839735485 &1923492426 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1923492423} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 --- !u!1 &2068721112 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Scenes/LevelScene/Level_1.unity b/Assets/Resources/Scenes/LevelScene/Level_1.unity index 1db1b46..b8d4547 100644 --- a/Assets/Resources/Scenes/LevelScene/Level_1.unity +++ b/Assets/Resources/Scenes/LevelScene/Level_1.unity @@ -5009,7 +5009,7 @@ TilemapCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 1 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: -0.05} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 @@ -5380,9 +5380,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1c367f7ce16fad44a8c04ccebbd8a354, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::CameraEffect - smoothTime: 0.3 + smoothTime: 0.15 lookDownAmount: 4 - offset: {x: 0, y: 2, z: -10} + lookUpAmount: 4 + offset: {x: 0, y: 0, z: -10} --- !u!1001 &679319475 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Scenes/LevelScene/Level_2.unity b/Assets/Resources/Scenes/LevelScene/Level_2.unity index ed5030e..9e07154 100644 --- a/Assets/Resources/Scenes/LevelScene/Level_2.unity +++ b/Assets/Resources/Scenes/LevelScene/Level_2.unity @@ -5009,7 +5009,7 @@ TilemapCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 1 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: -0.05} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 @@ -5377,9 +5377,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1c367f7ce16fad44a8c04ccebbd8a354, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::CameraEffect - smoothTime: 0.3 + smoothTime: 0.15 lookDownAmount: 4 - offset: {x: 0, y: 2, z: -10} + lookUpAmount: 4 + offset: {x: 0, y: 0, z: -10} --- !u!1001 &571674481 PrefabInstance: m_ObjectHideFlags: 0 @@ -5622,6 +5623,54 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6452561418906399231, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} propertyPath: m_Name value: UIManager @@ -5740,7 +5789,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7554647592671586946, guid: 3163abe7a6de943428e8b249a8210d70, type: 3} propertyPath: m_LocalPosition.y - value: 1.5 + value: 1.88 objectReference: {fileID: 0} - target: {fileID: 7554647592671586946, guid: 3163abe7a6de943428e8b249a8210d70, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Resources/Scenes/LevelScene/Level_3.unity b/Assets/Resources/Scenes/LevelScene/Level_3.unity index 578f6cb..576346a 100644 --- a/Assets/Resources/Scenes/LevelScene/Level_3.unity +++ b/Assets/Resources/Scenes/LevelScene/Level_3.unity @@ -6221,7 +6221,7 @@ TilemapCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 1 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: -0.05} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 @@ -7105,9 +7105,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1c367f7ce16fad44a8c04ccebbd8a354, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::CameraEffect - smoothTime: 0.3 + smoothTime: 0.15 lookDownAmount: 4 - offset: {x: 0, y: 2, z: -10} + lookUpAmount: 4 + offset: {x: 0, y: 0, z: -10} --- !u!1001 &434005055 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Scenes/LevelScene/Level_4.unity b/Assets/Resources/Scenes/LevelScene/Level_4.unity index 045c11f..a99af65 100644 --- a/Assets/Resources/Scenes/LevelScene/Level_4.unity +++ b/Assets/Resources/Scenes/LevelScene/Level_4.unity @@ -1787,10 +1787,72 @@ TilemapCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 1 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: -0.05} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 +--- !u!1001 &26121392 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1938024154} + m_Modifications: + - target: {fileID: 2859706750180037266, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_Name + value: Box_2 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_LocalPosition.x + value: -19 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_LocalPosition.y + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 31c43591b361ff649beefbf072a892a7, type: 3} +--- !u!4 &26121393 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9178017188456113784, guid: 31c43591b361ff649beefbf072a892a7, type: 3} + m_PrefabInstance: {fileID: 26121392} + m_PrefabAsset: {fileID: 0} --- !u!1 &153518990 GameObject: m_ObjectHideFlags: 0 @@ -2122,9 +2184,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1c367f7ce16fad44a8c04ccebbd8a354, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::CameraEffect - smoothTime: 0.3 + smoothTime: 0.15 lookDownAmount: 4 - offset: {x: 0, y: 2, z: -10} + lookUpAmount: 4 + offset: {x: 0, y: 0, z: -10} --- !u!1001 &698513172 PrefabInstance: m_ObjectHideFlags: 0 @@ -2651,71 +2714,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7253877491187406609} - - {fileID: 2145379129} + - {fileID: 26121393} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2145379128 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1938024154} - m_Modifications: - - target: {fileID: 2859706750180037266, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_Name - value: Box_2 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalPosition.x - value: -18.551 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalPosition.y - value: -2.5 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} ---- !u!4 &2145379129 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - m_PrefabInstance: {fileID: 2145379128} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7253877491187406608 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Scenes/LevelScene/Level_5.unity b/Assets/Resources/Scenes/LevelScene/Level_5.unity index fa2190c..d165fe8 100644 --- a/Assets/Resources/Scenes/LevelScene/Level_5.unity +++ b/Assets/Resources/Scenes/LevelScene/Level_5.unity @@ -2097,10 +2097,67 @@ TilemapCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 1 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: -0.05} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 +--- !u!1001 &42527552 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2859706750180037266, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_Name + value: Box_1 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_LocalPosition.x + value: -19.56 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_LocalPosition.y + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9178017188456113784, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0ff36777e0b72734ba4daae379a71a08, type: 3} --- !u!1001 &149399505 PrefabInstance: m_ObjectHideFlags: 0 @@ -2149,6 +2206,54 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6452561418906399231, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} propertyPath: m_Name value: UIManager @@ -2387,9 +2492,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1c367f7ce16fad44a8c04ccebbd8a354, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::CameraEffect - smoothTime: 0.3 + smoothTime: 0.15 lookDownAmount: 4 - offset: {x: 0, y: 2, z: -10} + lookUpAmount: 4 + offset: {x: 0, y: 0, z: -10} --- !u!1001 &462510107 PrefabInstance: m_ObjectHideFlags: 0 @@ -2526,68 +2632,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7554647592671586946, guid: 3163abe7a6de943428e8b249a8210d70, type: 3} m_PrefabInstance: {fileID: 525533675} m_PrefabAsset: {fileID: 0} ---- !u!1001 &616002639 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1938024154} - m_Modifications: - - target: {fileID: 2859706750180037266, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_Name - value: Box_2 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalPosition.x - value: -18.25 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalPosition.y - value: -2.5 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} ---- !u!4 &616002640 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9178017188456113784, guid: 19d08f8dc9433274caea91ec12d0f209, type: 3} - m_PrefabInstance: {fileID: 616002639} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1094794425 PrefabInstance: m_ObjectHideFlags: 0 @@ -2675,7 +2719,7 @@ Transform: m_GameObject: {fileID: 1105961119} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -22.42, y: -3.64, z: 0} + m_LocalPosition: {x: -22.96, y: -3.64, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3180,7 +3224,6 @@ Transform: - {fileID: 7253877491187406609} - {fileID: 525533676} - {fileID: 1705696495} - - {fileID: 616002640} - {fileID: 462510108} - {fileID: 2117611721} - {fileID: 1094794426} @@ -3265,7 +3308,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} propertyPath: m_LocalPosition.y - value: -1.17 + value: -1.12 objectReference: {fileID: 0} - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} propertyPath: m_LocalPosition.z @@ -3386,3 +3429,4 @@ SceneRoots: - {fileID: 1657802502} - {fileID: 2090707596} - {fileID: 149399505} + - {fileID: 42527552} diff --git a/Assets/Resources/Scenes/LevelScene/Level_999.unity b/Assets/Resources/Scenes/LevelScene/Level_6.unity similarity index 96% rename from Assets/Resources/Scenes/LevelScene/Level_999.unity rename to Assets/Resources/Scenes/LevelScene/Level_6.unity index 42cc08c..3962cbb 100644 --- a/Assets/Resources/Scenes/LevelScene/Level_999.unity +++ b/Assets/Resources/Scenes/LevelScene/Level_6.unity @@ -125,16 +125,8 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 71467770} m_Modifications: - - target: {fileID: 969923404812450577, guid: 6da18656dfae241469200567e0e4a60a, type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 969923404812450577, guid: 6da18656dfae241469200567e0e4a60a, type: 3} - propertyPath: m_LocalScale.y - value: 4 - objectReference: {fileID: 0} - target: {fileID: 969923404812450577, guid: 6da18656dfae241469200567e0e4a60a, type: 3} propertyPath: m_LocalPosition.x value: -6.5 @@ -153,15 +145,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 969923404812450577, guid: 6da18656dfae241469200567e0e4a60a, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 969923404812450577, guid: 6da18656dfae241469200567e0e4a60a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 969923404812450577, guid: 6da18656dfae241469200567e0e4a60a, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 969923404812450577, guid: 6da18656dfae241469200567e0e4a60a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -175,22 +167,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1879493985501473224, guid: 6da18656dfae241469200567e0e4a60a, type: 3} - propertyPath: m_Density - value: 3.23 - objectReference: {fileID: 0} - - target: {fileID: 1879493985501473224, guid: 6da18656dfae241469200567e0e4a60a, type: 3} - propertyPath: m_SurfaceLevel - value: 0.55 - objectReference: {fileID: 0} - - target: {fileID: 3308235232218162869, guid: 6da18656dfae241469200567e0e4a60a, type: 3} - propertyPath: m_Size.y - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 3308235232218162869, guid: 6da18656dfae241469200567e0e4a60a, type: 3} - propertyPath: m_Offset.y - value: -0.05 - objectReference: {fileID: 0} - target: {fileID: 4783304586301509184, guid: 6da18656dfae241469200567e0e4a60a, type: 3} propertyPath: m_Name value: WaterBlock @@ -4754,7 +4730,7 @@ CompositeCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: -0.05} m_GeometryType: 0 m_GenerationType: 0 m_EdgeRadius: 0 @@ -4779,14 +4755,14 @@ CompositeCollider2D: Y: -90000000 m_CompositePaths: m_Paths: - - - {x: 23.999971, y: -9} - - {x: 23.999971, y: 0} - - {x: -4, y: -0.000029300001} - - {x: -4.0000296, y: -5} - - {x: -9, y: -4.9999704} - - {x: -9.00003, y: 0} - - {x: -26, y: -0.000029300001} - - {x: -25.999971, y: -9} + - - {x: 23.999971, y: -9.05} + - {x: 23.999971, y: -0.05} + - {x: -4, y: -0.0500293} + - {x: -4.0000296, y: -5.05} + - {x: -9, y: -5.0499706} + - {x: -9.00003, y: -0.05} + - {x: -26, y: -0.0500293} + - {x: -25.999971, y: -9.05} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 m_UseDelaunayMesh: 0 @@ -4856,6 +4832,11 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 +--- !u!4 &38019396 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 969923404812450577, guid: 6da18656dfae241469200567e0e4a60a, type: 3} + m_PrefabInstance: {fileID: 802540} + m_PrefabAsset: {fileID: 0} --- !u!1 &71467769 GameObject: m_ObjectHideFlags: 0 @@ -4884,7 +4865,12 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1110068315} + - {fileID: 1752661960} + - {fileID: 1896378262} + - {fileID: 1882362395} + - {fileID: 38019396} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &153518990 @@ -5116,9 +5102,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1c367f7ce16fad44a8c04ccebbd8a354, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::CameraEffect - smoothTime: 0.3 + smoothTime: 0.15 lookDownAmount: 4 - offset: {x: 0, y: 2, z: -10} + lookUpAmount: 4 + offset: {x: 0, y: 0, z: -10} --- !u!1 &1105961119 GameObject: m_ObjectHideFlags: 0 @@ -5151,61 +5138,26 @@ Transform: - {fileID: 1554208358} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1110068312 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8266930110130702034, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} +--- !u!4 &1110068315 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 301985566009357442, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} m_PrefabInstance: {fileID: 1171264447} m_PrefabAsset: {fileID: 0} ---- !u!50 &1110068314 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1110068312} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 2.5 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: f404935b3489a20429821ec93144b14e, type: 2} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!1001 &1171264447 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 71467770} m_Modifications: - - target: {fileID: 301985566009357442, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} - propertyPath: m_LocalScale.x - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 301985566009357442, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} - propertyPath: m_LocalScale.y - value: 0.7 - objectReference: {fileID: 0} - target: {fileID: 301985566009357442, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} propertyPath: m_LocalPosition.x - value: -10.27 + value: -18.19 objectReference: {fileID: 0} - target: {fileID: 301985566009357442, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 1.257 objectReference: {fileID: 0} - target: {fileID: 301985566009357442, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} propertyPath: m_LocalPosition.z @@ -5217,15 +5169,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 301985566009357442, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 301985566009357442, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 301985566009357442, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 301985566009357442, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5246,11 +5198,65 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 8266930110130702034, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} - insertIndex: -1 - addedObject: {fileID: 1110068314} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7fb6a70d8f446d04aaa7816497d6acef, type: 3} +--- !u!1001 &1171808240 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 71467770} + m_Modifications: + - target: {fileID: 6095427791691596321, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_Name + value: Green_Book + objectReference: {fileID: 0} + - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_LocalPosition.x + value: -9.693324 + objectReference: {fileID: 0} + - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_LocalPosition.y + value: 2.4600248 + objectReference: {fileID: 0} + - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} --- !u!1 &1180046187 GameObject: m_ObjectHideFlags: 0 @@ -5522,6 +5528,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4491711cdda4d9e40899a5adcaba53b2, type: 3} +--- !u!1001 &1301805419 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 71467770} + m_Modifications: + - target: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5157971 + objectReference: {fileID: 0} + - target: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0.70632064 + objectReference: {fileID: 0} + - target: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1723293409309942786, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + propertyPath: m_Name + value: Cheese + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} --- !u!1001 &1419025762 PrefabInstance: m_ObjectHideFlags: 0 @@ -5670,6 +5733,16 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!4 &1752661960 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 152877588933897157, guid: aa4b992f3ee7c2144b5a86593a85e172, type: 3} + m_PrefabInstance: {fileID: 5804165704686056673} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1882362395 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8313723748428329357, guid: 7620ad53387fb42498b6722f0d880a6d, type: 3} + m_PrefabInstance: {fileID: 1171808240} + m_PrefabAsset: {fileID: 0} --- !u!1 &1893744572 GameObject: m_ObjectHideFlags: 0 @@ -5716,6 +5789,11 @@ Transform: - {fileID: 2032290698} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1896378262 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 157655442561767499, guid: 89d1343a9ab90d448b8aa2bdba1fb6d1, type: 3} + m_PrefabInstance: {fileID: 1301805419} + m_PrefabAsset: {fileID: 0} --- !u!1 &2032290697 GameObject: m_ObjectHideFlags: 0 @@ -5796,7 +5874,7 @@ TilemapRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_MaskInteraction: 0 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -6211,11 +6289,11 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 71467770} m_Modifications: - target: {fileID: 152877588933897157, guid: aa4b992f3ee7c2144b5a86593a85e172, type: 3} propertyPath: m_LocalPosition.x - value: -12.2 + value: -14.81 objectReference: {fileID: 0} - target: {fileID: 152877588933897157, guid: aa4b992f3ee7c2144b5a86593a85e172, type: 3} propertyPath: m_LocalPosition.y @@ -6231,15 +6309,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 152877588933897157, guid: aa4b992f3ee7c2144b5a86593a85e172, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 152877588933897157, guid: aa4b992f3ee7c2144b5a86593a85e172, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 152877588933897157, guid: aa4b992f3ee7c2144b5a86593a85e172, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 152877588933897157, guid: aa4b992f3ee7c2144b5a86593a85e172, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6277,6 +6355,3 @@ SceneRoots: - {fileID: 1419025762} - {fileID: 1212260728} - {fileID: 1181275796} - - {fileID: 802540} - - {fileID: 1171264447} - - {fileID: 5804165704686056673} diff --git a/Assets/Resources/Scenes/LevelScene/Level_999.unity.meta b/Assets/Resources/Scenes/LevelScene/Level_6.unity.meta similarity index 100% rename from Assets/Resources/Scenes/LevelScene/Level_999.unity.meta rename to Assets/Resources/Scenes/LevelScene/Level_6.unity.meta diff --git a/Assets/Resources/Scripts/Manager/GameManager.cs b/Assets/Resources/Scripts/Manager/GameManager.cs index a664de9..8e6638c 100644 --- a/Assets/Resources/Scripts/Manager/GameManager.cs +++ b/Assets/Resources/Scripts/Manager/GameManager.cs @@ -56,7 +56,8 @@ public class GameManager : MonoBehaviour private void Start() { Cursor.visible = false; - maxClearLevelID = PlayerPrefs.GetInt("MaxClearLevelID", 1); + PlayerPrefs.GetInt("MaxClearLevelID", 6); + maxClearLevelID = PlayerPrefs.GetInt("MaxClearLevelID", 6); } private void Update() @@ -149,11 +150,11 @@ public class GameManager : MonoBehaviour timer = 0; SceneManager.LoadScene("LevelSelction"); - + SoundManager.instance.PlayStageBGM(); OnExitLevel?.Invoke(); } - public void ClearLevel() + public async void ClearLevel() { gameState = GameState.Clear; @@ -165,8 +166,22 @@ public class GameManager : MonoBehaviour PlayerPrefs.SetInt("MaxClearLevelID", maxClearLevelID); } } - // 클리어 애니메이션 재생해주시고 - EnterLevel(currentLevelData.nextLevelData); + SoundManager.instance.PlaySFX(SfxType.Cheese); + if (GameObject.FindGameObjectWithTag("Player").TryGetComponent(out Animator anim)) + { + anim.SetTrigger("Eat"); + } + + await System.Threading.Tasks.Task.Delay(2000); + + if (currentLevelData.nextLevelData == null) + { + ExitLevel(); + } + else + { + EnterLevel(currentLevelData.nextLevelData); + } } public void PlayerDie() diff --git a/Assets/Resources/Scripts/Manager/SoundManager.cs b/Assets/Resources/Scripts/Manager/SoundManager.cs index fbb2cbf..f630bfc 100644 --- a/Assets/Resources/Scripts/Manager/SoundManager.cs +++ b/Assets/Resources/Scripts/Manager/SoundManager.cs @@ -85,8 +85,8 @@ public class SoundManager : MonoBehaviour { if (type == SfxType.Walk) { - sfxSource.pitch = Random.Range(0.9f, 1.1f); - sfxSource.volume = 0.2f; + sfxSource.pitch = Random.Range(0.8f, 1.2f); + sfxSource.volume = 0.7f; } else { diff --git a/Assets/Resources/Scripts/Player/PlayerController.cs b/Assets/Resources/Scripts/Player/PlayerController.cs index b3dc7ad..64174ed 100644 --- a/Assets/Resources/Scripts/Player/PlayerController.cs +++ b/Assets/Resources/Scripts/Player/PlayerController.cs @@ -11,6 +11,9 @@ public class PlayerController : MonoBehaviour private bool jumpBuffer; private bool hangBuffer; + private bool _isLookingDown; + private bool _isLookingUp; + private void Awake() { _playerMovement = GetComponent(); @@ -49,16 +52,45 @@ public class PlayerController : MonoBehaviour private void OnCameraDown(InputValue value) { - if (GameManager.instance.gameState != GameState.Playing) + if (GameManager.instance.gameState != GameState.Playing) return; + + if (value.isPressed && _playerMovement.IsGroundedState && !_playerMovement.IsMoving) { - return; + _isLookingDown = true; + _isLookingUp = false; } - var camEffect = Camera.main.GetComponent(); + else + { + _isLookingDown = false; + } + ApplyCameraLook(); + } + private void OnCameraUp(InputValue value) + { + if (GameManager.instance.gameState != GameState.Playing) return; + + if (value.isPressed && _playerMovement.IsGroundedState && !_playerMovement.IsMoving) + { + _isLookingUp = true; + _isLookingDown = false; + } + else + { + _isLookingUp = false; + } + ApplyCameraLook(); + } + + private void ApplyCameraLook() + { + CameraEffect camEffect = Camera.main.GetComponent(); if (camEffect != null) { - camEffect.SetLookDown(value.isPressed); + camEffect.SetCameraLook(_isLookingUp, _isLookingDown); } + _playerMovement.SetLookAnimation("isLookDown", _isLookingDown); + _playerMovement.SetLookAnimation("isLookUp", _isLookingUp); } private void OnHang(InputValue value) @@ -79,6 +111,16 @@ public class PlayerController : MonoBehaviour return; } + if (_isLookingDown || _isLookingUp) + { + if (_playerMovement.IsMoving || !_playerMovement.IsGroundedState) + { + _isLookingDown = false; + _isLookingUp = false; + ApplyCameraLook(); + } + } + // 플레이어 움직임 녹화 InputFrame currentFrame = new InputFrame(moveInputBuffer.x, jumpBuffer, hangBuffer); _inputRecorder?.Record(currentFrame); @@ -103,4 +145,4 @@ public class PlayerController : MonoBehaviour _playerMovement.TryHang(); } } -} +} \ No newline at end of file diff --git a/Assets/Resources/Scripts/Player/PlayerMovement.cs b/Assets/Resources/Scripts/Player/PlayerMovement.cs index d80f0a2..10f1863 100644 --- a/Assets/Resources/Scripts/Player/PlayerMovement.cs +++ b/Assets/Resources/Scripts/Player/PlayerMovement.cs @@ -1,4 +1,3 @@ -using System.Numerics; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.SceneManagement; @@ -29,15 +28,22 @@ public class PlayerMovement : MonoBehaviour [SerializeField] private Collider2D hangingWallCollider; [SerializeField] private Rigidbody2D hangingWallRigidBody; - // [Header("사운드 설정")] - // [SerializeField] private float footstepRate = 0.3f; + [Header("사운드 설정")] + [SerializeField] private float footstepRate = 0.3f; + + [Header("애니메이션 설정")] + [SerializeField] private float sleepClipTransTime = 5f; + [SerializeField] private float sleepEmojiSpawnRate = 3f; + [SerializeField] private GameObject sleepEmojiPrefab; + private float idleTimer = 0f; private Vector2 inputVector; private bool isHanging = false; private float footstepTimer; - // private bool isDead = false; private bool isPlayer; - // private bool isStageClear = false; + + public bool IsGroundedState => IsGrounded(); + public bool IsMoving => inputVector.x != 0; private void Awake() { @@ -49,26 +55,63 @@ public class PlayerMovement : MonoBehaviour private void FixedUpdate() { - // Playing 이 아닐때 ( Clear 또는 Die ) 못 움직이게 하기 if (GameManager.instance.gameState != GameState.Playing) { + _rigidbody2D.linearVelocity = new Vector2(0, _rigidbody2D.linearVelocity.y); return; } - bool isGrounded = IsGrounded(); - - float yVel = _rigidbody2D.linearVelocity.y; - - _animator.SetBool("isRun", inputVector.x != 0 && isGrounded); + bool isGrounded = IsGrounded(); + float yVelocity = _rigidbody2D.linearVelocity.y; + _animator.SetBool("isGround", isGrounded); - _animator.SetFloat("yVelocity", yVel); + _animator.SetFloat("yVelocity", yVelocity); + if (isGrounded) + { + if (inputVector.x != 0) + { + _animator.SetBool("isRun", true); + _animator.SetBool("isSleeping", false); + idleTimer = 0f; + } + else if(!_animator.GetBool("isLookDown") || !_animator.GetBool("isLookUp")) + { + _animator.SetBool("isRun", false); + idleTimer += Time.fixedDeltaTime; + if (idleTimer >= sleepClipTransTime) + { + _animator.SetBool("isSleeping", true); + if ((idleTimer - sleepClipTransTime) > sleepEmojiSpawnRate) + { + Instantiate(sleepEmojiPrefab, transform.position + (transform.up * 0.1f) + (transform.right * 0.6f), Quaternion.identity); + idleTimer -= sleepEmojiSpawnRate; + } + } + } + } + else + { + _animator.SetBool("isRun", false); + _animator.SetBool("isSleeping", false); + idleTimer = 0f; + } + if (isPlayer) { if (inputVector.x != 0 && isGrounded) { - SoundManager.instance.PlaySFX(SfxType.Walk); + footstepTimer += Time.fixedDeltaTime; + if (footstepTimer >= footstepRate) + { + SoundManager.instance.PlaySFX(SfxType.Walk); + footstepTimer = 0f; + } + } + else + { + footstepTimer = footstepRate; } } @@ -87,6 +130,33 @@ public class PlayerMovement : MonoBehaviour // 이동 로직 _rigidbody2D.linearVelocity = new Vector2(inputVector.x * moveSpeed, _rigidbody2D.linearVelocity.y); } + + public void SetLookAnimation(string paramName, bool value) + { + if (IsMoving || !IsGroundedState) + { + _animator.SetBool("isLookDown", false); + _animator.SetBool("isLookUp", false); + return; + } + + if (value) + { + if (paramName == "isLookDown") + { + _animator.SetBool("isLookUp", false); + idleTimer = 0f; + } + + if (paramName == "isLookUp") + { + _animator.SetBool("isLookDown", false); + idleTimer = 0f; + } + } + + _animator.SetBool(paramName, value); + } public void SetMoveInput(Vector2 input) { @@ -95,55 +165,32 @@ public class PlayerMovement : MonoBehaviour public void TryJump() { - if (GameManager.instance.gameState != GameState.Playing) - { - return; - } + if (GameManager.instance.gameState != GameState.Playing) return; // 매달린 상태에선 취소하기 if (isHanging) { CancelHanging(); - // 플레이어면 점프 소리 - if (isPlayer) - { - SoundManager.instance.PlaySFX(SfxType.Jump); - } + if (isPlayer) SoundManager.instance.PlaySFX(SfxType.Jump); } - // 땅이라면 점프하기 else if (IsGrounded()) { - // 플레이어면 점프 사운드 - - if (isPlayer) - { - SoundManager.instance.PlaySFX(SfxType.Jump); - } + if (isPlayer) SoundManager.instance.PlaySFX(SfxType.Jump); _rigidbody2D.linearVelocity = new Vector2(_rigidbody2D.linearVelocity.x, jumpForce); } } public void TryHang() { - if (GameManager.instance.gameState != GameState.Playing) - { - return; - } + if (GameManager.instance.gameState != GameState.Playing) return; - if (isHanging) - { - CancelHanging(); - } + if (isHanging) CancelHanging(); else { Vector2 checkPos = transform.TransformPoint(hangCheckOffset); - Collider2D hit = Physics2D.OverlapBox(checkPos, hangCheckSize, 0, hangingWallLayer); - if (hit != null) - { - HangingObject(); - } + if (hit != null) HangingObject(); } } @@ -180,7 +227,6 @@ public class PlayerMovement : MonoBehaviour Physics2D.IgnoreCollision(_collider2D, hangingWallCollider, true); transform.position = new Vector2(hit.point.x, transform.position.y); - gameObject.transform.SetParent(hit.transform, true); transform.localRotation = Quaternion.identity; } @@ -194,15 +240,10 @@ public class PlayerMovement : MonoBehaviour private void HandleRotation() { - if (inputVector.x > 0) - { - transform.rotation = Quaternion.Euler(0, 0, 0); - } - else if (inputVector.x < 0) - { - transform.rotation = Quaternion.Euler(0, 180, 0); - } + if (inputVector.x > 0) transform.rotation = Quaternion.Euler(0, 0, 0); + else if (inputVector.x < 0) transform.rotation = Quaternion.Euler(0, 180, 0); } + private void OnDrawGizmosSelected() { Gizmos.color = Color.green; diff --git a/Assets/Resources/Scripts/Prop/CheeseEnter.cs b/Assets/Resources/Scripts/Prop/CheeseEnter.cs index bb0b6f5..9dffe4e 100644 --- a/Assets/Resources/Scripts/Prop/CheeseEnter.cs +++ b/Assets/Resources/Scripts/Prop/CheeseEnter.cs @@ -29,9 +29,8 @@ public class GoalTrigger : MonoBehaviour { if (!isTriggered) { - SoundManager.instance.PlaySFX(SfxType.Cheese); - GameManager.instance.ClearLevel(); isTriggered = true; + GameManager.instance.ClearLevel(); } } } diff --git a/Assets/Resources/Scripts/Utility/CameraEffect.cs b/Assets/Resources/Scripts/Utility/CameraEffect.cs index 665f6a9..a32539a 100644 --- a/Assets/Resources/Scripts/Utility/CameraEffect.cs +++ b/Assets/Resources/Scripts/Utility/CameraEffect.cs @@ -4,12 +4,15 @@ using UnityEngine; public class CameraEffect : MonoBehaviour { + private Camera _camara; + private Transform target; - // 카메라 따라가는 속도 조절 [SerializeField] float smoothTime = 0.3f; - // 아래키로 화면 내릴 수 있는 수치 + [SerializeField] private float lookDownAmount = 4f; + [SerializeField] private float lookUpAmount = 4f; + // 오프셋 [SerializeField] private Vector3 offset = new Vector3(0, 0, -10f); @@ -20,6 +23,7 @@ public class CameraEffect : MonoBehaviour { defaultYOffset = offset.y; target = GameObject.FindGameObjectWithTag("Player").transform; + _camara = gameObject.GetComponent(); } private void LateUpdate() @@ -37,12 +41,14 @@ public class CameraEffect : MonoBehaviour { this.target = target; } - - - // 아래보는 키 눌렀을때 왔다 갔다 - public void SetLookDown(bool isLookingDown) + + public void SetCameraLook(bool isUp, bool isDown) { - if (isLookingDown) + if (isUp) + { + offset.y = defaultYOffset + lookUpAmount; + } + else if (isDown) { offset.y = defaultYOffset - lookDownAmount; } @@ -52,6 +58,11 @@ public class CameraEffect : MonoBehaviour } } + public void ZoomUpPlayer(float zoomAmout) + { + _camara.fieldOfView = zoomAmout; + } + public void PlayPreViewSequence(Action onComplete) { StartCoroutine(PreviewSequence(onComplete)); diff --git a/Assets/Resources/Scripts/Utility/Editor/ResetPlayerPrefs.cs b/Assets/Resources/Scripts/Utility/Editor/ResetPlayerPrefs.cs index 83e91a2..8f56666 100644 --- a/Assets/Resources/Scripts/Utility/Editor/ResetPlayerPrefs.cs +++ b/Assets/Resources/Scripts/Utility/Editor/ResetPlayerPrefs.cs @@ -6,6 +6,6 @@ public class ResetPlayerPrefs : MonoBehaviour [MenuItem("Window/PlayerPrefs Init")] private static void ResetPrefs() { - PlayerPrefs.SetInt("ClearLevelIndex", 1); + PlayerPrefs.DeleteKey("MaxClearLevelID"); } } \ No newline at end of file diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 20d67aa..b3b1105 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -26,6 +26,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Resources/Scenes/LevelScene/Level_5.unity guid: f80b5842018c649409b7daf92f9ad5e3 + - enabled: 1 + path: Assets/Resources/Scenes/LevelScene/Level_6.unity + guid: 349309cc9b1f3f946b8bcc55cd5abd9b m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} m_UseUCBPForAssetBundles: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 836e511..1e71305 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Ground - Cheese + - Ghost layers: - Default - TransparentFX diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 029ad8b..7a17e8f 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events