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

client_linchunjie

2018-08-14 932ac22422885383b09800ac90e9a3a9919b0341

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

 System/KnapSack/New/BagWin.cs

@@ -161,6 +161,8 @@
        {

            if (type != PackType.rptItem)

                return;



            _gridlineCtrl.JumpIndex(0);

            OnRefrenshUIModel();

        }




 System/KnapSack/New/DepotWin.cs

@@ -136,6 +136,7 @@
        {

            if (type != PackType.rptWarehouse)

                return;

            _gridlineCtrl.JumpIndex(0);

            OnCreateGridLineCell(_gridlineCtrl);

        }




 System/Store/StoreWin.cs

@@ -106,6 +106,29 @@
        protected override void OnActived()

        {

            base.OnActived();

            if(!WindowJumpMgr.Instance.IsJumpState && functionOrder == 0)

            {

                if(m_storeModel.storeFunc1Point.state == RedPointState.Simple)

                {

                    functionOrder = _weekStoreTitle.order;

                }

                else if(m_storeModel.storeFunc2Point.state == RedPointState.Simple)

                {

                    functionOrder = _commonStoreTitle.order;

                }

                else if (m_storeModel.storeFunc3Point.state == RedPointState.Simple)

                {

                    functionOrder = _growStrongerStoreTitle.order;

                }

                else if (m_storeModel.storeFunc4Point.state == RedPointState.Simple)

                {

                    functionOrder = _bindStoreTitle.order;

                }

                else if (m_storeModel.storeFunc5Point.state == RedPointState.Simple)

                {

                    functionOrder = _integralStoreTitle.order;

                }

            }

            _funcBtnGroup.TriggerByOrder(functionOrder);

            GlobalTimeEvent.Instance.secondEvent += RefreshResetTime;

        }


 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;

            }



@@ -1103,6 +1103,7 @@
        {

            if (isMatching)

            {

                SysNotifyMgr.Instance.ShowTip("TeamMatchingTimeOut");

                RequestCancelAutoMatchTeam();

            }

        }


 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>();

            }

        }