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

client_Wu Xijin

2019-03-12 05b523ec953a5b27e80d5a843c135ee375db4b90

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

 Core/GameEngine/Model/Config/ItemPlusMaxConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Thursday, February 14, 2019
//    [  Date ]:           Tuesday, March 12, 2019
//--------------------------------------------------------

using System.Collections.Generic;
@@ -13,10 +13,9 @@
public partial class ItemPlusMaxConfig
{

    public readonly int id;
    public readonly int EquipType;
    public readonly int equipPhase;
    public readonly int equipColor;
    public readonly int id;

    public readonly int EquipType;

    public readonly int equipStar;

    public readonly int levelMax;

    public ItemPlusMaxConfig()
@@ -29,15 +28,13 @@
        {
            var tables = input.Split('\t');

            int.TryParse(tables[0],out id); 

            int.TryParse(tables[1],out EquipType); 

            int.TryParse(tables[2],out equipPhase); 

            int.TryParse(tables[3],out equipColor); 

            int.TryParse(tables[4],out levelMax); 
            int.TryParse(tables[0],out id); 


            int.TryParse(tables[1],out EquipType); 


            int.TryParse(tables[2],out equipStar); 


            int.TryParse(tables[3],out levelMax); 
        }
        catch (Exception ex)
        {

 Core/GameEngine/Model/Config/ItemPlusMaxConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 709eceec8717fff4c8f2d12d19aa7f7c
timeCreated: 1550121833
timeCreated: 1552371037
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs

File was deleted

 Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs.meta

File was deleted

 Core/GameEngine/Model/TelPartialConfig/tagItemPlusMaxConfig.cs

@@ -10,22 +10,13 @@


    public void OnConfigParseCompleted()

    {

        t_ItemPM.Add(StringUtility.Contact(EquipType, equipPhase, equipColor).ToString(), this);



        if (!m_ItemPlusMaxLvDict.ContainsKey(EquipType))

        {

            m_ItemPlusMaxLvDict.Add(EquipType, equipPhase);

        }

        else if (equipPhase > m_ItemPlusMaxLvDict[EquipType])

        {

            m_ItemPlusMaxLvDict[EquipType] = equipPhase;

        }

        t_ItemPM.Add(StringUtility.Contact(EquipType, equipStar).ToString(), this);

    }



    public static ItemPlusMaxConfig GetEquipTypeAndPhaseColor(int _equipType, int _equipPhase, int _equipColor)//获取强化上限的类型，阶数和装备颜色

    public static ItemPlusMaxConfig GetEquipTypeAndEquipStar(int equipType, int equipStar)//获取强化类型，装备星数

    {

        ItemPlusMaxConfig itemPMax = null;

        t_ItemPM.TryGetValue(StringUtility.Contact(_equipType, _equipPhase, _equipColor).ToString(), out itemPMax);

        t_ItemPM.TryGetValue(StringUtility.Contact(equipType, equipStar).ToString(), out itemPMax);

        return itemPMax;

    }




 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/EquipGem/EquipStrengthFull.cs

New file
@@ -0,0 +1,20 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Tuesday, March 12, 2019
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;

namespace Snxxz.UI {

    public class EquipStrengthFull:MonoBehaviour {



    }

}




 System/EquipGem/EquipStrengthFull.cs.meta

copy from System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs.meta
copy to System/EquipGem/EquipStrengthFull.cs.meta
File was copied from System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9132f6584cbf4624a98b972346cfb13f
timeCreated: 1548838906
guid: f3fe1c9e8a1842a45a9ba5a42109aaf9
timeCreated: 1552361552
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/EquipGem/EquipStrengthModel.cs

@@ -19,7 +19,9 @@
}

public class EquipStrengthModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

{

    Dictionary<int, EquipStrengthClass> EquipStrengthDic = new Dictionary<int, EquipStrengthClass>();

    public  Dictionary<int, EquipStrengthClass> EquipStrengthDic = new Dictionary<int, EquipStrengthClass>();//强化数据

    public  Dictionary<int, int> EquipLevelMaxDic = new Dictionary<int, int>();//强化类型的最大等级上限

    public  Dictionary<int, int> PartTypeDic = new Dictionary<int, int>();//强化的部位类型

    public event Action EquipStrengthUpdate;//强化数据刷新

    public event Action SelectEquipRefresh;//二级页签刷新

    public event Action SelectLevelRefresh;//一级页签刷新

@@ -58,7 +60,9 @@
    }

    public override void Init()

    {



        var strengthenLevelLimit = FuncConfigConfig.Get("StrengthenLevelLimit").Numerical1;

        PartTypeDic = ConfigParse.GetDic<int, int>(strengthenLevelLimit);

        GetEquipLevelMax();

    }



    public void OnBeforePlayerDataInitialize()

@@ -101,6 +105,46 @@
            EquipStrengthUpdate();

        }

    }



    private void GetEquipLevelMax()

    {

        var itemPlusMax = ItemPlusMaxConfig.GetValues();

        foreach (var value in itemPlusMax)

        {

            if (EquipLevelMaxDic.ContainsKey(value.EquipType))

            {

                var lv = EquipLevelMaxDic[value.EquipType];

                if (value.levelMax > lv)

                {

                    EquipLevelMaxDic[value.EquipType] = value.levelMax;

                }

            }

            else

            {

                EquipLevelMaxDic.Add(value.EquipType, value.levelMax);

            }

        }

    }



    public int GetEquipStrengthType(int equipPlace)//获取装备类型

    {

        int type = 1;

        if (PartTypeDic.ContainsKey(equipPlace))

        {

            type = PartTypeDic[equipPlace];

        }

        return type;

    }



    public int GetEquipLevelMax(int type)//获取某一类型的最大强化等级

    {

        int lv = 0;

        if (EquipLevelMaxDic.ContainsKey(type))

        {

            lv = EquipLevelMaxDic[type];

        }

        return lv;

    }

}



 System/EquipGem/EquipStrengthRein.cs

New file
@@ -0,0 +1,20 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Tuesday, March 12, 2019
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;

namespace Snxxz.UI {

    public class EquipStrengthRein:MonoBehaviour {



    }

}




 System/EquipGem/EquipStrengthRein.cs.meta

File was renamed from System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9132f6584cbf4624a98b972346cfb13f
timeCreated: 1548838906
guid: 47cefd6066776454b8dd49ab23e93029
timeCreated: 1552361612
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/EquipGem/EquipStrengthSelectBehaviour.cs

@@ -18,14 +18,13 @@
        [SerializeField] Transform m_ContainerSelect;

        [SerializeField] ItemCell m_Item;

        [SerializeField] Text m_ItemName;

        [SerializeField] TinyGem[] m_TinyGems;

        [SerializeField] Button m_Select;

        [SerializeField] RedpointBehaviour m_Redpoint;



        EquipGemModel model { get { return ModelCenter.Instance.GetModel<EquipGemModel>(); } }

        EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }

        EquipStarModel equipStarModel { get { return ModelCenter.Instance.GetModel<EquipStarModel>(); } }

        EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }      
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }

        EquipStrengthModel strengthModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } }



        int equipLevel = 0;

        int equipPlace = 0;

@@ -43,18 +42,13 @@
            m_ContainerEquip.gameObject.SetActive(equiped);

            m_ContainerUnEquip.gameObject.SetActive(!equiped);



            m_Select.SetListener(() => { model.selectEquipPlace = equipPlace; });

            m_Select.SetListener(() => { strengthModel.SelectEquipPlace = equipPlace; });



            if (equiped)

            {

                DisplayBase();

                DisplayGems();



                EquipGemRedpoint equipGemRedpoint;

                if (model.TryGetRedpoint(level, place, out equipGemRedpoint))

                {

                    m_Redpoint.redpointId = equipGemRedpoint.repoint.id;

                }

                m_Redpoint.redpointId = 0;

            }

            else

            {

@@ -62,7 +56,7 @@
                DisplayUnEquip();

            }



            m_ContainerSelect.gameObject.SetActive(model.selectEquipPlace == equipPlace);

            m_ContainerSelect.gameObject.SetActive(strengthModel.SelectEquipPlace == equipPlace);

        }



        void DisplayBase()

@@ -74,22 +68,6 @@
                m_ItemName.text = item.config.ItemName;

                m_ItemName.color = UIHelper.GetUIColor(item.config.ItemColor, true);

            }

        }



        void DisplayGems()

        {

            //List<EquipGem> equipGems = null;

            //model.TryGetEquipGems(equipLevel, equipPlace, out equipGems);

            //for (int i = 0; i < m_TinyGems.Length; i++)

            //{

            //    bool isOpen = model.IsEquipGemHoleOpen(equipLevel, equipPlace, i);

            //    m_TinyGems[i].gameObject.SetActive(isOpen);

            //    if (isOpen)

            //    {

            //        var id = (equipGems != null && i < equipGems.Count) ? equipGems[i].id : 0;

            //        m_TinyGems[i].Set(id);

            //    }

            //}

        }



        void DisplayUnEquip()


 System/EquipGem/EquipStrengthUpper.cs

New file
@@ -0,0 +1,20 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Tuesday, March 12, 2019
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;

namespace Snxxz.UI {

    public class EquipStrengthUpper:MonoBehaviour {



    }

}




 System/EquipGem/EquipStrengthUpper.cs.meta

copy from System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs.meta
copy to System/EquipGem/EquipStrengthUpper.cs.meta
File was copied from System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9132f6584cbf4624a98b972346cfb13f
timeCreated: 1548838906
guid: 1516767d3f16f2b42935fd31e00c3dca
timeCreated: 1552361590
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/EquipGem/EquipStrengthWin.cs

@@ -15,11 +15,16 @@
    public class EquipStrengthWin : Window
    {

        [SerializeField] ScrollerController m_Controller;

        [SerializeField] GameObject m_NotEquipped;//未装备

        [SerializeField] EquipStrengthFull m_EquipStrengthFull;//满级

        [SerializeField] EquipStrengthUpper m_EquipStrengthUpper;//强化上限

        [SerializeField] EquipStrengthRein m_EquipStrengthRein;//可强化



        EquipStrengthModel strengthModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } }

        EquipGemModel model { get { return ModelCenter.Instance.GetModel<EquipGemModel>(); } }
        EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }

        EquipStarModel equipStarModel { get { return ModelCenter.Instance.GetModel<EquipStarModel>(); } }
        #region Built-in
        protected override void BindController()
        {
@@ -57,6 +62,7 @@
        #endregion

        private void EquipStrengthUpdate()

        {

            SetStrengthenedState();

        }

        void DisplayEquips()

        {

@@ -75,7 +81,7 @@
                    if (slotCount > 0)

                    {

                        m_Controller.AddCell(ScrollerDataType.Header, level);

                        if (model.selectLevel == level)

                        if (strengthModel.SelectLevel == level)

                        {

                            var places = model.GetMosaicEquipPlaces();

                            foreach (var place in places)

@@ -94,6 +100,7 @@
        private void SelectEquipRefresh()

        {

            m_Controller.m_Scorller.RefreshActiveCellViews();

            SetStrengthenedState();

        }



        private void SelectLevelRefresh()

@@ -116,6 +123,57 @@
                    break;

            }

        }

        private void SetStrengthenedState()

        {

            m_NotEquipped.SetActive(false);

            m_EquipStrengthFull.gameObject.SetActive(false);

            m_EquipStrengthUpper.gameObject.SetActive(false);

            m_EquipStrengthRein.gameObject.SetActive(false);

            int equipLevel = strengthModel.SelectLevel;

            int equipPlace = strengthModel.SelectEquipPlace;

            var equipSet = equipModel.GetEquipSet(equipLevel);

            string equipGuid = string.Empty;

            equipGuid = equipSet.GetEquip(equipPlace);

            var equiped = !string.IsNullOrEmpty(equipGuid);

            if (equiped)

            {

                int equipIndex = equipLevel * 10 + equipPlace;

               int star= equipStarModel.GetEquipStarLevel(equipLevel, equipPlace);

                int equipLv = 0;

                if (strengthModel.EquipStrengthDic.ContainsKey(equipIndex))//获取当前强化等级

                {

                    equipLv = strengthModel.EquipStrengthDic[equipIndex].EquipPartStarLV;

                }



                int equipType = strengthModel.GetEquipStrengthType(equipPlace);

                var itemPlusMaxConfig = ItemPlusMaxConfig.GetEquipTypeAndEquipStar(equipType, equipPlace);//获取强化等级上限值

                if (itemPlusMaxConfig == null)

                {

                    DebugEx.LogError("未查找到表数据");

                    return;

                }



                int maxLv = strengthModel.GetEquipLevelMax(equipType);//获取最大强化等级



                if (equipLv >= maxLv)//满级

                {

                    m_EquipStrengthFull.gameObject.SetActive(true);

                }

                else if (maxLv > equipLv && equipLv >= itemPlusMaxConfig.levelMax)//强化上限

                {

                    m_EquipStrengthUpper.gameObject.SetActive(true);

                }

                else if (itemPlusMaxConfig.levelMax > equipLv)//可强化过

                {

                    m_EquipStrengthRein.gameObject.SetActive(true);

                }

            }

            else

            {

                m_NotEquipped.SetActive(true);

            }

        }
    }

}

 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/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/Strengthening/StrengthenModel.cs

@@ -203,11 +203,11 @@
                ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();
                if (EquipMax(_Item.EquipPlace) != 3)
                {
                    _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor);
                    //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor);
                }
                else
                {
                    _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), 0, 0);
                    //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), 0, 0);
                }
                if (_itemPM.levelMax > DicEquip[key].CurrentLevel)
                {
@@ -241,11 +241,11 @@
            ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();
            if (EquipMax(_Item.EquipPlace) != 3)
            {
                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor);
                //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor);
            }
            else
            {
                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), 0, 0);
                //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), 0, 0);
            }

            int MaxLV = _itemPM.levelMax;
@@ -328,11 +328,11 @@
        ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();
        if (EquipMax(_Item.EquipPlace) != 3)
        {
            _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor);
            //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor);
        }
        else
        {
            _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), 0, 0);
            //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), 0, 0);
        }

        if (_itemPM.levelMax >= EquipPartStarLV)
@@ -407,7 +407,7 @@
            {
                ItemModel item = singlePack.GetItemByIndex(Index);
                ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();
                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(Index), 0, 0);
                //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(Index), 0, 0);
                if (_itemPM.levelMax > strengthengmodel._EqInfo[Index].EquipPartStarLV)//最大可升阶等级和服务端对比
                {
                    return true;
@@ -478,11 +478,11 @@
                ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();
                if (EquipMax(_Item.EquipPlace) != 3)
                {
                    _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor);
                    //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor);
                }
                else
                {
                    _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), 0, 0);
                    //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(EquipMax(_Item.EquipPlace), 0, 0);
                }
                if (_itemPM.levelMax > DicEquip[key].CurrentLevel)
                {

 System/Strengthening/StrengtheningSripts.cs

@@ -332,11 +332,11 @@
            ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

            if (strengthengmodel.EquipMax(_tag) != 3)

            {

                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), ItemConfig.Get((int)item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

                //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), ItemConfig.Get((int)item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

            }

            else

            {

                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0);

                //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0);

            }

            if (_itemPM.levelMax > strengthengmodel._EqInfo[_tag].EquipPartStarLV)

            {

@@ -391,12 +391,12 @@
            ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

            if (strengthengmodel.EquipMax(_tag) != 3)

            {

                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag),

                    ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

                //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag),

                //    ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

            }

            else

            {

                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0);

                //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0);

            }

            if (_itemPM.levelMax > strengthengmodel._EqInfo[_tag].EquipPartStarLV)

            {

@@ -474,12 +474,12 @@
        ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

        if (strengthengmodel.EquipMax(_tag) != 3)

        {

            _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag),

                ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

            //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag),

            //    ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

        }

        else

        {

            _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0);

            //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0);

        }

        if (_itemPM.levelMax >= _number)

        {

@@ -566,7 +566,7 @@
            {

                ItemModel item = singlePack.GetItemByIndex(Index);

                ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(Index), 0, 0);

                //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(Index), 0, 0);

                if (_itemPM.levelMax > strengthengmodel._EqInfo[Index].EquipPartStarLV)//最大可升阶等级和服务端对比

                {

                    return true;

@@ -593,12 +593,12 @@
                ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

                if (strengthengmodel.EquipMax(int.Parse(_locationSort[i])) != 3)

                {

                    _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(int.Parse(_locationSort[i])),

                        ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

                    //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(int.Parse(_locationSort[i])),

                    //    ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

                }

                else

                {

                    _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(int.Parse(_locationSort[i])), 0, 0);

                    //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(int.Parse(_locationSort[i])), 0, 0);

                }

                if (_itemPM.levelMax > strengthengmodel._EqInfo[int.Parse(_locationSort[i])].EquipPartStarLV)//最大可升阶等级和服务端对比

                {

@@ -776,12 +776,12 @@
        ItemPlusMaxConfig _tagItem = new ItemPlusMaxConfig();

        if (strengthengmodel.EquipMax(_number) != 3)

        {

            _tagItem = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_number),

                ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

            //_tagItem = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_number),

            //    ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

        }

        else

        {

            _tagItem = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_number), 0, 0);

            //_tagItem = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_number), 0, 0);

        }

        _LevelTextB.text = _tagItem.levelMax.ToString();

        if (_tagItem.levelMax == strengthengmodel._EqInfo[_number].EquipPartStarLV)

@@ -1123,11 +1123,11 @@
        ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

        if (strengthengmodel.EquipMax(_equippedWithA) != 3)

        {

            _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_equippedWithA), _Item.LV, _Item.ItemColor);

            //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_equippedWithA), _Item.LV, _Item.ItemColor);

        }

        else

        {

            _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_equippedWithA), 0, 0);

            //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_equippedWithA), 0, 0);

        }

        switch (_Item.ItemColor)

        {

@@ -1180,11 +1180,11 @@
        ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

        if (strengthengmodel.EquipMax(_Item.EquipPlace) != 3)

        {

            _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor);

            //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor);

        }

        else

        {

            _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_Item.EquipPlace), 0, 0);

            //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_Item.EquipPlace), 0, 0);

        }

        switch (_Item.ItemColor)

        {


 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>();


 System/WindowJump/WindowJumpMgr.cs

@@ -713,6 +713,16 @@
                rankModel.jumpRankType = int.Parse(_tagWinSearchModel.SelectActive);

                SetJumpLogic<RankPanel>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.AllianceBoss1:

                AllianceBossEntranceWin.dailyQuestId = (int)DailyQuestType.AllianceBoss1;

                dungeonModel.currentDungeon = new Dungeon(AllianceBossModel.DATAMAPID, 0);

                SetJumpLogic<AllianceBossEntranceWin>();

                break;

            case JumpUIType.AllianceBoss2:

                AllianceBossEntranceWin.dailyQuestId = (int)DailyQuestType.AllianceBoss2;

                dungeonModel.currentDungeon = new Dungeon(AllianceBossModel.DATAMAPID, 1);

                SetJumpLogic<AllianceBossEntranceWin>();

                break;

            default:

                DebugEx.Log("未添加此跳转界面：" + jumpType);

                IsJumpState = false;

@@ -1093,6 +1103,14 @@
                var springFestivalModel = ModelCenter.Instance.GetModel<SpringFestivalModel>();

                if (!springFestivalModel.IsJumpOpen())

                {

                    return false;

                }

                break;

            case JumpUIType.AllianceBoss1:

            case JumpUIType.AllianceBoss2:

                if (!PlayerDatas.Instance.fairyData.HasFairy)

                {

                    SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");

                    return false;

                }

                break;

@@ -1659,6 +1677,8 @@
    ToolCompose305 = 305, //诛仙附伤宝石合成

    LuckyTreasure306 = 306, //幸运鉴宝

    LoginReward307 = 307, //登录奖励

    AllianceBoss1 = 308,//仙盟Boss1

    AllianceBoss2 = 309,//仙盟Boss2



    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面