少年修仙传客户端代码仓库
client_Wu Xijin
2019-01-24 e53d449edd692b467c6d90cfcf804e781765cc9f
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
41 ■■■■ 已修改文件
System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyTower/JadeDynastyTowerRankBehaviour.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/BetterItemGetBehaviour.cs 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowJump/WindowJumpMgr.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs
@@ -25,11 +25,15 @@
         
            if(itemModel != null)
            {
                equipLvObj.SetActive(true);
                lockBtn.gameObject.SetActive(false);
                itemCell.Init(itemModel,true);
                string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", itemModel.chinItemModel.LV));
                equipLvText.text = Language.Get("L1091", equipLvSB);
                if (itemModel.EquipPlace > 0)
                {
                    equipLvObj.SetActive(true);
                    string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", itemModel.chinItemModel.LV));
                    equipLvText.text = Language.Get("L1091", equipLvSB);
                }
                itemCell.cellBtn.RemoveAllListeners();
                itemCell.cellBtn.AddListener(()=>
                {
System/JadeDynastyTower/JadeDynastyTowerRankBehaviour.cs
@@ -51,7 +51,7 @@
        private void ViewRank()
        {
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.JadeDynastyTowerRank);
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.JadeDynastyTowerRank289);
        }
        public struct RankInfo
System/KnapSack/BetterItemGetBehaviour.cs
@@ -25,6 +25,9 @@
        [SerializeField] Text coolTimeText;
        [SerializeField] Button m_Puton;
        [SerializeField] Button m_BetterEquipDetail;
        [SerializeField] GameObject equipLvObj;
        [SerializeField] Text equipLvText;
        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
        BetterEquipGetModel model { get { return ModelCenter.Instance.GetModel<BetterEquipGetModel>(); } }
@@ -143,8 +146,9 @@
        private void ToOpenJadeDynastyKnapsack(ItemModel betterEquip)
        {
            var model = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
            model.SetLookItemModel(betterEquip.itemInfo.ItemGUID);
            var equipModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
            equipModel.SetLookItemModel(betterEquip.itemInfo.ItemGUID);
            model.ReportConfirmBetterEquip(model.currentEquipGuid);
        }
        private void ShowBetterEquipDetails()
@@ -170,6 +174,17 @@
            m_FunctionTitle.text = Language.Get(itemConfig.ItemColor >= 3 ? "GoodEquip_See" : "GoodEquip_FitUp");
            m_EquipBehaviour.Init(betterModel, true);
            UpdateCoolTime(betterModel.itemInfo.ItemGUID);
            if(betterModel.packType == PackType.rptJadeDynastyItem && betterModel.chinItemModel.EquipPlace > 0)
            {
                equipLvObj.SetActive(true);
                string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", betterModel.chinItemModel.LV));
                equipLvText.text = Language.Get("L1091", equipLvSB);
            }
            else
            {
                equipLvObj.SetActive(false);
            }
        }
        IEnumerator Co_Delay(string _guid)
System/WindowJump/WindowJumpMgr.cs
@@ -192,6 +192,7 @@
            case JumpUIType.EquipCompose268:
            case JumpUIType.EquipCompose269:
            case JumpUIType.EquipCompose270:
            case JumpUIType.EquipCompose291:
                int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
                if(types.Length > 0)
                {
@@ -378,6 +379,7 @@
            case JumpUIType.LootPreciousFrameFunc1:
            case JumpUIType.DogzDungeon:
            case JumpUIType.FairyGrabBoss:
            case JumpUIType.JadeDynastyBoss290:
                SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.LootPreciousFrameSpec:
@@ -706,7 +708,7 @@
            case JumpUIType.JadeDynastyTower288:
                SetJumpLogic<TowerWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.JadeDynastyTowerRank:
            case JumpUIType.JadeDynastyTowerRank289:
                var rankModel = ModelCenter.Instance.GetModel<RankModel>();
                rankModel.jumpRankType = int.Parse(_tagWinSearchModel.SelectActive);
                SetJumpLogic<RankPanel>(_tagWinSearchModel.TABID);
@@ -1013,6 +1015,7 @@
            case JumpUIType.EquipCompose268:
            case JumpUIType.EquipCompose269:
            case JumpUIType.EquipCompose270:
            case JumpUIType.EquipCompose291:
                int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
                if (types.Length > 0)
                {
@@ -1602,8 +1605,9 @@
    SevenDaysTour286 = 286, //七日巡礼
    SevenDaysTour287 = 287, //七日巡礼
    JadeDynastyTower288 = 288,//诛仙塔
    JadeDynastyTowerRank = 289,//排行榜-诛仙塔
    JadeDynastyTowerRank289 = 289,//排行榜-诛仙塔
    JadeDynastyBoss290 = 290,//诛仙Boss
    EquipCompose291 = 291,//装备合成-诛仙装备
    DhszTs = 1001,//定海神针功法提升界面
    HyqTs = 1002,//皓月枪功法提升界面
    GyzTs = 1003,//鬼牙刃功法提升界面