| Core/GameEngine/Model/Player/Character/PlayerExtersionData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0408_tagPlayerSummonNPCAppear.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0419_tagPlayerReborn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0434_tagAreaPlayerAppearEx.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0435_tagPetAppear.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/State/SMB/STM_BaseAttack.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Stage/StageManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/FightingPKWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/Player/Character/PlayerExtersionData.cs
@@ -4,8 +4,18 @@ public class PlayerExtersionData { public int MaxHP; // 最大HP 28, private int aaa; public int MaxHP { get { return aaa; } set { aaa = value; #if UNITY_EDITOR Debug.Log("Maxhp: " + aaa); #endif } } // 最大HP 28, public int MaxMP; // 最大MP 30, public int ExpRate; // 当前经验倍率 单位为百分比 35, public int DEF; // 外防 42 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs
@@ -154,7 +154,10 @@ if (StageManager.Instance.isLoading) { GAMgr.Instance.reAdjustPosList.Add(_actor); if (!GAMgr.Instance.reAdjustPosList.Contains(_actor)) { GAMgr.Instance.reAdjustPosList.Add(_actor); } } }
@@ -57,7 +57,10 @@ { if (_actor != null) { GAMgr.Instance.reAdjustPosList.Add(_actor); if (!GAMgr.Instance.reAdjustPosList.Contains(_actor)) { GAMgr.Instance.reAdjustPosList.Add(_actor); } } } } Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
@@ -35,7 +35,7 @@ OpponentInformation.Instance.GetOpponentInformation0418(vNetData);//用于获取玩家护盾属性 if (PlayerDatas.Instance.PlayerId == vNetData.ObjID) { if ((PlayerDataRefresh)vNetData.ObjType == PlayerDataRefresh.HP) if ((PlayerDataRefresh)vNetData.RefreshType == PlayerDataRefresh.HP) { bool _sync = false; if (CrossServerRewardModel.IsCrossServerOneVsOne()) Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0419_tagPlayerReborn.cs
@@ -38,7 +38,7 @@ _player.SelectTarget = null; _player.InitBornPos(vNetData.PosX, vNetData.PosY); _player.ActorInfo.serverDie = false; _player.ActorInfo.ResetHp((int)_player.ActorInfo.MaxHp, (short)_player.ActorInfo.MaxHpEx); _player.ActorInfo.ResetHp(PlayerDatas.Instance.extersion.MaxHP, (short)_player.ActorInfo.MaxHpEx); _player.SelectTarget = null; _player.StopPathFind(); _player.IdleImmediate(); Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0434_tagAreaPlayerAppearEx.cs
@@ -44,6 +44,14 @@ _player = GAMgr.Instance.RequestPlayer<GA_Player>(vNetData.PlayerID, E_ActorGroup.Player, vNetData); if (StageManager.Instance.isLoading) { if (!GAMgr.Instance.reAdjustPosList.Contains(_player)) { GAMgr.Instance.reAdjustPosList.Add(_player); } } if (vNetData.IsAlive == 1) { if (vNetData.PlayerState == 1) Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0435_tagPetAppear.cs
@@ -46,7 +46,10 @@ if (StageManager.Instance.isLoading) { GAMgr.Instance.reAdjustPosList.Add(_pet); if (!GAMgr.Instance.reAdjustPosList.Contains(_pet)) { GAMgr.Instance.reAdjustPosList.Add(_pet); } } }
@@ -231,7 +231,7 @@ if (_fight == null) { #if UNITY_EDITOR Debug.LogErrorFormat("owner: {0} 类型问题: {1}" ,owner.ServerInstID, owner.GetType()); Debug.LogErrorFormat("owner: {0} 类型问题: {1}", owner.ServerInstID, owner.GetType()); #endif return; } @@ -367,8 +367,11 @@ { _target.Die(owner.ServerInstID); } else { _target.ActorInfo.ResetHp((int)_target.ActorInfo.SyncServerHp, (short)_target.ActorInfo.SyncServerHpEx); } _target.ActorInfo.ResetHp((int)_target.ActorInfo.SyncServerHp, (short)_target.ActorInfo.SyncServerHpEx); // 主角血量扣除的补充 if (_target.ServerInstID == PlayerDatas.Instance.PlayerId) { Fight/Stage/StageManager.cs
@@ -500,7 +500,7 @@ } _hero.State = E_ActorState.Idle; _hero.ActorInfo.ResetHp((int)PlayerDatas.Instance.baseData.HP, -1, (int)PlayerDatas.Instance.baseData.HP); _hero.ActorInfo.ResetHp((int)PlayerDatas.Instance.baseData.HP, -1, (int)PlayerDatas.Instance.extersion.MaxHP); _hero.CalculateMoveSpeed((ushort)PlayerDatas.Instance.extersion.SpeedValue); _hero.CalculateAtkSpeed(PlayerDatas.Instance.extersion.battleValEx1); _hero.InitBornPos(PlayerDatas.Instance.baseData.PosX, PlayerDatas.Instance.baseData.PosY); System/CrossServerOneVsOne/FightingPKWin.cs
@@ -82,7 +82,7 @@ OnCreateGridLineCel2(m_ScrollerController2); IsShowMyBuffBtn(); IsShowOpponentBuffBtn(); } protected override void OnActived() @@ -93,9 +93,9 @@ Viewport2.gameObject.SetActive(false); } protected override void OnAfterOpen() { { HeroBehaviour.OnStopHandupAI += OnHeroHandupAIStopPassive; HeroBehaviour.OnStartHandupAI += OnHeroHandupAIStarted; dungeonModel.dungeonCoolDownEvent += DungeonCoolDownEvent; @@ -126,14 +126,14 @@ OpponentInformation.Instance.ShieldUpdate -= ShieldUpdate; } protected override void OnAfterClose() { } protected override void LateUpdate() { if (PlayerDatas.Instance.hero!=null && PlayerDatas.Instance.hero.aiHandler.IsAuto()) if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.aiHandler.IsAuto()) { m_AutoImg.SetActive(false); } @@ -151,13 +151,13 @@ } else { var surplus = dungeonEndTime - DateTime.Now; var surplus = dungeonEndTime - DateTime.Now; m_CountdownText.text = (Mathf.CeilToInt((float)surplus.TotalSeconds)).ToString(); } } #endregion private void OnHeroHpChanged(ulong hp) { PlaceOfBirthUpdate(positionType); @@ -196,7 +196,7 @@ private void BuffUpdateEvent(int playerID) { int opponentPlayerId = CrossServerLogin.Instance.oneVsOnePlayerData.opponentPlayerId; if (playerID == opponentPlayerId) { @@ -239,7 +239,7 @@ } private void OnRefreshPlayerLifeBar(uint _instanceId, ulong _hp, ulong _maxHp) { // DebugEx.LogError("最大血量"+ _maxHp+"当前血量"+ _hp); // DebugEx.LogError("最大血量"+ _maxHp+"当前血量"+ _hp); if (positionType == 1) { m_RoleInformation2.SetHeroHP((int)_maxHp, (int)_hp); @@ -264,7 +264,7 @@ m_RoleInformation1.SetShieldNumber(CrossServerLogin.Instance.oneVsOnePlayerData.MaxProDef, shieldNow); } } // DebugEx.LogError("输出玩家的ID" + playerID+"输出当前护盾值"+ shieldNow); // DebugEx.LogError("输出玩家的ID" + playerID+"输出当前护盾值"+ shieldNow); } private void OnHeroHandupAIStopPassive() { @@ -323,7 +323,7 @@ m_ScoreText2.text = youWin.ToString(); } else { { m_ScoreText1.text = youWin.ToString(); m_ScoreText2.text = myWin.ToString(); } @@ -420,7 +420,7 @@ { _ScrollRect2.vertical = true; (Viewport2 as RectTransform).sizeDelta = (Viewport2 as RectTransform).sizeDelta.SetY(MaxHeight + UpperAndLower); } } } else { @@ -433,7 +433,7 @@ { _ScrollRect2.vertical = false; (Viewport2 as RectTransform).sizeDelta = (Viewport2 as RectTransform).sizeDelta.SetY(_MyBuffSortList.Count * ItemHeight + UpperAndLower); } } } } void UpdateControllerPositionOppoent() @@ -596,6 +596,9 @@ m_RoleInformation1.SetHeroLvAndName((int)PlayerDatas.Instance.baseData.LV, PlayerName); m_RoleInformation1.SetHeroHP(PlayerDatas.Instance.extersion.MaxHP, (int)PlayerDatas.Instance.baseData.HP); m_RoleInformation1.SetShieldNumber(PlayerDatas.Instance.extersion.MaxProDef, (int)PlayerDatas.Instance.baseData.ExAttr4); #if UNITY_EDITOR Debug.LogFormat("设置血量: {0}/{1}", PlayerDatas.Instance.baseData.HP, PlayerDatas.Instance.extersion.MaxHP); #endif } else { @@ -603,16 +606,19 @@ m_RoleInformation2.SetHeroLvAndName((int)PlayerDatas.Instance.baseData.LV, PlayerName); m_RoleInformation2.SetHeroHP(PlayerDatas.Instance.extersion.MaxHP, (int)PlayerDatas.Instance.baseData.HP); m_RoleInformation2.SetShieldNumber(PlayerDatas.Instance.extersion.MaxProDef, (int)PlayerDatas.Instance.baseData.ExAttr4); #if UNITY_EDITOR Debug.LogFormat("设置血量: {0}/{1}", PlayerDatas.Instance.baseData.HP, PlayerDatas.Instance.extersion.MaxHP); #endif } } private void GetopponentBuff()//获取对手身上的Buff { List<int> buffIds=new List<int>(); List<int> buffIds = new List<int>(); _OpponentBuffSortList.Clear(); StatusMgr.Instance.GetBuffIds((uint)CrossServerLogin.Instance.oneVsOnePlayerData.opponentPlayerId, ref buffIds); if (buffIds.Count > 0) { { for (int i = 0; i < buffIds.Count; i++) { _OpponentBuffSortList.Add(buffIds[i]);
