diff --git a/Assets/_Zombie/Prefabs/Bullets/GrenadeBullet.prefab b/Assets/_Zombie/Prefabs/Bullets/GrenadeBullet.prefab index 11c47f54..a3ee4f91 100644 --- a/Assets/_Zombie/Prefabs/Bullets/GrenadeBullet.prefab +++ b/Assets/_Zombie/Prefabs/Bullets/GrenadeBullet.prefab @@ -161,7 +161,7 @@ MonoBehaviour: impact_prefab: {fileID: 2619052377131353835, guid: 574b27281aea278409ca900d4e436154, type: 3} impact_despawn_time: 1 - use_gravity: 0 + use_gravity: 1 hit_trigger: 0 HitLayer: serializedVersion: 2 diff --git a/Assets/_Zombie/Prefabs/Bullets/PistolBullet.prefab b/Assets/_Zombie/Prefabs/Bullets/PistolBullet.prefab index 5ef86283..f80cefb1 100644 --- a/Assets/_Zombie/Prefabs/Bullets/PistolBullet.prefab +++ b/Assets/_Zombie/Prefabs/Bullets/PistolBullet.prefab @@ -5088,7 +5088,7 @@ MonoBehaviour: impact_prefab: {fileID: 2619052377131353835, guid: 20794f5299c5eef49bedbc06095e9d22, type: 3} impact_despawn_time: 1 - use_gravity: 1 + use_gravity: 0 hit_trigger: 0 HitLayer: serializedVersion: 2 diff --git a/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie.asset b/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie.asset index 6725daf3..ce19b726 100644 --- a/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie.asset +++ b/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie.asset @@ -33,9 +33,9 @@ MonoBehaviour: Enemy State","Instant":true,"SharedIntstate":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":4}}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(293.334137,239.230759)"},"ID":19,"Name":"Sequence","Instant":true,"AbortTypeabortType":"Self","Children":[{"Type":"Conditionals+CheckEnemyState","NodeData":{"Offset":"(-167.665009,177.145142)","Comment":"\u6218\u6597"},"ID":20,"Name":"Check Enemy State","Instant":true,"SharedIntstate":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":4}},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(178.630554,176.631439)"},"ID":21,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-448.213623,290)","Comment":"\u6218\u6597\u8fc7\u7a0b\u4e2d\u672a\u77e5\u539f\u56e0\n\u8d85\u51fa\u53ef\u653b\u51fb\u8303\u56f4"},"ID":22,"Name":"Sequence","Instant":true,"AbortTypeabortType":"LowerPriority","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Inverter","NodeData":{"Offset":"(-236.879791,170)"},"ID":23,"Name":"Inverter","Instant":true,"Children":[{"Type":"Conditionals+EnemyInMaxAtkArea","NodeData":{"Offset":"(222.200714,14.2857094)"},"ID":24,"Name":"Enemy In Max Atk Area","Instant":true}]},{"Type":"Actions+SetEnemyState","NodeData":{"Offset":"(250.974686,169.583374)","Comment":"\u8f6c\u4e3a\u641c\u7d22"},"ID":25,"Name":"Set - Enemy State","Instant":true,"SharedIntstate":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":2}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(353.91217,174.750732)"},"ID":26,"Name":"Selector","Instant":true,"AbortTypeabortType":"Self","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-67.9949341,113.554214)","Comment":"\u653b\u51fb"},"ID":27,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"Actions+EnemyStop","NodeData":{"Offset":"(-266.551971,193.987625)"},"ID":28,"Name":"Enemy + Enemy State","Instant":true,"SharedIntstate":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":2}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(353.91217,174.750732)"},"ID":26,"Name":"Selector","Instant":true,"AbortTypeabortType":"Self","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(25.755064,123.970879)","Comment":"\u653b\u51fb"},"ID":27,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"Actions+EnemyStop","NodeData":{"Offset":"(-266.551971,193.987625)"},"ID":28,"Name":"Enemy Stop","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(-133.48999,193.646362)"},"ID":29,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":0.2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"Actions+EnemyAttack","NodeData":{"Offset":"(23.9905472,189.630936)"},"ID":30,"Name":"Enemy - Attack","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(160,190)"},"ID":31,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"Actions+EnemyStopAttack","NodeData":{"Offset":"(307.148682,189.172363)"},"ID":32,"Name":"Enemy + Attack","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(160,188.749985)"},"ID":31,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"Actions+EnemyStopAttack","NodeData":{"Offset":"(307.148682,189.172363)"},"ID":32,"Name":"Enemy Stop Attack","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(514.3523,186.803589)"},"ID":33,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":0},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":3}}]}]}]}]}]}]},"DetachedTasks":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(2965.1272,1720.00122)","Comment":"\u8fb9\u8d70\u8fb9\u5c04"},"ID":34,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Inverter","NodeData":{"Offset":"(-333.165771,176.051178)"},"ID":35,"Name":"Inverter","Instant":true,"Children":[{"Type":"Conditionals+EnemyInMinAtkArea","NodeData":{"Offset":"(148.571472,0)"},"ID":36,"Name":"Enemy In Min Atk Area","Instant":true}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(-32.274147,177.602829)"},"ID":37,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"Actions+EnemyMoveForward","NodeData":{"Offset":"(105.930588,183.632187)"},"ID":38,"Name":"Enemy Move Forward","Instant":true,"SharedFloatdis":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(248.5385,176.267776)"},"ID":39,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":0.5},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(372.646729,181.85994)","Comment":"\u5c04\u51fb\u4e00\u6b21\n"},"ID":40,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"Actions+EnemyStop","NodeData":{"Offset":"(-233.318756,197.858337)"},"ID":41,"Name":"Enemy diff --git a/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie1.controller b/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie1.controller index fd99a7e8..5b2b0614 100644 --- a/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie1.controller +++ b/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie1.controller @@ -39,10 +39,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -7534207687684657452} - m_Position: {x: 160, y: -50, z: 0} + m_Position: {x: 300, y: -120, z: 0} - serializedVersion: 1 m_State: {fileID: -8439067012974317267} - m_Position: {x: -70, y: -50, z: 0} + m_Position: {x: -200, y: -10, z: 0} - serializedVersion: 1 m_State: {fileID: 7541040469739651399} m_Position: {x: 220, y: 130, z: 0} @@ -64,14 +64,18 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -2993950643271879275} m_Position: {x: 260, y: 740, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5113694150595440664} + m_Position: {x: 50, y: -110, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 3502420806399048877} - {fileID: 2497801003041922896} + - {fileID: 3002962476961262286} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 50, z: 0} + m_AnyStatePosition: {x: 130, y: 0, z: 0} m_EntryPosition: {x: -10, y: 130, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} @@ -86,7 +90,8 @@ AnimatorState: m_Name: "\u53D7\u51FB\uFF08\u5DE6\uFF09" m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8144810284724368467} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -102,6 +107,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-8144810284724368467 +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: 7541040469739651399} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8584906 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-7534207687684657452 AnimatorState: serializedVersion: 6 @@ -112,7 +139,8 @@ AnimatorState: m_Name: "\u53D7\u51FB\uFF08\u53F3\uFF09" m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 5963798074526893719} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -359,6 +387,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: dead + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -463,6 +497,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &3002962476961262286 +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: dead + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5113694150595440664} + 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 &3502420806399048877 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -488,6 +547,54 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &5113694150595440664 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u6B7B\u4EA1 0" + 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: 3841233948c6fc74cbe039d69a25893b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &5963798074526893719 +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: 7541040469739651399} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8584906 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &6128141422261118964 AnimatorStateMachine: serializedVersion: 6 diff --git a/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie2.prefab b/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie2.prefab index d8499266..250ad8ac 100644 --- a/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie2.prefab +++ b/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie2.prefab @@ -17,7 +17,6 @@ GameObject: - component: {fileID: 3385042198793023540} - component: {fileID: 7080690137013203284} - component: {fileID: 7197731392863499401} - - component: {fileID: 8332677255116968161} - component: {fileID: 6050164871199415342} m_Layer: 8 m_Name: Zombie2 @@ -291,21 +290,6 @@ MonoBehaviour: Version: 1.7.3 gizmoViewMode: 2 showBehaviorDesignerGizmo: 1 ---- !u!114 &8332677255116968161 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2571627240868883349} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3} - m_Name: - m_EditorClassIdentifier: - _Animator: {fileID: 3808703191575688829} - _Transitions: {fileID: 0} - _ActionOnDisable: 0 --- !u!114 &6050164871199415342 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie3.prefab b/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie3.prefab index b32d3ecb..bffbc7fa 100644 --- a/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie3.prefab +++ b/Assets/_Zombie/Prefabs/Enemys/Zombie/Zombie3.prefab @@ -49,7 +49,6 @@ GameObject: - component: {fileID: 4670336092993185589} - component: {fileID: 8363390063876622731} - component: {fileID: 3991817914681660393} - - component: {fileID: 6048273732658902225} m_Layer: 8 m_Name: Zombie3 m_TagString: Enemy @@ -373,33 +372,6 @@ MonoBehaviour: attackEffect: {fileID: 0} effect: {fileID: 0} selfDie: {fileID: 7400000, guid: 6be54bff809e00647b18dcd9a481c197, type: 2} ---- !u!54 &6048273732658902225 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4718562697156690535} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 80 - m_CollisionDetection: 0 --- !u!1001 &6021962138326553038 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Scripts/Enemys/Enemy.cs b/Assets/_Zombie/Scripts/Enemys/Enemy.cs index b5301468..0be049c8 100644 --- a/Assets/_Zombie/Scripts/Enemys/Enemy.cs +++ b/Assets/_Zombie/Scripts/Enemys/Enemy.cs @@ -251,7 +251,7 @@ public class Enemy : Agent { if (target != null) { - transform.rotation = Quaternion.Lerp(transform.rotation, Quaternion.LookRotation(target.transform.position - transform.position), Time.deltaTime * 10f); + transform.rotation = Quaternion.Lerp(transform.rotation, Quaternion.LookRotation(target.transform.position.ReflectVectorXOZ() - transform.position), Time.deltaTime * 10f); } } @@ -305,7 +305,7 @@ public class Enemy : Agent if(isServer) GameManager.Ins.DeleteEnemy(id,transform); }, 1f); - AnimatorComponent.SetBool("dead", true); + AnimatorComponent.SetTrigger("dead"); GameManager.Ins.PlaySound3DRPC(dieSound,transform,true); } } @@ -368,24 +368,9 @@ public class Enemy : Agent // 在 server 上播放死亡并通知客户端 Vector3 hitPoint = transform.position; if (info is Vector3) hitPoint = (Vector3)info; - Debug.Log("得分："+info); if(info is int i && i != -1) GameManager.Ins.AddScore(i.ToString(), GameManager.Ins.EnemyInfos[type].Score); RpcPlayDeath(hitPoint); - - // 播放死亡音效（在客户端通过 RpcPlayDeath 会触发本地 PlaySound） - // Server 端额外处理：生成爆炸/掉落/计分等 - //PlayServerDeathEffects(); - - // 最终 server 可决定是否销毁网络对象 - if (/*你想直接销毁*/ false) - { - NetworkServer.Destroy(gameObject); - } - else - { - // 保持对象存在，直到 server 另外决定销毁 - } } [ClientRpc] @@ -516,7 +501,7 @@ public class Enemy : Agent public Transform attackPoint; // 攻击检测点 private float attackRange = 4f; // 攻击半径 - public float attackAngle = 45f; // 扇形角度 + private float attackAngle = 90f; // 扇形角度 public LayerMask playerLayer; // 玩家所在的层 /// @@ -531,10 +516,8 @@ public class Enemy : Agent // 判断是否在前方45度范围内 Vector3 dirToTarget = (hit.transform.position - attackPoint.position).normalized; float angle = Vector3.Angle(attackPoint.forward, dirToTarget); - - if (angle <= attackAngle * 0.5f) // 扇形角度一半 + if (angle > attackAngle ) // 扇形角度一半 { - Debug.LogError(hit.gameObject.name); Player player = hit.GetComponent(); if (player != null) { diff --git a/Assets/_Zombie/Scripts/GameManager.cs b/Assets/_Zombie/Scripts/GameManager.cs index d108d84c..b0ca7685 100644 --- a/Assets/_Zombie/Scripts/GameManager.cs +++ b/Assets/_Zombie/Scripts/GameManager.cs @@ -100,6 +100,8 @@ public class GameManager : NetworkBehaviour public Dictionary> TowerList2 = new Dictionary>(); public Dictionary SettleInfos = new Dictionary(); + + [SyncVar] public bool isStart; /// /// 波次自增 @@ -111,7 +113,7 @@ public class GameManager : NetworkBehaviour [SyncVar] public long vistEnd = 0; // 总游玩时长 - private int vistAllTime = (int)(60 * 1f); + private int vistAllTime = (int)(60 * 10f); [SyncVar] public string settleData = ""; @@ -465,6 +467,7 @@ public class GameManager : NetworkBehaviour EnemyList.Remove(id); if (id == 2) { + Debug.LogError("创建爆炸"); CreateExplosion(pos,id); } curRoundEnemyCount--; diff --git a/Assets/_Zombie/Scripts/UI/HUDPanel.cs b/Assets/_Zombie/Scripts/UI/HUDPanel.cs index a0f5f320..9246820b 100644 --- a/Assets/_Zombie/Scripts/UI/HUDPanel.cs +++ b/Assets/_Zombie/Scripts/UI/HUDPanel.cs @@ -81,6 +81,7 @@ public class HUDPanel : MonoBehaviour EventDispatcher.AddEventListener("UserGun", UserGun); EventDispatcher.AddEventListener("WinRound", ShowWinRound); EventDispatcher.AddEventListener("ChangeGunIcon", ChangeGunIcon); + LessTimeText.text = "10:00"; } public void HpChange(float currentHp, float maxHp) diff --git a/Assets/sucai/僵尸/僵尸自爆犬/僵尸自爆犬.controller b/Assets/sucai/僵尸/僵尸自爆犬/僵尸自爆犬.controller index f376344a..c22820fc 100644 --- a/Assets/sucai/僵尸/僵尸自爆犬/僵尸自爆犬.controller +++ b/Assets/sucai/僵尸/僵尸自爆犬/僵尸自爆犬.controller @@ -257,12 +257,6 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: dead - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - m_Name: state m_Type: 3 m_DefaultFloat: 0 @@ -281,6 +275,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: dead + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -366,9 +366,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.8345845 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 0.75000006 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0