Merge branch 'master' into leonard

client_Wu Xijin

2018-08-15 0012445c0109fa67987800a1bac8f32e989b2d19

 System/Team/TeamPrepareWin.cs

@@ -31,9 +31,6 @@
        float timer = 0f;



        bool alreadyAutoPrepare = false;



        bool autoHandupRecord = false;

        int moveToNPCRecord = 0;

        bool rejectManual = false;



        TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }

@@ -52,8 +49,10 @@
        protected override void OnPreOpen()

        {

            rejectManual = false;

            autoHandupRecord = PlayerDatas.Instance.hero.aiHandler.IsAuto();

            moveToNPCRecord = MapTransferUtility.Instance.NpcID;

            if (!model.myTeam.iamCaptainer)

            {

                model.RecordHeroAI();

            }



            PlayerDatas.Instance.hero.Behaviour.StopHandupAI();

            MapTransferUtility.Instance.Clear();

@@ -85,23 +84,21 @@
        {

            if (rejectManual || model.teamPrepare.isError || model.teamPrepare.IsReject())

            {

                if (autoHandupRecord)

                if (model.autoHandupRecord)

                {

                    if (PlayerDatas.Instance.hero != null)

                    {

                        PlayerDatas.Instance.hero.Behaviour.StartHandupAI();

                    }



                    autoHandupRecord = false;

                }



                if (moveToNPCRecord != 0)

                if (model.moveToNPCRecord != 0)

                {

                    MapTransferUtility.Instance.MoveToNPC(moveToNPCRecord);

                    moveToNPCRecord = 0;

                    MapTransferUtility.Instance.MoveToNPC(model.moveToNPCRecord);

                }

            }



            model.ClearHeroAIRecord();

            model.memberPrepareStateChangeEvent -= ShowPrepareStates;

        }