少年修仙传客户端代码仓库
client_Zxw
2018-08-24 f66d0695014da92dc821e1b207a58ba733b1066c
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
27个文件已修改
158 ■■■■ 已修改文件
System/AssetVersion/InGameDownLoadProgress.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestWin.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzWin.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/FairyAuTaskWin.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/UnionPanel.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FindPrecious/FindPreciousFrameWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Market/MarketWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServerActivityWin.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServerGiftWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Pet/PetWin.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Rank/RankPanel.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Realm/RealmWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/RolePanel.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RolePromote/RolePromoteWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Rune/RunePanel.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RuneTower/RuneNewGotWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RuneTower/RuneTowerWin.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Skill/SkillPanel.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/SystemSetting/SettingUpWin.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureSelectWin.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureSoulWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/VipExperienceWin.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/VipRechargeWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WorldMap/LocalMapWin.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WorldMap/MapFrameWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WorldMap/WorldMapWin.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/AssetVersion/InGameDownLoadProgress.cs
@@ -107,6 +107,8 @@
        {
            m_ProgressSlider.fillAmount = InGameDownLoad.Instance.progress;
            if (InGameDownLoad.Instance.state == InGameDownLoad.State.DownLoad)
            {
            if (m_ProgressText != null)
            {
                var progress = Mathf.RoundToInt(InGameDownLoad.Instance.progress * 100);
@@ -114,6 +116,8 @@
            }
        }
        }
        private void OpenInGameDownloadWin()
        {
            switch (InGameDownLoad.Instance.state)
System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs
@@ -145,8 +145,7 @@
        {
            WindowJumpMgr.Instance.ClearJumpData();
            WindowCenter.Instance.Close<DailyQuestWin>();
            WindowCenter.Instance.Open<RealmWin>();
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RealmFunc1);
        }
        private void GetPracticePoint()
System/DailyQuest/DailyQuestWin.cs
@@ -71,7 +71,10 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        protected override void OnActived()
@@ -518,7 +521,7 @@
            if (gotoTreasureId == 0)
            {
                treasureModel.currentCategory = TreasureCategory.Human;
                WindowCenter.Instance.Open<TreasureSelectWin>();
                WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.TreasureFunc1);
            }
            else
            {
@@ -528,14 +531,48 @@
                    treasureModel.treasureGotoId = gotoTreasureId;
                    var config = Config.Instance.Get<TreasureConfig>(unlockShowTreasure);
                    treasureModel.currentCategory = (TreasureCategory)config.Category;
                    WindowCenter.Instance.Open<TreasureSelectWin>();
                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.TreasureFunc1);
                }
                else
                {
                    var config = Config.Instance.Get<TreasureConfig>(gotoTreasureId);
                    treasureModel.selectedTreasure = gotoTreasureId;
                    treasureModel.currentCategory = (TreasureCategory)config.Category;
                    WindowCenter.Instance.Open<TreasureLevelUpWin>();
                    switch (gotoTreasureId)
                    {
                        case 101:
                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DhszTs);
                            break;
                        case 102:
                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.HyqTs);
                            break;
                        case 103:
                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.GyzTs);
                            break;
                        case 104:
                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.LqhTs);
                            break;
                        case 105:
                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.PlyTs);
                            break;
                        case 106:
                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.XhqTs);
                            break;
                        case 107:
                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DhzTs);
                            break;
                        case 108:
                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ZjhlTs);
                            break;
                        case 109:
                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.YldTs);
                            break;
                        case 110:
                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StfTs);
                            break;
                    }
                }
            }
        }
System/Dogz/DogzWin.cs
@@ -75,14 +75,16 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        void OnClose()
        {
            CloseChild();
            CloseImmediately();
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        void CloseChild()
System/FairyAu/FairyAuTaskWin.cs
@@ -124,6 +124,10 @@
            PlayerTaskDatas.Event_FairyAuTask -= FairyAuRefresh;
            PlayerTaskDatas.Event_FairyAuReward -= FairyAuGrades;
            taskmodel.FairyAuBool = false;
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        private void OnPlayerDie()
@@ -226,7 +230,6 @@
        void CloseButton()//关闭按钮
        {
            WindowCenter.Instance.CloseImmediately<FairyAuTaskWin>();
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        void CompleteTaskDeletion()//删除完成的任务
        {
System/FairyAu/UnionPanel.cs
@@ -152,8 +152,11 @@
        {
            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFariyInfo;
            PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyMine;
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        }
        void CloseChildWin()
System/FindPrecious/FindPreciousFrameWin.cs
@@ -59,8 +59,11 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        }
        protected override void OnActived()
        {
System/Market/MarketWin.cs
@@ -99,8 +99,11 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        }
        #endregion
        private void OnClose()
        {
System/OpenServerActivity/OpenServerActivityWin.cs
@@ -121,13 +121,15 @@
            OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;
            OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;
            CloseOtherWin();
            WindowCenter.Instance.Open<MainInterfaceWin>();
            impactRankModel.gotoImpactRankType = 0;
        }
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        int GetDefaultSelect()
System/OpenServerActivity/OpenServerGiftWin.cs
@@ -115,10 +115,6 @@
        private void OnCloseClick()
        {
            CloseImmediately();
            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
    }
System/Pet/PetWin.cs
@@ -27,7 +27,6 @@
        {
            CloseChild();
            WindowCenter.Instance.CloseImmediately<PetWin>();
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        protected override void BindController()
@@ -52,6 +51,10 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        protected override void OnActived()
System/Rank/RankPanel.cs
@@ -335,8 +335,11 @@
        protected override void OnAfterClose()
        {
            PlayerDatas.Instance.rank.OnRefreshRank -= OnRefreshRankList;
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
    }
}
}
System/Realm/RealmWin.cs
@@ -73,8 +73,11 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        }
        #endregion
        private void CloseChildWin()
System/Role/RolePanel.cs
@@ -357,7 +357,10 @@
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnRefreshPlayerInfo;
            titleModel.OnRefreshGainTitle -= OnRefreshTitle;
            PlayerDatas.Instance.OnRoleAttrRefresh -= OnRefreshWorldLv;
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
            }
            PlayerDatas.Instance.RefreshPlayerInfoEvent -= RefreshPlayerInfoEvent;
            CloseChild();
        }
System/RolePromote/RolePromoteWin.cs
@@ -88,8 +88,11 @@
        protected override void OnAfterClose()
        {
            CloseChild();
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        }
        #endregion
        private void OnResource()
        {
System/Rune/RunePanel.cs
@@ -103,8 +103,11 @@
        }
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        }
        private void CloseChild()
        {
System/RuneTower/RuneNewGotWin.cs
@@ -43,7 +43,7 @@
            m_RuneIcon.SetSprite(itemConfig.IconKey);
            var runeType = Language.Get(StringUtility.Contact("RuneType_", itemConfig.Effect1));
            m_UnLockType.text = Language.Get("RuneTower15", runeType);
            m_RuneEffect1.text = Language.Get("RuneTypeDesc_", itemConfig.Effect1);
            m_RuneEffect1.text = Language.Get(StringUtility.Contact("RuneTypeDesc_", itemConfig.Effect1));
            autoCloseTime = Time.time + 10;
            m_CoolDown.text = Language.Get("RuneTower9", 10);
System/RuneTower/RuneTowerWin.cs
@@ -109,6 +109,10 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        protected override void OnActived()
@@ -136,7 +140,6 @@
        public override void CloseClick()
        {
            base.CloseClick();
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        #endregion
System/Skill/SkillPanel.cs
@@ -105,8 +105,11 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        }
        void OnClose()
        {
System/SystemSetting/SettingUpWin.cs
@@ -79,7 +79,10 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        #endregion
@@ -182,11 +185,6 @@
        private void CloseWin()
        {
            CloseImmediately();
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
System/Treasure/TreasureSelectWin.cs
@@ -77,7 +77,6 @@
                }
                CloseImmediately();
                UI3DTreasureSelectStage.Instance.Close();
                WindowCenter.Instance.Open<MainInterfaceWin>();
            });
        }
@@ -128,6 +127,10 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState && !m_CorrectClose)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        #endregion
System/Treasure/TreasureSoulWin.cs
@@ -119,8 +119,11 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        }
        #endregion
        private void AchievementCompletedEvent(int _id)
System/Vip/VipExperienceWin.cs
@@ -55,11 +55,14 @@
        protected override void OnPreClose()
        {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        #endregion
        private void OnExperienceBtn()
System/Vip/VipRechargeWin.cs
@@ -130,8 +130,11 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        }
        #endregion
        private void OnClose()
System/WorldMap/LocalMapWin.cs
@@ -63,7 +63,10 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        protected override void OnActived()
@@ -78,11 +81,6 @@
        public override void CloseClick()
        {
            base.CloseClick();
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        void Init()
System/WorldMap/MapFrameWin.cs
@@ -58,8 +58,11 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
            WindowCenter.Instance.Open<MainInterfaceWin>();
        }
        }
        protected override void OnActived()
        {
System/WorldMap/WorldMapWin.cs
@@ -56,6 +56,10 @@
        protected override void OnAfterClose()
        {
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        protected override void OnActived()
@@ -67,11 +71,6 @@
        public override void CloseClick()
        {
            base.CloseClick();
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }
        void Init()