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

client_Hale

2018-08-24 cdfc038f08288e20958526880d50ba5a00721337

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

 System/KnapSack/PreciousItemGetBehaviour.cs

@@ -43,7 +43,6 @@


        public void ShowItem()

        {

            m_PreciousItem.gameObject.SetActive(false);

            if (model.currentShowItem != default(PreciousItemGetModel.PreciousItem))

            {

                var itemModel = playerPack.GetItemModelByGUID(model.currentShowItem.guid);

@@ -62,6 +61,14 @@
                        m_PreciousItem.gameObject.SetActive(true);

                    }

                }

                else

                {

                    m_PreciousItem.gameObject.SetActive(false);

                }

            }

            else

            {

                m_PreciousItem.gameObject.SetActive(false);

            }

            model.isGetNewItem = false;

        }


 System/Treasure/TreasureModel.cs

@@ -245,6 +245,7 @@
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFunctionStateChange;

            packageModel.RefreshItemCountAct += OnPackageItemChange;

            WindowCenter.Instance.windowAfterOpenEvent += OnWindowOpen;

            NewBieCenter.Instance.guideCompletedEvent += GuideComplete;

        }



        public override void UnInit()

@@ -252,6 +253,7 @@
            achievementModel.achievementProgressUpdateEvent -= OnAchievementProgressUpdate;

            achievementModel.achievementAwardableEvent -= OnAchievementAwardable;

            achievementModel.achievementCompletedEvent -= OnAchievementCompleted;

            NewBieCenter.Instance.guideCompletedEvent -= GuideComplete;



            DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent -= OnGetSkillLevelUpResult;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnTreasurePotentialSPChange;

@@ -392,7 +394,7 @@
            LocalSave.SetInt(StringUtility.Contact(_playerId, _type, "_TreasureUnlockShow"), _id);

        }



        public void SetTreasureStageShow(int _id,int _stage)

        public void SetTreasureStageShow(int _id, int _stage)

        {

            LocalSave.SetInt(StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID,

                "_TreasureStageShow_", _id), _stage);

@@ -525,17 +527,7 @@
                            newGotTreasureId = id;

                            treasureEntranceShowId = id;



                            var mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

                            if (mapConfig.MapFBType == (int)MapType.OpenCountry)

                            {

                                if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

                                {

                                    if (PreFightMission.Instance.IsFinished())

                                    {

                                        WindowCenter.Instance.Open<TreasureNewGotWin>();

                                    }

                                }

                            }

                            OpenTreasureNewGot();

                        }



                        if (treasureCollectingShowId == id)

@@ -845,13 +837,7 @@
        {

            if (_window is MainInterfaceWin)

            {

                if (newGotTreasureId != 0)

                {

                    if (PreFightMission.Instance.IsFinished())

                    {

                        WindowCenter.Instance.Open<TreasureNewGotWin>();

                    }

                }

                SnxxzGame.Instance.StartCoroutine(Co_OpenTreasureNewGot());

                if (needDisplayReguluLevelUp)

                {

                    CheckReguluPop();

@@ -859,6 +845,44 @@
            }

        }



        void GuideComplete(int _id)

        {

            SnxxzGame.Instance.StartCoroutine(Co_OpenTreasureNewGot());

        }



        IEnumerator Co_OpenTreasureNewGot()

        {

            yield return WaitingForSecondConst.WaitMS600;

            OpenTreasureNewGot();

        }



        public void CheckOpenTreasureNewGot()

        {

            SnxxzGame.Instance.StartCoroutine(Co_OpenTreasureNewGot());

        }



        private void OpenTreasureNewGot()

        {

            if (!(StageManager.Instance.CurrentStage is DungeonStage) || !serverInited)

            {

                return;

            }

            if (!PreFightMission.Instance.IsFinished() || newGotTreasureId == 0

                || NewBieCenter.Instance.inGuiding || !WindowCenter.Instance.CheckOpen<MainInterfaceWin>()

                || WindowCenter.Instance.ExitAnyFullScreenOrMaskWinLEqual(WindowType.Base)

                || WindowCenter.Instance.CheckOpen<TreasureNewGotWin>())

            {

                return;

            }

            var dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>();

            var mapId = dungeonModel.GetDungeonDataIdByMapId(PlayerDatas.Instance.baseData.MapID);

            if (mapId == 41110)

            {

                return;

            }

            WindowCenter.Instance.Open<TreasureNewGotWin>();

        }



        private void UpdateSkillLevelUpRedpoint(int _treasureId)

        {

            if (treasures.ContainsKey(_treasureId))


 System/Vip/VipRechargeWin.cs

@@ -133,6 +133,7 @@
            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

                ModelCenter.Instance.GetModel<TreasureModel>().CheckOpenTreasureNewGot();

            }

        }

        #endregion