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

client_linchunjie

2019-03-12 9473a532fb1160cf720af536c8d6d3d3237bf9af

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/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/ComposeWinModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(ComposeWinModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 47, 10, 7);
            Utils.BeginObjectRegister(type, L, translator, 0, 46, 10, 7);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
@@ -55,7 +55,6 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SendComposeRequest", _m_SendComposeRequest);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SendComposeQuest", _m_SendComposeQuest);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsBindByFixedAndUnFixedMat", _m_IsBindByFixedAndUnFixedMat);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetBindOrNoBindMinCnt", _m_GetBindOrNoBindMinCnt);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetComposeSuccessRate", _m_GetComposeSuccessRate);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsComposeTicketByType", _m_IsComposeTicketByType);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "CheckComposeItemById", _m_CheckComposeItemById);
@@ -1139,39 +1138,6 @@
                    
                    
                    return 1;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_GetBindOrNoBindMinCnt(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                ComposeWinModel gen_to_be_invoked = (ComposeWinModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _minBindCnt;
                    int _minNoBindCnt;
                    
                    gen_to_be_invoked.GetBindOrNoBindMinCnt( out _minBindCnt, out _minNoBindCnt );
                    LuaAPI.xlua_pushinteger(L, _minBindCnt);
                        
                    LuaAPI.xlua_pushinteger(L, _minNoBindCnt);
                        
                    
                    
                    
                    return 2;
                }
                
            } catch(System.Exception gen_e) {

 Lua/Gen/ComposeWinModelWrap.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e0e359da308439d4e87a7d7ce8fd4cc5
timeCreated: 1550120588
timeCreated: 1552375168
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Lua/Gen/DelegatesGensBridge.cs

@@ -4466,7 +4466,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, System.Collections.Generic.Dictionary<int, Snxxz.UI.JadeDynastyEquipModel.JadeDynastySuitAttrData>> __Gen_Delegate_Imp194(object p0)
        public System.Collections.Generic.Dictionary<int, System.Collections.Generic.Dictionary<int, Snxxz.UI.JadeDynastyEquipModel.JadeDynastySuitAttrData>> __Gen_Delegate_Imp193(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4488,7 +4488,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, System.Collections.Generic.Dictionary<int, Snxxz.UI.JadeDynastyEquipModel.JadeDynastyStoneSuitAttrData>> __Gen_Delegate_Imp195(object p0)
        public System.Collections.Generic.Dictionary<int, System.Collections.Generic.Dictionary<int, Snxxz.UI.JadeDynastyEquipModel.JadeDynastyStoneSuitAttrData>> __Gen_Delegate_Imp194(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4510,7 +4510,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp196(object p0, object p1, object p2)
        public void __Gen_Delegate_Imp195(object p0, object p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4534,7 +4534,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp197(object p0, int p1, int p2, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastySuitAttrData p3)
        public bool __Gen_Delegate_Imp196(object p0, int p1, int p2, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastySuitAttrData p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4559,7 +4559,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp198(object p0, int p1, int p2, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastyStoneSuitAttrData p3)
        public bool __Gen_Delegate_Imp197(object p0, int p1, int p2, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastyStoneSuitAttrData p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4584,7 +4584,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp199(object p0, int p1, int p2, out int p3)
        public bool __Gen_Delegate_Imp198(object p0, int p1, int p2, out int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4609,7 +4609,7 @@
#endif
        }
        
        public System.Collections.Generic.List<int> __Gen_Delegate_Imp200(object p0, int p1)
        public System.Collections.Generic.List<int> __Gen_Delegate_Imp199(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4632,7 +4632,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp201(object p0, out System.Collections.Generic.List<int> p1, out System.Collections.Generic.List<int> p2)
        public bool __Gen_Delegate_Imp200(object p0, out System.Collections.Generic.List<int> p1, out System.Collections.Generic.List<int> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4656,7 +4656,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp202(object p0, int p1, PackType p2, out int p3, out int p4, int p5)
        public bool __Gen_Delegate_Imp201(object p0, int p1, PackType p2, out int p3, out int p4, int p5)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4683,7 +4683,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp203(object p0, int p1, out int p2, out int p3)
        public bool __Gen_Delegate_Imp202(object p0, int p1, out int p2, out int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4708,7 +4708,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp204(object p0, int p1, PackType p2, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastySuitAttrData p3, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastySuitAttrData p4, int p5)
        public bool __Gen_Delegate_Imp203(object p0, int p1, PackType p2, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastySuitAttrData p3, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastySuitAttrData p4, int p5)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4735,7 +4735,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp205(object p0, int p1, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastyStoneSuitAttrData p2, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastyStoneSuitAttrData p3)
        public bool __Gen_Delegate_Imp204(object p0, int p1, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastyStoneSuitAttrData p2, out Snxxz.UI.JadeDynastyEquipModel.JadeDynastyStoneSuitAttrData p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4760,152 +4760,7 @@
#endif
        }
        
        public int[] __Gen_Delegate_Imp207(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);
                
                
                int[] __gen_ret = (int[])translator.GetObject(L, errFunc + 1, typeof(int[]));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public bool __Gen_Delegate_Imp208(object p0, int p1, int p2, int p3)
        {
#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);
                LuaAPI.xlua_pushinteger(L, p2);
                LuaAPI.xlua_pushinteger(L, p3);
                
                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 RedPointState __Gen_Delegate_Imp210(object p0, int p1)
        {
#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, 1, errFunc);
                
                
                RedPointState __gen_ret;translator.Get(L, errFunc + 1, out __gen_ret);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public bool __Gen_Delegate_Imp211(object p0, int p1, int p2, out int p3, out int p4)
        {
#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);
                LuaAPI.xlua_pushinteger(L, p2);
                
                PCall(L, 3, 3, errFunc);
                
                p3 = LuaAPI.xlua_tointeger(L, errFunc + 2);
                p4 = LuaAPI.xlua_tointeger(L, errFunc + 3);
                
                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 int __Gen_Delegate_Imp212(object p0, int p1, int p2, bool p3, int p4)
        {
#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);
                LuaAPI.xlua_pushinteger(L, p2);
                LuaAPI.lua_pushboolean(L, p3);
                LuaAPI.xlua_pushinteger(L, p4);
                
                PCall(L, 5, 1, errFunc);
                
                
                int __gen_ret = LuaAPI.xlua_tointeger(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public System.Collections.Generic.List<Snxxz.UI.ItemModel> __Gen_Delegate_Imp213(object p0, int p1)
        {
#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, 1, errFunc);
                
                
                System.Collections.Generic.List<Snxxz.UI.ItemModel> __gen_ret = (System.Collections.Generic.List<Snxxz.UI.ItemModel>)translator.GetObject(L, errFunc + 1, typeof(System.Collections.Generic.List<Snxxz.UI.ItemModel>));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public void __Gen_Delegate_Imp214(object p0, PackType p1, bool p2, int p3, int p4)
        public void __Gen_Delegate_Imp205(object p0, PackType p1, bool p2, int p3, int p4)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4931,7 +4786,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp215(object p0, PackType p1, bool p2, int p3)
        public void __Gen_Delegate_Imp206(object p0, PackType p1, bool p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4956,7 +4811,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp216(object p0, PackType p1, bool p2)
        public void __Gen_Delegate_Imp207(object p0, PackType p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4980,7 +4835,7 @@
#endif
        }
        
        public Snxxz.UI.JadeDynastySkillModel __Gen_Delegate_Imp217(object p0)
        public Snxxz.UI.JadeDynastySkillModel __Gen_Delegate_Imp208(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5002,7 +4857,7 @@
#endif
        }
        
        public UnityEngine.Transform __Gen_Delegate_Imp218(object p0)
        public UnityEngine.Transform __Gen_Delegate_Imp209(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5024,7 +4879,7 @@
#endif
        }
        
        public Snxxz.UI.JadeDynastySkillState __Gen_Delegate_Imp219(object p0, int p1)
        public Snxxz.UI.JadeDynastySkillState __Gen_Delegate_Imp210(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5047,7 +4902,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp220(object p0, int p1, out Snxxz.UI.JadeDynastySkillCondition p2)
        public bool __Gen_Delegate_Imp211(object p0, int p1, out Snxxz.UI.JadeDynastySkillCondition p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5071,7 +4926,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp221(object p0, int p1, out UnityEngine.Sprite[] p2)
        public bool __Gen_Delegate_Imp212(object p0, int p1, out UnityEngine.Sprite[] p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5095,7 +4950,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp222(object p0, Snxxz.UI.ActivateShow.ActivateFunc p1, int p2)
        public void __Gen_Delegate_Imp213(object p0, Snxxz.UI.ActivateShow.ActivateFunc p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5119,7 +4974,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp223(object p0, Snxxz.UI.ActivateShow.ActivateFunc p1)
        public void __Gen_Delegate_Imp214(object p0, Snxxz.UI.ActivateShow.ActivateFunc p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5142,7 +4997,7 @@
#endif
        }
        
        public Snxxz.UI.KingTreasureModel __Gen_Delegate_Imp224(object p0)
        public Snxxz.UI.KingTreasureModel __Gen_Delegate_Imp215(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5164,7 +5019,7 @@
#endif
        }
        
        public KingTreasureItemConfig __Gen_Delegate_Imp225(object p0)
        public KingTreasureItemConfig __Gen_Delegate_Imp216(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5186,7 +5041,7 @@
#endif
        }
        
        public string __Gen_Delegate_Imp226(object p0, object p1, int p2)
        public string __Gen_Delegate_Imp217(object p0, object p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5210,7 +5065,7 @@
#endif
        }
        
        public Snxxz.UI.KingTreasureShowModel __Gen_Delegate_Imp227(object p0)
        public Snxxz.UI.KingTreasureShowModel __Gen_Delegate_Imp218(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5232,7 +5087,7 @@
#endif
        }
        
        public Snxxz.UI.CrossServerOneVsOne __Gen_Delegate_Imp228(object p0)
        public Snxxz.UI.CrossServerOneVsOne __Gen_Delegate_Imp219(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5254,7 +5109,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp229(object p0, Snxxz.UI.CrossServerOneVsOne p1)
        public void __Gen_Delegate_Imp220(object p0, Snxxz.UI.CrossServerOneVsOne p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5277,7 +5132,7 @@
#endif
        }
        
        public Snxxz.UI.LoginModel __Gen_Delegate_Imp230(object p0)
        public Snxxz.UI.LoginModel __Gen_Delegate_Imp221(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5299,7 +5154,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp231(object p0, object p1, object p2, int p3, bool p4)
        public void __Gen_Delegate_Imp222(object p0, object p1, object p2, int p3, bool p4)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5325,7 +5180,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp232(object p0, byte p1)
        public void __Gen_Delegate_Imp223(object p0, byte p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5348,7 +5203,7 @@
#endif
        }
        
        public TaskModel __Gen_Delegate_Imp233(object p0)
        public TaskModel __Gen_Delegate_Imp224(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5370,7 +5225,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp234(object p0, int p1, int p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp225(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5394,7 +5249,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp235(object p0, TreasureCategory p1)
        public void __Gen_Delegate_Imp226(object p0, TreasureCategory p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5417,7 +5272,7 @@
#endif
        }
        
        public PlayerDeadModel __Gen_Delegate_Imp236(object p0)
        public PlayerDeadModel __Gen_Delegate_Imp227(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5439,7 +5294,7 @@
#endif
        }
        
        public Snxxz.UI.LuckyTreasureModel __Gen_Delegate_Imp237(object p0)
        public Snxxz.UI.LuckyTreasureModel __Gen_Delegate_Imp228(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5461,7 +5316,7 @@
#endif
        }
        
        public LoginRewardModel __Gen_Delegate_Imp238(object p0)
        public LoginRewardModel __Gen_Delegate_Imp229(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5483,7 +5338,7 @@
#endif
        }
        
        public Snxxz.UI.FestivalRedpackModel __Gen_Delegate_Imp239(object p0)
        public Snxxz.UI.FestivalRedpackModel __Gen_Delegate_Imp230(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5505,7 +5360,7 @@
#endif
        }
        
        public Snxxz.UI.AchievementModel __Gen_Delegate_Imp240(object p0)
        public Snxxz.UI.AchievementModel __Gen_Delegate_Imp231(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5527,7 +5382,7 @@
#endif
        }
        
        public Snxxz.UI.RedEnvelopeModel __Gen_Delegate_Imp241(object p0)
        public Snxxz.UI.RedEnvelopeModel __Gen_Delegate_Imp232(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5549,7 +5404,7 @@
#endif
        }
        
        public System.DateTime __Gen_Delegate_Imp242(object p0, object p1)
        public System.DateTime __Gen_Delegate_Imp233(object p0, object p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5572,7 +5427,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp243(object p0, object p1, int p2)
        public bool __Gen_Delegate_Imp234(object p0, object p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5596,7 +5451,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp244(object p0, int p1, out Snxxz.UI.FestivalRedpack p2)
        public bool __Gen_Delegate_Imp235(object p0, int p1, out Snxxz.UI.FestivalRedpack p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5620,7 +5475,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp245(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.FestivalRedpackAchievement> p2)
        public bool __Gen_Delegate_Imp236(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.FestivalRedpackAchievement> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5644,7 +5499,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp246(object p0, Snxxz.UI.Operation p1, int p2)
        public void __Gen_Delegate_Imp237(object p0, Snxxz.UI.Operation p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5668,7 +5523,7 @@
#endif
        }
        
        public Snxxz.UI.FlashSaleModel __Gen_Delegate_Imp247(object p0)
        public Snxxz.UI.FlashSaleModel __Gen_Delegate_Imp238(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5690,7 +5545,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp248(object p0, Snxxz.UI.OperationFlashSale.FlashSaleGift p1)
        public void __Gen_Delegate_Imp239(object p0, Snxxz.UI.OperationFlashSale.FlashSaleGift p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5713,7 +5568,7 @@
#endif
        }
        
        public OpenServiceAchievementModel __Gen_Delegate_Imp249(object p0)
        public OpenServiceAchievementModel __Gen_Delegate_Imp240(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5735,7 +5590,7 @@
#endif
        }
        
        public Snxxz.UI.OperationLuckyTreasure __Gen_Delegate_Imp250(object p0)
        public Snxxz.UI.OperationLuckyTreasure __Gen_Delegate_Imp241(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5757,7 +5612,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp251(object p0, Snxxz.UI.Operation p1)
        public void __Gen_Delegate_Imp242(object p0, Snxxz.UI.Operation p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5780,7 +5635,7 @@
#endif
        }
        
        public Snxxz.UI.OperationLuckyTreasure.LuckyTreasureItem __Gen_Delegate_Imp252(object p0)
        public Snxxz.UI.OperationLuckyTreasure.LuckyTreasureItem __Gen_Delegate_Imp243(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5802,7 +5657,7 @@
#endif
        }
        
        public Snxxz.UI.MysticalPurchaseModel __Gen_Delegate_Imp253(object p0)
        public Snxxz.UI.MysticalPurchaseModel __Gen_Delegate_Imp244(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5824,7 +5679,7 @@
#endif
        }
        
        public Snxxz.UI.ImpactRankModel __Gen_Delegate_Imp254(object p0)
        public Snxxz.UI.ImpactRankModel __Gen_Delegate_Imp245(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5846,7 +5701,7 @@
#endif
        }
        
        public Snxxz.UI.OSRedEnvelopeModel __Gen_Delegate_Imp255(object p0)
        public Snxxz.UI.OSRedEnvelopeModel __Gen_Delegate_Imp246(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5868,7 +5723,7 @@
#endif
        }
        
        public Snxxz.UI.FairyLeagueModel __Gen_Delegate_Imp256(object p0)
        public Snxxz.UI.FairyLeagueModel __Gen_Delegate_Imp247(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5890,7 +5745,7 @@
#endif
        }
        
        public Snxxz.UI.FairyGrabBossModel __Gen_Delegate_Imp257(object p0)
        public Snxxz.UI.FairyGrabBossModel __Gen_Delegate_Imp248(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5912,7 +5767,7 @@
#endif
        }
        
        public Snxxz.UI.OSGiftModel __Gen_Delegate_Imp258(object p0)
        public Snxxz.UI.OSGiftModel __Gen_Delegate_Imp249(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5934,7 +5789,7 @@
#endif
        }
        
        public Snxxz.UI.VipModel __Gen_Delegate_Imp259(object p0)
        public Snxxz.UI.VipModel __Gen_Delegate_Imp250(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5956,7 +5811,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp260(object p0, int p1, object p2, int p3, int p4)
        public void __Gen_Delegate_Imp251(object p0, int p1, object p2, int p3, int p4)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5982,7 +5837,7 @@
#endif
        }
        
        public SpringFestivalModel __Gen_Delegate_Imp261(object p0)
        public SpringFestivalModel __Gen_Delegate_Imp252(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6004,7 +5859,7 @@
#endif
        }
        
        public Snxxz.UI.ActivateShow.ActivateFunc __Gen_Delegate_Imp262()
        public Snxxz.UI.ActivateShow.ActivateFunc __Gen_Delegate_Imp253()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6025,7 +5880,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp263(Snxxz.UI.ActivateShow.ActivateFunc p0)
        public void __Gen_Delegate_Imp254(Snxxz.UI.ActivateShow.ActivateFunc p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6047,7 +5902,7 @@
#endif
        }
        
        public string __Gen_Delegate_Imp264()
        public string __Gen_Delegate_Imp255()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6068,7 +5923,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp265(int p0, int p1, int p2)
        public void __Gen_Delegate_Imp256(int p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6092,7 +5947,7 @@
#endif
        }
        
        public Snxxz.UI.RealmModel __Gen_Delegate_Imp266(object p0)
        public Snxxz.UI.RealmModel __Gen_Delegate_Imp257(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6114,7 +5969,7 @@
#endif
        }
        
        public Snxxz.UI.MagicianModel __Gen_Delegate_Imp267()
        public Snxxz.UI.MagicianModel __Gen_Delegate_Imp258()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6135,7 +5990,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp268(uint p0, out System.Collections.Generic.Dictionary<int, int> p1)
        public bool __Gen_Delegate_Imp259(uint p0, out System.Collections.Generic.Dictionary<int, int> p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6158,7 +6013,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp269(uint p0, int p1, out int p2)
        public bool __Gen_Delegate_Imp260(uint p0, int p1, out int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6182,7 +6037,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp270(Snxxz.UI.EquipShowSwitch.EquipShowSwitchType p0, uint p1)
        public bool __Gen_Delegate_Imp261(Snxxz.UI.EquipShowSwitch.EquipShowSwitchType p0, uint p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6205,7 +6060,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp271(uint p0)
        public void __Gen_Delegate_Imp262(uint p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6227,7 +6082,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, string> __Gen_Delegate_Imp272(object p0)
        public System.Collections.Generic.Dictionary<int, string> __Gen_Delegate_Imp263(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6249,7 +6104,29 @@
#endif
        }
        
        public int[] __Gen_Delegate_Imp273(object p0, int p1)
        public int[] __Gen_Delegate_Imp264(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);
                
                
                int[] __gen_ret = (int[])translator.GetObject(L, errFunc + 1, typeof(int[]));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public int[] __Gen_Delegate_Imp265(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6272,7 +6149,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp274(object p0, int p1, int p2, int p3, out int p4)
        public bool __Gen_Delegate_Imp266(object p0, int p1, int p2, int p3, out int p4)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6298,7 +6175,7 @@
#endif
        }
        
        public Snxxz.UI.GodWeaponInfo __Gen_Delegate_Imp275(object p0, int p1)
        public Snxxz.UI.GodWeaponInfo __Gen_Delegate_Imp267(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6321,7 +6198,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp276(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.GodWeaponCondition> p2)
        public bool __Gen_Delegate_Imp268(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.GodWeaponCondition> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6345,7 +6222,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp277(object p0, int p1, out Snxxz.UI.AutoHammerCost p2)
        public bool __Gen_Delegate_Imp269(object p0, int p1, out Snxxz.UI.AutoHammerCost p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6369,7 +6246,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp278(object p0, TextColType p1, bool p2)
        public void __Gen_Delegate_Imp270(object p0, TextColType p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6393,7 +6270,7 @@
#endif
        }
        
        public Snxxz.UI.FuncSwitchModel __Gen_Delegate_Imp279(object p0)
        public Snxxz.UI.FuncSwitchModel __Gen_Delegate_Imp271(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6415,7 +6292,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, Snxxz.UI.FuncSwitchModel.FuncSwithData> __Gen_Delegate_Imp280(object p0)
        public System.Collections.Generic.Dictionary<int, Snxxz.UI.FuncSwitchModel.FuncSwithData> __Gen_Delegate_Imp272(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6437,7 +6314,7 @@
#endif
        }
        
        public Snxxz.UI.TestModel __Gen_Delegate_Imp281(object p0)
        public Snxxz.UI.TestModel __Gen_Delegate_Imp273(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6459,7 +6336,7 @@
#endif
        }
        
        public UIEffect __Gen_Delegate_Imp282(object p0)
        public UIEffect __Gen_Delegate_Imp274(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6481,7 +6358,7 @@
#endif
        }
        
        public Treasure3DConfig __Gen_Delegate_Imp283(object p0)
        public Treasure3DConfig __Gen_Delegate_Imp275(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6503,7 +6380,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp284(object p0, UnityEngine.Vector3 p1)
        public UnityEngine.Vector3 __Gen_Delegate_Imp276(object p0, UnityEngine.Vector3 p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6526,7 +6403,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp285(object p0)
        public UnityEngine.Vector3 __Gen_Delegate_Imp277(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6548,7 +6425,7 @@
#endif
        }
        
        public Treasure3DConfig.TreasureParam __Gen_Delegate_Imp286(object p0)
        public Treasure3DConfig.TreasureParam __Gen_Delegate_Imp278(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6570,7 +6447,7 @@
#endif
        }
        
        public Snxxz.UI.UI3DTreasureSelectStage __Gen_Delegate_Imp287()
        public Snxxz.UI.UI3DTreasureSelectStage __Gen_Delegate_Imp279()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6591,7 +6468,7 @@
#endif
        }
        
        public TreasureCategory __Gen_Delegate_Imp288(object p0)
        public TreasureCategory __Gen_Delegate_Imp280(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6613,7 +6490,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp289(object p0, bool p1, TreasureCategory p2)
        public void __Gen_Delegate_Imp281(object p0, bool p1, TreasureCategory p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6637,7 +6514,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp290(object p0, TreasureCategory p1, object p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp282(object p0, TreasureCategory p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6661,7 +6538,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp291(object p0, TreasureCategory p1, bool p2)
        public void __Gen_Delegate_Imp283(object p0, TreasureCategory p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6685,7 +6562,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp292(object p0, int p1)
        public UnityEngine.Vector3 __Gen_Delegate_Imp284(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6708,7 +6585,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp293(object p0, object p1, float p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp285(object p0, object p1, float p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -6732,7 +6609,7 @@
#endif
        }
        
        public Snxxz.UI.SignInModel __Gen_Delegate_Imp294(object p0)
        public Snxxz.UI.SignInModel __Gen_Delegate_Imp286(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)

 Lua/Gen/DelegatesGensBridge.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: a0b56727fd4fea343b550221deb3c6ae
timeCreated: 1550120583
timeCreated: 1552374349
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Lua/Gen/ItemPlusMaxConfigWrap.cs

@@ -21,15 +21,14 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(ItemPlusMaxConfig);
            Utils.BeginObjectRegister(type, L, translator, 0, 1, 5, 0);
            Utils.BeginObjectRegister(type, L, translator, 0, 1, 4, 0);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnConfigParseCompleted", _m_OnConfigParseCompleted);
            
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "id", _g_get_id);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "EquipType", _g_get_EquipType);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "equipPhase", _g_get_equipPhase);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "equipColor", _g_get_equipColor);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "equipStar", _g_get_equipStar);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "levelMax", _g_get_levelMax);
            
            
@@ -43,7 +42,7 @@
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetValues", _m_GetValues_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "Has", _m_Has_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "Init", _m_Init_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetEquipTypeAndPhaseColor", _m_GetEquipTypeAndPhaseColor_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetEquipTypeAndEquipStar", _m_GetEquipTypeAndEquipStar_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetItemPlusMaxLv", _m_GetItemPlusMaxLv_xlua_st_);
            
            
@@ -293,7 +292,7 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_GetEquipTypeAndPhaseColor_xlua_st_(RealStatePtr L)
        static int _m_GetEquipTypeAndEquipStar_xlua_st_(RealStatePtr L)
        {
            try {
            
@@ -303,11 +302,10 @@
            
                
                {
                    int __equipType = LuaAPI.xlua_tointeger(L, 1);
                    int __equipPhase = LuaAPI.xlua_tointeger(L, 2);
                    int __equipColor = LuaAPI.xlua_tointeger(L, 3);
                    int _equipType = LuaAPI.xlua_tointeger(L, 1);
                    int _equipStar = LuaAPI.xlua_tointeger(L, 2);
                    
                        ItemPlusMaxConfig gen_ret = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor( __equipType, __equipPhase, __equipColor );
                        ItemPlusMaxConfig gen_ret = ItemPlusMaxConfig.GetEquipTypeAndEquipStar( _equipType, _equipStar );
                        translator.Push(L, gen_ret);
                    
                    
@@ -390,27 +388,13 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_equipPhase(RealStatePtr L)
        static int _g_get_equipStar(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                ItemPlusMaxConfig gen_to_be_invoked = (ItemPlusMaxConfig)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.equipPhase);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_equipColor(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                ItemPlusMaxConfig gen_to_be_invoked = (ItemPlusMaxConfig)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.equipColor);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.equipStar);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }

 Lua/Gen/ItemPlusMaxConfigWrap.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 4dbb21a8162e9634a945c87bb7928f94
timeCreated: 1550122888
timeCreated: 1552374335
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Lua/Gen/SnxxzUIEquipTrainModelWrap.cs

@@ -38,7 +38,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetMaterialNeed", _m_GetMaterialNeed);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetMaxTrainLevel", _m_GetMaxTrainLevel);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetCandidatePlaces", _m_GetCandidatePlaces);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsEquipPlaceTrainable", _m_IsEquipPlaceTrainable);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetEquipPlaceTrainState", _m_GetEquipPlaceTrainState);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetUnSavedProperties", _m_GetUnSavedProperties);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetTrainedProperties", _m_GetTrainedProperties);
            
@@ -545,7 +545,7 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_IsEquipPlaceTrainable(RealStatePtr L)
        static int _m_GetEquipPlaceTrainState(RealStatePtr L)
        {
            try {
            
@@ -557,7 +557,13 @@
            
                
                {
                    string _equipGuid = LuaAPI.lua_tostring(L, 2);
                    int _level = LuaAPI.xlua_tointeger(L, 2);
                    int _place = LuaAPI.xlua_tointeger(L, 3);
                    
                        Snxxz.UI.EquipTrainModel.TrainState gen_ret = gen_to_be_invoked.GetEquipPlaceTrainState( _level, _place );
                        translator.Push(L, gen_ret);
                    
                    
                    
                    return 1;
                }

 Lua/Gen/XLuaGenAutoRegister.cs

@@ -799,13 +799,13 @@
        
            translator.DelayWrapLoader(typeof(UnityEngine.Bounds), UnityEngineBoundsWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(UnityEngine.Ray2D), UnityEngineRay2DWrap.__Register);
        
        }
        
        static void wrapInit5(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(UnityEngine.Ray2D), UnityEngineRay2DWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(UnityEngine.Time), UnityEngineTimeWrap.__Register);
        
@@ -956,13 +956,13 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.DailyQuestActionTimer), SnxxzUIDailyQuestActionTimerWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.DailyQuestModel), SnxxzUIDailyQuestModelWrap.__Register);
        
        }
        
        static void wrapInit6(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.DailyQuestModel), SnxxzUIDailyQuestModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.ResourcesBackModel), SnxxzUIResourcesBackModelWrap.__Register);
        
@@ -1110,16 +1110,16 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.JadeDynastyTowerModel), SnxxzUIJadeDynastyTowerModelWrap.__Register);
        
        }
        
        static void wrapInit7(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.FBHelpPointExchageModel), SnxxzUIFBHelpPointExchageModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.KnapsackTimeCDMgr), SnxxzUIKnapsackTimeCDMgrWrap.__Register);
        
        }
        
        static void wrapInit7(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.BoxGetItemModel), SnxxzUIBoxGetItemModelWrap.__Register);
        
@@ -1267,16 +1267,16 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.WishingPoolModel), SnxxzUIWishingPoolModelWrap.__Register);
        
        }
        
        static void wrapInit8(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(PetBackpack), PetBackpackWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(PetReinforceModel), PetReinforceModelWrap.__Register);
        
        }
        
        static void wrapInit8(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.RidingAndPetActivationModel), SnxxzUIRidingAndPetActivationModelWrap.__Register);
        
@@ -1421,10 +1421,6 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.VipInvestModel), SnxxzUIVipInvestModelWrap.__Register);
        
        }
        
        static void wrapInit9(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.WheelOfFortuneModel), SnxxzUIWheelOfFortuneModelWrap.__Register);
        
@@ -1434,6 +1430,10 @@
        
            translator.DelayWrapLoader(typeof(SpeechTranslate), SpeechTranslateWrap.__Register);
        
        }
        
        static void wrapInit9(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.AwardExchangeModel), SnxxzUIAwardExchangeModelWrap.__Register);
        

 Lua/Gen/XLuaGenAutoRegister.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ff2dde43802d1d14795873c131842a1e
timeCreated: 1552309981
timeCreated: 1552375168
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Lua/Gen/link.xml

@@ -230,7 +230,6 @@
        <type fullname="mapbornConfig" preserve="all"/>
        <type fullname="mapnpcConfig" preserve="all"/>
        <type fullname="maptransportConfig" preserve="all"/>
        <type fullname="PlayerStoneData" preserve="all"/>
        <type fullname="PlayerDatas" preserve="all"/>
        <type fullname="Snxxz.UI.RealmModel" preserve="all"/>
        <type fullname="SnxxzGame" preserve="all"/>
@@ -336,7 +335,6 @@
        <type fullname="Snxxz.UI.JadeDynastyBossModel" preserve="all"/>
        <type fullname="Snxxz.UI.JadeDynastyDecomposeModel" preserve="all"/>
        <type fullname="Snxxz.UI.JadeDynastyEquipModel" preserve="all"/>
        <type fullname="Snxxz.UI.JadeDynastyGemModel" preserve="all"/>
        <type fullname="Snxxz.UI.JadeDynastySkillModel" preserve="all"/>
        <type fullname="Snxxz.UI.JadeDynastyTowerModel" preserve="all"/>
        <type fullname="Snxxz.UI.FBHelpPointExchageModel" preserve="all"/>
@@ -415,7 +413,6 @@
        <type fullname="Snxxz.UI.BuySuccessModel" preserve="all"/>
        <type fullname="StoreModel" preserve="all"/>
        <type fullname="EquipReinforceModel" preserve="all"/>
        <type fullname="Snxxz.UI.GemModel" preserve="all"/>
        <type fullname="GodBeastModel" preserve="all"/>
        <type fullname="HowToPlayModel" preserve="all"/>
        <type fullname="Snxxz.UI.WingsRedDotModel" preserve="all"/>

 System/BlastFurnace/BlastFurnaceModel.cs

@@ -1073,16 +1073,13 @@


        for (int i = 0; i < itemModels.Count; i++)

        {

            string key = StringUtility.Contact(itemModels[i].itemId, "IsBind", itemModels[i].isBind);

            string key = itemModels[i].itemId.ToString();

            if (!lookRecycleDict.ContainsKey(key))

            {

                List<ItemModel> modellist = new List<ItemModel>();

                modellist.Add(itemModels[i]);

                lookRecycleDict.Add(key, modellist);

                if (itemModels[i].isBind == 1)

                {

                    AddSelectRecycleDan(itemModels[i]);

                }

                AddSelectRecycleDan(itemModels[i]);

            }

            else

            {

@@ -1095,10 +1092,6 @@


    private int CompareByDanBindAndLv(ItemModel start, ItemModel end)

    {

        bool isBindStart = start.isBind == 1 ? true : false;

        bool isBindEnd = end.isBind == 1 ? true : false;

        if (isBindStart.CompareTo(isBindEnd) != 0) return -isBindStart.CompareTo(isBindEnd);



        int startLv = start.config.LV;

        int endLv = end.config.LV;

        if (startLv.CompareTo(endLv) != 0) return startLv.CompareTo(endLv);

@@ -1111,7 +1104,7 @@
    public event Action RefreshSelectRecycleAct;

    public void AddSelectRecycleDan(ItemModel itemModel)

    {

        string key = StringUtility.Contact(itemModel.itemId, "IsBind", itemModel.isBind);

        string key = itemModel.itemId.ToString();

        if (!recycleStrlist.Contains(key))

        {

            recycleStrlist.Add(key);

@@ -1125,7 +1118,7 @@


    public void RemoveSelectRecycleDan(ItemModel itemModel)

    {

        string key = StringUtility.Contact(itemModel.itemId, "IsBind", itemModel.isBind);

        string key = itemModel.itemId.ToString();

        if (recycleStrlist.Contains(key))

        {

            recycleStrlist.Remove(key);

@@ -1163,8 +1156,6 @@
            return;

        }

        #region 设置回收数据

        int unBindCnt = 0;

        int sumCnt = 0;

        int getMoney = 0;

        recycleDanDict.Clear();

        for (int i = 0; i < recycleStrlist.Count; i++)

@@ -1175,16 +1166,10 @@
            {

                for (int j = 0; j < modellist.Count; j++)

                {

                    sumCnt += modellist[j].count;

                    if (modellist[j].isBind == 0)

                    {

                        unBindCnt += modellist[j].count;

                    }



                    if (playerPack.CheckIsDrugById(modellist[j].itemId))

                    {

                        AttrFruitConfig fruitConfig = AttrFruitConfig.Get(modellist[j].itemId);

                        getMoney = getMoney + fruitConfig.RecycleExp * modellist[j].count;

                        getMoney += fruitConfig.RecycleExp * modellist[j].count;

                    }



                    if (!recycleDanDict.ContainsKey(modellist[j].itemPlace))

@@ -1200,56 +1185,11 @@
        }

        #endregion

        SendRecycleDrugQuest(recycleDanDict.Keys.ToList(), recycleDanDict.Values.ToList());

        //if (isOpenPrompting)

        //{

        //    ConfirmCancel.ToggleConfirmCancel(Language.Get("Mail101"), Language.Get("BlastFurnace114",sumCnt,getMoney,string.Format("<Img chat={0}/>",StringUtility.Contact("Money_Type_",27))),

        //        Language.Get("ConfirmCancel102"),(bool isOk, bool isToggle) =>

        //       {

        //         if (isOk)

        //         {

        //               if(unBindCnt > 0)

        //               {

        //                   ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("BlastFurnace115", unBindCnt),

        //                  (bool isRecycle) =>

        //                  {

        //                     if (isRecycle)

        //                     {

        //                         SendRecycleDrugQuest(recycleDanDict.Keys.ToList(), recycleDanDict.Values.ToList());

        //                     }

        //                 });

        //               }

        //               else

        //               {

        //                   SendRecycleDrugQuest(recycleDanDict.Keys.ToList(), recycleDanDict.Values.ToList());

        //               }

        //         }

        //         isOpenPrompting = !isToggle;

        //     });

        //}

        //else

        //{

        //    if (unBindCnt > 0)

        //    {

        //       ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("BlastFurnace115", unBindCnt),

        //       (bool isRecycle) =>

        //       {

        //           if (isRecycle)

        //           {

        //               SendRecycleDrugQuest(recycleDanDict.Keys.ToList(), recycleDanDict.Values.ToList());

        //           }

        //       });

        //    }

        //    else

        //    {

        //        SendRecycleDrugQuest(recycleDanDict.Keys.ToList(), recycleDanDict.Values.ToList());

        //    }

        //}



    }



    public void SendRecycleDrugQuest(List<int> indexs, List<int> nums)

    {

        CA32A_tagCMRecycleAttrFruit recycleAttrFruit = new CA32A_tagCMRecycleAttrFruit();

        var recycleAttrFruit = new CA32A_tagCMRecycleAttrFruit();

        recycleAttrFruit.IndexCount = (byte)indexs.Count;

        byte[] indexByte = new byte[indexs.Count];

        ushort[] numShort = new ushort[indexs.Count];


 System/BlastFurnace/RecycleDrugCell.cs

@@ -21,7 +21,7 @@
            {

                itemCell.gameObject.SetActive(true);

                ItemModel itemModel = list[0];

                string key = StringUtility.Contact(itemModel.itemId, "IsBind", itemModel.isBind);

                string key = itemModel.itemId.ToString();

                if (blastFurnace.recycleStrlist.Contains(key))

                {

                    selectImg.SetActive(true);


 System/Compose/New/ComposeEquipWin.cs

@@ -59,14 +59,12 @@
        [SerializeField] UIEffect failEffect;



        ComposeWinModel _composeWinModel;

        ComposeWinModel composeWinModel

        {

        ComposeWinModel composeWinModel {

            get { return _composeWinModel ?? (_composeWinModel = ModelCenter.Instance.GetModel<ComposeWinModel>()); }

        }



        PackModel _playerPack;

        PackModel playerPack

        {

        PackModel playerPack {

            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }

        }



@@ -86,8 +84,7 @@
        bool isIncreaseRate = false;

        int successRate = 0;

        SelectEquipModel _selectModel;

        SelectEquipModel selectModel    
        {

        SelectEquipModel selectModel {

            get { return _selectModel ?? (_selectModel = ModelCenter.Instance.GetModel<SelectEquipModel>()); }

        }

        protected override void BindController()

@@ -144,8 +141,8 @@
        #region 新的逻辑

        private void Display()

        {

            composeWinModel.TryGetFirstTypeData((int)ComposeFuncType.Equip,out firstTypeData);

            if (firstTypeData == null ) return;

            composeWinModel.TryGetFirstTypeData((int)ComposeFuncType.Equip, out firstTypeData);

            if (firstTypeData == null) return;



            isIncreaseRate = false;

            successRate = 0;

@@ -163,7 +160,7 @@
                composeWinModel.ResetJumpToModel();

            }



            if(composeWinModel.CurComposeModel == null)

            if (composeWinModel.CurComposeModel == null)

            {

                curComposeEquipIndex = -1;

            }

@@ -188,17 +185,17 @@
            if (firstTypeData == null) return;



            cellCtrl.Refresh();

            foreach(var second in firstTypeData.secondTypeDict.Keys)

            foreach (var second in firstTypeData.secondTypeDict.Keys)

            {

                cellCtrl.AddCell(ScrollerDataType.Header,second);

                if(second == curSecondType)

                cellCtrl.AddCell(ScrollerDataType.Header, second);

                if (second == curSecondType)

                {

                    var thirdTypeDict = firstTypeData.secondTypeDict[second].thirdTypeDict;

                    foreach(var third in thirdTypeDict.Keys)

                    foreach (var third in thirdTypeDict.Keys)

                    {

                        if (third != 0)

                        {

                            cellCtrl.AddCell(ScrollerDataType.Normal,third);

                            cellCtrl.AddCell(ScrollerDataType.Normal, third);

                        }

                    }

                }

@@ -209,7 +206,7 @@
            {

                CreateEquipTypeLineCell();

                composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Equip, curSecondType, curThirdType, out thirdTypeData);

                if(thirdTypeData != null)

                if (thirdTypeData != null)

                {

                    ItemConfig itemConfig = ItemConfig.Get(thirdTypeData.itemCompound.makeID[0]);

                    if (itemConfig != null && itemConfig.ItemColor == 6)

@@ -292,7 +289,7 @@
        {

            curThirdType = 0;

            curSecondType = secondType;

            composeWinModel.TryGetSecondTypeData((int)ComposeFuncType.Equip,secondType,out secondTypeData);

            composeWinModel.TryGetSecondTypeData((int)ComposeFuncType.Equip, secondType, out secondTypeData);

            OnClickSecondType();

            CreateTypeCell();

            JumpIndex();

@@ -334,7 +331,7 @@


        private void UpdateThirdType(int thirdType)

        {

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Equip, curSecondType,thirdType, out thirdTypeData);

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Equip, curSecondType, thirdType, out thirdTypeData);

            curThirdType = thirdType;

            OnClickThirdType();

            CreateTypeCell();

@@ -380,7 +377,7 @@
                if (thirdTypeDatas.Count > 0)

                {

                    ItemCompoundConfig tagItemCompound = thirdTypeDatas[0].itemCompound;

                    UpdateEquipType(tagItemCompound,0);

                    UpdateEquipType(tagItemCompound, 0);

                    RefreshUI(tagItemCompound);

                    ChangeUIState(false, false, true);

                }

@@ -420,7 +417,7 @@
            int[] fixedIds = compoundModel.itemID;

            int[] fixedDisplays = compoundModel.itemDisplay;

            int[] unfixedDisplays = compoundModel.unfixedItemDisplay;

            if(compoundModel.unfixedItemCount <= 3)

            if (compoundModel.unfixedItemCount <= 3)

            {

                three_ComposeEquip.SetActive(true);

                five_ComposeEquip.SetActive(false);

@@ -473,7 +470,7 @@
                int increaseNeedNum = increases[1];

                int increaseRate = increases[2] / 100;

                increaseRateMatCell.gameObject.SetActive(true);

                increaseRateMatCell.SetDisplay(compoundModel,NeedMatType.IncreaseItem,false,"",increaseId);

                increaseRateMatCell.SetDisplay(compoundModel, NeedMatType.IncreaseItem, false, "", increaseId);

                increaseText.text = Language.Get("Compose109", StringUtility.Contact(increaseRate, "%"));

                int haveIncreaseNum = playerPack.GetItemCountByID(PackType.Item, increaseId);

                ItemConfig itemConfig = ItemConfig.Get(increaseId);

@@ -511,7 +508,7 @@
            switch (selectType)

            {

                case SelectItemType.unfixed:

                    matCell.SetDisplay(compoundModel,NeedMatType.unfixedItem,false,"",0,itemIndex);

                    matCell.SetDisplay(compoundModel, NeedMatType.unfixedItem, false, "", 0, itemIndex);

                    break;

                case SelectItemType.addons:

                    matCell.SetDisplay(compoundModel, NeedMatType.addItem, false, "", 0, itemIndex);

@@ -519,12 +516,12 @@
            }

        }



        private void UpdateReduce(ComposeMatCell matCell,NeedMatType matType)

        private void UpdateReduce(ComposeMatCell matCell, NeedMatType matType)

        {

            switch (matType)

            {

                case NeedMatType.unfixedItem:

                    matCell.SetDisplay(compoundModel,matType, false, UIHelper.ReplaceNewLine(Language.Get("ComposeWin_PutInText_2")));

                    matCell.SetDisplay(compoundModel, matType, false, UIHelper.ReplaceNewLine(Language.Get("ComposeWin_PutInText_2")));

                    break;

                case NeedMatType.addItem:

                    matCell.SetDisplay(compoundModel, matType, false);

@@ -561,9 +558,9 @@
            List<ComposeWinModel.ComposeThirdTypeData> thirdTypeDatas = null;

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Equip, curSecondType, curThirdType, out thirdTypeDatas);

            EquipTypeLineCell typeLineCell = cell.GetComponent<EquipTypeLineCell>();

            typeLineCell.Refresh(cell,thirdTypeDatas);

            typeLineCell.Refresh(cell, thirdTypeDatas);

        }

    


        private void RefreshUI(ItemCompoundConfig compoundModel)

        {

            this.compoundModel = compoundModel;

@@ -592,25 +589,25 @@
            {

                successRate = compoundModel.successRate;

            }

            if(isIncreaseRate)

            if (isIncreaseRate)

            {

                int[] increases = compoundModel.successRateIncrease;

                if(increases != null && increases.Length > 1)

                if (increases != null && increases.Length > 1)

                {

                    increaseRate = increases[2] / 100;

                }

            }

            
            if(increaseRate > 0)



            if (increaseRate > 0)

            {

                string extraAddRate = UIHelper.AppendStringColor(TextColType.Green,StringUtility.Contact("+", increaseRate, "%"),true);

                string extraAddRate = UIHelper.AppendStringColor(TextColType.Green, StringUtility.Contact("+", increaseRate, "%"), true);

                successRateText.text = Language.Get("HallowsWin_Success", StringUtility.Contact(successRate / 100, "%", extraAddRate));

            }

            else

            {

                successRateText.text = Language.Get("HallowsWin_Success", StringUtility.Contact(successRate / 100, "%"));

            }

           


        }



        private void OnClickOnekeyPutBtn()

@@ -634,7 +631,7 @@
                    var matCell = fixedAndUnfixeds[unfixedDisplay - 1];

                    if (matCell.itemModel == null)

                    {

                        for(int j = 0; j < unSelectItems.Count; j++)

                        for (int j = 0; j < unSelectItems.Count; j++)

                        {

                            ItemModel _model = unSelectItems[j];

                            if (!unfixeAddDict.ContainsKey(_model.itemPlace))

@@ -649,18 +646,18 @@
            }

        }



        private int CompareByOverdueTime(ItemModel start,ItemModel end)

        private int CompareByOverdueTime(ItemModel start, ItemModel end)

        {

            int remainTime1 = 0;

            int remainTime2 = 0;

            bool isRemain1 = TryGetRemainTime(start,out remainTime1);

            bool isRemain2 = TryGetRemainTime(end,out remainTime2);

            bool isRemain1 = TryGetRemainTime(start, out remainTime1);

            bool isRemain2 = TryGetRemainTime(end, out remainTime2);

            if (isRemain1.CompareTo(isRemain2) != 0) return -isRemain1.CompareTo(isRemain2);

            if (remainTime1.CompareTo(remainTime2) != 0) return -remainTime1.CompareTo(remainTime2);

            return 0;

        }



        private bool TryGetRemainTime(ItemModel model,out int seconds)

        private bool TryGetRemainTime(ItemModel model, out int seconds)

        {

            seconds = 0;

            if (model.config.EquipPlace != (int)RoleEquipType.Guard1

@@ -702,7 +699,7 @@
                }

            }

            ItemConfig itemConfig = ItemConfig.Get(compoundModel.makeID[0]);

            switch((RoleEquipType)itemConfig.EquipPlace)

            switch ((RoleEquipType)itemConfig.EquipPlace)

            {

                case RoleEquipType.Guard1:

                    if (!composeWinModel.IsEnoughUnfixedMat(compoundModel))

@@ -712,13 +709,13 @@
                    else

                    {

                        WindowCenter.Instance.Open<GuardComposeConfirmWin>();

                    }                
                    }

                    break;

                default:

                    SetFixedItemIndexDic();

                    composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict, GetPlayUIEffct(), 1, 10000, isIncreaseRate);

                    break;

            }            
            }

        }



        private void SetFixedItemIndexDic()

@@ -730,27 +727,11 @@
            SinglePack singlePack = playerPack.GetSinglePack(packType);

            if (singlePack == null) return;



            int minBindCnt = 0;

            int minNoBindCnt = 0;

            composeWinModel.GetBindOrNoBindMinCnt(out minBindCnt, out minNoBindCnt);

            int[] fixedIds = compoundModel.itemID;

            int[] fixedCounts = compoundModel.itemCount;

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

            {

                List<int> itemIndexlist = null;

                if (minBindCnt >= fixedCounts[i])

                {

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i], fixedCounts[i], true);

                }

                else if (minNoBindCnt >= fixedCounts[i])

                {

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i], fixedCounts[i], false);

                }

                else

                {

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i], fixedCounts[i]);

                }



                var itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i], fixedCounts[i]);

                if (itemIndexlist != null)

                {

                    fixedItemIndexDict.Add(fixedIds[i], itemIndexlist);

@@ -763,7 +744,7 @@
        {

            if (compoundModel == null) return null;



             if(compoundModel.unfixedItemCount <= 3)

            if (compoundModel.unfixedItemCount <= 3)

            {

                return composeEffect_Three;

            }


 System/Compose/New/ComposeTicketWin.cs

@@ -28,17 +28,15 @@
        [SerializeField] List<ComposeMatCell> twoMatFixedAndUnfixeds = new List<ComposeMatCell>();

        [Header("合成物品")]

        [SerializeField] List<ComposeMatCell> makeItems = new List<ComposeMatCell>();

       


        ComposeWinModel _composeWinModel;

        ComposeWinModel composeWinModel

        {

        ComposeWinModel composeWinModel {

            get { return _composeWinModel ?? (_composeWinModel = ModelCenter.Instance.GetModel<ComposeWinModel>()); }

        }



    


        PackModel _playerPack;

        PackModel playerPack

        {

        PackModel playerPack {

            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }

        }



@@ -51,7 +49,7 @@
        private int preSecondType = 0;

        [SerializeField] int initSuccessRate = 10000;

        ItemCompoundConfig compoundModel = null;

        private Dictionary<int,List<int>> fixedItemIndexDict = new Dictionary<int, List<int>>();

        private Dictionary<int, List<int>> fixedItemIndexDict = new Dictionary<int, List<int>>();

        AchievementGuideEffect guidEffect = null;



        protected override void BindController()

@@ -60,7 +58,7 @@
            cellCtrl.vertical = true;

            cellCtrl.lockType = EnhanceLockType.KeepVertical;

            composeWinModel.ResetModelEvent += ResetModel;

          


        }



        protected override void AddListeners()

@@ -110,7 +108,7 @@
            bool isJumpTo = false;

            var achieveId = AchievementGoto.guideAchievementId;

            SuccessConfig successConfig = SuccessConfig.Get(achieveId);

            if(successConfig != null && successConfig.Type == 69)

            if (successConfig != null && successConfig.Type == 69)

            {

                isJumpTo = true;

                curSecondType = composeWinModel.secondType;

@@ -201,7 +199,7 @@
            else

            {

                RefreshUI(null);

                UpdateUIShow(false,true, false,false);

                UpdateUIShow(false, true, false, false);

            }

        }



@@ -329,13 +327,13 @@
            for (int i = 0; i < makeItems.Count; i++)

            {

                var matCell = makeItems[i];

                if(makeIds != null && i < makeIds.Length)

                if (makeIds != null && i < makeIds.Length)

                {

                    matCell.SetDisplay(compoundModel, NeedMatType.MakeItem,false,"",makeIds[i]);

                    matCell.SetDisplay(compoundModel, NeedMatType.MakeItem, false, "", makeIds[i]);

                }

                else

                {

                    matCell.SetDisplay(compoundModel, NeedMatType.MakeItem,true);

                    matCell.SetDisplay(compoundModel, NeedMatType.MakeItem, true);

                }

            }



@@ -343,7 +341,7 @@
            int[] fixedDisplays = compoundModel.itemDisplay;

            int[] unfixedIds = compoundModel.unfixedItemID;

            int[] unfixedDisplays = compoundModel.unfixedItemDisplay;

            if(fixedIds != null && fixedIds.Length < 2)

            if (fixedIds != null && fixedIds.Length < 2)

            {

                for (int i = 0; i < oneMatFixedAndUnfixeds.Count; i++)

                {

@@ -373,7 +371,7 @@
                    }

                }

            }

            else if(fixedIds != null)

            else if (fixedIds != null)

            {

                for (int i = 0; i < twoMatFixedAndUnfixeds.Count; i++)

                {

@@ -403,7 +401,7 @@
                    }

                }

            }

           


            _moneyCountText.text = ItemLogicUtility.Instance.OnChangeCoinsUnit((ulong)compoundModel.money);

        }



@@ -412,9 +410,9 @@
            if (compoundModel == null) return null;



            int[] fixedIds = compoundModel.itemID;

            if(fixedIds != null)

            if (fixedIds != null)

            {

                if(fixedIds.Length < 2)

                if (fixedIds.Length < 2)

                {

                    return oneMatComposeEffect;

                }

@@ -447,7 +445,7 @@
            composeWinModel.SetCurComposeModel(compoundModel);

            UpdateComposeMat();

        }

     


        private void ClickAllComposeBtn()

        {

            fixedItemIndexDict.Clear();

@@ -489,7 +487,7 @@
                    break;

                }

            }

            composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict,GetPlayMatEffect(), composeCnt);

            composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict, GetPlayMatEffect(), composeCnt);

        }



        private void OnClickComposeBtn()

@@ -503,7 +501,7 @@
                return;

            }

            SetFixedItemIndexDic();

            composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict,GetPlayMatEffect(),1);

            composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict, GetPlayMatEffect(), 1);

        }



        private void SetFixedItemIndexDic()

@@ -514,35 +512,19 @@
            SinglePack singlePack = playerPack.GetSinglePack(packType);

            if (singlePack == null) return;



            int minBindCnt = 0;

            int minNoBindCnt = 0;

            composeWinModel.GetBindOrNoBindMinCnt(out minBindCnt,out minNoBindCnt);

            int[] fixedIds = compoundModel.itemID;

            int[] fixedCounts = compoundModel.itemCount;



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

            {

                List<int> itemIndexlist = null;

                if (minBindCnt >= fixedCounts[i])

                {

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i],fixedCounts[i], true);

                }

                else if(minNoBindCnt >= fixedCounts[i])

                {

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i],fixedCounts[i],false);

                }

                else

                {

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i],fixedCounts[i]);

                }



                var itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i], fixedCounts[i]);

                if (itemIndexlist != null)

                {

                    fixedItemIndexDict.Add(fixedIds[i], itemIndexlist);

                }

            }



           


        }



        private void OnComposeAnswer(HA814_tagMCMakeItemAnswer answer)


 System/Compose/New/ComposeToolsWin.cs

@@ -40,8 +40,7 @@
        [SerializeField] UIEffect composeEffect;



        ComposeWinModel _composeWinModel;

        ComposeWinModel composeWinModel

        {

        ComposeWinModel composeWinModel {

            get { return _composeWinModel ?? (_composeWinModel = ModelCenter.Instance.GetModel<ComposeWinModel>()); }

        }



@@ -52,11 +51,10 @@
        [SerializeField] int initSuccessRate = 10000;

        ItemCompoundConfig compoundModel = null;



        private Dictionary<int,List<int>> fixedItemIndexDict = new Dictionary<int, List<int>>();

        private Dictionary<int, List<int>> fixedItemIndexDict = new Dictionary<int, List<int>>();



        PackModel _playerPack;

        PackModel playerPack

        {

        PackModel playerPack {

            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }

        }



@@ -157,7 +155,7 @@
                        }

                    }

                }

               


            }

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Item, curSecondType, curThirdType, out thirdTypeData);

            if (thirdTypeData != null)

@@ -211,14 +209,14 @@
                        {

                            if (second != 3)

                            {

                                cellCtrl.AddCell(ScrollerDataType.Normal,third);

                                cellCtrl.AddCell(ScrollerDataType.Normal, third);

                            }

                            else

                            {

                                var makerIds = thirdTypeDatas[0].itemCompound.makeID;

                                if (composeWinModel.IsComposeJobLimit(makerIds[0]))

                                {

                                    cellCtrl.AddCell(ScrollerDataType.Normal,third);

                                    cellCtrl.AddCell(ScrollerDataType.Normal, third);

                                }

                            }

                        }

@@ -267,7 +265,7 @@
                    break;

                }

            }

            if(curThirdType >= 4)

            if (curThirdType >= 4)

            {

                curIndex = curIndex + curThirdType - 2;

            }

@@ -414,7 +412,7 @@
            curSecondType = 0;

            curThirdType = 0;

            compoundModel = null;

            if(!WindowJumpMgr.Instance.IsJumpState)

            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                preSecondType = 0;

                preThirdType = 0;

@@ -444,7 +442,7 @@
            }



            SetFixedItemIndexDic();

            composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict,composeEffect,1);

            composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict, composeEffect, 1);

        }



        private void SetFixedItemIndexDic()

@@ -455,27 +453,11 @@
            SinglePack singlePack = playerPack.GetSinglePack(packType);

            if (singlePack == null) return;



            int minBindCnt = 0;

            int minNoBindCnt = 0;

            composeWinModel.GetBindOrNoBindMinCnt(out minBindCnt, out minNoBindCnt);

            int[] fixedIds = compoundModel.itemID;

            int[] fixedCounts = compoundModel.itemCount;

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

            {

                List<int> itemIndexlist = null;

                if (minBindCnt >= fixedCounts[i])

                {

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i],fixedCounts[i], true);

                }

                else if (minNoBindCnt >= fixedCounts[i])

                {

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i],fixedCounts[i], false);

                }

                else

                {

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i],fixedCounts[i]);

                }



                var itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i], fixedCounts[i]);

                if (itemIndexlist != null)

                {

                    fixedItemIndexDict.Add(fixedIds[i], itemIndexlist);

@@ -504,13 +486,13 @@


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

            {

                int haveCount = playerPack.GetItemCountByID(packType,fixedIds[i]);

                int haveCount = playerPack.GetItemCountByID(packType, fixedIds[i]);

                int canComposeCount = haveCount / fixedCounts[i];

                composeCountlist.Add(canComposeCount);

                List<int> itemIndexlist = null;

                if (singlePack != null)

                {

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i],fixedCounts[i] * canComposeCount);

                    itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i], fixedCounts[i] * canComposeCount);

                }

                fixedItemIndexDict.Add(fixedIds[i], itemIndexlist);

            }


 System/Compose/New/ComposeWinModel.cs

@@ -1001,55 +1001,6 @@
        return itemArray;

    }



    public void GetBindOrNoBindMinCnt(out int minBindCnt, out int minNoBindCnt)

    {

        minBindCnt = 0;

        minNoBindCnt = 0;

        if (CurComposeModel == null) return;



        Dictionary<int, int> bindCntDic = new Dictionary<int, int>();

        Dictionary<int, int> noBindCntDic = new Dictionary<int, int>();

        int[] fixedIds = CurComposeModel.itemID;

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

        {

            var list = playerPack.GetSinglePack(PackType.Item).GetItemsById(fixedIds[i]);

            if (list != null)

            {

                int bindCnt = 0;

                int noBindCnt = 0;

                for (int j = 0; j < list.Count; j++)

                {

                    if (list[j].isBind == 1)

                    {

                        bindCnt += list[j].count;



                    }

                    else if (list[j].isBind == 0)

                    {

                        noBindCnt += list[j].count;

                    }

                }

                bindCntDic.Add(fixedIds[i], bindCnt);

                noBindCntDic.Add(fixedIds[i], noBindCnt);

            }

        }



        List<int> bindCntlist = bindCntDic.Values.ToList();

        bindCntlist.Sort();

        if (bindCntlist.Count > 0)

        {

            minBindCnt = bindCntlist[0];

        }



        List<int> noBindCntlist = noBindCntDic.Values.ToList();

        noBindCntlist.Sort();

        if (noBindCntlist.Count > 0)

        {

            minNoBindCnt = noBindCntlist[0];

        }



    }



    /// <summary>

    /// 计算附加材料增加的成功率

    /// </summary>


 System/Compose/New/ComposeWingsWin.cs

@@ -610,26 +610,16 @@
            var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);

            SinglePack singlePack = playerPack.GetSinglePack(packType);

            if (singlePack == null) return;

            int isBind = 0;



            if(IsComposeBind)

            {

                isBind = 1;

            }

            else

            {

                isBind = 0;

            }

            int[] fixedIds = compoundModel.itemID;

            int[] fixedCounts = compoundModel.itemCount;

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

            {

                List<int> itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i], fixedCounts[i],isBind==1);

                List<int> itemIndexlist = singlePack.GetItemIndexsAppointedCount(fixedIds[i], fixedCounts[i]);

                if (itemIndexlist != null)

                {

                    fixedItemIndexDict.Add(fixedIds[i], itemIndexlist);

                }



            }

        }




 System/Compose/New/SelectEquipModel.cs

@@ -177,10 +177,6 @@
        y = end.config.StarLevel;

        if (x.CompareTo(y) != 0) return x.CompareTo(y);



        x = start.isBind;

        y = end.isBind;

        if (x.CompareTo(y) != 0) return -x.CompareTo(y);



        x = oneKeyPutlist.IndexOf(start);

        y = oneKeyPutlist.IndexOf(end);

        if (x.CompareTo(y) != 0) return x.CompareTo(y);

@@ -190,10 +186,6 @@


    public int CompareByCondition(ItemModel start, ItemModel end)

    {

        int startIsBind = start.isBind;

        int endIsBind = end.isBind;

        if (startIsBind.CompareTo(endIsBind) != 0) return startIsBind.CompareTo(endIsBind);



        int startQuality = start.config.ItemColor;

        int endQuality = end.config.ItemColor;

        if (startQuality.CompareTo(endQuality) != 0) return startQuality.CompareTo(endQuality);


 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

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: f3fe1c9e8a1842a45a9ba5a42109aaf9
timeCreated: 1552361552
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 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

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 47cefd6066776454b8dd49ab23e93029
timeCreated: 1552361612
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 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

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 1516767d3f16f2b42935fd31e00c3dca
timeCreated: 1552361590
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 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/EquipTrain/EquipTrainModel.cs

@@ -27,6 +27,12 @@
        public override void Init()
        {
            ParseConfig();

            var levels = equipModel.GetAllEquipSets();
            foreach (var level in levels)
            {
                equipTrains[level] = new EquipTrainSet(level);
            }
        }

        public override void UnInit()
@@ -178,6 +184,32 @@
                return;
            }

            if (invevitable)
            {
                var properties = GetTrainedProperties(selectedLevel.value, selectedPlace.value);
                var type = GetTrainType(selectedPlace.value);
                var trainLevel = GetTrainLevel(selectedLevel.value, selectedPlace.value);
                var data = EquipWashConfig.Get(type, trainLevel);
                var isPerfect = false;
                switch (index)
                {
                    case 1:
                        isPerfect = properties[index - 1] >= data.config.attMax1;
                        break;
                    case 2:
                        isPerfect = properties[index - 1] >= data.config.attMax2;
                        break;
                    case 3:
                        isPerfect = properties[index - 1] >= data.config.attMax3;
                        break;
                }

                if (isPerfect)
                {
                    return;
                }
            }

            if (propertyBars.Count > index)
            {
                propertyBars[index].inevitable.value = invevitable;
@@ -255,17 +287,29 @@
                return TrainState.Empty;
            }

            var currentStarLevel = GetTrainLevel(equip.config.LV, equip.config.EquipPlace);
            var absoluteMax = GetMaxTrainLevel(equip.config.EquipPlace);
            if (currentStarLevel >= absoluteMax)
            var type = GetTrainType(place);
            var currentStarLevel = GetTrainLevel(level, place);
            var absoluteMax = GetMaxTrainLevel(place);
            var data = EquipWashConfig.Get(type, Mathf.Clamp(currentStarLevel, 1, absoluteMax));
            if (data == null)
            {
                return TrainState.MaxLevel;
                return TrainState.Empty;
            }

            var relativeMax = GetMaxTrainLevel(equip.config.LV, equip.config.EquipPlace);
            if (currentStarLevel >= relativeMax)
            var properties = GetTrainedProperties(level, place);
            var isFull = properties.x >= data.config.attMax1 && properties.y >= data.config.attMax2 && properties.z >= data.config.attMax3;
            if (isFull)
            {
                return TrainState.StarLimit;
                if (currentStarLevel >= absoluteMax)
                {
                    return TrainState.MaxLevel;
                }

                var relativeMax = GetMaxTrainLevel(equip.config.LV, equip.config.EquipPlace);
                if (currentStarLevel >= relativeMax)
                {
                    return TrainState.StarLimit;
                }
            }

            return TrainState.Allowable;
@@ -316,7 +360,7 @@
            var unSavedProperties = GetUnSavedProperties(level, place);
            var trainedProperties = GetTrainedProperties(level, place);
            var trainLevel = GetTrainLevel(level, place);
            var data = EquipWashConfig.Get(GetTrainType(place), Mathf.Clamp(trainLevel + 1, 1, absoluteMax));
            var data = EquipWashConfig.Get(GetTrainType(place), Mathf.Clamp(trainLevel, 1, absoluteMax));

            if (data != null)
            {
@@ -370,25 +414,23 @@

        private TrainOperateType CalculateTrainOperateType(int level, int place)
        {
            var currentLevel = GetTrainLevel(level, place);
            var maxLevel = GetMaxTrainLevel(level, place);
            if (maxLevel > 0 && currentLevel >= maxLevel)
            {
                return TrainOperateType.Max;
            }

            var unSavedProperties = GetUnSavedProperties(level, place);
            if (unSavedProperties != Int3.zero)
            {
                return TrainOperateType.Save;
            }

            var trainable = GetEquipPlaceTrainState(level, place) == TrainState.Allowable;
            if (trainable)
            var trainState = GetEquipPlaceTrainState(level, place);
            if (trainState == TrainState.Allowable)
            {
                return TrainOperateType.Train;
            }

            if (trainState == TrainState.StarLimit || trainState == TrainState.MaxLevel)
            {
                return TrainOperateType.Max;
            }

            return TrainOperateType.None;
        }


 System/EquipTrain/EquipTrainPropertyBarBehaviour.cs

@@ -48,16 +48,19 @@
                    m_Progress.value = 0;
                    m_Value.text = "0";
                    m_DeltaValue.gameObject.SetActive(false);
                    m_Inevitable.gameObject.SetActive(true);
                    break;
                case EquipTrainModel.TrainState.StarLimit:
                    m_Progress.value = 1;
                    m_Value.text = string.Format("{0}/{1}", propertyBar.propertyValue, propertyBar.upperLimit);
                    m_DeltaValue.gameObject.SetActive(false);
                    m_DeltaValue.gameObject.SetActive(true);
                    m_Inevitable.gameObject.SetActive(false);
                    break;
                case EquipTrainModel.TrainState.MaxLevel:
                    m_Progress.value = 1;
                    m_Value.text = string.Format("{0}/{1}", propertyBar.propertyValue, propertyBar.upperLimit);
                    m_DeltaValue.gameObject.SetActive(false);
                    m_DeltaValue.gameObject.SetActive(true);
                    m_Inevitable.gameObject.SetActive(false);
                    break;
                case EquipTrainModel.TrainState.Allowable:
                    m_Inevitable.gameObject.SetActive(true);
@@ -69,11 +72,6 @@

        private void DisplayDynamicInfo(bool force)
        {
            if (force || propertyBar.inevitable.dirty)
            {
                m_Inevitable.isOn = propertyBar.inevitable.Fetch();
            }

            if (force || propertyBar.propertyValue.dirty)
            {
                var value = propertyBar.propertyValue.Fetch();
@@ -89,38 +87,41 @@
                var inevitable = propertyBar.inevitable.Fetch();

                m_Inevitable.isOn = inevitable;
                if (operateType == EquipTrainModel.TrainOperateType.Train)

                var isPerfect = propertyBar.upperLimit > 0 && propertyBar.propertyValue.value >= propertyBar.upperLimit;
                if (isPerfect)
                {
                    var isPerfect = propertyBar.upperLimit > 0 && propertyBar.propertyValue.value >= propertyBar.upperLimit;
                    if (isPerfect)
                    {
                        m_DeltaValue.text = "完美";
                        m_DeltaValue.color = UIHelper.GetUIColor(TextColType.Green, true);
                    }
                    else
                    {
                        m_DeltaValue.text = inevitable ? "必增" : "";
                    }
                    m_DeltaValue.text = "完美";
                    m_DeltaValue.color = UIHelper.GetUIColor(TextColType.Green, true);
                }
                else
                {
                    if (deltaValue > 0)
                    if (operateType == EquipTrainModel.TrainOperateType.Train)
                    {
                        m_DeltaValue.text = string.Format("+{0}", deltaValue);
                        m_DeltaValue.text = inevitable ? "必增" : "";
                        m_DeltaValue.color = UIHelper.GetUIColor(TextColType.Green, true);
                    }
                    else if (deltaValue < 0)
                    {
                        m_DeltaValue.text = string.Format("-{0}", deltaValue);
                        m_DeltaValue.color = UIHelper.GetUIColor(TextColType.Red, true);
                    }
                    else
                    {
                        m_DeltaValue.text = "";
                        m_DeltaValue.color = UIHelper.GetUIColor(TextColType.Green, true);
                        if (deltaValue > 0)
                        {
                            m_DeltaValue.text = string.Format("+{0}", deltaValue);
                            m_DeltaValue.color = UIHelper.GetUIColor(TextColType.Green, true);
                        }
                        else if (deltaValue < 0)
                        {
                            m_DeltaValue.text = deltaValue.ToString();
                            m_DeltaValue.color = UIHelper.GetUIColor(TextColType.Red, true);
                        }
                        else
                        {
                            m_DeltaValue.text = string.Format("+{0}", deltaValue);
                            m_DeltaValue.color = UIHelper.GetUIColor(TextColType.Green, true);
                        }
                    }
                }


            }

        }

 System/EquipTrain/EquipTrainWin.cs

@@ -141,7 +141,7 @@
            {
                var trainLevel = model.equipTrainLevel.Fetch();
                m_TrainLevel.text = string.Format("{0}级洗练", trainLevel);
                m_MaxLevelContainer.gameObject.SetActive(trainLevel > 0 && trainLevel >= model.equipTrainMaxLevel.value);
                m_MaxLevelContainer.gameObject.SetActive(trainLevel > 1 && trainLevel >= model.equipTrainMaxLevel.value);
            }

            if (force || model.equipTrainMaxLevel.dirty)
@@ -213,7 +213,7 @@
                var type = EquipTrainModel.GetTrainType(place);
                var trainLevel = model.GetTrainLevel(level, place);
                var config = EquipWashConfig.Get(type, trainLevel + 1);
                m_InevitableMaterial.Display(false, own, need, config.mustCosts[need - 1]);
                m_InevitableMaterial.Display(false, need, own, config.mustCosts[need - 1]);
            }
            else
            {

 System/KnapSack/Logic/SinglePack.cs

@@ -162,8 +162,6 @@
                }
            }

            goalItems.Sort(CompareIsBind);

            var itemIndexs = new List<int>();
            var count = 0;
            for (var i = 0; i < goalItems.Count; i++)
@@ -181,52 +179,6 @@
            }

            return itemIndexs;
        }

        /// <summary>
        /// 得到同一个id物品指定数量的格子序号
        /// </summary>
        /// <param name="itemId"></param>
        /// <param name="preferBind">优先条件（true 为绑定，false为不绑定）</param>
        /// <returns></returns>
        public List<int> GetItemIndexsAppointedCount(int itemId, int needCnt, bool preferBind)
        {
            var itemPool = new List<ItemModel>();
            foreach (var item in items.Values)
            {
                if (item.itemId == itemId)
                {
                    itemPool.Add(item);
                }
            }

            var preferCondition = preferBind ? 1 : 0;
            var indexs = new List<int>();
            int count = 0;
            for (int i = 0; count < needCnt && i < itemPool.Count; i++)
            {
                if (itemPool[i].isBind == preferCondition)
                {
                    indexs.Add(itemPool[i].itemPlace);
                    count += itemPool[i].count;
                }
            }

            for (int i = 0; count < needCnt && i < itemPool.Count; i++)
            {
                if (itemPool[i].isBind != preferCondition)
                {
                    indexs.Add(itemPool[i].itemPlace);
                    count += itemPool[i].count;
                }
            }

            return indexs;
        }

        private int CompareIsBind(ItemModel x, ItemModel y)
        {
            return -x.isBind.CompareTo(y.isBind);
        }

        /// <summary>

 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

@@ -231,6 +231,7 @@
            RegisterModel<AllianceBossModel>();

            RegisterModel<AuctionHelpModel>();

            RegisterModel<EquipTrainModel>();

            RegisterModel<EquipStrengthModel>();

            inited = true;

        }