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

client_Wu Xijin

2018-12-29 dda9731bc5ae25b6aab7d92dcbb82fa11de660cd

 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -148,6 +148,7 @@
        {

            if (PlayerDatas.Instance.baseData.ExAttr5 != 1) return;



            var hero = PlayerDatas.Instance.hero;

            var mission = dungeonModel.mission;

            if(mission.prepareTime > 0)

            {

@@ -156,6 +157,11 @@
                {

                    WindowCenter.Instance.Open<CrossServerOneVsOneRoundWin>();

                }

                if(hero != null)

                {

                    hero.Behaviour.StopHandupAI(true);

                }

              
            }

            DebugEx.LogFormat("副本帮助信息回合是否开始：：{0}",mission.isStart);

            if (mission.isStart == 1)

@@ -169,6 +175,10 @@
                {

                    WindowCenter.Instance.Open<CrossServerOneVsOneStartFightWin>();

                }

                if (hero != null)

                {

                    hero.Behaviour.StartHandupAI();

                }

            }

        }