Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2019-02-16 2eb8b112429c33c9f4541c0361199e7690e2dfcf

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/CrossServerOneVsOneClient/ClientCrossServerOneVsOneStage.cs

@@ -155,6 +155,7 @@
            opponentPlayer.ActorInfo.ResetHp((int)playerInfo.maxHp, -1, (int)playerInfo.maxHp, -1);
            opponentPlayer.ActorInfo.serverDie = false;
            opponentPlayer.IdleImmediate();
            opponentPlayer.SkillMgr.ResetAllCD();
            GA_PVPClientPlayer.AutoAI(false);

            PlayerDatas.Instance.baseData.HP = (uint)PlayerDatas.Instance.extersion.MaxHP;
@@ -163,6 +164,7 @@
            PlayerDatas.Instance.FightRefreshPlayerHp((uint)maxHp);
            PlayerDatas.Instance.hero.IdleImmediate();
            PlayerDatas.Instance.hero.Behaviour.StopHandupAI(true);
            PlayerDatas.Instance.hero.SkillMgr.ResetAllCD();

            opponentPlayer.Pos = ClientCrossServerOneVsOne.myPlace == 1 ? rightBornPoint : leftBornPoint;
            PlayerDatas.Instance.hero.Pos = ClientCrossServerOneVsOne.myPlace == 1 ? leftBornPoint : rightBornPoint;
@@ -287,6 +289,7 @@
                opponentPlayer.ActorInfo.ResetHp((int)playerInfo.maxHp, -1, (int)playerInfo.maxHp, -1);
                opponentPlayer.ActorInfo.serverDie = false;
                opponentPlayer.IdleImmediate();
                opponentPlayer.SkillMgr.ResetAllCD();

                if (PlayerDatas.Instance.hero.ActorInfo.RealHp <= 0)
                {
@@ -304,6 +307,7 @@
                PlayerDatas.Instance.hero.ActorInfo.ResetHp(maxHp, -1, maxHp, -1);
                PlayerDatas.Instance.FightRefreshPlayerHp((uint)maxHp);
                PlayerDatas.Instance.hero.IdleImmediate();
                PlayerDatas.Instance.hero.SkillMgr.ResetAllCD();

                if (opponentPlayer.ActorInfo.RealHp <= 0)
                {