1565 组队准备界面取消，队长无法恢复原先的状态

client_Wu Xijin

2018-08-14 1c1c65c2e4e96b9ad1ebf3984140f04be70674df

1565  组队准备界面取消，队长无法恢复原先的状态

 System/Team/TeamModel.cs

@@ -554,7 +554,7 @@
            GameNetSystem.Instance.SendInfo(sendInfo);

        }



        public void ReqeustPrepareEnterDungeon(bool _prepare)

        public void RequestPrepareEnterDungeon(bool _prepare)

        {

            var sendInfo = new CB909_tagCGTeamMemberPrepare();

            sendInfo.PrepareState = (byte)(_prepare ? 1 : 2);

@@ -935,7 +935,7 @@
        {

            if (!AssetSource.sceneFromEditor && VersionConfig.Get().assetAccess != InstalledAsset.IngoreDownLoad && !AssetVersionUtility.unPriorAssetDownLoadDone)

            {

                ReqeustPrepareEnterDungeon(false);

                RequestPrepareEnterDungeon(false);

                return;

            }




 System/Team/TeamPrepareWin.cs

@@ -34,7 +34,7 @@


        bool autoHandupRecord = false;

        int moveToNPCRecord = 0;



        bool rejectManual = false;



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

        #region Built-in

@@ -51,6 +51,7 @@


        protected override void OnPreOpen()

        {

            rejectManual = false;

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

            moveToNPCRecord = MapTransferUtility.Instance.NpcID;



@@ -82,11 +83,31 @@


        protected override void OnPreClose()

        {

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

            {

                if (autoHandupRecord)

                {

                    if (PlayerDatas.Instance.hero != null)

                    {

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

                    }



                    autoHandupRecord = false;

                }



                if (moveToNPCRecord != 0)

                {

                    MapTransferUtility.Instance.MoveToNPC(moveToNPCRecord);

                    moveToNPCRecord = 0;

                }

            }



            model.memberPrepareStateChangeEvent -= ShowPrepareStates;

        }



        protected override void OnAfterClose()

        {



        }

        #endregion



@@ -114,27 +135,12 @@


        private void Reject()

        {

            if (autoHandupRecord)

            {

                if (PlayerDatas.Instance.hero != null)

                {

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

                }



                autoHandupRecord = false;

            }



            if (moveToNPCRecord != 0)

            {

                MapTransferUtility.Instance.MoveToNPC(moveToNPCRecord);

                moveToNPCRecord = 0;

            }



            var myPlayerId = PlayerDatas.Instance.baseData.PlayerID;

            var prepareState = model.teamPrepare.GetPlayerPrepareSate((int)myPlayerId);

            if (prepareState == TeammatePrepareState.UnPrepared)

            {

                model.ReqeustPrepareEnterDungeon(false);

                rejectManual = true;

                model.RequestPrepareEnterDungeon(false);

                WindowCenter.Instance.Close<TeamPrepareWin>();

            }

        }

@@ -145,7 +151,7 @@
            var prepareState = model.teamPrepare.GetPlayerPrepareSate((int)myPlayerId);

            if (prepareState == TeammatePrepareState.UnPrepared)

            {

                model.ReqeustPrepareEnterDungeon(true);

                model.RequestPrepareEnterDungeon(true);

            }

        }



@@ -153,7 +159,8 @@
        {

            if (model.myTeam.iamCaptainer)

            {

                model.ReqeustPrepareEnterDungeon(false);

                rejectManual = true;

                model.RequestPrepareEnterDungeon(false);

                WindowCenter.Instance.Close<TeamPrepareWin>();

            }

        }