diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index 7f076ed..80d041e 100644 --- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat +++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat @@ -42,8 +42,8 @@ Material: - WaveCount: 50 - WaveIntensity_1: 0.02 - WaveIntensity_2: 1 - - WaveSpread_Value: 5.9999986 + - WaveSpread_Value: 0 m_Colors: - - Center: {r: 0.20030116, g: 0.31703544, b: 0, a: 0} + - Center: {r: -0.040960018, g: 0.3156991, 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 63c16b3..685b5e6 100644 --- a/Assets/Scenes/动画测试与预览.unity +++ b/Assets/Scenes/动画测试与预览.unity @@ -312,7 +312,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 703923299} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 8.914796, y: 0.9224905, z: -3.2978365} + m_LocalPosition: {x: -7.39, y: 0.9224905, z: -3.2978365} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 490062778} diff --git a/Assets/Scenes/各种系统测试与陈列.unity b/Assets/Scenes/各种系统测试与陈列.unity index 85c8def..89fd68b 100644 --- a/Assets/Scenes/各种系统测试与陈列.unity +++ b/Assets/Scenes/各种系统测试与陈列.unity @@ -2703,6 +2703,36 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1113866055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1113866056} + m_Layer: 0 + m_Name: "\u6295\u63B7\u70B9" + m_TagString: Untagged + m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1113866056 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113866055} + 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: 1272973346} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1144456071 GameObject: m_ObjectHideFlags: 0 @@ -2958,6 +2988,304 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1001 &1272973345 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1601657821} + m_Modifications: + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalScale.x + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalScale.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalScale.z + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalPosition.x + value: 2.455 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalPosition.y + value: -2.01 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6505588563760846690, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_Name + value: "\u5C0F\u5B69\uFF08\u52A8\u753B\u6D4B\u8BD5" + objectReference: {fileID: 0} + - target: {fileID: 6505588563760846690, guid: 28d7167a156a930489d946fd19163778, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 28d7167a156a930489d946fd19163778, type: 3} +--- !u!4 &1272973346 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3} + m_PrefabInstance: {fileID: 1272973345} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1272973347 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6505588563760846690, guid: 28d7167a156a930489d946fd19163778, type: 3} + m_PrefabInstance: {fileID: 1272973345} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1272973348 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272973347} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ed1c51e5852ad914e8c313176c3789cb, type: 2} + m_CullingMode: 1 + m_UpdateMode: 1 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1272973349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272973347} + 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: 0} +--- !u!50 &1272973350 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272973347} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &1272973351 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272973347} + 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.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: 1.87, y: 5.53} + m_EdgeRadius: 0 +--- !u!114 &1272973352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272973347} + 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: 1272973349} + 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: 1272973349} + 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: 1272973349} + 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: 1272973349} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnCoding + 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: f7af9390-5dad-4c80-a4a7-83d8314f8e88 + m_ActionName: PlayerNormal/Codeing[/XInputControllerWindows/rightTrigger,/Keyboard/space] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: beabb251-6f14-495d-9364-88119e0f9bf0 + m_ActionName: NullMap/New action + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 078b3370-2cb6-4574-9156-0146ae814573 + m_ActionName: PlayerInThrowing/Quit[/Keyboard/k] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1272973349} + 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: 1272973349} + 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_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: Player + m_DefaultActionMap: PlayerNormal + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!1 &1302000701 GameObject: m_ObjectHideFlags: 0 @@ -3110,7 +3438,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: 4860efe03218f35409057848102eb931, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3133,6 +3461,10 @@ PrefabInstance: propertyPath: m_Name value: "\u5C0F\u5B69" objectReference: {fileID: 0} + - target: {fileID: 1777921847428221707, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1777921847428221709, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3} propertyPath: m_RootOrder value: 0 @@ -4208,6 +4540,7 @@ Transform: m_Children: - {fileID: 1333232960} - {fileID: 745750434} + - {fileID: 1272973346} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/M_Player.cs b/Assets/Scripts/M_Player.cs index 0a0e971..ce8ed4c 100644 --- a/Assets/Scripts/M_Player.cs +++ b/Assets/Scripts/M_Player.cs @@ -26,12 +26,14 @@ public class M_Player : MonoBehaviour public GameObject missile;//投掷物的预制体 [Tooltip("投掷物抛出点")] public Transform throwOffset;//记录一下抛出点的位置 + private Animator M_Animator; void Start() { indexRecoder = FindObjectOfType();//获取数值记录组件，方便策划修改暴露参数 m_rigidbody = GetComponent();//获取自身刚体组件 faceDir = 1;//默认面部朝右 playerInput = GetComponent(); //获取自身输入组件 + //M_Animator = GetComponent(); } // Update is called once per frame @@ -45,6 +47,7 @@ public class M_Player : MonoBehaviour Move(); } + //调整投掷角度的函数 private void AdjustTheAngle() { if(canAdjustTheAngle)//如果玩家正在调整角度 @@ -77,7 +80,7 @@ public class M_Player : MonoBehaviour inputDir = -1; faceDir = -1; } - else inputDir = 0; + else {inputDir = 0;} //修改面部朝向 transform.localScale = new Vector3( Mathf.Abs(transform.localScale.x)*faceDir, @@ -95,7 +98,15 @@ public class M_Player : MonoBehaviour ); } + // void OnAnimatorMove()//Unity的回调函数，这样做能解决模型无法转向的问题，每帧调用一次 + // { + // m_rigidbody.MovePosition(m_rigidbody.position + faceDir*M_Animator.deltaPosition.magnitude*Vector2.right); + // Debug.Log(M_Animator.deltaPosition.magnitude); + // //m_RigidBody.MoveRotation(m_Rotation);//当物体有物理组件rigidbody的时候，再修改位置和旋转信息就不要用transfrom了，用刚体自带的Move等方法 + // } + + //监听投掷按键的函数 public void OnThrow(InputAction.CallbackContext context) { if(context.started)//如果按下投掷键，表示可以开始控制角度了 @@ -108,9 +119,11 @@ public class M_Player : MonoBehaviour } } + //监听修改投掷角度的函数 public void OnAdjustTheAngle(InputAction.CallbackContext context) {throwingAngleDir = context.ReadValue();}//把收到的轴的值交给角度变化的大小和方向 + //控制投掷相关的具体函数 private void Throw() { //Debug.Log("我投出手上拿着的东西了"); @@ -133,6 +146,7 @@ public class M_Player : MonoBehaviour } } + //监听交互按键的函数 public void OnInteraction(InputAction.CallbackContext context) { if(context.started) @@ -154,6 +168,7 @@ public class M_Player : MonoBehaviour } } + //监听打电码的函数 public void OnCoding(InputAction.CallbackContext context) { if(context.canceled) @@ -173,6 +188,7 @@ public class M_Player : MonoBehaviour } } + //使自身进入投掷状态的函数 public void EnterThrowingState() { throwingState = true;//修改自身记录状态变量，表示正式进入投掷状态 @@ -181,9 +197,11 @@ public class M_Player : MonoBehaviour //2.动画相关 // } + + //等待完善投掷系统 public void QuitThrowingsState(){} - //绘制曲线的函数，非常🐂 + //绘制投掷曲线的函数，非常🐂 public void DrawPath() { // @@ -208,6 +226,5 @@ public class M_Player : MonoBehaviour line.SetPosition(i, segments[i]); //把算好的点传入线的点集 } } - // } diff --git a/Assets/图/动画/renwu.controller b/Assets/图/动画/renwu.controller index c3d186f..e15537f 100644 --- a/Assets/图/动画/renwu.controller +++ b/Assets/图/动画/renwu.controller @@ -2,7 +2,7 @@ %TAG !u! tag:unity3d.com,2011: --- !u!1107 &-1116240413357958017 AnimatorStateMachine: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -11,17 +11,18 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1259281646917324526} - m_Position: {x: 30, y: 120, z: 0} + m_Position: {x: 210, y: 120, z: 0} - serializedVersion: 1 m_State: {fileID: 3926615483802031973} m_Position: {x: -10, y: 60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] - m_EntryTransitions: [] + m_EntryTransitions: + - {fileID: 351989570621910821} m_StateMachineTransitions: {} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: -110, y: -30, z: 0} - m_EntryPosition: {x: -60, y: 180, z: 0} + m_EntryPosition: {x: -40, y: 190, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1259281646917324526} @@ -47,9 +48,23 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1109 &351989570621910821 +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: 3926615483802031973} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 --- !u!1102 &1259281646917324526 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -75,7 +90,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &3926615483802031973 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} diff --git a/Assets/游戏内动画资源.meta b/Assets/游戏内动画资源.meta new file mode 100644 index 0000000..f10ba13 --- /dev/null +++ b/Assets/游戏内动画资源.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07f794bfdee78f549bda2af5e01a4e80 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/游戏内动画资源/AC.meta b/Assets/游戏内动画资源/AC.meta new file mode 100644 index 0000000..d6b8f1c --- /dev/null +++ b/Assets/游戏内动画资源/AC.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 679b5ab020a850d40b3dc0a7ae556d0d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/游戏内动画资源/AC/小孩（序章）.controller b/Assets/游戏内动画资源/AC/小孩（序章）.controller new file mode 100644 index 0000000..411361c --- /dev/null +++ b/Assets/游戏内动画资源/AC/小孩（序章）.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9181802701414636654 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u8D70" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 7883594159301626064} + 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: cffd8edf6b210da46b5d57ee7c61f5c8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-8200817034425736061 +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: 6955327852232728186} + 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: c5193ce48c865f54d82ed80f602df605, 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: "\u5C0F\u5B69\uFF08\u5E8F\u7AE0\uFF09" + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: IsWalking + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7854166707549671423} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &6955327852232728186 +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: -9181802701414636654} + 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!1107 &7854166707549671423 +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: -8200817034425736061} + m_Position: {x: 340, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -9181802701414636654} + m_Position: {x: 465.57388, y: -24.151016, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8200817034425736061} +--- !u!1101 &7883594159301626064 +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: -8200817034425736061} + 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 diff --git a/Assets/游戏内动画资源/AC/小孩（序章）.controller.meta b/Assets/游戏内动画资源/AC/小孩（序章）.controller.meta new file mode 100644 index 0000000..d60a968 --- /dev/null +++ b/Assets/游戏内动画资源/AC/小孩（序章）.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ed1c51e5852ad914e8c313176c3789cb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/游戏内动画资源/AM.meta b/Assets/游戏内动画资源/AM.meta new file mode 100644 index 0000000..fe51f36 --- /dev/null +++ b/Assets/游戏内动画资源/AM.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7813f76ff00dc0744bb25f41b68300ee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/图/动画/待机.anim b/Assets/游戏内动画资源/AM/待机.anim similarity index 100% rename from Assets/图/动画/待机.anim rename to Assets/游戏内动画资源/AM/待机.anim 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 100% rename from Assets/图/动画/走.anim rename to Assets/游戏内动画资源/AM/走.anim 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/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index e7c7bf7..02a728c 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -21,10 +21,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18