少年修仙传客户端代码仓库
client_linchunjie
2019-03-12 134b3013bb96abf706fc64363a0a587ef0b1262e
3335 删除旧宝石以及诛仙宝石代码
15个文件已修改
34个文件已删除
6500 ■■■■■ 已修改文件
Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/DelegatesGensBridge.cs 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/PlayerStoneDataWrap.cs 232 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/PlayerStoneDataWrap.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/SnxxzUIGemModelWrap.cs 1161 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/SnxxzUIGemModelWrap.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/SnxxzUIJadeDynastyGemModelWrap.cs 902 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/SnxxzUIJadeDynastyGemModelWrap.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/XLuaGenAutoRegister.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/EquipGem/EquipGemModel.cs 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs 79 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyGemEquipCell.cs 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyGemEquipCell.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyGemModel.cs 526 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyGemModel.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyGemWin.cs 324 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyGemWin.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyKnapSackWin.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs 390 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/GemElementObj.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemLogicUtility.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemOperateUtility.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemTipsModel.cs 79 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Message/RichTableEvent.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RoleParticulars/RoleParticularModel.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RoleParticulars/ViewFuncCell.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RolePromote/RolePromoteModel.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/EquipReinforceWin.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemEquipCell.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemEquipCell.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemEquipPlate.cs 168 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemEquipPlate.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemFlauntCell.cs 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemFlauntCell.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemGetWayCell.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemGetWayCell.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemLevelUpCell.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemLevelUpCell.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemLevelUpWin.cs 513 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemLevelUpWin.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemModel.cs 665 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemModel.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemShopCell.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GemShopCell.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/InlaidPanel.cs 725 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/InlaidPanel.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowBase/ModelCenter.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs
File was deleted
Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs.meta
File was deleted
Lua/Gen/DelegatesGensBridge.cs
@@ -4466,28 +4466,6 @@
#endif
        }
        
        public Snxxz.UI.JadeDynastyGemModel __Gen_Delegate_Imp193(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                Snxxz.UI.JadeDynastyGemModel __gen_ret = (Snxxz.UI.JadeDynastyGemModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.JadeDynastyGemModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public System.Collections.Generic.Dictionary<int, System.Collections.Generic.Dictionary<int, Snxxz.UI.JadeDynastyEquipModel.JadeDynastySuitAttrData>> __Gen_Delegate_Imp194(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
@@ -4782,28 +4760,6 @@
#endif
        }
        
        public Snxxz.UI.GemModel __Gen_Delegate_Imp206(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                Snxxz.UI.GemModel __gen_ret = (Snxxz.UI.GemModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.GemModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public int[] __Gen_Delegate_Imp207(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
@@ -4842,30 +4798,6 @@
                
                PCall(L, 4, 1, errFunc);
                
                bool __gen_ret = LuaAPI.lua_toboolean(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public bool __Gen_Delegate_Imp209(object p0, int p1, out Snxxz.UI.JadeDynastyGemModel.GemEquipData p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                LuaAPI.xlua_pushinteger(L, p1);
                PCall(L, 2, 2, errFunc);
                translator.Get(L, errFunc + 2, out p2);
                
                bool __gen_ret = LuaAPI.lua_toboolean(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
Lua/Gen/PlayerStoneDataWrap.cs
File was deleted
Lua/Gen/PlayerStoneDataWrap.cs.meta
File was deleted
Lua/Gen/SnxxzUIGemModelWrap.cs
File was deleted
Lua/Gen/SnxxzUIGemModelWrap.cs.meta
File was deleted
Lua/Gen/SnxxzUIJadeDynastyGemModelWrap.cs
File was deleted
Lua/Gen/SnxxzUIJadeDynastyGemModelWrap.cs.meta
File was deleted
Lua/Gen/XLuaGenAutoRegister.cs
@@ -695,9 +695,6 @@
            translator.DelayWrapLoader(typeof(maptransportConfig), maptransportConfigWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(PlayerStoneData), PlayerStoneDataWrap.__Register);
            translator.DelayWrapLoader(typeof(PlayerDatas), PlayerDatasWrap.__Register);
        
        
@@ -1108,9 +1105,6 @@
            translator.DelayWrapLoader(typeof(Snxxz.UI.JadeDynastyEquipModel), SnxxzUIJadeDynastyEquipModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.JadeDynastyGemModel), SnxxzUIJadeDynastyGemModelWrap.__Register);
            translator.DelayWrapLoader(typeof(Snxxz.UI.JadeDynastySkillModel), SnxxzUIJadeDynastySkillModelWrap.__Register);
        
        
@@ -1351,9 +1345,6 @@
        
        
            translator.DelayWrapLoader(typeof(EquipReinforceModel), EquipReinforceModelWrap.__Register);
            translator.DelayWrapLoader(typeof(Snxxz.UI.GemModel), SnxxzUIGemModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(GodBeastModel), GodBeastModelWrap.__Register);
System/EquipGem/EquipGemModel.cs
@@ -18,6 +18,8 @@
        readonly List<int> m_GemHoleItemIds = new List<int> { 0, 0, 0, 0 };
        public readonly Redpoint redpoint = new Redpoint(106, 10609);
        public const int EQUIPGEM_HOLE_COUNT = 4;
        public static int REDPOINTBASE = 106090000;
@@ -291,6 +293,16 @@
            return true;
        }
        public bool IsEquipGemHoleOpen(int packIndex, int hole)
        {
            var config = EquipPlaceMapConfig.Get(packIndex);
            if (config != null)
            {
                return IsEquipGemHoleOpen(config.LV, config.EquipPlace, hole);
            }
            return false;
        }
        public bool IsEquipGemMaxLevel(int id)
        {
            var itemConfig = ItemConfig.Get(id);
@@ -306,6 +318,44 @@
            return true;
        }
        public bool IsBetterGem(int itemId)
        {
            var config = ItemConfig.Get(itemId);
            if (config == null)
            {
                return false;
            }
            foreach (var level in cacheEquipSets)
            {
                foreach (var place in m_EquipPlaces)
                {
                    var gemTypes = m_EquipGemTypes[place];
                    if (!gemTypes.Contains(config.EffectValueA1))
                    {
                        continue;
                    }
                    for (int i = 0; i < EQUIPGEM_HOLE_COUNT; i++)
                    {
                        if (!IsEquipGemHoleOpen(level, place, i))
                        {
                            continue;
                        }
                        var equipGem = 0;
                        if (TryGetEquipGem(level, place, i, out equipGem))
                        {
                            var compareConfig = ItemConfig.Get(equipGem);
                            return config.EffectValueB1 > compareConfig.EffectValueB1;
                        }
                        else
                        {
                            return true;
                        }
                    }
                }
            }
            return false;
        }
        public ICollection<int> GetMosaicEquipPlaces()
        {
            return m_EquipPlaces;
System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
@@ -14,7 +14,6 @@
    {
        JadeDynastyTowerModel towerModel { get { return ModelCenter.Instance.GetModel<JadeDynastyTowerModel>(); } }
        PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        JadeDynastyGemModel gemModel { get { return ModelCenter.Instance.GetModel<JadeDynastyGemModel>(); } }
        public string LocalSaveEquipUnlock { get; private set; }
        public string LocalSaveActiveSuit { get; private set; }
        public string LocalSaveActiveStoneSuit { get; private set; }
@@ -659,23 +658,23 @@
                    var model = playerPack.GetItemByIndex(PackType.JadeDynastyEquip, key);
                    if (model != null)
                    {
                        JadeDynastyGemModel.GemEquipData equipData;
                        var existGem = gemModel.TryGetEquipGems(key, out equipData);
                        uint[] stoneIds = existGem ? equipData.items : null;
                        if (stoneIds != null)
                        {
                            foreach (var id in stoneIds)
                            {
                                if (id != 0)
                                {
                                    var config = ItemConfig.Get((int)id);
                                    if (config.EffectValueB1 >= suitLv)
                                    {
                                        activeStoneNum += 1;
                                    }
                                }
                            }
                        }
                        //JadeDynastyGemModel.GemEquipData equipData;
                        //var existGem = gemModel.TryGetEquipGems(key, out equipData);
                        //uint[] stoneIds = existGem ? equipData.items : null;
                        //if (stoneIds != null)
                        //{
                        //    foreach (var id in stoneIds)
                        //    {
                        //        if (id != 0)
                        //        {
                        //            var config = ItemConfig.Get((int)id);
                        //            if (config.EffectValueB1 >= suitLv)
                        //            {
                        //                activeStoneNum += 1;
                        //            }
                        //        }
                        //    }
                        //}
                    }
                }
            }
@@ -821,28 +820,28 @@
                    var model = playerPack.GetItemByIndex(PackType.JadeDynastyEquip, key);
                    if (model != null)
                    {
                        JadeDynastyGemModel.GemEquipData equipData;
                        var existGem = gemModel.TryGetEquipGems(key, out equipData);
                        uint[] stoneIds = existGem ? equipData.items : null;
                        if (stoneIds != null)
                        {
                            foreach (var id in stoneIds)
                            {
                                if (id != 0)
                                {
                                    var config = ItemConfig.Get((int)id);
                                    if (!stoneDict.ContainsKey(config.EffectValueB1))
                                    {
                                        stoneDict.Add(config.EffectValueB1, 1);
                                    }
                                    else
                                    {
                                        stoneDict[config.EffectValueB1] += 1;
                                    }
                                }
                            }
                        }
                        //JadeDynastyGemModel.GemEquipData equipData;
                        //var existGem = gemModel.TryGetEquipGems(key, out equipData);
                        //uint[] stoneIds = existGem ? equipData.items : null;
                        //if (stoneIds != null)
                        //{
                        //    foreach (var id in stoneIds)
                        //    {
                        //        if (id != 0)
                        //        {
                        //            var config = ItemConfig.Get((int)id);
                        //            if (!stoneDict.ContainsKey(config.EffectValueB1))
                        //            {
                        //                stoneDict.Add(config.EffectValueB1, 1);
                        //            }
                        //            else
                        //            {
                        //                stoneDict[config.EffectValueB1] += 1;
                        //            }
                        //        }
                        //
                        //    }
                        //}
                    }
                }
            }
System/JadeDynastyKnapSack/JadeDynastyGemEquipCell.cs
File was deleted
System/JadeDynastyKnapSack/JadeDynastyGemEquipCell.cs.meta
File was deleted
System/JadeDynastyKnapSack/JadeDynastyGemModel.cs
File was deleted
System/JadeDynastyKnapSack/JadeDynastyGemModel.cs.meta
File was deleted
System/JadeDynastyKnapSack/JadeDynastyGemWin.cs
File was deleted
System/JadeDynastyKnapSack/JadeDynastyGemWin.cs.meta
File was deleted
System/JadeDynastyKnapSack/JadeDynastyKnapSackWin.cs
@@ -82,7 +82,6 @@
        private void OpenJadeDynastyGem()
        {
            CloseSubWindows();
            WindowCenter.Instance.Open<JadeDynastyGemWin>();
            functionOrder = m_JadeDynastyGem.order;
        }
System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs
File was deleted
System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs.meta
File was deleted
System/KnapSack/Logic/GemElementObj.cs
@@ -120,7 +120,7 @@
                }
                
                InlaidPanel.ShowGemInfo(gemAttrDes,stoneId, false);
                //InlaidPanel.ShowGemInfo(gemAttrDes,stoneId, false);
            }
        }
System/KnapSack/Logic/ItemLogicUtility.cs
@@ -597,7 +597,7 @@
                    }
                    break;
                case 25:
                    if (!ModelCenter.Instance.GetModel<GemModel>().SatisfyBetter(item.itemId))
                    if (!ModelCenter.Instance.GetModel<EquipGemModel>().IsBetterGem(item.itemId))
                    {
                        return false;
                    }
System/KnapSack/Logic/ItemOperateUtility.cs
@@ -17,6 +17,7 @@
        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
        BoxGetItemModel BoxModel { get { return ModelCenter.Instance.GetModel<BoxGetItemModel>(); } }
        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
        EquipGemModel equipGemModel { get { return ModelCenter.Instance.GetModel<EquipGemModel>(); } }
        #region 装备
@@ -176,14 +177,14 @@
                }
            }
            var stones = PlayerStoneData.Instance.GetStoneInfo(equipPlace);
            var gemOpenLvs = itemTipsModel.gemOpenLvs;
            int[] stones = null;
            equipGemModel.TryGetEquipGems(equipPlace, out stones);
            if (stones != null)
            {
                int i = 0;
                for (i = 0; i < stones.Length; i++)
                {
                    if (stones[i] != 0 && item.config.LV >= gemOpenLvs[0])
                    if (stones[i] != 0 && equipGemModel.IsEquipGemHoleOpen(equipPlace, 0))
                    {
                        SysNotifyMgr.Instance.ShowTip("SwitchEquip_Gem");
                        break;
System/KnapSack/Logic/ItemTipsModel.cs
@@ -2163,36 +2163,36 @@
        private Dictionary<int, int> GetStoneAttrDict()
        {
            Dictionary<int, int> attrDict = new Dictionary<int, int>();
            var stoneDict = PlayerStoneData.Instance.GetAllStone();
            foreach (var key in stoneDict.Keys)
            {
                var stoneIds = stoneDict[key];
                var itemModel = playerPack.GetItemByIndex(PackType.Equip, key);
                if (itemModel != null && stoneIds != null)
                {
                    for (int i = 0; i < stoneIds.Length; i++)
                    {
                        int stoneId = (int)stoneIds[i];
                        ItemConfig itemConfig = ItemConfig.Get(stoneId);
                        if (itemConfig != null)
                        {
                            var itemEffectDict = SetItemEffectDict(itemConfig);
                            foreach (var attrId in itemEffectDict.Keys)
                            {
                                var attrValue = itemEffectDict[attrId];
                                if (!attrDict.ContainsKey(attrId))
                                {
                                    attrDict.Add(attrId, attrValue);
                                }
                                else
                                {
                                    attrDict[attrId] += attrValue;
                                }
                            }
                        }
                    }
                }
            }
            //var stoneDict = PlayerStoneData.Instance.GetAllStone();
            //foreach (var key in stoneDict.Keys)
            //{
            //    var stoneIds = stoneDict[key];
            //    var itemModel = playerPack.GetItemByIndex(PackType.Equip, key);
            //    if (itemModel != null && stoneIds != null)
            //    {
            //        for (int i = 0; i < stoneIds.Length; i++)
            //        {
            //            int stoneId = (int)stoneIds[i];
            //            ItemConfig itemConfig = ItemConfig.Get(stoneId);
            //            if (itemConfig != null)
            //            {
            //                var itemEffectDict = SetItemEffectDict(itemConfig);
            //                foreach (var attrId in itemEffectDict.Keys)
            //                {
            //                    var attrValue = itemEffectDict[attrId];
            //                    if (!attrDict.ContainsKey(attrId))
            //                    {
            //                        attrDict.Add(attrId, attrValue);
            //                    }
            //                    else
            //                    {
            //                        attrDict[attrId] += attrValue;
            //                    }
            //                }
            //            }
            //        }
            //    }
            //}
            return attrDict;
        }
@@ -2509,7 +2509,7 @@
        public ulong count { get; private set; }
        public int isBind { get; private set; }
        public int unionWarehouseScore { get; private set; }
        public uint[] stones { get; private set; } //可镶嵌宝石数组 长度为0 未镶嵌  数值为0 未镶嵌
        public int[] stones { get; private set; } //可镶嵌宝石数组 长度为0 未镶嵌  数值为0 未镶嵌
        public int score { get; private set; }
        public bool isCompare { get; private set; } //是否进行装备比较
        public bool isPreview { get; private set; }//是否预览
@@ -2639,13 +2639,18 @@
                    switch (type)
                    {
                        case PackType.Equip:
                            SetGemModel(PlayerStoneData.Instance.GetStoneInfo(index));
                            int[] equipGems = null;
                            var equipGemModel = ModelCenter.Instance.GetModel<EquipGemModel>();
                            if (equipGemModel.TryGetEquipGems(index, out equipGems))
                            {
                                SetGemModel(equipGems);
                            }
                            break;
                        case PackType.JadeDynastyEquip:
                            JadeDynastyGemModel.GemEquipData equipData;
                            var model = ModelCenter.Instance.GetModel<JadeDynastyGemModel>();
                            var existGem = model.TryGetEquipGems(index + 121, out equipData);
                            SetGemModel(existGem ? equipData.items : null);
                            //JadeDynastyGemModel.GemEquipData equipData;
                            //var model = ModelCenter.Instance.GetModel<JadeDynastyGemModel>();
                            //var existGem = model.TryGetEquipGems(index + 121, out equipData);
                            //SetGemModel(existGem ? equipData.items : null);
                            break;
                    }
@@ -2955,7 +2960,7 @@
        }
        //设置弹框的宝石数据
        public void SetGemModel(params uint[] stones)
        public void SetGemModel(params int[] stones)
        {
            this.stones = stones;
        }
System/Message/RichTableEvent.cs
@@ -399,12 +399,12 @@
    private void OnSingleClickItemCell(int itemId, RichTextMgr.HrefInfo hrefInfo)
    {
        uint[] stone = null;
        int[] stone = null;
        if (hrefInfo.mSplits.ContainsKey("stone"))
        {
            try
            {
                stone = LitJson.JsonMapper.ToObject<uint[]>(hrefInfo.mSplits["stone"]);
                stone = LitJson.JsonMapper.ToObject<int[]>(hrefInfo.mSplits["stone"]);
            }
            catch (Exception e)
            {
@@ -503,6 +503,7 @@
            itemId = chatSendItem.itemId;
            itemCount = chatSendItem.count;
            isBind = chatSendItem.isBind;
            stone = chatSendItem.equipGems;
            if (!string.IsNullOrEmpty(chatSendItem.useData))
            {
                userdatadic = ConfigParse.Analysis(chatSendItem.useData);
System/RoleParticulars/RoleParticularModel.cs
@@ -747,7 +747,7 @@
        {
            Dictionary<int, ulong> fightPowerDict = new Dictionary<int, ulong>();
            Dictionary<int, int> equipPartStarLvDict = new Dictionary<int, int>();
            Dictionary<int, uint[]> equipPartStoneDict = new Dictionary<int, uint[]>();
            Dictionary<int, int[]> equipPartStoneDict = new Dictionary<int, int[]>();
            Dictionary<int, EquipWash> equipWashDict = new Dictionary<int, EquipWash>();
            Dictionary<int, int> godWeaponDict = new Dictionary<int, int>();
            Dictionary<int, int> treasureDict = new Dictionary<int, int>();
@@ -797,7 +797,7 @@
                return allEquipStarLv;
            }
            public uint[] GetEquipStone(int index)
            public int[] GetEquipStone(int index)
            {
                if (equipPartStoneDict != null && equipPartStoneDict.ContainsKey(index))
                {
@@ -806,7 +806,7 @@
                return null;
            }
            public Dictionary<int, uint[]> GetAllEquipStone()
            public Dictionary<int, int[]> GetAllEquipStone()
            {
                return equipPartStoneDict;
            }
@@ -899,7 +899,7 @@
                            foreach (var key in jsonPlusData.Keys)
                            {
                                int index = int.Parse(key);
                                equipPartStoneDict.Add(index, JsonMapper.ToObject<uint[]>(jsonPlusData[key].ToJson()));
                                equipPartStoneDict.Add(index, JsonMapper.ToObject<int[]>(jsonPlusData[key].ToJson()));
                            }
                        }
                    }
System/RoleParticulars/ViewFuncCell.cs
@@ -227,10 +227,10 @@
            }
        }
        public int GetAllStoneLv(Dictionary<int, uint[]> dict)
        public int GetAllStoneLv(Dictionary<int, int[]> dict)
        {
            int allStoneLv = 0;
            foreach (uint[] array in dict.Values)
            foreach (int[] array in dict.Values)
            {
                if (array == null || array.Length == 0)
                    continue;
System/RolePromote/RolePromoteModel.cs
@@ -16,6 +16,8 @@
            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }
        }
        EquipGemModel equipGemModel { get { return ModelCenter.Instance.GetModel<EquipGemModel>(); } }
        public override void Init()
        {
            ParseConfig();
@@ -110,7 +112,6 @@
            }
        }
        GemModel gemModel { get { return ModelCenter.Instance.GetModel<GemModel>(); } }
        BlastFurnaceModel blastFurnaceModel { get { return ModelCenter.Instance.GetModel<BlastFurnaceModel>(); } }
@@ -445,7 +446,7 @@
                _id == magicianModel.magicianRedpoint.id ||
                _id == methodData.fairyHeartRedpoint.id ||
                _id == realmModel.realmRedpoint.id ||
                _id == gemModel.gemTagRedPoint.id ||
                _id == equipGemModel.redpoint.id ||
                _id == rolePointModel.redpoint.id)
            {
                CheckPromoteDetailEffect();
@@ -474,7 +475,7 @@
                case PromoteDetailType.TreasurePotential:
                    return false;
                case PromoteDetailType.Gem:
                    return gemModel.gemTagRedPoint.state == RedPointState.Simple;
                    return equipGemModel.redpoint.state == RedPointState.Simple;
                case PromoteDetailType.Wash:
                    return MainRedDot.Instance.redPointWashFunc.state == RedPointState.Simple;
                case PromoteDetailType.RolePromote:
System/Strengthening/EquipReinforceWin.cs
@@ -37,12 +37,6 @@
        private GameObject _InlaidGemPanel; //宝石
        private GameObject _wingsRefinePanel;
        GemModel m_gemModel;
        GemModel gemModel {
            get {
                return m_gemModel ?? (m_gemModel = ModelCenter.Instance.GetModel<GemModel>());
            }
        }
        WingsRedDotModel m_WingsRedDot;
        WingsRedDotModel wingsRedDot {
            get {
@@ -90,10 +84,6 @@
                    if (strengtheng.redPointStre.state == RedPointState.Simple)
                    {
                        functionOrder = _strengthTitle.order;
                    }
                    else if (gemModel.gemTagRedPoint.state == RedPointState.Simple)
                    {
                        functionOrder = _inlayTitle.order;
                    }
                    else if (wingsRedDot.redPointStre.state == RedPointState.Simple)
                    {
System/Strengthening/GemEquipCell.cs
File was deleted
System/Strengthening/GemEquipCell.cs.meta
File was deleted
System/Strengthening/GemEquipPlate.cs
File was deleted
System/Strengthening/GemEquipPlate.cs.meta
File was deleted
System/Strengthening/GemFlauntCell.cs
File was deleted
System/Strengthening/GemFlauntCell.cs.meta
File was deleted
System/Strengthening/GemGetWayCell.cs
File was deleted
System/Strengthening/GemGetWayCell.cs.meta
File was deleted
System/Strengthening/GemLevelUpCell.cs
File was deleted
System/Strengthening/GemLevelUpCell.cs.meta
File was deleted
System/Strengthening/GemLevelUpWin.cs
File was deleted
System/Strengthening/GemLevelUpWin.cs.meta
File was deleted
System/Strengthening/GemModel.cs
File was deleted
System/Strengthening/GemModel.cs.meta
File was deleted
System/Strengthening/GemShopCell.cs
File was deleted
System/Strengthening/GemShopCell.cs.meta
File was deleted
System/Strengthening/InlaidPanel.cs
File was deleted
System/Strengthening/InlaidPanel.cs.meta
File was deleted
System/WindowBase/ModelCenter.cs
@@ -104,7 +104,6 @@
            RegisterModel<StoreModel>();
            RegisterModel<GetItemPathModel>();
            RegisterModel<RuneModel>();
            RegisterModel<GemModel>();
            RegisterModel<TreasureModel>();
            RegisterModel<DailyQuestModel>();
            RegisterModel<FairyLeagueModel>();
@@ -223,7 +222,6 @@
            RegisterModel<JadeDynastyEquipModel>();
            RegisterModel<FestivalRedpackModel>();
            RegisterModel<NewYearFairylandCeremonyModel>();
            RegisterModel<JadeDynastyGemModel>();
            RegisterModel<LuckyTreasureModel>();
            RegisterModel<EquipModel>();
            RegisterModel<EquipStarModel>();