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

client_Hale

2019-01-10 3b4dfe6c175154be50f163a7268b6a22580e2783

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

 System/DogzDungeon/DogzDungeonWin.cs

@@ -300,7 +300,7 @@
                    m_ContainerBoxCollectWeary.gameObject.SetActive(false);
                    m_ContainerBossKillWeary.gameObject.SetActive(true);
                    var wearyValueLimit = GeneralDefine.bossWearyValues[2];
                    m_BossKillWearyValue.text = StringUtility.Contact(model.wearyValue, "/", wearyValueLimit);
                    m_BossKillWearyValue.text = Language.Get("WorldBoss_Endurance0", wearyValueLimit - model.wearyValue);
                    m_BossKillWearyValue.colorType = model.wearyValue >= wearyValueLimit ? TextColType.Red : TextColType.DarkGreen;
                    break;
            }

 System/FashionDress/FashionDressModel.cs

@@ -76,7 +76,7 @@
        public event Action selectQualityRefresh;

        public event Action cabinetRefresh;

        public event Action<int> fashionDressRefresh;

        public event Action<int> previewRefresh;

        public event Action<int> selectFashionDressRefresh;

        public event Action<int> virtualEquipRefresh;



        PlayerPackModel packModel

@@ -362,9 +362,9 @@
        public void SetSelectFashionDress(int type, int id)

        {

            fashionDressSelectDict[type] = id;

            if (previewRefresh != null)

            if (selectFashionDressRefresh != null)

            {

                previewRefresh(type);

                selectFashionDressRefresh(type);

            }

        }




 System/FashionDress/FashionDressWin.cs

@@ -66,7 +66,7 @@
            model.cabinetRefresh += FashionDressCabinetRefresh;

            model.selectTypeRefresh += SelectTypeRefresh;

            model.selectQualityRefresh += SelectQualityRefresh;

            model.previewRefresh += PreviewRefresh;

            model.selectFashionDressRefresh += SelectFashionDressRefresh;

            //model.virtualEquipRefresh += VirtualEquipRefresh;

            model.fashionDressRefresh += FashionDressRefresh;

            packModel.RefreshItemCountAct += RefreshItemCountAct;

@@ -91,7 +91,7 @@
            model.cabinetRefresh -= FashionDressCabinetRefresh;

            model.selectTypeRefresh -= SelectTypeRefresh;

            model.selectQualityRefresh -= SelectQualityRefresh;

            model.previewRefresh -= PreviewRefresh;

            model.selectFashionDressRefresh -= SelectFashionDressRefresh;

            packModel.RefreshItemCountAct -= RefreshItemCountAct;

            model.fashionDressRefresh -= FashionDressRefresh;

            //model.virtualEquipRefresh -= VirtualEquipRefresh;

@@ -104,6 +104,8 @@
            {

                m_FashionDressQualitys[i].Dispose();

            }



            UI3DModelExhibition.Instance.StopShow();



            model.TryEquip();

        }

@@ -219,7 +221,7 @@
            DisplayFashionDress();

        }



        private void PreviewRefresh(int type)

        private void SelectFashionDressRefresh(int type)

        {

            if (model.selectType == type)

            {

@@ -375,10 +377,10 @@
        private void ViewDetail()

        {

            var virtualEquipId = model.GetVirtualEquipFashionDress(model.selectType);

            var previewId = model.GetSelectFashionDress(model.selectType);

            if (previewId != 0)

            var selectFashionDress = model.GetSelectFashionDress(model.selectType);

            if (selectFashionDress != 0)

            {

                model.ViewFashionDressDetails(previewId);

                model.ViewFashionDressDetails(selectFashionDress);

            }

            else if (virtualEquipId != 0)

            {


 System/FindPrecious/PersonalBossWin.cs

@@ -39,8 +39,7 @@
        {

            totalTimes = dungeonModel.GetTotalTimes(PersonalBossModel.PERSONALBOSS_MAPID);

            enterTimes = dungeonModel.GetEnterTimes(PersonalBossModel.PERSONALBOSS_MAPID);

            m_Times.text = StringUtility.Contact(totalTimes - enterTimes, "/", totalTimes);



            m_Times.text =  Language.Get("WorldBoss_Endurance0", totalTimes - enterTimes);

            m_Times.color = UIHelper.GetUIColor((totalTimes - enterTimes) > 0 ? TextColType.Green : TextColType.Red, true);

        }




 System/FindPrecious/WorldBossWin.cs

@@ -44,7 +44,7 @@
        protected override void OnPreOpen()

        {

            var wearyValueLimit = GeneralDefine.bossWearyValues[0] + model.extraBossWearyValue;

            m_WearyValue.text = StringUtility.Contact(model.wearyValue, "/", wearyValueLimit);

            m_WearyValue.text = Language.Get("WorldBoss_Endurance0", wearyValueLimit - model.wearyValue);

            m_WearyValue.colorType = model.wearyValue >= wearyValueLimit ? TextColType.Red : TextColType.DarkGreen;

        }




 System/Realm/RealmBossShow.cs

@@ -250,7 +250,7 @@
            if (clothesModel != null)

            {

                var animator = clothesModel.GetComponent<Animator>();

                animator.Play(GAStaticDefine.State_SitDown);

                animator.SetInteger(GAStaticDefine.Param_Action, GAStaticDefine.Act_Dazuo);

            }

        }




 System/Tip/SkillDetailsWin.cs

@@ -63,7 +63,7 @@


        protected override void OnPreClose()

        {

            UI3DModelExhibition.Instance.StopShow();

            UI3DModelExhibition.InstanceClone1.StopShow();

        }



        protected override void OnAfterClose()

@@ -169,7 +169,7 @@
                job = job,

                godWeapons = godWeaponDict,

            };

            UI3DModelExhibition.Instance.ShowOtherPlayer(m_RawPlayer, data);

            UI3DModelExhibition.InstanceClone1.ShowOtherPlayer(m_RawPlayer, data);



            DisplayFightPower();

        }


 System/Welcome/WelcomeWin.cs

@@ -36,6 +36,7 @@

        protected override void OnPreOpen()
        {
            timer = 0f;
            m_Close.gameObject.SetActive(false);
            superOutTime = m_OutTime + 5f;
            ensured = false;