| Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0428_tagPlayerRideHorse.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/AI/HeroAI_Auto.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/HeroBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/Skill/AttackHandler.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/Skill/SoBodyControl.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/State/SMB/SMB_Base.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_Hero.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GActorPlayerBase.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/RuntimeLogUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0428_tagPlayerRideHorse.cs
@@ -2,7 +2,7 @@ using TableConfig; using Snxxz.UI; //04 28 玩家上马#tagPlayerRideHorse //04 28 �������#tagPlayerRideHorse @@ -32,7 +32,9 @@ return; } if (_hero == null || _hero.MovingState == E_MovingState.Ride) if (_hero == null || _hero.MovingState == E_MovingState.Ride || _hero.IsPolyMorph) { return; } Fight/Actor/AI/HeroAI_Auto.cs
@@ -124,6 +124,11 @@ GA_Hero _hero = PlayerDatas.Instance.hero; if(_hero.IsPolyMorph) { return; } if (_hero.SelectTarget == _hero) { _hero.SelectTarget = null; Fight/Actor/HeroBehaviour.cs
@@ -78,6 +78,11 @@ return; } if(m_Hero.IsPolyMorph) { return; } if (m_Hero.aiHandler.currentType == E_HeroAIType.KillUntilDie) { if (IsComAtk(skillID)) Fight/Actor/Skill/AttackHandler.cs
@@ -1080,7 +1080,7 @@ // 攻击者是玩家 if (attacker.ActorType == GameObjType.gotPlayer) { return false; return _bodyControl.useForPlayer && target.CanPushedBack(); } else if (attacker.ActorType == GameObjType.gotNPC) { Fight/Actor/Skill/SoBodyControl.cs
@@ -7,4 +7,7 @@ [Tooltip("表现的时间")] public float duration;// 移动时间 [Tooltip("是否对玩家类型生效")] public bool useForPlayer = false; } Fight/Actor/State/SMB/SMB_Base.cs
@@ -91,6 +91,7 @@ protected void AddToNpcPosList(GActorFight attacker, GActorFight target, int bodyControlId, Vector3 direction, List<NPCPos> npcPosList) { // Debug.LogFormat("{0} attack {1} ==================== 0", attacker.GetType().ToString(), target.GetType().ToString()); if (PreFightMission.Instance.IsFinished() == false) { return; @@ -125,7 +126,7 @@ //Debug.Log("--------------------------- 8"); if (_player.MovingState != E_MovingState.Ride) { //Debug.Log("--------------------------- 9"); // Debug.LogFormat("{0} attack {1} ==================== 9", attacker.GetType().ToString(), target.GetType().ToString()); CB402_tagCMNPCBeatBack _beatBack = new CB402_tagCMNPCBeatBack(); _beatBack.ObjType = (byte)GameObjType.gotPlayer; _beatBack.Count = 1; Fight/GameActor/GA_Hero.cs
@@ -506,7 +506,8 @@ && !IsDaZuo() && State != E_ActorState.Roll && !s_MapSwitching && !heavenBattleModel.IsBattlePrepare; && !heavenBattleModel.IsBattlePrepare && !m_Beating; } public bool CanCastSkill() @@ -519,7 +520,8 @@ && State != E_ActorState.Roll && State != E_ActorState.Mocked && !s_MapSwitching && !heavenBattleModel.IsBattlePrepare; && !heavenBattleModel.IsBattlePrepare && !m_Beating; } public void StopAll() Fight/GameActor/GActorPlayerBase.cs
@@ -39,6 +39,7 @@ protected HeadUpName m_HeadUpName = null; private int m_HorseActionType = 0; public int nextComAtkIndex = -1; public JobSetupConfig JobSetup { get; protected set; } @@ -62,8 +63,6 @@ } } public int nextComAtkIndex = -1; public void SwitchHeadNameBindNode(bool castingSkill) { // 角色被隐藏状态下不执行头顶名称切换逻辑 @@ -82,6 +81,87 @@ { m_HeadUpName.target = MP_Name; } } } public bool IsPolyMorph { get; private set; } private GameObject m_SheepModel; private bool m_SheepIsDefaultNpc; public virtual void Polymorph(bool doOrNo) { IsPolyMorph = doOrNo; if (IsPolyMorph) { ChangeBinderToRoot(); // 正在骑乘状态下 if (MovingState == E_MovingState.Ride) { m_HorseModel.transform.position = Constants.Special_Hide_Position; SwitchHorse(0); DTC0428_tagPlayerRideHorse.Send_tagPlayerRideHorse(false); } else { m_ClothesModel.transform.position = Constants.Special_Hide_Position; } m_SheepIsDefaultNpc = false; var _p = InstanceResourcesLoader.LoadNpc(10101001); if (_p == null) { _p = InstanceResourcesLoader.LoadDefaultFightNPC(); m_SheepIsDefaultNpc = true; } m_SheepModel = GameObjectPoolManager.Instance.RequestGameObject(_p); m_SheepModel.transform.SetParent(m_Root); var _a = m_SheepModel.GetComponent<Animator>(); if (_a) { _a.enabled = true; _a.SetInteger(GAStaticDefine.Param_ActorInstID, (int)ClientInstID); m_ClothesAnimator.enabled = false; m_ClothesAnimator = _a; } if (ShowOrHide) { m_SheepModel.transform.localPosition = Vector3.zero; } else { m_SheepModel.transform.localPosition = Constants.Special_Hide_Position; } m_SheepModel.transform.localRotation = Quaternion.identity; } else { if (m_SheepModel) { if (m_SheepIsDefaultNpc) { GameObjectPoolManager.Instance.ReleaseDefaultFightNPC(m_SheepModel); } else { var _prefab = InstanceResourcesLoader.LoadNpc(10101001); GameObjectPoolManager.Instance.ReleaseGameObject(_prefab, m_SheepModel); } } m_SheepModel = null; m_ClothesModel.transform.localPosition = Vector3.zero; ChangeBinderToClothes(); m_ClothesAnimator = m_ClothesModel.GetComponent<Animator>(); m_ClothesAnimator.enabled = true; m_ClothesAnimator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)ClientInstID); m_ClothesAnimator.SetInteger(GAStaticDefine.Param_MoveState, (int)E_MovingState.Normal); } } @@ -974,8 +1054,11 @@ } if (ShowOrHide) { if (!IsPolyMorph) { m_ClothesModel.transform.localPosition = Vector3.zero; m_ClothesModel.transform.localRotation = Quaternion.identity; } } else { @@ -987,13 +1070,19 @@ if (m_WingModel) { MovingState = E_MovingState.Fly; if (!IsPolyMorph) { m_ClothesAnimator.SetInteger(GAStaticDefine.Param_MoveState, (int)E_MovingState.Fly); } } else { MovingState = E_MovingState.Normal; if (!IsPolyMorph) { m_ClothesAnimator.SetInteger(GAStaticDefine.Param_MoveState, (int)E_MovingState.Normal); } } SwitchHeadNameBindNode(false); } Utility/RuntimeLogUtility.cs
@@ -223,7 +223,7 @@ if (GUILayout.Button("酷酷酷")) { PlayerDatas.Instance.hero.Polymorph(!PlayerDatas.Instance.hero.IsPolyMorph); } if (GUILayout.Button("直接重连"))
