diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index 8ae6f33..c99219f 100644 --- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat +++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat @@ -44,6 +44,6 @@ Material: - WaveIntensity_2: 1 - WaveSpread_Value: 0 m_Colors: - - Center: {r: 0.55210906, g: 0.25071788, b: 0, a: 0} + - Center: {r: 0.06781408, g: 0.37312084, b: 0, a: 0} - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/动画测试与预览.unity b/Assets/Scenes/动画测试与预览.unity index 1be5d57..ca2aca2 100644 --- a/Assets/Scenes/动画测试与预览.unity +++ b/Assets/Scenes/动画测试与预览.unity @@ -284,7 +284,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!95 &703923300 Animator: serializedVersion: 3 @@ -414,6 +414,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.6567551 objectReference: {fileID: 0} + - target: {fileID: 2040557953805017707, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalPosition.x + value: 0.44272265 + objectReference: {fileID: 0} - target: {fileID: 2963418977626722768, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalPosition.x value: 2.5576658 @@ -633,7 +637,7 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2726020710528076839, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} m_PrefabInstance: {fileID: 1167304730} m_PrefabAsset: {fileID: 0} ---- !u!95 &1167304732 +--- !u!95 &1167304734 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 @@ -646,12 +650,38 @@ Animator: m_Controller: {fileID: 9100000, guid: e4da2f58275a75a47a7615856a5ca77e, type: 2} m_CullingMode: 0 m_UpdateMode: 0 - m_ApplyRootMotion: 0 + m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!61 &1167304737 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167304731} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!1001 &1613913567 PrefabInstance: m_ObjectHideFlags: 0 @@ -707,6 +737,10 @@ PrefabInstance: propertyPath: m_Name value: "\u6211\u519B" objectReference: {fileID: 0} + - target: {fileID: -4565123580431842046, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: -1702321563162783781, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} --- !u!1 &1613913568 stripped diff --git a/Assets/Scenes/序章-战场.unity b/Assets/Scenes/序章-战场.unity index d35f844..9e109cb 100644 --- a/Assets/Scenes/序章-战场.unity +++ b/Assets/Scenes/序章-战场.unity @@ -284,7 +284,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 56435766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.35, y: 1.25, z: -10} + m_LocalPosition: {x: -0.52, y: 0.92, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1049093360} @@ -444,7 +444,7 @@ GameObject: - component: {fileID: 221943871} m_Layer: 0 m_Name: "\u7535\u8BDD\u7EBF (2)" - m_TagString: Untagged + m_TagString: "\u7535\u8BDD\u7EBF" m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -555,6 +555,316 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &318330975 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1506938805} + m_Modifications: + - target: {fileID: -919386973632262436, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_Name + value: "\u4ED6\u7238" + objectReference: {fileID: 0} + - target: {fileID: -919386973632262436, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -919386973632262436, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_LocalPosition.x + value: -24.8 + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_LocalPosition.y + value: -1.9 + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 7769891390202795144, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} +--- !u!4 &318330976 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + m_PrefabInstance: {fileID: 318330975} + m_PrefabAsset: {fileID: 0} +--- !u!1 &318330977 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -919386973632262436, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + m_PrefabInstance: {fileID: 318330975} + m_PrefabAsset: {fileID: 0} +--- !u!95 &318330978 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318330977} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 9ef6669e7dd2f764bbb94648bcca8c9b, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &318330979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318330977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e2c1a0de69ef6d468a14db32ebf68fe, type: 3} + m_Name: + m_EditorClassIdentifier: + catched: {fileID: 0} + missile: {fileID: 4018427281142380165, guid: 628f0c1ef857ddd4687c94b8ba9b1aa6, type: 3} + throwOffset: {fileID: 918764316} +--- !u!114 &318330980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318330977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 6c1186e0febe48c4e866173c0f39422d, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 318330979} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnMoveHorizons + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 5a93f020-27b4-4cb6-975f-af9ed1ef4ec3 + m_ActionName: PlayerNormal/MoveHorizons[/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick/left,/XInputControllerWindows/leftStick/right] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 318330979} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnRun + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 5c554403-34b9-4a85-a8f5-ac58363cad75 + m_ActionName: PlayerNormal/Run[/XInputControllerWindows/rightShoulder,/Keyboard/shift] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 318330979} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnInteraction + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: a3099043-3ac2-4656-8595-f0c577842621 + m_ActionName: PlayerNormal/Interaction[/XInputControllerWindows/buttonWest,/Keyboard/f] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 318330979} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnThrowQuit + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 078b3370-2cb6-4574-9156-0146ae814573 + m_ActionName: PlayerInThrowing/Quit[/Keyboard/k] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 318330979} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnThrow + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 6bab4454-55d6-409c-9736-d1640a407628 + m_ActionName: PlayerInThrowing/Throw[/Keyboard/shift] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 318330979} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnAdjustTheAngle + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: fddd4068-5ae8-4c1a-8498-4c8c30327f57 + m_ActionName: PlayerInThrowing/AdjustTheAngle[/Keyboard/s,/Keyboard/w] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 318330979} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnQuit + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 8d490180-d97c-4d4f-836c-a6f7a4392b67 + m_ActionName: PlayerNormal/Quit[/Keyboard/k,/XInputControllerWindows/buttonEast] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 7740a478-a400-40d6-96a6-27525d86c2dc + m_ActionName: PlayerInCoding/Coding[/Keyboard/space] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 43dde524-dc10-473f-b1e8-7ce5297afc88 + m_ActionName: PlayerInReparingTheMachine/Comfirm[/Keyboard/f] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 26b56a36-3d1d-4cb2-9efb-beb11a1d5267 + m_ActionName: NullMap/New action + m_NeverAutoSwitchControlSchemes: 1 + m_DefaultControlScheme: + m_DefaultActionMap: PlayerNormal + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!61 &318330981 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318330977} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 5.28} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2.87, y: 9.13} + m_EdgeRadius: 0 +--- !u!50 &318330982 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318330977} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 1 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 --- !u!114 &336340668 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} @@ -787,8 +1097,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.2254455, y: 0.2, z: 0.5263625} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1890536043} + m_Children: [] m_Father: {fileID: 1803085805} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -817,16 +1126,17 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: -5.294608, y: -0.4671805} + - - {x: -4.2888002, y: -0.5422386} - {x: -10.396973, y: -0.3636892} - {x: -10.342025, y: -4.3687534} - {x: 10.368096, y: -4.4148846} - {x: 10.292473, y: -1.2182164} - {x: 6.0643954, y: -1.24768} - - {x: 3.0815985, y: -0.8028679} - - {x: 2.3130484, y: -1.7651647} - - {x: -0.15087914, y: -1.7044234} - - {x: -1.1965556, y: -0.5840493} + - {x: 3.2295554, y: -1.0823418} + - {x: 2.3064122, y: -2.6044633} + - {x: 2.3884776, y: -4.0911093} + - {x: -0.8653765, y: -4.1691523} + - {x: -1.3151197, y: -0.7141393} --- !u!50 &496175138 Rigidbody2D: serializedVersion: 4 @@ -1053,6 +1363,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_interface: {fileID: 0} +--- !u!4 &918764316 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + m_PrefabInstance: {fileID: 966544878} + m_PrefabAsset: {fileID: 0} --- !u!1 &927359184 GameObject: m_ObjectHideFlags: 0 @@ -1197,7 +1512,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 3, y: -1.7, z: 0} + m_TrackedObjectOffset: {x: 3, y: 1.72, z: 0} m_LookaheadTime: 0 m_LookaheadSmoothing: 0 m_LookaheadIgnoreY: 0 @@ -1259,6 +1574,10 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 719456409433494248, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_NotificationBehavior value: 2 @@ -1359,17 +1678,37 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[4].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 1692961902718145224, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_Size.y + value: 2.97 + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145224, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_Offset.x + value: 0.02 + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145224, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_Offset.y + value: -2.18 + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145225, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_GravityScale + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145227, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: ed1c51e5852ad914e8c313176c3789cb, type: 2} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_LocalPosition.x - value: -7.35 + value: -8.14 objectReference: {fileID: 0} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_LocalPosition.y - value: 2.95 + value: 3.23 objectReference: {fileID: 0} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_LocalPosition.z @@ -1407,6 +1746,10 @@ PrefabInstance: propertyPath: m_Name value: "\u5C0F\u5B69 " objectReference: {fileID: 0} + - target: {fileID: 5563886958839055788, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} --- !u!4 &966544879 stripped @@ -1421,6 +1764,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1803085805} m_Modifications: + - target: {fileID: 3945938555658400083, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_TagString + value: "\u7535\u8BDD\u7EBF" + objectReference: {fileID: 0} - target: {fileID: 3945938555658400084, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} propertyPath: m_Sprite value: @@ -1836,7 +2183,7 @@ MonoBehaviour: m_Priority: 10 m_StandbyUpdate: 2 m_LookAt: {fileID: 0} - m_Follow: {fileID: 966544879} + m_Follow: {fileID: 318330976} m_Lens: FieldOfView: 60 OrthographicSize: 3.43 @@ -1860,7 +2207,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373134508} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.35, y: 1.25, z: -10} + m_LocalPosition: {x: -0.52, y: 0.92, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 963972581} @@ -1949,6 +2296,37 @@ Transform: m_Father: {fileID: 1803085805} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1506938804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1506938805} + m_Layer: 0 + m_Name: "\u7236\u4EB2" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1506938805 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506938804} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.92, y: -0.23, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_Children: + - {fileID: 318330976} + m_Father: {fileID: 1633485123} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1537313301 GameObject: m_ObjectHideFlags: 0 @@ -6781,6 +7159,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 966544879} + - {fileID: 1506938805} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7029,7 +7408,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1898344561 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 100 m_Sprite: {fileID: 21300000, guid: 8160e1c791ac9c44e8771cb5f900901f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -7049,7 +7428,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1686602594} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.56, y: -0.92, z: 0.5263625} + m_LocalPosition: {x: 0.56, y: -1.44, z: 0.5263625} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1803085805} @@ -7069,7 +7448,7 @@ GameObject: - component: {fileID: 1700859676} m_Layer: 0 m_Name: "\u7535\u8BDD\u7EBF (3)" - m_TagString: Untagged + m_TagString: "\u7535\u8BDD\u7EBF" m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -7255,7 +7634,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2732673, y: 0.23600002} m_AnchorMax: {x: 0.72315717, y: 0.80067426} - m_AnchoredPosition: {x: 0.5, y: -3.9999619} + m_AnchoredPosition: {x: 0.5, y: -3.9999466} m_SizeDelta: {x: -79, y: -26} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1837461867 @@ -7296,72 +7675,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1837461865} m_CullTransparentMesh: 1 ---- !u!1 &1890536042 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1890536043} - - component: {fileID: 1890536044} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1890536043 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890536042} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 496175136} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!60 &1890536044 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890536042} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -5.294608, y: -0.4671805} - - {x: -10.396973, y: -0.3636892} - - {x: -10.342025, y: -4.3687534} - - {x: 10.368096, y: -4.4148846} - - {x: 10.292473, y: -1.2182164} - - {x: 6.0643954, y: -1.24768} - - {x: 3.0815985, y: -0.8028679} - - {x: 2.3130484, y: -1.7651647} - - {x: -0.15087914, y: -1.7044234} - - {x: -1.1965556, y: -0.5840493} --- !u!1 &1935890965 GameObject: m_ObjectHideFlags: 0 @@ -7664,7 +7977,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2732673, y: 0.23600002} m_AnchorMax: {x: 0.72315717, y: 0.80067426} - m_AnchoredPosition: {x: 0.5, y: -3.9999619} + m_AnchoredPosition: {x: 0.5, y: -3.9999466} m_SizeDelta: {x: -79, y: -26} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2141584034 diff --git a/Assets/Scripts/M_Player.cs b/Assets/Scripts/M_Player.cs index 299f7a2..e7ff7f7 100644 --- a/Assets/Scripts/M_Player.cs +++ b/Assets/Scripts/M_Player.cs @@ -157,7 +157,15 @@ public class M_Player : MonoBehaviour //可交互对象都有UI界面。当按下交互键后,显示交互界面 if(catched != null) { + //触发交互函数,在具象物体中重写这个虚拟功能 catched.OnCall(); + //如果捕捉对象是电话线 + if(catched.tag == "电话线") + { + //获取其电话线组件,如果其未修好,则执行修理动画 + if(!catched.GetComponent().HasTheBePrepared()) + M_Animator.SetBool("IsReparing", true); + } } } @@ -167,10 +175,19 @@ public class M_Player : MonoBehaviour if(catched != null) { catched.StopRepareTheTelephoneLine(); + //如果捕捉对象是电话线,停止修电话线动画 + if(catched.tag == "电话线") M_Animator.SetBool("IsReparing", false); } } } + //当修好了一个电话线,强制打断修电话线动画 + public void HasReparedATelephone() + { + M_Animator.SetBool("IsReparing", false); + } + + //监听打电码的函数 public void OnCoding(InputAction.CallbackContext context) { diff --git a/Assets/Scripts/具象物体/TelephoneLine.cs b/Assets/Scripts/具象物体/TelephoneLine.cs index f744b5d..04f381a 100644 --- a/Assets/Scripts/具象物体/TelephoneLine.cs +++ b/Assets/Scripts/具象物体/TelephoneLine.cs @@ -41,6 +41,7 @@ public class TelephoneLine : Interactive Debug.Log("满了,这个修好了"); OnStopReparing();//关下UI GetComponent().enabled = true;//打开修好的的图片素材 + FindObjectOfType().HasReparedATelephone();//告诉玩家自己被修好,打断修理动画 if(endEvent != null) endEvent.OnCall();//如果有结束事件,那触发一下结束事件 } //还要更新UI上的进度条 @@ -77,6 +78,7 @@ public class TelephoneLine : Interactive m_interface.SetActive(false);//关闭修电话线的UI } + public bool HasTheBePrepared(){return isRepared;} //制造一个只读的变量,不要动这些 diff --git a/Assets/图/动画/下坑.anim b/Assets/图/动画/下坑.anim index 32d96f8..2b47f9e 100644 --- a/Assets/图/动画/下坑.anim +++ b/Assets/图/动画/下坑.anim @@ -1146,7 +1146,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.42143795, y: -6.6626387, z: 6.3364797} + value: {x: -0.42143795, y: -0.6626, z: 6.3364797} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -1155,7 +1155,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: -0.42143795, y: -6.6626387, z: 6.3364797} + value: {x: -0.42143795, y: -0.6626, z: 6.3364797} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -1164,7 +1164,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.8333333 - value: {x: 0.3, y: -6.55, z: 6.3364797} + value: {x: 0.3, y: -0.55, z: 6.3364797} inSlope: {x: 4.219608, y: 0, z: 0} outSlope: {x: 4.219608, y: 0, z: 0} tangentMode: 0 @@ -1173,7 +1173,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.25 - value: {x: 2.04, y: -9.91, z: 6.3364797} + value: {x: 2.04, y: -3.91, z: 6.3364797} + 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: 2.04, y: -3.91, z: 6.3364797} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -6404,7 +6413,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -6.6626387 + value: -0.6626 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -6413,7 +6422,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: -6.6626387 + value: -0.6626 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -6422,7 +6431,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: -6.55 + value: -0.55 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -6431,7 +6440,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.25 - value: -9.91 + value: -3.91 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: -3.91 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/图/动画/他爸.controller b/Assets/图/动画/他爸.controller index c666c07..dc40c6d 100644 --- a/Assets/图/动画/他爸.controller +++ b/Assets/图/动画/他爸.controller @@ -1,8 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7417046876039147702 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4152199690549074923} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-5481511477900700387 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -28,7 +50,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &-3660802073315185107 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -76,7 +98,7 @@ AnimatorController: m_Controller: {fileID: 9100000} --- !u!1102 &429271347515795469 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -100,9 +122,53 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &514544178442069997 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4152199690549074923} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1073349690158177164 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3660802073315185107} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.85 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &2735281586871154179 AnimatorStateMachine: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -111,10 +177,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 8147200386770861203} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 60, y: 340, z: 0} - serializedVersion: 1 m_State: {fileID: -5481511477900700387} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 410, y: 50, z: 0} - serializedVersion: 1 m_State: {fileID: 5671058436772492650} m_Position: {x: 270, y: 130, z: 0} @@ -135,23 +201,45 @@ AnimatorStateMachine: m_Position: {x: 445, y: 455, z: 0} - serializedVersion: 1 m_State: {fileID: 9211234985352789427} - m_Position: {x: 480, y: 520, z: 0} + m_Position: {x: 720, y: 490, z: 0} - serializedVersion: 1 m_State: {fileID: 4152199690549074923} - m_Position: {x: 515, y: 585, z: 0} + m_Position: {x: 270, y: 550, 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_EntryPosition: {x: 30, y: 130, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 8147200386770861203} +--- !u!1101 &2827348600312728680 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3660802073315185107} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &4152199690549074923 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -177,7 +265,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &4290427244686223265 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -203,7 +291,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &5671058436772492650 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -229,7 +317,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &8033208513622415575 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -255,7 +343,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &8147200386770861203 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -263,7 +351,8 @@ AnimatorState: m_Name: New Animation m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -7417046876039147702} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -281,7 +370,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &8438016665438056779 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -305,9 +394,23 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1109 &9183214982127445956 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 429271347515795469} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 --- !u!1102 &9211234985352789427 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} diff --git a/Assets/游戏内动画资源/AC/父亲(序章战场).controller b/Assets/游戏内动画资源/AC/父亲(序章战场).controller new file mode 100644 index 0000000..5ba920b --- /dev/null +++ b/Assets/游戏内动画资源/AC/父亲(序章战场).controller @@ -0,0 +1,353 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8584466502654314005 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u4FEE\u7535\u62A5\u7EBF\u8D77\u8EAB" + 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: 3bba2e35ebcd794428a86f24598aba8d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-5849251197863786513 +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: 1638246589573868614} + m_Position: {x: 290, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2116101768925852824} + m_Position: {x: 466.33636, y: 314.76956, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7240349920650150620} + m_Position: {x: 430, y: -20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4359815533979674897} + m_Position: {x: 230, y: 480, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 130, y: -110, 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: 1638246589573868614} +--- !u!1101 &-5437882204653483180 +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: IsReparing + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7240349920650150620} + 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: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3581875307212823314 +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: IsWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1638246589573868614} + 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: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2896505810038684790 +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: IsReparing + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7240349920650150620} + 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: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2742225518432671294 +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: IsReparing + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1638246589573868614} + 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: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-2116101768925852824 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u884C\u8D70" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3581875307212823314} + - {fileID: -2896505810038684790} + 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: 1d96dcc7e90e9ee41bb53456ae47d564, 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: "\u7236\u4EB2\uFF08\u5E8F\u7AE0\u6218\u573A\uFF09" + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: IsWalking + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: IsReparing + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5849251197863786513} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1638246589573868614 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u5F85\u673A" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3166904759876327473} + - {fileID: -5437882204653483180} + 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: 4827a578a63006d478104d1ec4839258, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &3166904759876327473 +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: IsWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2116101768925852824} + 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: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &4359815533979674897 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u4E0B\u5751" + 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: 0cd7b5aae31b8b34c8ac701fbb20a78c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &5349346327903521239 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u4FEE\u7535\u62A5\u7EBF" + 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: bbd52679edba00d4cab2a5f1cf00b99f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &7240349920650150620 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u4FEE\u7535\u62A5\u7EBF\u4E2D" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2742225518432671294} + 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: 69a4ef204c6b40544894fe052257c8a3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/游戏内动画资源/AC/父亲(序章战场).controller.meta b/Assets/游戏内动画资源/AC/父亲(序章战场).controller.meta new file mode 100644 index 0000000..692cbcc --- /dev/null +++ b/Assets/游戏内动画资源/AC/父亲(序章战场).controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ef6669e7dd2f764bbb94648bcca8c9b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/游戏内动画资源/AM/次骨骼.meta b/Assets/游戏内动画资源/AM/次骨骼.meta new file mode 100644 index 0000000..9f44b92 --- /dev/null +++ b/Assets/游戏内动画资源/AM/次骨骼.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3840af4aa3d0e964e8c54edf31131eea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/图/动画/修电报线中.anim b/Assets/游戏内动画资源/AM/次骨骼/修电报线中.anim similarity index 99% rename from Assets/图/动画/修电报线中.anim rename to Assets/游戏内动画资源/AM/次骨骼/修电报线中.anim index 7fee6e9..2b589a8 100644 --- a/Assets/图/动画/修电报线中.anim +++ b/Assets/游戏内动画资源/AM/次骨骼/修电报线中.anim @@ -1422,7 +1422,7 @@ AnimationClip: m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 m_LoopTime: 1 - m_LoopBlend: 0 + m_LoopBlend: 1 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 m_LoopBlendPositionXZ: 0 diff --git a/Assets/图/动画/修电报线中.anim.meta b/Assets/游戏内动画资源/AM/次骨骼/修电报线中.anim.meta similarity index 100% rename from Assets/图/动画/修电报线中.anim.meta rename to Assets/游戏内动画资源/AM/次骨骼/修电报线中.anim.meta diff --git a/Assets/图/动画/主角待机.anim b/Assets/游戏内动画资源/AM/次骨骼/待机.anim similarity index 95% rename from Assets/图/动画/主角待机.anim rename to Assets/游戏内动画资源/AM/次骨骼/待机.anim index 4f2adec..1848516 100644 --- a/Assets/图/动画/主角待机.anim +++ b/Assets/游戏内动画资源/AM/次骨骼/待机.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u4E3B\u89D2\u5F85\u673A" + m_Name: "\u5F85\u673A" serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -1019,40 +1019,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: bone_1/bone_2 - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.1859982, y: 4.10394, 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: 0.5 - value: {x: 0.20273179, y: 4.0537114, 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 - value: {x: 0.1859982, y: 4.10394, 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: bone_1 m_ScaleCurves: - curve: serializedVersion: 2 @@ -1530,40 +1496,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: bone_1/bone_2 - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 1, y: 1, z: 1} - 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: 0.5 - value: {x: 1, y: 1, z: 1} - 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 - value: {x: 1, y: 1, z: 1} - 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: bone_1 m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 @@ -1601,13 +1533,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 377759540 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 898452142 attribute: 4 @@ -1881,13 +1806,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 377759540 - attribute: 3 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -3464,117 +3382,6 @@ AnimationClip: path: bone_1/bone_2 classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.1859982 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0.20273179 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.1859982 - 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: bone_1 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 4.10394 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 4.0537114 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 4.10394 - 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: bone_1 - classID: 4 - script: {fileID: 0} - - 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: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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: bone_1 - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -6848,117 +6655,6 @@ AnimationClip: path: bone_1/bone_2 classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - 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_LocalScale.x - path: bone_1 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - 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_LocalScale.y - path: bone_1 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - 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_LocalScale.z - path: bone_1 - classID: 4 - script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/图/动画/主角待机.anim.meta b/Assets/游戏内动画资源/AM/次骨骼/待机.anim.meta similarity index 100% rename from Assets/图/动画/主角待机.anim.meta rename to Assets/游戏内动画资源/AM/次骨骼/待机.anim.meta diff --git a/Assets/图/动画/行走.anim b/Assets/游戏内动画资源/AM/次骨骼/行走.anim similarity index 98% rename from Assets/图/动画/行走.anim rename to Assets/游戏内动画资源/AM/次骨骼/行走.anim index 400870b..a46d697 100644 --- a/Assets/图/动画/行走.anim +++ b/Assets/游戏内动画资源/AM/次骨骼/行走.anim @@ -1524,7 +1524,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.42143795, y: -6.6626387, z: 6.3364797} + value: {x: -0.42143795, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -1533,7 +1533,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.41666666 - value: {x: 0.88, y: -6.6626387, z: 6.3364797} + value: {x: 0.88, y: 0, z: 0} inSlope: {x: 0.95999956, y: 0, z: 0} outSlope: {x: 0.95999956, y: 0, z: 0} tangentMode: 0 @@ -1542,7 +1542,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 1, y: -6.6626387, z: 6.3364797} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0.82285714, y: 0, z: 0} outSlope: {x: 0.82285714, y: 0, z: 0} tangentMode: 0 @@ -1551,7 +1551,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 2.61, y: -6.6626387, z: 6.3364797} + value: {x: 2.61, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -2073,22 +2073,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: bone_1 - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 1, y: 1, z: 1} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 @@ -2427,13 +2411,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 3 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -8874,98 +8851,6 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -6.6626387 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: -6.6626387 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: -6.6626387 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -6.6626387 - 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} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 6.3364797 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 6.3364797 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 6.3364797 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 6.3364797 - 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} - curve: serializedVersion: 2 m_Curve: @@ -9050,63 +8935,6 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.z - path: - classID: 4 - script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/图/动画/行走.anim.meta b/Assets/游戏内动画资源/AM/次骨骼/行走.anim.meta similarity index 100% rename from Assets/图/动画/行走.anim.meta rename to Assets/游戏内动画资源/AM/次骨骼/行走.anim.meta diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 04f03fa..9f2b107 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -9,6 +9,7 @@ TagManager: - "\u6295\u63B7\u7269" - "\u70AE\u5F39" - "\u77F3\u5934" + - "\u7535\u8BDD\u7EBF" layers: - Default - TransparentFX diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index b0f4e50..d499c58 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,25 +15,25 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb - flags: 0 - RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820 flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb + flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820 + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba85e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7