diff --git a/Assets/Animations/PlayerAnimations/Player1.meta b/Assets/Animations/PlayerAnimations/Player1.meta new file mode 100644 index 0000000..65ba20c --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2ae5477a37308647b76ac707c22b0c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Idle.meta b/Assets/Animations/PlayerAnimations/Player1/Idle.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle.meta diff --git a/Assets/Animations/PlayerAnimations/Idle/Idle.anim b/Assets/Animations/PlayerAnimations/Player1/Idle/Idle.anim similarity index 99% rename from Assets/Animations/PlayerAnimations/Idle/Idle.anim rename to Assets/Animations/PlayerAnimations/Player1/Idle/Idle.anim index 7751a46..10ac8f1 100644 --- a/Assets/Animations/PlayerAnimations/Idle/Idle.anim +++ b/Assets/Animations/PlayerAnimations/Player1/Idle/Idle.anim @@ -79,7 +79,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Animations/PlayerAnimations/Idle/Idle.anim.meta b/Assets/Animations/PlayerAnimations/Player1/Idle/Idle.anim.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/Idle.anim.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle/Idle.anim.meta diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0001.png b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0001.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0001.png rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0001.png diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0001.png.meta b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0001.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0001.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0001.png.meta diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0002.png b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0002.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0002.png rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0002.png diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0002.png.meta b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0002.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0002.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0002.png.meta diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0003.png b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0003.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0003.png rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0003.png diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0003.png.meta b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0003.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0003.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0003.png.meta diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0004.png b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0004.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0004.png rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0004.png diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0004.png.meta b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0004.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0004.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0004.png.meta diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0005.png b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0005.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0005.png rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0005.png diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0005.png.meta b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0005.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0005.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0005.png.meta diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0006.png b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0006.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0006.png rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0006.png diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0006.png.meta b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0006.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0006.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0006.png.meta diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0007.png b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0007.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0007.png rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0007.png diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0007.png.meta b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0007.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0007.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0007.png.meta diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0008.png b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0008.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0008.png rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0008.png diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0008.png.meta b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0008.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0008.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0008.png.meta diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0009.png b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0009.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0009.png rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0009.png diff --git a/Assets/Animations/PlayerAnimations/Idle/PlayerIdle0009.png.meta b/Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0009.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Idle/PlayerIdle0009.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Idle/PlayerIdle0009.png.meta diff --git a/Assets/Animations/PlayerAnimations/Mopping.meta b/Assets/Animations/PlayerAnimations/Player1/Mopping.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping.meta rename to Assets/Animations/PlayerAnimations/Player1/Mopping.meta diff --git a/Assets/Animations/PlayerAnimations/Mopping/Mopping.anim b/Assets/Animations/PlayerAnimations/Player1/Mopping/Mopping.anim similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/Mopping.anim rename to Assets/Animations/PlayerAnimations/Player1/Mopping/Mopping.anim diff --git a/Assets/Animations/PlayerAnimations/Mopping/Mopping.anim.meta b/Assets/Animations/PlayerAnimations/Player1/Mopping/Mopping.anim.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/Mopping.anim.meta rename to Assets/Animations/PlayerAnimations/Player1/Mopping/Mopping.anim.meta diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0001.png b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0001.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0001.png rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0001.png diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0001.png.meta b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0001.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0001.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0001.png.meta diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0002.png b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0002.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0002.png rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0002.png diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0002.png.meta b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0002.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0002.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0002.png.meta diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0003.png b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0003.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0003.png rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0003.png diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0003.png.meta b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0003.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0003.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0003.png.meta diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0004.png b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0004.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0004.png rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0004.png diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0004.png.meta b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0004.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0004.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0004.png.meta diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0005.png b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0005.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0005.png rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0005.png diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0005.png.meta b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0005.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0005.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0005.png.meta diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0006.png b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0006.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0006.png rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0006.png diff --git a/Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0006.png.meta b/Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0006.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Mopping/PlayerMoppin0006.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Mopping/PlayerMoppin0006.png.meta diff --git a/Assets/Animations/PlayerAnimations/PlayerAnimations.controller b/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller similarity index 52% rename from Assets/Animations/PlayerAnimations/PlayerAnimations.controller rename to Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller index 5c1f376..35551f0 100644 --- a/Assets/Animations/PlayerAnimations/PlayerAnimations.controller +++ b/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller @@ -33,7 +33,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Idle + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 9123080415032741332} m_Solo: 0 @@ -44,7 +47,7 @@ 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 @@ -59,42 +62,123 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 9123080415032741332} - m_Position: {x: 200, y: 90, z: 0} + m_Position: {x: 40, y: 70, z: 0} - serializedVersion: 1 m_State: {fileID: 548892628922324246} - m_Position: {x: 570, y: 110, z: 0} + m_Position: {x: 570, y: 80, z: 0} - serializedVersion: 1 m_State: {fileID: 5718945116413065706} - m_Position: {x: 310, y: 240, z: 0} + m_Position: {x: 570, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: -8349034508235637004} - m_Position: {x: 510, y: -20, z: 0} + m_Position: {x: 570, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3308394434488297487} + m_Position: {x: 570, y: 160, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: -6173615721886091892} + - {fileID: 5712453572289168545} + - {fileID: -2232175589853228148} + - {fileID: 4210568570521344070} + - {fileID: -2601431713474190462} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 240, y: 20, z: 0} + m_AnyStatePosition: {x: 300, y: 80, z: 0} m_EntryPosition: {x: 20, y: 160, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 9123080415032741332} +--- !u!1101 &-2601431713474190462 +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: Run + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5718945116413065706} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2232175589853228148 +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: Mop + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 548892628922324246} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: PlayerAnimations + m_Name: PlayerAnimations1 serializedVersion: 5 m_AnimatorParameters: - - m_Name: Blend - m_Type: 1 + - m_Name: Idle + m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Mop + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: RunMop + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Run + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Swing + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -134,6 +218,82 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &3308394434488297487 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RunningMopping + 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: 8fa2170d3269c7749a927969c08bb6f7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &4210568570521344070 +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: RunMop + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3308394434488297487} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5712453572289168545 +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: Swing + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8349034508235637004} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &5718945116413065706 AnimatorState: serializedVersion: 6 diff --git a/Assets/Animations/PlayerAnimations/PlayerAnimations.controller.meta b/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/PlayerAnimations.controller.meta rename to Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller.meta diff --git a/Assets/Animations/PlayerAnimations/Running.meta b/Assets/Animations/PlayerAnimations/Player1/Running.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running.meta rename to Assets/Animations/PlayerAnimations/Player1/Running.meta diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0001.png b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0001.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0001.png rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0001.png diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0001.png.meta b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0001.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0001.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0001.png.meta diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0002.png b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0002.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0002.png rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0002.png diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0002.png.meta b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0002.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0002.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0002.png.meta diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0003.png b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0003.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0003.png rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0003.png diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0003.png.meta b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0003.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0003.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0003.png.meta diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0004.png b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0004.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0004.png rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0004.png diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0004.png.meta b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0004.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0004.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0004.png.meta diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0005.png b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0005.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0005.png rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0005.png diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0005.png.meta b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0005.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0005.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0005.png.meta diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0006.png b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0006.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0006.png rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0006.png diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0006.png.meta b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0006.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0006.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0006.png.meta diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0007.png b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0007.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0007.png rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0007.png diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0007.png.meta b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0007.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0007.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0007.png.meta diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0008.png b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0008.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0008.png rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0008.png diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0008.png.meta b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0008.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0008.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0008.png.meta diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0009.png b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0009.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0009.png rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0009.png diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0009.png.meta b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0009.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0009.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0009.png.meta diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0010.png b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0010.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0010.png rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0010.png diff --git a/Assets/Animations/PlayerAnimations/Running/PlayerRunning0010.png.meta b/Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0010.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/PlayerRunning0010.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/PlayerRunning0010.png.meta diff --git a/Assets/Animations/PlayerAnimations/Running/Running.anim b/Assets/Animations/PlayerAnimations/Player1/Running/Running.anim similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/Running.anim rename to Assets/Animations/PlayerAnimations/Player1/Running/Running.anim diff --git a/Assets/Animations/PlayerAnimations/Running/Running.anim.meta b/Assets/Animations/PlayerAnimations/Player1/Running/Running.anim.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Running/Running.anim.meta rename to Assets/Animations/PlayerAnimations/Player1/Running/Running.anim.meta diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping.meta new file mode 100644 index 0000000..22aa82b --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac48e02db5160fd44bb2658eeb5cb2ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0001.png b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0001.png new file mode 100644 index 0000000..81b3596 Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0001.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0001.png.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0001.png.meta new file mode 100644 index 0000000..a4d6905 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0001.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9bf9e9b1313836249a44ead3d25eac20 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0002.png b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0002.png new file mode 100644 index 0000000..81b3596 Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0002.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0002.png.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0002.png.meta new file mode 100644 index 0000000..ff10269 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0002.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9832866514b3e5a41a10c9949b572fb5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0003.png b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0003.png new file mode 100644 index 0000000..81b3596 Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0003.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0003.png.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0003.png.meta new file mode 100644 index 0000000..f08843a --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0003.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 41ea2c215472c504bb9a0608b036798d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0004.png b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0004.png new file mode 100644 index 0000000..97bbda6 Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0004.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0004.png.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0004.png.meta new file mode 100644 index 0000000..97eb0f1 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0004.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: a7d74ef6bbe4a6c44b01c0485fe71075 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0005.png b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0005.png new file mode 100644 index 0000000..97bbda6 Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0005.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0005.png.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0005.png.meta new file mode 100644 index 0000000..8eaa3a6 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0005.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 04c99bd2dc800c647af0c03aaf87222d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0006.png b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0006.png new file mode 100644 index 0000000..b42cd23 Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0006.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0006.png.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0006.png.meta new file mode 100644 index 0000000..36fc045 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0006.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 5c1b32f936716b240b9dcc9879ba6b8a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0007.png b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0007.png new file mode 100644 index 0000000..b42cd23 Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0007.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0007.png.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0007.png.meta new file mode 100644 index 0000000..87f76ec --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0007.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: d6d9695879910cc45897f43d9d42a390 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0008.png b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0008.png new file mode 100644 index 0000000..b42cd23 Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0008.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0008.png.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0008.png.meta new file mode 100644 index 0000000..99c9daa --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0008.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 47c8cef9a72fbf7408b6e41e87e476b2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0009.png b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0009.png new file mode 100644 index 0000000..fa01190 Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0009.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0009.png.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0009.png.meta new file mode 100644 index 0000000..8994f05 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0009.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 7db4df161134b9b4ca8974b29a04166f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0010.png b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0010.png new file mode 100644 index 0000000..fa01190 Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0010.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0010.png.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0010.png.meta new file mode 100644 index 0000000..cf4c685 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/PlayerRunning_WhileMop0010.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 634b972e969b01e4ba6fa38896a7a3c9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/RunningMopping/RunningMopping.anim b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/RunningMopping.anim new file mode 100644 index 0000000..8977fca --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/RunningMopping.anim @@ -0,0 +1,99 @@ +%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: RunningMopping + 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: 21300000, guid: 9bf9e9b1313836249a44ead3d25eac20, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: 9832866514b3e5a41a10c9949b572fb5, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: 41ea2c215472c504bb9a0608b036798d, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: a7d74ef6bbe4a6c44b01c0485fe71075, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 04c99bd2dc800c647af0c03aaf87222d, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: 5c1b32f936716b240b9dcc9879ba6b8a, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: d6d9695879910cc45897f43d9d42a390, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 47c8cef9a72fbf7408b6e41e87e476b2, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: 7db4df161134b9b4ca8974b29a04166f, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 634b972e969b01e4ba6fa38896a7a3c9, 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 9bf9e9b1313836249a44ead3d25eac20, type: 3} + - {fileID: 21300000, guid: 9832866514b3e5a41a10c9949b572fb5, type: 3} + - {fileID: 21300000, guid: 41ea2c215472c504bb9a0608b036798d, type: 3} + - {fileID: 21300000, guid: a7d74ef6bbe4a6c44b01c0485fe71075, type: 3} + - {fileID: 21300000, guid: 04c99bd2dc800c647af0c03aaf87222d, type: 3} + - {fileID: 21300000, guid: 5c1b32f936716b240b9dcc9879ba6b8a, type: 3} + - {fileID: 21300000, guid: d6d9695879910cc45897f43d9d42a390, type: 3} + - {fileID: 21300000, guid: 47c8cef9a72fbf7408b6e41e87e476b2, type: 3} + - {fileID: 21300000, guid: 7db4df161134b9b4ca8974b29a04166f, type: 3} + - {fileID: 21300000, guid: 634b972e969b01e4ba6fa38896a7a3c9, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.51666665 + 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/Animations/PlayerAnimations/Player1/RunningMopping/RunningMopping.anim.meta b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/RunningMopping.anim.meta new file mode 100644 index 0000000..a8bc5c6 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/RunningMopping/RunningMopping.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fa2170d3269c7749a927969c08bb6f7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Swing.meta b/Assets/Animations/PlayerAnimations/Player1/Swing.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing.meta rename to Assets/Animations/PlayerAnimations/Player1/Swing.meta diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0001.png b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0001.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0001.png rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0001.png diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0001.png.meta b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0001.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0001.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0001.png.meta diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0002.png b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0002.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0002.png rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0002.png diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0002.png.meta b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0002.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0002.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0002.png.meta diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0003.png b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0003.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0003.png rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0003.png diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0003.png.meta b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0003.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0003.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0003.png.meta diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0004.png b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0004.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0004.png rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0004.png diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0004.png.meta b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0004.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0004.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0004.png.meta diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0005.png b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0005.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0005.png rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0005.png diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0005.png.meta b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0005.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0005.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0005.png.meta diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0006.png b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0006.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0006.png rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0006.png diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0006.png.meta b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0006.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0006.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0006.png.meta diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0007.png b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0007.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0007.png rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0007.png diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0007.png.meta b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0007.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0007.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0007.png.meta diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0008.png b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0008.png similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0008.png rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0008.png diff --git a/Assets/Animations/PlayerAnimations/Swing/PlayerSwing0008.png.meta b/Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0008.png.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/PlayerSwing0008.png.meta rename to Assets/Animations/PlayerAnimations/Player1/Swing/PlayerSwing0008.png.meta diff --git a/Assets/Animations/PlayerAnimations/Swing/Swing.anim b/Assets/Animations/PlayerAnimations/Player1/Swing/Swing.anim similarity index 99% rename from Assets/Animations/PlayerAnimations/Swing/Swing.anim rename to Assets/Animations/PlayerAnimations/Player1/Swing/Swing.anim index 6120755..6576677 100644 --- a/Assets/Animations/PlayerAnimations/Swing/Swing.anim +++ b/Assets/Animations/PlayerAnimations/Player1/Swing/Swing.anim @@ -76,7 +76,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Animations/PlayerAnimations/Swing/Swing.anim.meta b/Assets/Animations/PlayerAnimations/Player1/Swing/Swing.anim.meta similarity index 100% rename from Assets/Animations/PlayerAnimations/Swing/Swing.anim.meta rename to Assets/Animations/PlayerAnimations/Player1/Swing/Swing.anim.meta diff --git a/Assets/Animations/PlayerAnimations/Player2.meta b/Assets/Animations/PlayerAnimations/Player2.meta new file mode 100644 index 0000000..5e2e4c4 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d97c9a839538c14fbd795c807ac5449 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player2/Idle.meta b/Assets/Animations/PlayerAnimations/Player2/Idle.meta new file mode 100644 index 0000000..718529f --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/Idle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d993b7e35db7ba342b8974304690894a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player2/Mopping.meta b/Assets/Animations/PlayerAnimations/Player2/Mopping.meta new file mode 100644 index 0000000..cb9c178 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/Mopping.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76bb3c3e52030324baca298a991abcb7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller b/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller new file mode 100644 index 0000000..7bdf8d8 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller @@ -0,0 +1,49 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-4590016191452643091 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 240, y: 20, z: 0} + m_EntryPosition: {x: 20, y: 160, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerAnimations2 + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Blend + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4590016191452643091} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller.meta b/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller.meta new file mode 100644 index 0000000..5290a03 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 623a667f47c8d2040bf8c1d597752cb0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player2/Running.meta b/Assets/Animations/PlayerAnimations/Player2/Running.meta new file mode 100644 index 0000000..190591f --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/Running.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be476c63d32697143b22dea9c1241325 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player2/Swing.meta b/Assets/Animations/PlayerAnimations/Player2/Swing.meta new file mode 100644 index 0000000..f3455b9 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/Swing.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: baee6fd85addab842b3f4d9ab023ba54 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Player.prefab b/Assets/Resources/Player.prefab index e7cdc8f..32e2b0b 100644 --- a/Assets/Resources/Player.prefab +++ b/Assets/Resources/Player.prefab @@ -154,6 +154,7 @@ GameObject: - component: {fileID: 651446758998956252} - component: {fileID: 3086165646112058191} - component: {fileID: 1508323898269695585} + - component: {fileID: 6703520545207170367} m_Layer: 7 m_Name: Player m_TagString: Player @@ -241,3 +242,15 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 1 m_Constraints: 4 +--- !u!114 &6703520545207170367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120938410244321186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c2ddf673a65d3d49bc9470e1a4572e4, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scenes/MovementTest.unity b/Assets/Scenes/MovementTest.unity index 4a8b710..4b3bc04 100644 --- a/Assets/Scenes/MovementTest.unity +++ b/Assets/Scenes/MovementTest.unity @@ -480,7 +480,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &220016281 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1924,15 +1924,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 320690117028550720, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} propertyPath: m_LocalPosition.x - value: -16.04 + value: 0 objectReference: {fileID: 0} - target: {fileID: 320690117028550720, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} propertyPath: m_LocalPosition.y - value: -0.44170734 + value: 0 objectReference: {fileID: 0} - target: {fileID: 320690117028550720, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} propertyPath: m_LocalPosition.z - value: -0.09089095 + value: 0 objectReference: {fileID: 0} - target: {fileID: 320690117028550720, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/Player/PlayerAnimationHandler.cs b/Assets/Scripts/Player/PlayerAnimationHandler.cs index 0e3a43b..4394f65 100644 --- a/Assets/Scripts/Player/PlayerAnimationHandler.cs +++ b/Assets/Scripts/Player/PlayerAnimationHandler.cs @@ -12,25 +12,31 @@ public class PlayerAnimationHandler : MonoBehaviour } void Update() { - if (Input.GetKeyDown(KeyCode.D)) - Run(); + if (Input.GetKeyDown(KeyCode.I)) + Idle(true); if (Input.GetKeyDown(KeyCode.Space)) - Mop(); + Mop(true); + if (Input.GetKeyDown(KeyCode.R)) + Run(true); } - public void Idle() + public void Idle(bool active) { - + animator.SetBool("Idle", active); } - public void Run() + public void Run(bool active) { - + animator.SetBool("Run", active); } - public void Swing() + public void Swing(bool active) { - + animator.SetBool("Swing",active); } - public void Mop() + public void Mop(bool active) { - + animator.SetBool("Mop", active); + } + public void RunMop(bool active) + { + animator.SetBool("RunMop", active); } } diff --git a/Assets/Scripts/Player/PlayerMovement1.cs b/Assets/Scripts/Player/PlayerMovement1.cs index 9c74fdb..b19e3e1 100644 --- a/Assets/Scripts/Player/PlayerMovement1.cs +++ b/Assets/Scripts/Player/PlayerMovement1.cs @@ -22,7 +22,8 @@ public class PlayerMovement1 : MonoBehaviour { rb = GetComponent(); - playerController = Gamepad.all[0]; + if (playerController != null) + playerController = Gamepad.all[0]; StartCoroutine(ToggleWithDelay()); } @@ -48,7 +49,7 @@ public class PlayerMovement1 : MonoBehaviour } private void RumbleWalk() { - if (vibrate) + if (vibrate && playerController != null) { if (right) { diff --git a/Assets/Scripts/Player/PlayerMovement2.cs b/Assets/Scripts/Player/PlayerMovement2.cs index ccc37bf..30e2efe 100644 --- a/Assets/Scripts/Player/PlayerMovement2.cs +++ b/Assets/Scripts/Player/PlayerMovement2.cs @@ -30,8 +30,16 @@ public class PlayerMovement2 : MonoBehaviour void Update() { - movement.x = playerController.leftStick.x.ReadValue(); - movement.y = playerController.leftStick.y.ReadValue(); + if (playerController != null) + { + movement.x = playerController.leftStick.x.ReadValue(); + movement.y = playerController.leftStick.y.ReadValue(); + } + else + { + movement.x = Input.GetAxisRaw("Horizontal"); + movement.y = Input.GetAxisRaw("Vertical"); ; + } if (movement.x != 0 || movement.y != 0) RumbleWalk(); } @@ -41,7 +49,7 @@ public class PlayerMovement2 : MonoBehaviour } private void RumbleWalk() { - if (vibrate) + if (vibrate && playerController != null) { if (right) {