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

client_Hale

2018-12-07 5c5d568a7078c34f791a5e64db8b730df173064e

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

 Lua/Gen/DelegatesGensBridge.cs

@@ -1381,7 +1381,7 @@
#endif
        }
        
        public PlayerTaskDatas __Gen_Delegate_Imp60(object p0)
        public void __Gen_Delegate_Imp60(object p0, int p1, object p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1391,13 +1391,16 @@
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                LuaAPI.xlua_pushinteger(L, p1);
                translator.PushAny(L, p2);
                LuaAPI.xlua_pushinteger(L, p3);
                
                PCall(L, 1, 1, errFunc);
                PCall(L, 4, 0, errFunc);
                
                
                PlayerTaskDatas __gen_ret = (PlayerTaskDatas)translator.GetObject(L, errFunc + 1, typeof(PlayerTaskDatas));
                
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
                
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
@@ -1425,7 +1428,53 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp62(object p0, int p1, int p2)
        public int __Gen_Delegate_Imp62(object p0, Snxxz.UI.Item p1, Snxxz.UI.Item p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                translator.Push(L, p1);
                translator.Push(L, p2);
                
                PCall(L, 3, 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 PlayerTaskDatas __Gen_Delegate_Imp63(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);
                
                
                PlayerTaskDatas __gen_ret = (PlayerTaskDatas)translator.GetObject(L, errFunc + 1, typeof(PlayerTaskDatas));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp64(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1449,7 +1498,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp63(object p0, int p1, int p2)
        public int __Gen_Delegate_Imp65(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1473,7 +1522,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp64(object p0, TreasureCategory p1)
        public void __Gen_Delegate_Imp66(object p0, TreasureCategory p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1496,7 +1545,7 @@
#endif
        }
        
        public Snxxz.UI.FlashSaleModel __Gen_Delegate_Imp65(object p0)
        public Snxxz.UI.FlashSaleModel __Gen_Delegate_Imp67(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1518,7 +1567,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp66(object p0, Snxxz.UI.OperationFlashSale.FlashSaleGift p1)
        public void __Gen_Delegate_Imp68(object p0, Snxxz.UI.OperationFlashSale.FlashSaleGift p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1541,7 +1590,7 @@
#endif
        }
        
        public Snxxz.UI.MysticalPurchaseModel __Gen_Delegate_Imp67(object p0)
        public Snxxz.UI.MysticalPurchaseModel __Gen_Delegate_Imp69(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1563,7 +1612,7 @@
#endif
        }
        
        public Snxxz.UI.ImpactRankModel __Gen_Delegate_Imp68(object p0)
        public Snxxz.UI.ImpactRankModel __Gen_Delegate_Imp70(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1585,7 +1634,7 @@
#endif
        }
        
        public Snxxz.UI.OSRedEnvelopeModel __Gen_Delegate_Imp69(object p0)
        public Snxxz.UI.OSRedEnvelopeModel __Gen_Delegate_Imp71(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1607,7 +1656,7 @@
#endif
        }
        
        public Snxxz.UI.FairyLeagueModel __Gen_Delegate_Imp70(object p0)
        public Snxxz.UI.FairyLeagueModel __Gen_Delegate_Imp72(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1629,7 +1678,7 @@
#endif
        }
        
        public Snxxz.UI.FairyGrabBossModel __Gen_Delegate_Imp71(object p0)
        public Snxxz.UI.FairyGrabBossModel __Gen_Delegate_Imp73(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1651,7 +1700,7 @@
#endif
        }
        
        public Snxxz.UI.OSGiftModel __Gen_Delegate_Imp72(object p0)
        public Snxxz.UI.OSGiftModel __Gen_Delegate_Imp74(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1673,7 +1722,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp73(object p0, ScrollerDataType p1, int p2, out float p3)
        public bool __Gen_Delegate_Imp75(object p0, ScrollerDataType p1, int p2, out float p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1698,7 +1747,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp74(object p0, int p1, int p2)
        public void __Gen_Delegate_Imp76(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1722,7 +1771,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp75(object p0, Snxxz.UI.Operation p1)
        public void __Gen_Delegate_Imp77(object p0, Snxxz.UI.Operation p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1745,7 +1794,7 @@
#endif
        }
        
        public Snxxz.UI.VipModel __Gen_Delegate_Imp76(object p0)
        public Snxxz.UI.VipModel __Gen_Delegate_Imp78(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1767,7 +1816,7 @@
#endif
        }
        
        public Snxxz.UI.RealmModel __Gen_Delegate_Imp77(object p0)
        public Snxxz.UI.RealmModel __Gen_Delegate_Imp79(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1789,7 +1838,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp78(object p0, object p1, bool p2)
        public void __Gen_Delegate_Imp80(object p0, object p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1813,7 +1862,7 @@
#endif
        }
        
        public Snxxz.UI.MagicianModel __Gen_Delegate_Imp79(object p0)
        public Snxxz.UI.MagicianModel __Gen_Delegate_Imp81(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1835,7 +1884,74 @@
#endif
        }
        
        public Snxxz.UI.TestModel __Gen_Delegate_Imp80(object p0)
        public Snxxz.UI.FuncSwitchModel __Gen_Delegate_Imp82(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                
                PCall(L, 1, 1, errFunc);
                
                
                Snxxz.UI.FuncSwitchModel __gen_ret = (Snxxz.UI.FuncSwitchModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.FuncSwitchModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, Snxxz.UI.FuncSwitchModel.FuncSwithData> __Gen_Delegate_Imp83(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);
                
                
                System.Collections.Generic.Dictionary<int, Snxxz.UI.FuncSwitchModel.FuncSwithData> __gen_ret = (System.Collections.Generic.Dictionary<int, Snxxz.UI.FuncSwitchModel.FuncSwithData>)translator.GetObject(L, errFunc + 1, typeof(System.Collections.Generic.Dictionary<int, Snxxz.UI.FuncSwitchModel.FuncSwithData>));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public bool __Gen_Delegate_Imp84(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);
                
                
                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 Snxxz.UI.TestModel __Gen_Delegate_Imp85(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1857,7 +1973,7 @@
#endif
        }
        
        public UIEffect __Gen_Delegate_Imp81(object p0)
        public UIEffect __Gen_Delegate_Imp86(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1879,7 +1995,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp82(object p0, object p1, object p2)
        public void __Gen_Delegate_Imp87(object p0, object p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1903,30 +2019,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp83(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);
                
                
                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 Treasure3DConfig __Gen_Delegate_Imp84(object p0)
        public Treasure3DConfig __Gen_Delegate_Imp88(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1948,7 +2041,7 @@
#endif
        }
        
        public Snxxz.UI.AchievementModel __Gen_Delegate_Imp85(object p0)
        public Snxxz.UI.AchievementModel __Gen_Delegate_Imp89(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1970,7 +2063,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp86(object p0, int p1)
        public UnityEngine.Vector3 __Gen_Delegate_Imp90(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1993,7 +2086,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp87(object p0, UnityEngine.Vector3 p1)
        public UnityEngine.Vector3 __Gen_Delegate_Imp91(object p0, UnityEngine.Vector3 p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2016,7 +2109,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp88(object p0, float p1)
        public System.Collections.IEnumerator __Gen_Delegate_Imp92(object p0, float p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2039,7 +2132,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp89(object p0, bool p1, bool p2)
        public void __Gen_Delegate_Imp93(object p0, bool p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2063,7 +2156,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp90(object p0, Snxxz.UI.TreasureAnimation.TreasureShowStep p1)
        public void __Gen_Delegate_Imp94(object p0, Snxxz.UI.TreasureAnimation.TreasureShowStep p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2086,7 +2179,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp91(object p0, bool p1, int p2)
        public void __Gen_Delegate_Imp95(object p0, bool p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2110,7 +2203,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp92(object p0, object p1, int p2)
        public void __Gen_Delegate_Imp96(object p0, object p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2134,7 +2227,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp93(object p0, PackType p1, int p2, int p3)
        public void __Gen_Delegate_Imp97(object p0, PackType p1, int p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2159,7 +2252,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp94(object p0, int p1)
        public int __Gen_Delegate_Imp98(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2182,7 +2275,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp95(object p0, int p1, int p2, bool p3)
        public void __Gen_Delegate_Imp99(object p0, int p1, int p2, bool p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2207,7 +2300,7 @@
#endif
        }
        
        public UnityEngine.Camera __Gen_Delegate_Imp96(object p0)
        public UnityEngine.Camera __Gen_Delegate_Imp100(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2229,7 +2322,7 @@
#endif
        }
        
        public UnityEngine.Transform __Gen_Delegate_Imp97(object p0)
        public UnityEngine.Transform __Gen_Delegate_Imp101(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2251,7 +2344,7 @@
#endif
        }
        
        public float __Gen_Delegate_Imp98(object p0)
        public float __Gen_Delegate_Imp102(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2273,7 +2366,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp99(object p0)
        public UnityEngine.Vector3 __Gen_Delegate_Imp103(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2295,7 +2388,7 @@
#endif
        }
        
        public Treasure3DConfig.TreasureParam __Gen_Delegate_Imp100(object p0)
        public Treasure3DConfig.TreasureParam __Gen_Delegate_Imp104(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2317,7 +2410,7 @@
#endif
        }
        
        public Snxxz.UI.UI3DTreasureSelectStage __Gen_Delegate_Imp101()
        public Snxxz.UI.UI3DTreasureSelectStage __Gen_Delegate_Imp105()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2338,7 +2431,7 @@
#endif
        }
        
        public TreasureCategory __Gen_Delegate_Imp102(object p0)
        public TreasureCategory __Gen_Delegate_Imp106(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2360,7 +2453,7 @@
#endif
        }
        
        public UnityEngine.GameObject __Gen_Delegate_Imp103(object p0)
        public UnityEngine.GameObject __Gen_Delegate_Imp107(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2382,7 +2475,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp104(object p0, bool p1, TreasureCategory p2)
        public void __Gen_Delegate_Imp108(object p0, bool p1, TreasureCategory p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2406,7 +2499,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp105(object p0, TreasureCategory p1, object p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp109(object p0, TreasureCategory p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2430,7 +2523,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp106(object p0, TreasureCategory p1, bool p2)
        public void __Gen_Delegate_Imp110(object p0, TreasureCategory p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2454,7 +2547,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp107(object p0, object p1, float p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp111(object p0, object p1, float p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2478,7 +2571,7 @@
#endif
        }
        
        public Snxxz.UI.SignInModel __Gen_Delegate_Imp108(object p0)
        public Snxxz.UI.SignInModel __Gen_Delegate_Imp112(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)

 Lua/Gen/GameObjectPoolManagerWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(GameObjectPoolManager);
            Utils.BeginObjectRegister(type, L, translator, 0, 19, 0, 0);
            Utils.BeginObjectRegister(type, L, translator, 0, 21, 0, 0);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Initialize", _m_Initialize);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "AddDontDestroyGoInstID", _m_AddDontDestroyGoInstID);
@@ -30,6 +30,8 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "CacheGameObject", _m_CacheGameObject);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "CacheNpc", _m_CacheNpc);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestGameObject", _m_RequestGameObject);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestEmptyJY", _m_RequestEmptyJY);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "ReleaseEmptyJY", _m_ReleaseEmptyJY);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestDefaultPet", _m_RequestDefaultPet);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestDefaultFightNpc", _m_RequestDefaultFightNpc);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestDefaultFuncNpc", _m_RequestDefaultFuncNpc);
@@ -293,6 +295,62 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_RequestEmptyJY(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                GameObjectPoolManager gen_to_be_invoked = (GameObjectPoolManager)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    
                        UnityEngine.GameObject gen_ret = gen_to_be_invoked.RequestEmptyJY(  );
                        translator.Push(L, gen_ret);
                    
                    
                    
                    return 1;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_ReleaseEmptyJY(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                GameObjectPoolManager gen_to_be_invoked = (GameObjectPoolManager)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    UnityEngine.GameObject _go = (UnityEngine.GameObject)translator.GetObject(L, 2, typeof(UnityEngine.GameObject));
                    
                    gen_to_be_invoked.ReleaseEmptyJY( _go );
                    
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_RequestDefaultPet(RealStatePtr L)
        {
            try {

 Lua/Gen/PutawayDataWrap.cs

@@ -23,19 +23,19 @@
            System.Type type = typeof(PutawayData);
            Utils.BeginObjectRegister(type, L, translator, 0, 1, 5, 5);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Reset", _m_Reset);
            
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "priceType", _g_get_priceType);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "priceCnt", _g_get_priceCnt);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "pwd", _g_get_pwd);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "itemCnt", _g_get_itemCnt);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "priceCount", _g_get_priceCount);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "password", _g_get_password);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "itemCount", _g_get_itemCount);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "itemModel", _g_get_itemModel);
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "priceType", _s_set_priceType);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "priceCnt", _s_set_priceCnt);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "pwd", _s_set_pwd);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "itemCnt", _s_set_itemCnt);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "priceCount", _s_set_priceCount);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "password", _s_set_password);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "itemCount", _s_set_itemCount);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "itemModel", _s_set_itemModel);
            
            
@@ -83,7 +83,7 @@
        
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_Init(RealStatePtr L)
        static int _m_Reset(RealStatePtr L)
        {
            try {
            
@@ -96,7 +96,7 @@
                
                {
                    
                    gen_to_be_invoked.Init(  );
                    gen_to_be_invoked.Reset(  );
                    
                    
                    
@@ -127,13 +127,13 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_priceCnt(RealStatePtr L)
        static int _g_get_priceCount(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                PutawayData gen_to_be_invoked = (PutawayData)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushuint(L, gen_to_be_invoked.priceCnt);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.priceCount);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
@@ -141,13 +141,13 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_pwd(RealStatePtr L)
        static int _g_get_password(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                PutawayData gen_to_be_invoked = (PutawayData)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushstring(L, gen_to_be_invoked.pwd);
                LuaAPI.lua_pushstring(L, gen_to_be_invoked.password);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
@@ -155,13 +155,13 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_itemCnt(RealStatePtr L)
        static int _g_get_itemCount(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                PutawayData gen_to_be_invoked = (PutawayData)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.itemCnt);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.itemCount);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
@@ -200,13 +200,13 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_priceCnt(RealStatePtr L)
        static int _s_set_priceCount(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                PutawayData gen_to_be_invoked = (PutawayData)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.priceCnt = LuaAPI.xlua_touint(L, 2);
                gen_to_be_invoked.priceCount = LuaAPI.xlua_tointeger(L, 2);
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -215,13 +215,13 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_pwd(RealStatePtr L)
        static int _s_set_password(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                PutawayData gen_to_be_invoked = (PutawayData)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.pwd = LuaAPI.lua_tostring(L, 2);
                gen_to_be_invoked.password = LuaAPI.lua_tostring(L, 2);
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -230,13 +230,13 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_itemCnt(RealStatePtr L)
        static int _s_set_itemCount(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                PutawayData gen_to_be_invoked = (PutawayData)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.itemCnt = (ushort)LuaAPI.xlua_tointeger(L, 2);
                gen_to_be_invoked.itemCount = (ushort)LuaAPI.xlua_tointeger(L, 2);
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);

 Lua/Gen/SnxxzUIFairyLeagueModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.FairyLeagueModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 41, 33, 7);
            Utils.BeginObjectRegister(type, L, translator, 0, 42, 33, 7);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
@@ -37,6 +37,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetCrystalIndex", _m_GetCrystalIndex);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "BattleChampion", _m_BattleChampion);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SelfFairyInBattle", _m_SelfFairyInBattle);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequireFairyLeagueRemind", _m_RequireFairyLeagueRemind);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SatisfyEnterLeague", _m_SatisfyEnterLeague);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "DisplayErrorTip", _m_DisplayErrorTip);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "CheckFairyLeagueData", _m_CheckFairyLeagueData);
@@ -550,6 +551,35 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_RequireFairyLeagueRemind(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.FairyLeagueModel gen_to_be_invoked = (Snxxz.UI.FairyLeagueModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _session = LuaAPI.xlua_tointeger(L, 2);
                    
                        bool gen_ret = gen_to_be_invoked.RequireFairyLeagueRemind( _session );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    
                    
                    
                    return 1;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_SatisfyEnterLeague(RealStatePtr L)
        {
            try {

 Lua/Gen/SnxxzUIFindPreciousModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.FindPreciousModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 31, 3, 2);
            Utils.BeginObjectRegister(type, L, translator, 0, 32, 3, 2);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
@@ -31,6 +31,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnSwitchAccount", _m_OnSwitchAccount);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnMapInitOk", _m_OnMapInitOk);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestViewPreciousDropRecord", _m_RequestViewPreciousDropRecord);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestQueryBossInfo", _m_RequestQueryBossInfo);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPreciousDropRecordUpdate", _m_OnPreciousDropRecordUpdate);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnUpdateBossInfos", _m_OnUpdateBossInfos);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnUpdateBossLineInfos", _m_OnUpdateBossLineInfos);
@@ -327,6 +328,34 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_RequestQueryBossInfo(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.FindPreciousModel gen_to_be_invoked = (Snxxz.UI.FindPreciousModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _bossId = LuaAPI.xlua_tointeger(L, 2);
                    
                    gen_to_be_invoked.RequestQueryBossInfo( _bossId );
                    
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_OnPreciousDropRecordUpdate(RealStatePtr L)
        {
            try {

 Lua/Gen/SnxxzUIFunctionButtonWrap.cs

@@ -21,12 +21,13 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.FunctionButton);
            Utils.BeginObjectRegister(type, L, translator, 0, 3, 12, 12);
            Utils.BeginObjectRegister(type, L, translator, 0, 4, 12, 12);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Invoke", _m_Invoke);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPointerClick", _m_OnPointerClick);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPointClickLockFunc", _e_OnPointClickLockFunc);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "repeatClickFunc", _e_repeatClickFunc);
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "order", _g_get_order);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "functionId", _g_get_functionId);
@@ -544,6 +545,40 @@
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _e_repeatClickFunc(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                int gen_param_count = LuaAPI.lua_gettop(L);
            Snxxz.UI.FunctionButton gen_to_be_invoked = (Snxxz.UI.FunctionButton)translator.FastGetCSObj(L, 1);
                System.Action gen_delegate = translator.GetDelegate<System.Action>(L, 3);
                if (gen_delegate == null) {
                    return LuaAPI.luaL_error(L, "#3 need System.Action!");
                }
				
                if (gen_param_count == 3)
                {
					
                    if (LuaAPI.xlua_is_eq_str(L, 2, "+")) {
                        gen_to_be_invoked.repeatClickFunc += gen_delegate;
                        return 0;
                    } 
					
					
                    if (LuaAPI.xlua_is_eq_str(L, 2, "-")) {
                        gen_to_be_invoked.repeatClickFunc -= gen_delegate;
                        return 0;
                    } 
					
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.FunctionButton.repeatClickFunc!");
            return 0;
        }
        
        
        
    }

 Lua/Gen/SnxxzUIImpactRankModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.ImpactRankModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 28, 18, 5);
            Utils.BeginObjectRegister(type, L, translator, 0, 28, 19, 6);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
@@ -70,12 +70,14 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "priorityOpen", _g_get_priorityOpen);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsInImpactRank", _g_get_IsInImpactRank);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsAdvance", _g_get_IsAdvance);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "impactRankSorts", _g_get_impactRankSorts);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "impactRankRedpoint", _g_get_impactRankRedpoint);
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "gotoImpactRankType", _s_set_gotoImpactRankType);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "presentSelectType", _s_set_presentSelectType);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "presentBillRankType", _s_set_presentBillRankType);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "OSCEffectOpen", _s_set_OSCEffectOpen);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "impactRankSorts", _s_set_impactRankSorts);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "impactRankRedpoint", _s_set_impactRankRedpoint);
            
            
@@ -1073,6 +1075,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_impactRankSorts(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.ImpactRankModel gen_to_be_invoked = (Snxxz.UI.ImpactRankModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.impactRankSorts);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_impactRankRedpoint(RealStatePtr L)
        {
            try {
@@ -1150,6 +1166,21 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_impactRankSorts(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.ImpactRankModel gen_to_be_invoked = (Snxxz.UI.ImpactRankModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.impactRankSorts = (System.Collections.Generic.List<int>)translator.GetObject(L, 2, typeof(System.Collections.Generic.List<int>));
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_impactRankRedpoint(RealStatePtr L)
        {
            try {

 Lua/Gen/SnxxzUIItemTipsModelWrap.cs

@@ -21,11 +21,12 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.ItemTipsModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 38, 34, 3);
            Utils.BeginObjectRegister(type, L, translator, 0, 43, 38, 3);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetAtkSpeedColor", _m_TryGetAtkSpeedColor);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetItemTipsModel", _m_SetItemTipsModel);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetCurrentAttrData", _m_SetCurrentAttrData);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetCompareAttrData", _m_SetCompareAttrData);
@@ -40,6 +41,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetPutOnTipsBtn", _m_SetPutOnTipsBtn);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetWaysList", _m_GetWaysList);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetBasicAttr", _m_GetBasicAttr);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetProValueType", _m_GetProValueType);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetLegendAttr", _m_GetLegendAttr);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetEquipLegendAttrCntPreview", _m_GetEquipLegendAttrCntPreview);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetDogzLegendAttrCntPreview", _m_GetDogzLegendAttrCntPreview);
@@ -61,6 +63,9 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetQualityName", _m_GetQualityName);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetMountSkillDict", _m_GetMountSkillDict);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetPetAttrStr", _m_SetPetAttrStr);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetFightPowerByItemId", _m_TryGetFightPowerByItemId);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsPeerlessEquip", _m_IsPeerlessEquip);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetEquipFightPower", _m_GetEquipFightPower);
            
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "equipLegendAttrTypeDict", _g_get_equipLegendAttrTypeDict);
@@ -78,6 +83,7 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "guardDesDict", _g_get_guardDesDict);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "unlockPetDict", _g_get_unlockPetDict);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "unlockMountDict", _g_get_unlockMountDict);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "itemParamsDict", _g_get_itemParamsDict);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "gemOpenLvs", _g_get_gemOpenLvs);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "gemOpenVipLv", _g_get_gemOpenVipLv);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "gemType1s", _g_get_gemType1s);
@@ -89,11 +95,14 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "ItemRenewalIds", _g_get_ItemRenewalIds);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "tryPutOnEquipIds", _g_get_tryPutOnEquipIds);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "randomRuneIds", _g_get_randomRuneIds);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "PeerlessEquipIds", _g_get_PeerlessEquipIds);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "atkSpeedColorDict", _g_get_atkSpeedColorDict);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "curAttrData", _g_get_curAttrData);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "compareAttrData", _g_get_compareAttrData);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "OpenCount", _g_get_OpenCount);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "packType", _g_get_packType);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "Index", _g_get_Index);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "strengthengmodel", _g_get_strengthengmodel);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "petAndMountQualityDict", _g_get_petAndMountQualityDict);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "expValueFormula", _g_get_expValueFormula);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "guardAutoDrops", _g_get_guardAutoDrops);
@@ -219,6 +228,38 @@
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_TryGetAtkSpeedColor(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _atkSpeed = LuaAPI.xlua_tointeger(L, 2);
                    string _color;
                    
                        bool gen_ret = gen_to_be_invoked.TryGetAtkSpeedColor( _atkSpeed, out _color );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    LuaAPI.lua_pushstring(L, _color);
                        
                    
                    
                    
                    return 2;
                }
                
            } catch(System.Exception gen_e) {
@@ -676,6 +717,36 @@
                    
                        string gen_ret = gen_to_be_invoked.GetBasicAttr( _attrData );
                        LuaAPI.lua_pushstring(L, gen_ret);
                    
                    
                    
                    return 1;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_GetProValueType(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _precentType = LuaAPI.xlua_tointeger(L, 2);
                    int _value = LuaAPI.xlua_tointeger(L, 3);
                    
                        int gen_ret = gen_to_be_invoked.GetProValueType( _precentType, _value );
                        LuaAPI.xlua_pushinteger(L, gen_ret);
                    
                    
                    
@@ -1378,6 +1449,96 @@
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_TryGetFightPowerByItemId(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _itemId = LuaAPI.xlua_tointeger(L, 2);
                    int _fightPower;
                    
                        bool gen_ret = gen_to_be_invoked.TryGetFightPowerByItemId( _itemId, out _fightPower );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    LuaAPI.xlua_pushinteger(L, _fightPower);
                        
                    
                    
                    
                    return 2;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_IsPeerlessEquip(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _itemId = LuaAPI.xlua_tointeger(L, 2);
                    
                        bool gen_ret = gen_to_be_invoked.IsPeerlessEquip( _itemId );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    
                    
                    
                    return 1;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_GetEquipFightPower(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _equipScore = LuaAPI.xlua_tointeger(L, 2);
                    
                        int gen_ret = gen_to_be_invoked.GetEquipFightPower( _equipScore );
                        LuaAPI.xlua_pushinteger(L, gen_ret);
                    
                    
                    
                    return 1;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        
        
        
@@ -1592,6 +1753,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_itemParamsDict(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.itemParamsDict);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_gemOpenLvs(RealStatePtr L)
        {
            try {
@@ -1746,6 +1921,34 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_PeerlessEquipIds(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.PeerlessEquipIds);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_atkSpeedColorDict(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.atkSpeedColorDict);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_curAttrData(RealStatePtr L)
        {
            try {
@@ -1816,6 +2019,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_strengthengmodel(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.strengthengmodel);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_petAndMountQualityDict(RealStatePtr L)
        {
            try {

 Lua/Gen/SnxxzUIRuneModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.RuneModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 59, 25, 12);
            Utils.BeginObjectRegister(type, L, translator, 0, 61, 26, 13);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
@@ -72,6 +72,8 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetOpenTowerCnt", _m_GetOpenTowerCnt);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "ClearRuneData", _m_ClearRuneData);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "JumpToRuneCompose", _m_JumpToRuneCompose);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsQualityMark", _m_IsQualityMark);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetQualityMark", _m_SetQualityMark);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetMaxLevelRuneCnt", _m_GetMaxLevelRuneCnt);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateBreakRune", _m_UpdateBreakRune);
            
@@ -99,6 +101,7 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "runeBreakList", _g_get_runeBreakList);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "runeBreakEnableDict", _g_get_runeBreakEnableDict);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "runeBreakRects", _g_get_runeBreakRects);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "runeBasePropretyDict", _g_get_runeBasePropretyDict);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "runeAttrDic", _g_get_runeAttrDic);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "runeAttrAdditionDic", _g_get_runeAttrAdditionDic);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "runeExpDic", _g_get_runeExpDic);
@@ -112,6 +115,7 @@
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "runePackList", _s_set_runePackList);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "runeBreakList", _s_set_runeBreakList);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "runeBasePropretyDict", _s_set_runeBasePropretyDict);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "runeAttrDic", _s_set_runeAttrDic);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "runeAttrAdditionDic", _s_set_runeAttrAdditionDic);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "runeExpDic", _s_set_runeExpDic);
@@ -1658,6 +1662,64 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_IsQualityMark(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.RuneModel gen_to_be_invoked = (Snxxz.UI.RuneModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _itemColor = LuaAPI.xlua_tointeger(L, 2);
                    
                        bool gen_ret = gen_to_be_invoked.IsQualityMark( _itemColor );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    
                    
                    
                    return 1;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_SetQualityMark(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.RuneModel gen_to_be_invoked = (Snxxz.UI.RuneModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _itemColor = LuaAPI.xlua_tointeger(L, 2);
                    bool _mark = LuaAPI.lua_toboolean(L, 3);
                    
                    gen_to_be_invoked.SetQualityMark( _itemColor, _mark );
                    
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_GetMaxLevelRuneCnt(RealStatePtr L)
        {
            try {
@@ -1930,6 +1992,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_runeBasePropretyDict(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RuneModel gen_to_be_invoked = (Snxxz.UI.RuneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.runeBasePropretyDict);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_runeAttrDic(RealStatePtr L)
        {
            try {
@@ -2102,6 +2178,21 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_runeBasePropretyDict(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RuneModel gen_to_be_invoked = (Snxxz.UI.RuneModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.runeBasePropretyDict = (System.Collections.Generic.Dictionary<int, System.Collections.Generic.Dictionary<int, int>>)translator.GetObject(L, 2, typeof(System.Collections.Generic.Dictionary<int, System.Collections.Generic.Dictionary<int, int>>));
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_runeAttrDic(RealStatePtr L)
        {
            try {

 Lua/Gen/SnxxzUITreasureModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.TreasureModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 61, 31, 20);
            Utils.BeginObjectRegister(type, L, translator, 0, 62, 31, 20);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
@@ -62,6 +62,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsVersionUnOpenTreasure", _m_IsVersionUnOpenTreasure);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetMapIdByTreasure", _m_GetMapIdByTreasure);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetTreasureFightPower", _m_GetTreasureFightPower);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetExtensionPower", _m_GetExtensionPower);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetPotentialGetSkill", _m_TryGetPotentialGetSkill);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsPotentialUnlock", _m_IsPotentialUnlock);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetPotentialInitialPower", _m_GetPotentialInitialPower);
@@ -1439,6 +1440,35 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_GetExtensionPower(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int __treasureId = LuaAPI.xlua_tointeger(L, 2);
                    
                        int gen_ret = gen_to_be_invoked.GetExtensionPower( __treasureId );
                        LuaAPI.xlua_pushinteger(L, gen_ret);
                    
                    
                    
                    return 1;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_TryGetPotentialGetSkill(RealStatePtr L)
        {
            try {

 Lua/Gen/SnxxzUITrialDungeonModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.TrialDungeonModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 20, 5, 4);
            Utils.BeginObjectRegister(type, L, translator, 0, 20, 6, 4);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
@@ -46,6 +46,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SelectEquipClassEvent", _e_SelectEquipClassEvent);
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "trialExchangeRemindLevel", _g_get_trialExchangeRemindLevel);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "trialSweepGradeLimit", _g_get_trialSweepGradeLimit);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "selectEquipClass", _g_get_selectEquipClass);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "openFromTask", _g_get_openFromTask);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "trialClassTokens", _g_get_trialClassTokens);
@@ -60,10 +61,11 @@
            Utils.EndObjectRegister(type, L, translator, null, null,
                null, null, null);

            Utils.BeginClassRegister(type, L, __CreateInstance, 2, 0, 0);
            Utils.BeginClassRegister(type, L, __CreateInstance, 3, 0, 0);
            
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "TRIALEXCHANGE_GUIDE", Snxxz.UI.TrialDungeonModel.TRIALEXCHANGE_GUIDE);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "TRIALDUNGOEN_MAPID", Snxxz.UI.TrialDungeonModel.TRIALDUNGOEN_MAPID);
            
            
            
@@ -673,6 +675,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_trialSweepGradeLimit(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.TrialDungeonModel gen_to_be_invoked = (Snxxz.UI.TrialDungeonModel)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.trialSweepGradeLimit);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_selectEquipClass(RealStatePtr L)
        {
            try {

 Lua/Gen/XLuaGenAutoRegister.cs

@@ -659,6 +659,9 @@
            translator.DelayWrapLoader(typeof(ChatSetting), ChatSettingWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.FuncSwitchModel), SnxxzUIFuncSwitchModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(HangUpSetModel), HangUpSetModelWrap.__Register);
        
        
@@ -799,14 +802,14 @@
        
            translator.DelayWrapLoader(typeof(FileExtersion), FileExtersionWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(GMCommand), GMCommandWrap.__Register);
        
        }
        
        static void wrapInit5(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(GMCommand), GMCommandWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(GlobalTimeEvent), GlobalTimeEventWrap.__Register);
        
        

 Lua/Gen/link.xml

@@ -189,6 +189,7 @@
        <type fullname="Snxxz.UI.WingsRedDot" preserve="all"/>
        <type fullname="Snxxz.UI.ActivitiesPushMgr" preserve="all"/>
        <type fullname="ChatSetting" preserve="all"/>
        <type fullname="Snxxz.UI.FuncSwitchModel" preserve="all"/>
        <type fullname="HangUpSetModel" preserve="all"/>
        <type fullname="PrivateRemind" preserve="all"/>
        <type fullname="Snxxz.UI.SetPrivateModel" preserve="all"/>

 System/Dungeon/DemonTreasureDungeonVictoryWin.cs

@@ -39,28 +39,8 @@


        protected override void DrawExitTimer(int seconds)

        {

            bool satisfyChallengeNext = false;

            var result = dungeonModel.dungeonResult;

            TreasureDungeon treasureDungeon;

            if (model.TryGetTreasureDungeon(41110, result.lineID, out treasureDungeon))

            {

                var dungeonInfo = treasureDungeon.Get(result.wheel + 1);

                if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))

                {

                    var fightPower = PlayerDatas.Instance.baseData.FightPoint;

                    satisfyChallengeNext = fightPower >= dungeonInfo.fightPower;

                }

            }

            if (satisfyChallengeNext)

            {

                m_ExitTimer.text = Language.Get("DemonDungeonExit");

                m_ChallengeNextTimer.text = Language.Get("RuneDungeonVictory_Btn_Next_1", Mathf.Clamp(seconds, 0, int.MaxValue));

            }

            else

            {

                m_ChallengeNextTimer.text = Language.Get("DemonDungeonChallengeNext");

                m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp(seconds, 0, int.MaxValue));

            }

            m_ExitTimer.text = Language.Get("DemonDungeonExit");

            m_ChallengeNextTimer.text = Language.Get("RuneDungeonVictory_Btn_Next_1", Mathf.Clamp(seconds, 0, int.MaxValue));

        }



        private void DisplayDemonTreasureProperty()

@@ -97,7 +77,32 @@
            var result = dungeonModel.dungeonResult;

            if (model.TryGetTreasureDungeon(41110, result.lineID, out treasureDungeon))

            {

                model.DemonDungeonChallengeNext(result.lineID);

                var dungeonInfo = treasureDungeon.Get(result.wheel + 1);

                if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))

                {

                    if (PlayerDatas.Instance.baseData.FightPoint >= dungeonInfo.fightPower)

                    {

                        model.DemonDungeonChallengeNext(result.lineID);

                    }

                    else

                    {

                        ConfirmCancel.ShowRuneTowerPopConfirm(

                             Language.Get("DemonLackPowerTitle"),

                             Language.Get("DemonLackFightPower", dungeonInfo.fightPower),

                             (bool ok) =>

                             {

                                 if (ok)

                                 {

                                     model.DemonDungeonChallengeNext(result.lineID);

                                 }

                                 else

                                 {

                                     dungeonModel.ExitCurrentDungeon();

                                 }

                             }

                             );

                    }

                }

            }

        }




 System/Dungeon/DungeonFightWin.cs

@@ -351,21 +351,38 @@
                    TreasureDungeon treasureDungeon;

                    if (treasureModel.TryGetTreasureDungeon(41110, model.dungeonResult.lineID, out treasureDungeon))

                    {

                        var dungeonInfo = treasureDungeon.Get(model.dungeonResult.wheel + 1);

                        if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))

                        if (!RuneTowerConfirmWin.waitConfirm)

                        {

                            if (PlayerDatas.Instance.baseData.FightPoint >= dungeonInfo.fightPower)

                            var dungeonInfo = treasureDungeon.Get(model.dungeonResult.wheel + 1);

                            if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))

                            {

                                treasureModel.DemonDungeonChallengeNext(model.dungeonResult.lineID);

                                if (PlayerDatas.Instance.baseData.FightPoint >= dungeonInfo.fightPower)

                                {

                                    treasureModel.DemonDungeonChallengeNext(model.dungeonResult.lineID);

                                }

                                else

                                {

                                    ConfirmCancel.ShowRuneTowerPopConfirm(

                                            Language.Get("DemonLackPowerTitle"),

                                            Language.Get("DemonLackFightPower", dungeonInfo.fightPower),

                                            (bool ok) =>

                                            {

                                                if (ok)

                                                {

                                                    treasureModel.DemonDungeonChallengeNext(model.dungeonResult.lineID);

                                                }

                                                else

                                                {

                                                    model.ExitCurrentDungeon();

                                                }

                                            }

                                            );

                                }

                            }

                            else

                            {

                                model.ExitCurrentDungeon();

                            }

                        }

                        else

                        {

                            model.ExitCurrentDungeon();

                        }

                    }

                    else


 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -1007,7 +1007,7 @@
            ItemModel itemModel = playerPack.GetItemModelByGUID(guid);

            if (itemModel == null || itemModel.packType != PackType.rptItem) return;



            PutawayData.Instance.Init();

            PutawayData.Instance.Reset();

            PutawayData.Instance.itemModel = itemModel;

            WindowCenter.Instance.Open<PutawayWin>();

        }


 System/Market/MarketBagItemCell.cs

@@ -1,97 +1,97 @@
using Snxxz.UI;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System;
namespace EnhancedUI.EnhancedScroller
{
    public class MarketBagItemCell : CellView
    {
        [SerializeField] MarketBagItem[] m_MarketBagItems;
        [NonSerialized] public AchievementGuideEffect[] m_AchieveEffects = new AchievementGuideEffect[4];
        public MarketBagItem this[int _index]
        {
            get
            {
                if (_index < m_MarketBagItems.Length)
                {
                    return m_MarketBagItems[_index];
                }
                return null;
            }
        }

        MarketModel m_Model;
        MarketModel model
        {
            get
            {
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<MarketModel>());
            }
        }

        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }

        public void Display(params int[] _indexs)
        {
            if (_indexs == null)
            {
                return;
            }
            for (int i = 0; i < _indexs.Length; i++)
            {
                m_MarketBagItems[i].cellBtn.RemoveAllListeners();
                if (_indexs[i] == -1 || _indexs[i] >= model.bagItems.Count)
                {
                    m_MarketBagItems[i].gameObject.SetActive(false);
                    continue;
                }
                m_MarketBagItems[i].gameObject.SetActive(true);
                var _itemModel = model.bagItems[_indexs[i]];
                m_MarketBagItems[i].Init(_itemModel);
                m_MarketBagItems[i].itemIcon.material = model.CheckItemPutaway(_itemModel) ?
                    MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
                m_MarketBagItems[i].cellBtn.onClick.AddListener(() =>
                {
                    OnItemClick(_itemModel);
                });
            }
        }

        private void OnItemClick(ItemModel itemBag)
        {
            model.m_AchievementIndex = -1;
            if (!model.CheckItemPutaway(itemBag, true))
            {
                return;
            }
            itemTipsModel.SetItemTipsModel(itemBag.packType, itemBag.itemInfo.ItemGUID, false);
            itemTipsModel.curAttrData.SetTipsFuncBtn(ItemWinBtnType.putAway, OnPutawayClick);
            itemTipsModel.ShowUICtrl();

            PutawayData.Instance.Init();
            PutawayData.Instance.itemModel = itemBag;
        }

        private void OnPutawayClick(ItemWinBtnType type, string s)
        {
            KnapSackEventMgr.Instance.HideItemPopWin();
            switch (type)
            {
                case ItemWinBtnType.putAway:
                    {
                        WindowCenter.Instance.Open<PutawayWin>();
                    }
                    break;
            }
        }
    }
}

using Snxxz.UI;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using System;

namespace EnhancedUI.EnhancedScroller

{

    public class MarketBagItemCell : CellView

    {

        [SerializeField] MarketBagItem[] m_MarketBagItems;

        [NonSerialized] public AchievementGuideEffect[] m_AchieveEffects = new AchievementGuideEffect[4];

        public MarketBagItem this[int _index]

        {

            get

            {

                if (_index < m_MarketBagItems.Length)

                {

                    return m_MarketBagItems[_index];

                }

                return null;

            }

        }



        MarketModel m_Model;

        MarketModel model

        {

            get

            {

                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<MarketModel>());

            }

        }



        ItemTipsModel _itemTipsModel;

        ItemTipsModel itemTipsModel

        {

            get

            {

                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());

            }

        }



        public void Display(params int[] _indexs)

        {

            if (_indexs == null)

            {

                return;

            }

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

            {

                m_MarketBagItems[i].cellBtn.RemoveAllListeners();

                if (_indexs[i] == -1 || _indexs[i] >= model.bagItems.Count)

                {

                    m_MarketBagItems[i].gameObject.SetActive(false);

                    continue;

                }

                m_MarketBagItems[i].gameObject.SetActive(true);

                var _itemModel = model.bagItems[_indexs[i]];

                m_MarketBagItems[i].Init(_itemModel);

                m_MarketBagItems[i].itemIcon.material = model.CheckItemPutaway(_itemModel) ?

                    MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();

                m_MarketBagItems[i].cellBtn.onClick.AddListener(() =>

                {

                    OnItemClick(_itemModel);

                });

            }

        }



        private void OnItemClick(ItemModel itemBag)

        {

            model.m_AchievementIndex = -1;

            if (!model.CheckItemPutaway(itemBag, true))

            {

                return;

            }

            itemTipsModel.SetItemTipsModel(itemBag.packType, itemBag.itemInfo.ItemGUID, false);

            itemTipsModel.curAttrData.SetTipsFuncBtn(ItemWinBtnType.putAway, OnPutawayClick);

            itemTipsModel.ShowUICtrl();



            PutawayData.Instance.Reset();

            PutawayData.Instance.itemModel = itemBag;

        }



        private void OnPutawayClick(ItemWinBtnType type, string s)

        {

            KnapSackEventMgr.Instance.HideItemPopWin();

            switch (type)

            {

                case ItemWinBtnType.putAway:

                    {

                        WindowCenter.Instance.Open<PutawayWin>();

                    }

                    break;

            }

        }

    }

}




 System/Market/PutawayData.cs

@@ -7,18 +7,18 @@
public class PutawayData:Singleton<PutawayData>  {

    public byte priceType = 0;
    public uint priceCnt = 0;//出售价格
    public string pwd = string.Empty;//交易密码
    public ushort itemCnt = 0;
    public int priceCount = 0;//出售价格
    public string password = string.Empty;//交易密码
    public ushort itemCount = 0;

    public ItemModel itemModel = null;

    public void Init()
    public void Reset()
    {
        priceType = 0;
        priceCnt = 0;
        pwd = string.Empty;
        priceCount = 0;
        password = string.Empty;
        itemModel = null;
        itemCnt = 0;
        itemCount = 0;
    }
}

 System/Market/PutawayWin.cs

@@ -10,80 +10,47 @@
using UnityEngine.UI;
using TableConfig;
using Snxxz.UI;

using UnityEngine.Serialization;



namespace Snxxz.UI
{

    [XLua.Hotfix]
    public class PutawayWin : Window
    {
        [SerializeField] Button closeBtn;
        [SerializeField] Button m_Close;
        [SerializeField] Button m_Putaway;
        [SerializeField] Button m_SetPassword;
        [SerializeField] Text m_SetPasswordTxt;
        [SerializeField] Button m_OpenKeyboard;
        [SerializeField] Text m_TargetPrice;
        [SerializeField] Image m_ItemBG;
        [SerializeField] Image m_ItemIcon;
        [SerializeField] Text m_ItemCount;
        [SerializeField] Text m_ItemName;
        [SerializeField] Text m_SinglePrice;
        [SerializeField] List<Transform> m_Stars;
        [SerializeField] Slider m_ItemCountSlider;
        [SerializeField] Button m_Add;
        [SerializeField] Button m_Reduce;
        [SerializeField] Text m_PutawayItemCount;
        [SerializeField] PutawayItem[] m_PutawayItems;
        [SerializeField] Transform m_ContainerNoneItems;
        [SerializeField] Text m_PutawayBtnTxt;
        [SerializeField] Text m_DealPrice;
        [SerializeField] Text m_DealItemTip;
        [SerializeField] Text m_TaxTip;
        [SerializeField] NumKeyBoard m_Keyboard;
        [SerializeField] ClickScreenOtherSpace m_ClickSpace;

        [SerializeField] Button putawayBtn;
        [SerializeField] Button vippasBtn;
        [SerializeField] Text vippasBtnText;
        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }

        [SerializeField] Button soldNumBtn;
        [SerializeField] Text soldNum;
        MarketModel model { get { return ModelCenter.Instance.GetModel<MarketModel>(); } }

        #region 物品信息
        [SerializeField] Image itemBg;
        [SerializeField] Image itemIcon;
        [SerializeField] Text itemCnt;
        [SerializeField] Text itemName;
        [SerializeField] Text itemSoldNum;
        [SerializeField] List<GameObject> starList;
        #endregion
        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        [SerializeField] Slider itemNumSlider;
        [SerializeField] Button addBtn;
        [SerializeField] Button reduceBtn;
        [SerializeField] Text itemNum;

        [SerializeField] PutawayItem[] queryItems;
        [SerializeField] GameObject noOtherTip;

        [SerializeField] Text putawayBtnText;

        [SerializeField] Text dealItemPrice;
        [SerializeField] Text dealItemTip;

        [SerializeField] Text taxTip;

        VipModel m_VipModel;
        VipModel vipModel
        {
            get
            {
                return m_VipModel ?? (m_VipModel = ModelCenter.Instance.GetModel<VipModel>());
            }
        }

        MarketModel m_Model = null;
        MarketModel model
        {
            get
            {
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<MarketModel>());
            }
        }

        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }

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

        [SerializeField]
        NumKeyBoard keyBoard;
        PlayerPackModel packModel { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }





        #region Built-in
        protected override void BindController()
        {
@@ -91,98 +58,95 @@

        protected override void AddListeners()
        {
            itemNumSlider.onValueChanged.AddListener(OnItemNumChange);
            putawayBtn.onClick.AddListener(OnPutawayBtn);
            vippasBtn.onClick.AddListener(OnVipPasBtn);
            closeBtn.onClick.AddListener(OnCloseBtn);
            soldNumBtn.onClick.AddListener(OnSoldNumClick);
            addBtn.onClick.AddListener(OnItemNumAdd);
            reduceBtn.onClick.AddListener(OnItemNumReduce);
            keyBoard.onValueChange.AddListener(OnNumKeyboardChange);
            keyBoard.onConfirm.AddListener((bool _isConfirm) =>
            m_ItemCountSlider.onValueChanged.AddListener(OnSliderValueChange);
            m_Putaway.onClick.AddListener(OnPutaway);
            m_SetPassword.onClick.AddListener(SetPassword);
            m_Close.onClick.AddListener(CloseClick);
            m_OpenKeyboard.onClick.AddListener(OpenKeyboard);
            m_Add.onClick.AddListener(Add);
            m_Reduce.onClick.AddListener(Reduce);
            m_Keyboard.onValueChange.AddListener(OnValueChange);
            m_Keyboard.onConfirm.AddListener((bool isOk) =>
            {
                if (_isConfirm)
                {
                    keyBoard.gameObject.SetActive(false);
                if (isOk)
                {

                    PutawayData.Instance.priceCount = Mathf.Max(PutawayData.Instance.priceCount, model.minprice);
                    m_Keyboard.gameObject.SetActive(false);
                }
                RefreshPriceCnt((int)PutawayData.Instance.priceCnt);
                RefreshPriceCnt((int)PutawayData.Instance.priceCount, true);
            });
        }

            m_ClickSpace.AddListener(ClickSpace);
        }



        protected override void OnPreOpen()
        {
            if (PutawayData.Instance.itemModel != null)
            {
                CB503_tagCGPYQueryBourseItemOnSale querypack = new CB503_tagCGPYQueryBourseItemOnSale();
                querypack.ItemID = (uint)PutawayData.Instance.itemModel.itemInfo.ItemID;
                querypack.ItemName = string.Empty;
                querypack.QueryType = 0;
                GameNetSystem.Instance.SendInfo(querypack);
                CB503_tagCGPYQueryBourseItemOnSale pak = new CB503_tagCGPYQueryBourseItemOnSale();
                pak.ItemID = (uint)PutawayData.Instance.itemModel.itemInfo.ItemID;
                pak.ItemName = string.Empty;
                pak.QueryType = 0;
                GameNetSystem.Instance.SendInfo(pak);
            }
            model.OnRefreshQueryMarketItem += OnRefreshQueryMarketItem;

            model.OnRefreshQueryMarketItem += DisplayPutawayItems;
            PwdKeyboardWin.OnPwdWinClose += OnPwdWinClose;
            model.OnRefreshItemDealPrice += OnRefreshItemDealPrice;
            keyBoard.gameObject.SetActive(false);
            m_Keyboard.gameObject.SetActive(false);

            InitData();
            Display();

            OnRefreshItemDealPrice((int)PutawayData.Instance.itemModel.itemInfo.ItemID);
        }

        private void OnRefreshItemDealPrice(int itemid)
        private void OnRefreshItemDealPrice(int itemId)
        {
            if (PutawayData.Instance.itemModel.itemInfo.ItemID == (uint)itemid)
            if (PutawayData.Instance.itemModel.itemInfo.ItemID == (uint)itemId)
            {
                uint price = model.GetItemDealPrice((uint)PutawayData.Instance.itemModel.itemInfo.ItemID);
                if (price == 0)
                {
                    dealItemTip.text = Language.Get("Market_Text_21");
                    ItemConfig cfg = Config.Instance.Get<ItemConfig>(itemid);
                    if (cfg != null)
                    m_DealItemTip.text = Language.Get("Market_Text_21");
                    var config = Config.Instance.Get<ItemConfig>(itemId);
                    if (config != null)
                    {
                        dealItemPrice.text = cfg.GoldPrice.ToString();
                        m_DealPrice.text = config.GoldPrice.ToString();
                    }
                }
                else
                {
                    dealItemTip.text = Language.Get("Market_Text_20");
                    if (price == 200000000)
                    {
                        dealItemPrice.text = "<1";
                    }
                    else
                    {
                        dealItemPrice.text = price.ToString();
                    }
                    m_DealItemTip.text = Language.Get("Market_Text_20");
                    m_DealPrice.text = price == 200000000 ? "<1" : price.ToString();
                }
            }
        }

        private void OnPwdWinClose(bool okClose)
        private void OnPwdWinClose(bool isOk)
        {
            if (!hasInBuying)
            if (!inBuyingState)
            {
                if (!PwdKeyboard.Instance.pwd.Equals(string.Empty) && PwdKeyboard.Instance.pwd.Length < 6)
                {
                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("Market_Text_26"));
                    return;
                }
                PutawayData.Instance.pwd = PwdKeyboard.Instance.pwd;
                PutawayData.Instance.password = PwdKeyboard.Instance.pwd;
            }
            else
            {
                hasInBuying = false;
                if (okClose)
                inBuyingState = false;
                if (isOk)
                {
                    pwd = PwdKeyboard.Instance.pwd;
                    password = PwdKeyboard.Instance.pwd;
                    SendBuyPack();
                }
            }
        }

        private void OnRefreshQueryMarketItem()
        private void DisplayPutawayItems()
        {
            List<MarketItemData> list = null;
            noOtherTip.SetActive(true);
            m_ContainerNoneItems.gameObject.SetActive(true);
            model.queryMarketItemList.TryGetValue(0, out list);
            if (list != null)
            {
@@ -192,43 +156,44 @@
                    MarketItemData data = list[i];
                    if (data.PlayerID != PlayerDatas.Instance.baseData.PlayerID)
                    {
                        if (index < queryItems.Length)

                        if (index < m_PutawayItems.Length)

                        {

                            queryItems[index].gameObject.SetActive(true);

                            queryItems[index].Init(data, OnQueryItemClick);

                            m_PutawayItems[index].gameObject.SetActive(true);

                            m_PutawayItems[index].Init(data, OnQueryItemClick);

                        }
                        index++;
                    }
                }
                for (int i = index; i < 3; i++)
                {
                    queryItems[i].gameObject.SetActive(false);
                    m_PutawayItems[i].gameObject.SetActive(false);
                }

                noOtherTip.SetActive(index == 0);
                m_ContainerNoneItems.gameObject.SetActive(index == 0);
            }
        }

        #region 购买物品
        private string pwd = string.Empty;
        private MarketItemData willBuyData = null;
        private bool hasInBuying = false;
        private string password = string.Empty;
        private MarketItemData buyItem = null;
        private bool inBuyingState = false;
        public void SendBuyPack()
        {
            if (willBuyData != null)
            if (buyItem != null)
            {
                CB502_tagCMPYBuyBourseItem buypack = new CB502_tagCMPYBuyBourseItem();
                buypack.ItemGUID = willBuyData.ItemGUID;
                buypack.Pwd = pwd;
                GameNetSystem.Instance.SendInfo(buypack);
                CB502_tagCMPYBuyBourseItem pak = new CB502_tagCMPYBuyBourseItem();
                pak.ItemGUID = buyItem.ItemGUID;
                pak.Pwd = password;
                GameNetSystem.Instance.SendInfo(pak);
            }
        }

        private void OnQueryItemClick(MarketItemData data)
        {
            willBuyData = data;
            buyItem = data;
            ItemAttrData attrData = new ItemAttrData((int)data.ItemTypeID, false, data.Count, -1, 0,
                false, PackType.rptDeleted, "", data.UserData);
            attrData.SetTipsFuncBtn(ItemWinBtnType.buy, OnItemBuyClick);
            itemTipsModel.SetItemTipsModel(attrData);

        }

        private void OnItemBuyClick(ItemWinBtnType type, string s)
@@ -238,26 +203,26 @@
            {
                case ItemWinBtnType.buy:
                    {
                        if (UIHelper.GetMoneyCnt(willBuyData.PriceType) < willBuyData.PriceCount)
                        if (UIHelper.GetMoneyCnt(buyItem.PriceType) < buyItem.PriceCount)
                        {
                            SysNotifyMgr.Instance.ShowTip("NoEnoughMoney1");
                            return;
                        }
                        int gridCnt = playerPack.GetReaminGridCount(PackType.rptItem);
                        int gridCnt = packModel.GetReaminGridCount(PackType.rptItem);
                        if (gridCnt < 1)
                        {
                            SysNotifyMgr.Instance.ShowTip("BourseBagfull");
                            return;
                        }
                        if (willBuyData.NeadPwd == 1)
                        if (buyItem.NeadPwd == 1)
                        {
                            PwdKeyboard.Instance.pwd = string.Empty;
                            hasInBuying = true;
                            inBuyingState = true;
                            WindowCenter.Instance.Open<PwdKeyboardWin>();
                        }
                        else
                        {
                            pwd = string.Empty;
                            password = string.Empty;
                            SendBuyPack();
                        }
                    }
@@ -277,92 +242,87 @@

        protected override void OnAfterClose()
        {
            model.OnRefreshQueryMarketItem -= OnRefreshQueryMarketItem;
            model.OnRefreshQueryMarketItem -= DisplayPutawayItems;
            PwdKeyboardWin.OnPwdWinClose -= OnPwdWinClose;
            model.OnRefreshItemDealPrice -= OnRefreshItemDealPrice;
        }
        #endregion
        private void OnCloseBtn()

        private void OpenKeyboard()
        {
            CloseImmediately();
            m_Keyboard.min = 0;
            m_Keyboard.max = (uint)model.maxprice - 1;
            m_Keyboard.gameObject.SetActive(true);
        }

        private void OnSoldNumClick()
        private void Display()
        {
            keyBoard.min = (uint)model.minprice;
            keyBoard.max = (uint)model.maxprice - 1;
            keyBoard.gameObject.SetActive(true);
        }

        private void InitData()
        {
            for (int i = 0; i < queryItems.Length; i++)

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

            {

                queryItems[i].gameObject.SetActive(false);

                m_PutawayItems[i].gameObject.SetActive(false);

            }
            noOtherTip.SetActive(true);
            m_ContainerNoneItems.gameObject.SetActive(true);
            if (PutawayData.Instance.itemModel == null)
            {
                return;
            }
            ItemConfig cfg = Config.Instance.Get<ItemConfig>((int)PutawayData.Instance.itemModel.itemInfo.ItemID);
            if (cfg != null)
            ItemConfig config = Config.Instance.Get<ItemConfig>((int)PutawayData.Instance.itemModel.itemInfo.ItemID);
            if (config != null)
            {
                var _itemColor = cfg.ItemColor;
                if (cfg.Type == 111)//翅膀
                var _itemColor = config.ItemColor;
                if (config.Type == 111)//翅膀
                {
                    _itemColor = UIHelper.GetItemColor(cfg.ID, PutawayData.Instance.itemModel.useDataDict);
                    _itemColor = UIHelper.GetItemColor(config.ID, PutawayData.Instance.itemModel.useDataDict);
                }
                itemBg.SetItemBackGround(_itemColor);
                itemIcon.SetSprite(cfg.IconKey);
                itemName.text = cfg.ItemName;
                bool _bright = (itemName is RichText) ? (itemName as RichText).colorType == RichText.ColorType.Bright : true;
                itemName.color = UIHelper.GetUIColor(_itemColor, _bright);
                m_ItemBG.SetItemBackGround(_itemColor);
                m_ItemIcon.SetSprite(config.IconKey);
                m_ItemName.text = config.ItemName;
                m_ItemName.color = UIHelper.GetUIColor(_itemColor, true);
            }
            itemSoldNum.text = PutawayData.Instance.priceCnt.ToString();
            for (int i = 0; i < starList.Count; i++)
            m_SinglePrice.text = PutawayData.Instance.priceCount.ToString();
            for (int i = 0; i < m_Stars.Count; i++)
            {
                if (i < cfg.StarLevel)
                if (i < config.StarLevel)
                {
                    starList[i].gameObject.SetActive(true);
                    m_Stars[i].gameObject.SetActive(true);
                }
                else
                {
                    starList[i].gameObject.SetActive(false);
                    m_Stars[i].gameObject.SetActive(false);
                }
            }
            int _Cnt = PutawayData.Instance.itemModel.itemInfo.ItemCount;
            if (_Cnt > 1)
            {
                itemCnt.gameObject.SetActive(true);
                itemNumSlider.gameObject.SetActive(true);
                itemCnt.text = _Cnt.ToString();
                itemNumSlider.maxValue = _Cnt;
                itemNumSlider.minValue = 1;
                itemNumSlider.value = _Cnt;
                PutawayData.Instance.itemCnt = (ushort)_Cnt;
                m_ItemCount.gameObject.SetActive(true);
                m_ItemCountSlider.gameObject.SetActive(true);
                m_ItemCount.text = _Cnt.ToString();
                m_ItemCountSlider.maxValue = _Cnt;
                m_ItemCountSlider.minValue = 1;
                m_ItemCountSlider.value = _Cnt;
                PutawayData.Instance.itemCount = (ushort)_Cnt;
            }
            else
            {
                itemCnt.gameObject.SetActive(false);
                itemNumSlider.gameObject.SetActive(false);
                PutawayData.Instance.itemCnt = 1;
                m_ItemCount.gameObject.SetActive(false);
                m_ItemCountSlider.gameObject.SetActive(false);
                PutawayData.Instance.itemCount = 1;
            }

            PutawayData.Instance.priceType = 1;

            putawayBtnText.text = UIHelper.ReplaceNewLine(Language.Get("Market_Text_17", model.totalPutawayCnt - PlayerDatas.Instance.market.putawayCnt));
            m_PutawayBtnTxt.text = UIHelper.ReplaceNewLine(Language.Get("Market_Text_17", model.totalPutawayCnt - PlayerDatas.Instance.market.putawayCnt));
            int pwdVipLv = vipModel.GetPrivilegeVipLv(VipPrivilegeType.MarketPutawayPwd);
            vippasBtnText.text = UIHelper.ReplaceNewLine(Language.Get("Market_Text_16", pwdVipLv));
            m_SetPasswordTxt.text = UIHelper.ReplaceNewLine(Language.Get("Market_Text_16", pwdVipLv));
            OnRefreshItemDealPrice((int)PutawayData.Instance.itemModel.itemInfo.ItemID);

            if (PlayerDatas.Instance.baseData.VIPLv < pwdVipLv)
            {
                vippasBtn.interactable = false;
                m_SetPassword.interactable = false;
            }
            else
            {
                vippasBtn.interactable = true;
                m_SetPassword.interactable = true;
            }

            if (PlayerDatas.Instance.baseData.VIPLv == 0)
@@ -377,22 +337,22 @@
                        break;
                    }
                }
                taxTip.text = Language.Get("Market_Text_22", _presentTax / 100, _nextVip, VipPrivilegeConfig.GetVipPrivilegeData(VipPrivilegeType.TradeTax, _nextVip) / 100);
                m_TaxTip.text = Language.Get("Market_Text_22", _presentTax / 100, _nextVip, VipPrivilegeConfig.GetVipPrivilegeData(VipPrivilegeType.TradeTax, _nextVip) / 100);
            }
            else
            {
                taxTip.text = Language.Get("Market_Text_14", PlayerDatas.Instance.baseData.VIPLv,
                m_TaxTip.text = Language.Get("Market_Text_14", PlayerDatas.Instance.baseData.VIPLv,
                    VipPrivilegeConfig.GetVipPrivilegeData(VipPrivilegeType.TradeTax, PlayerDatas.Instance.baseData.VIPLv) / 100);
            }

            RefreshItemNumCnt();
        }

        private void OnVipPasBtn()
        private void SetPassword()
        {
            if (vipModel.GetVipPrivilegeCnt(VipPrivilegeType.MarketPutawayPwd) > 0)
            {
                PwdKeyboard.Instance.pwd = PutawayData.Instance.pwd;
                PwdKeyboard.Instance.pwd = PutawayData.Instance.password;
                WindowCenter.Instance.Open<PwdKeyboardWin>();
            }
            else
@@ -401,71 +361,73 @@
            }
        }

        private void OnNumKeyboardChange()
        private void OnValueChange()
        {
            int arg1 = int.Parse(keyBoard.Value);
            //if (arg1 >= model.maxprice)
            //{
            //    arg1 = model.maxprice - 1;
            //}
            PutawayData.Instance.priceCnt = (uint)Mathf.Max(arg1, model.minprice);
            RefreshPriceCnt(arg1);
            //keyBoard.Value = arg1.ToString();
            int result = int.Parse(m_Keyboard.Value);

            PutawayData.Instance.priceCount = result;
            RefreshPriceCnt((int)PutawayData.Instance.priceCount, false);
        }

        private void RefreshPriceCnt(int _count)
        private void ClickSpace()

        {

            int result = int.Parse(m_Keyboard.Value);
            PutawayData.Instance.priceCount = Mathf.Max(result, model.minprice);
            RefreshPriceCnt((int)PutawayData.Instance.priceCount, true);

        }

        private void RefreshPriceCnt(int _count, bool verify)
        {
            if (_count == 0)
            if (_count == 0 && verify)
            {
                soldNum.text = Language.Get("Market_Text_18");
                itemSoldNum.text = (0).ToString();
                m_TargetPrice.text = Language.Get("Market_Text_18");
                m_SinglePrice.text = (0).ToString();
            }
            else
            {
                soldNum.text = _count.ToString();
                int singlePrice = (int)PutawayData.Instance.priceCnt / (int)PutawayData.Instance.itemCnt;
                m_TargetPrice.text = _count.ToString();
                int singlePrice = (int)PutawayData.Instance.priceCount / (int)PutawayData.Instance.itemCount;
                if (singlePrice < 1)
                {
                    itemSoldNum.text = "<1";
                    m_SinglePrice.text = "<1";
                }
                else
                {
                    itemSoldNum.text = singlePrice.ToString();
                    m_SinglePrice.text = singlePrice.ToString();
                }
            }
        }

        private void OnItemNumReduce()
        private void Reduce()
        {
            if (itemNumSlider.value > 1)
            if (m_ItemCountSlider.value > 1)
            {
                itemNumSlider.value -= 1;
                m_ItemCountSlider.value -= 1;
            }
        }

        private void OnItemNumAdd()
        private void Add()
        {
            if (itemNumSlider.value < itemNumSlider.maxValue)
            if (m_ItemCountSlider.value < m_ItemCountSlider.maxValue)
            {
                itemNumSlider.value += 1;
                m_ItemCountSlider.value += 1;
            }
        }

        private void OnItemNumChange(float arg0)
        private void OnSliderValueChange(float arg0)
        {
            int _Cnt = (int)arg0;
            PutawayData.Instance.itemCnt = (ushort)_Cnt;
            PutawayData.Instance.itemCount = (ushort)_Cnt;
            RefreshItemNumCnt();
        }

        private void RefreshItemNumCnt()
        {
            itemCnt.text = PutawayData.Instance.itemCnt.ToString();
            itemNum.text = PutawayData.Instance.itemCnt.ToString();
            RefreshPriceCnt((int)PutawayData.Instance.priceCnt);
            m_ItemCount.text = PutawayData.Instance.itemCount.ToString();
            m_PutawayItemCount.text = PutawayData.Instance.itemCount.ToString();
            RefreshPriceCnt((int)PutawayData.Instance.priceCount, true);
        }

        private void OnPutawayBtn()
        private void OnPutaway()
        {
            if (PutawayData.Instance.itemModel == null) return;
            if (PlayerDatas.Instance.market.putawayCnt >= model.totalPutawayCnt)
@@ -473,17 +435,17 @@
                SysNotifyMgr.Instance.ShowTip("MarketNoPutaway4", model.totalPutawayCnt);
                return;
            }
            if (PutawayData.Instance.priceCnt == 0)
            if (PutawayData.Instance.priceCount == 0)
            {
                SysNotifyMgr.Instance.ShowTip("Market_Price_Null");
                return;
            }
            if (PutawayData.Instance.pwd.Equals(string.Empty))
            if (PutawayData.Instance.password.Equals(string.Empty))
            {
                SendPutawayPack();
                return;
            }
            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("Market_Text_29", PutawayData.Instance.pwd), (bool isOk) =>
            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("Market_Text_29", PutawayData.Instance.password), (bool isOk) =>
            {
                if (isOk)
                {
@@ -495,13 +457,13 @@

        private void SendPutawayPack()
        {
            CB501_tagCMPYPlayerSellBourseItem putawaypack = new CB501_tagCMPYPlayerSellBourseItem();
            putawaypack.ItemIndex = (byte)PutawayData.Instance.itemModel.itemInfo.ItemPlace;
            putawaypack.Count = PutawayData.Instance.itemCnt;
            putawaypack.PriceCount = PutawayData.Instance.priceCnt;
            putawaypack.PriceType = PutawayData.Instance.priceType;
            putawaypack.Pwd = PutawayData.Instance.pwd;
            GameNetSystem.Instance.SendInfo(putawaypack);
            CB501_tagCMPYPlayerSellBourseItem pak = new CB501_tagCMPYPlayerSellBourseItem();
            pak.ItemIndex = (byte)PutawayData.Instance.itemModel.itemInfo.ItemPlace;
            pak.Count = PutawayData.Instance.itemCount;
            pak.PriceCount = (uint)PutawayData.Instance.priceCount;
            pak.PriceType = PutawayData.Instance.priceType;
            pak.Pwd = PutawayData.Instance.password;
            GameNetSystem.Instance.SendInfo(pak);
            CloseImmediately();
        }
    }

 System/Team/TeamModel.cs

@@ -8,7 +8,7 @@
namespace Snxxz.UI

{

    [XLua.LuaCallCSharp]

    public class TeamModel : Model, IAfterPlayerDataInitialize, ISwitchAccount, IPlayerLoginOk, IMapInitOk

    public class TeamModel : Model, IAfterPlayerDataInitialize, ISwitchAccount, IPlayerLoginOk, IMapInitOk

    {

        public const int NONE_MISSION = 0;

        public const int CURRENTMAP_MISSION = 1;

@@ -208,6 +208,8 @@
        {

            isMatching = false;

            serverInited = false;

            prepareBeginTime = DateTime.MinValue;

            teamPrepare.playerStates.Clear();

        }



        public void OnSwitchAccount()


 System/Tip/RuneTowerConfirmWin.cs

@@ -24,6 +24,8 @@
        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
        RuneTowerModel model { get { return ModelCenter.Instance.GetModel<RuneTowerModel>(); } }

        public static bool waitConfirm = false;

        #region Built-in
        protected override void BindController()
        {
@@ -40,6 +42,7 @@
            timer = 0f;
            executed = false;
            model.waitNextConfirm = true;
            waitConfirm = true;
        }

        protected override void OnAfterOpen()
@@ -48,7 +51,8 @@

        protected override void OnPreClose()
        {
            model.waitNextConfirm = false;
            model.waitNextConfirm = false;

            waitConfirm = false;
        }

        protected override void OnAfterClose()