5398 子 【开发】【1.4】跨服竞技场 => 修复跨服出来视野中的玩家和NPC看不见. 修复玩家死亡后回主服没有站起来

client_Hale

2018-12-28 df4178cd9fef70f07dfb52ab9e6e5552b681211e

5398 子 【开发】【1.4】跨服竞技场 => 修复跨服出来视野中的玩家和NPC看不见. 修复玩家死亡后回主服没有站起来

 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs

@@ -228,6 +228,8 @@
                _hero.StopAll();

                _hero.InitBornPos(vNetData.PosX, vNetData.PosY);

                _hero.RequestName();

                _hero.ActorInfo.serverDie = false;

                _hero.IdleImmediate();

            }

        }




 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs

@@ -137,12 +137,17 @@


                    break;

                case E_NpcType.SGZC_FightAssist:

                    




                    GAMgr.Instance.RequestPlayer<GA_NpcFightSgzcZZ>(vNetData.ObjID, E_ActorGroup.Player, vNetData);



                    break;

            }



            if (StageManager.Instance.isLoading)

            {

                GAMgr.Instance.reAdjustPosList.Add(_actor);

            }

        }



#if UNITY_EDITOR


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0408_tagPlayerSummonNPCAppear.cs

@@ -30,8 +30,8 @@

        if (_npcConfig.NPCType == (int)E_NpcType.Collect)
        {
            GAMgr.Instance.RequestNpcNoFight<GA_NpcSummonFunc>(vNetData.ObjID,
                vNetData.NPCID, E_ActorGroup.FuncNpc, vNetData);
            _actor = GAMgr.Instance.RequestNpcNoFight<GA_NpcSummonFunc>(vNetData.ObjID,
                  vNetData.NPCID, E_ActorGroup.FuncNpc, vNetData);
        }
        else
        {
@@ -42,8 +42,16 @@
                _group = _owner.Group;
            }

            GAMgr.Instance.RequestNPCFight<GA_NpcSummonFight>(vNetData.ObjID,
                vNetData.NPCID, _group, vNetData);
            _actor = GAMgr.Instance.RequestNPCFight<GA_NpcSummonFight>(vNetData.ObjID,
                   vNetData.NPCID, _group, vNetData);
        }

        if (StageManager.Instance.isLoading)
        {
            if (_actor != null)
            {
                GAMgr.Instance.reAdjustPosList.Add(_actor);
            }
        }
    }
}

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0435_tagPetAppear.cs

@@ -36,6 +36,11 @@
        }
        _pet = GAMgr.Instance.RequestNPCFight<GA_Pet>(vNetData.PetID, vNetData.NPCID, _group, vNetData);


        if (StageManager.Instance.isLoading)
        {
            GAMgr.Instance.reAdjustPosList.Add(_pet);
        }
    }

}

 Fight/GameActor/GAMgr.cs

@@ -7,8 +7,9 @@


[XLua.LuaCallCSharp]

public class GAMgr : SingletonMonobehaviour<GAMgr>



{

    public List<GActor> reAdjustPosList = new List<GActor>();



    private List<BossSkillTip_JudgeSummon> m_BossSkillTipList = new List<BossSkillTip_JudgeSummon>();



    public Dictionary<int, string> s_NpcID2BundleName = new Dictionary<int, string>();


 Fight/GameActor/GA_Player.cs

@@ -47,7 +47,7 @@


        // 初始化坐标

        AdjustPos(m_H0434.PosX, m_H0434.PosY);



        ActorInfo.serverBornPos = new Vector2(m_H0434.PosX, m_H0434.PosY);

        // 计算移动速度

        CalculateMoveSpeed(m_H0434.Speed);




 Fight/Stage/StageManager.cs

@@ -415,6 +415,11 @@
        WindowCenter.Instance.Close<LoadingWin>();

        SystemSetting.Instance.SetGameFps(SystemSetting.Instance.GetGameFps());



        foreach(var _actor in GAMgr.Instance.reAdjustPosList)

        {

            _actor.AdjustPos((ushort)_actor.ActorInfo.serverBornPos.x,(ushort)_actor.ActorInfo.serverBornPos.y);

        }

        GAMgr.Instance.reAdjustPosList.Clear();

    }



    IEnumerator BackToNoviceVillageWhileMapResourceLacked(int _mapResId)