5685 【前端】【1.4.100】聚魂一键分解功能红点提醒与逻辑优化

client_linchunjie

2019-01-05 c8ac55a6fdc988c6a9205e5bdb093b2f1ac0218d

5685 【前端】【1.4.100】聚魂一键分解功能红点提醒与逻辑优化

 Lua/Gen/DelegatesGensBridge.cs

@@ -2704,7 +2704,31 @@
#endif
        }
        
        public void __Gen_Delegate_Imp118(object p0, ItemWinBtnType p1, object p2)
        public void __Gen_Delegate_Imp118(object p0, object p1, bool 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.PushAny(L, p1);
                LuaAPI.lua_pushboolean(L, p2);
                
                PCall(L, 3, 0, errFunc);
                
                
                
                LuaAPI.lua_settop(L, errFunc - 1);
                
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public void __Gen_Delegate_Imp119(object p0, ItemWinBtnType p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2728,7 +2752,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp119(object p0, int p1, int p2)
        public void __Gen_Delegate_Imp120(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2752,7 +2776,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp120(object p0, PackType p1, int p2)
        public void __Gen_Delegate_Imp121(object p0, PackType p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2776,7 +2800,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp121(object p0, UnityEngine.Vector3 p1, UnityEngine.Vector3 p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp122(object p0, UnityEngine.Vector3 p1, UnityEngine.Vector3 p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2800,7 +2824,7 @@
#endif
        }
        
        public System.Collections.Generic.List<int> __Gen_Delegate_Imp122(object p0)
        public System.Collections.Generic.List<int> __Gen_Delegate_Imp123(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2822,7 +2846,7 @@
#endif
        }
        
        public System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> __Gen_Delegate_Imp123(object p0)
        public System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> __Gen_Delegate_Imp124(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2844,7 +2868,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, int> __Gen_Delegate_Imp124(object p0)
        public System.Collections.Generic.Dictionary<int, int> __Gen_Delegate_Imp125(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2866,7 +2890,7 @@
#endif
        }
        
        public string __Gen_Delegate_Imp125(int p0)
        public string __Gen_Delegate_Imp126(int p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2888,7 +2912,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp126(object p0, object p1)
        public int __Gen_Delegate_Imp127(object p0, object p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2911,7 +2935,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp127(object p0, PackType p1)
        public void __Gen_Delegate_Imp128(object p0, PackType p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2934,7 +2958,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp128(object p0, out System.Collections.Generic.List<int> p1)
        public bool __Gen_Delegate_Imp129(object p0, out System.Collections.Generic.List<int> p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2957,7 +2981,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp129(object p0, int p1)
        public bool __Gen_Delegate_Imp130(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2980,7 +3004,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp130(object p0, int p1, ref System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> p2)
        public void __Gen_Delegate_Imp131(object p0, int p1, ref System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3005,7 +3029,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp131(object p0, object p1, int p2, out int p3)
        public bool __Gen_Delegate_Imp132(object p0, object p1, int p2, out int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3030,7 +3054,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp132(object p0, object p1, out int p2)
        public bool __Gen_Delegate_Imp133(object p0, object p1, out int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3054,7 +3078,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp133(object p0, int p1, object p2)
        public bool __Gen_Delegate_Imp134(object p0, int p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3078,7 +3102,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp134(object p0, int p1, object p2)
        public int __Gen_Delegate_Imp135(object p0, int p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3102,7 +3126,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp135(object p0, int p1, int p2)
        public bool __Gen_Delegate_Imp136(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3126,7 +3150,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp136(object p0, object p1, int p2, int p3)
        public bool __Gen_Delegate_Imp137(object p0, object p1, int p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3151,7 +3175,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp137(object p0, object p1, int p2)
        public void __Gen_Delegate_Imp138(object p0, object p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3163,30 +3187,6 @@
                translator.PushAny(L, p0);
                translator.PushAny(L, p1);
                LuaAPI.xlua_pushinteger(L, p2);
                
                PCall(L, 3, 0, errFunc);
                
                
                
                LuaAPI.lua_settop(L, errFunc - 1);
                
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public void __Gen_Delegate_Imp138(object p0, object p1, bool 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.PushAny(L, p1);
                LuaAPI.lua_pushboolean(L, p2);
                
                PCall(L, 3, 0, errFunc);
                

 Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.CrossServerOneVsOneModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 27, 19, 9);
            Utils.BeginObjectRegister(type, L, translator, 0, 27, 21, 10);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
@@ -58,6 +58,7 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsMatching", _g_get_IsMatching);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "matchStartTime", _g_get_matchStartTime);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "roundEndTime", _g_get_roundEndTime);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsNewDay", _g_get_IsNewDay);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "freeMaxMatchNum", _g_get_freeMaxMatchNum);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "buyMaxMatchNum", _g_get_buyMaxMatchNum);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "priceFormula", _g_get_priceFormula);
@@ -65,6 +66,7 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "dayAwardTypelist", _g_get_dayAwardTypelist);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "afterOpenDayOpenCross", _g_get_afterOpenDayOpenCross);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "pkResultInfo", _g_get_pkResultInfo);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "LocalSaveThirdTypeKey", _g_get_LocalSaveThirdTypeKey);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossServerRedpoint", _g_get_crossServerRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossOneVsOneRedpoint", _g_get_crossOneVsOneRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossArenaRedpoint", _g_get_crossArenaRedpoint);
@@ -75,6 +77,7 @@
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "isClickCoolTime", _s_set_isClickCoolTime);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "IsMatching", _s_set_IsMatching);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "matchStartTime", _s_set_matchStartTime);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "LocalSaveThirdTypeKey", _s_set_LocalSaveThirdTypeKey);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossServerRedpoint", _s_set_crossServerRedpoint);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossOneVsOneRedpoint", _s_set_crossOneVsOneRedpoint);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossArenaRedpoint", _s_set_crossArenaRedpoint);
@@ -864,6 +867,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_IsNewDay(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushboolean(L, gen_to_be_invoked.IsNewDay);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_freeMaxMatchNum(RealStatePtr L)
        {
            try {
@@ -955,6 +972,20 @@
            
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.pkResultInfo);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_LocalSaveThirdTypeKey(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushstring(L, gen_to_be_invoked.LocalSaveThirdTypeKey);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
@@ -1094,6 +1125,21 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_LocalSaveThirdTypeKey(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.LocalSaveThirdTypeKey = LuaAPI.lua_tostring(L, 2);
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_crossServerRedpoint(RealStatePtr L)
        {
            try {

 Lua/Gen/SnxxzUIGatheringSoulModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.GatheringSoulModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 45, 18, 5);
            Utils.BeginObjectRegister(type, L, translator, 0, 46, 18, 5);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
@@ -48,6 +48,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SendResolvePack", _m_SendResolvePack);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "ExecuteEquipSoul", _m_ExecuteEquipSoul);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "ExecuteReplaceSoul", _m_ExecuteReplaceSoul);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryExecuteReplaceSoul", _m_TryExecuteReplaceSoul);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "ExecutePutOffSoul", _m_ExecutePutOffSoul);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "CheckExist", _m_CheckExist);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetHoleCondition", _m_TryGetHoleCondition);
@@ -87,19 +88,19 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "levelUpRedpoint", _g_get_levelUpRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "equipRedpointHole", _g_get_equipRedpointHole);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "levelUpRedpointHole", _g_get_levelUpRedpointHole);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "replaceRedHoles", _g_get_replaceRedHoles);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "replaceRedpointIndex", _g_get_replaceRedpointIndex);
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "autoResolve", _s_set_autoResolve);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "topBestSoulIndexs", _s_set_topBestSoulIndexs);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "equipRedpointHole", _s_set_equipRedpointHole);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "levelUpRedpointHole", _s_set_levelUpRedpointHole);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "replaceRedHoles", _s_set_replaceRedHoles);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "replaceRedpointIndex", _s_set_replaceRedpointIndex);
            
            
            Utils.EndObjectRegister(type, L, translator, null, null,
                null, null, null);

            Utils.BeginClassRegister(type, L, __CreateInstance, 8, 0, 0);
            Utils.BeginClassRegister(type, L, __CreateInstance, 9, 0, 0);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetEquipHoleName", _m_GetEquipHoleName_xlua_st_);
            
            
@@ -109,6 +110,7 @@
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "SOULDUST_MONEYTYPE", Snxxz.UI.GatheringSoulModel.SOULDUST_MONEYTYPE);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "SOULSPLINTERS_MONEYTYPE", Snxxz.UI.GatheringSoulModel.SOULSPLINTERS_MONEYTYPE);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "SOULCORE_MONEYTYPE", Snxxz.UI.GatheringSoulModel.SOULCORE_MONEYTYPE);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "RARA_GATHERSOUL_QUALITY", Snxxz.UI.GatheringSoulModel.RARA_GATHERSOUL_QUALITY);
            
            
            
@@ -962,6 +964,35 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_TryExecuteReplaceSoul(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.GatheringSoulModel gen_to_be_invoked = (Snxxz.UI.GatheringSoulModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _hole = LuaAPI.xlua_tointeger(L, 2);
                    Snxxz.UI.GatherSoulItem _item = (Snxxz.UI.GatherSoulItem)translator.GetObject(L, 3, typeof(Snxxz.UI.GatherSoulItem));
                    
                    gen_to_be_invoked.TryExecuteReplaceSoul( _hole, _item );
                    
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_ExecutePutOffSoul(RealStatePtr L)
        {
            try {
@@ -1718,13 +1749,13 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_replaceRedHoles(RealStatePtr L)
        static int _g_get_replaceRedpointIndex(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.GatheringSoulModel gen_to_be_invoked = (Snxxz.UI.GatheringSoulModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.replaceRedHoles);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.replaceRedpointIndex);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
@@ -1794,13 +1825,13 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_replaceRedHoles(RealStatePtr L)
        static int _s_set_replaceRedpointIndex(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.GatheringSoulModel gen_to_be_invoked = (Snxxz.UI.GatheringSoulModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.replaceRedHoles = (System.Collections.Generic.List<int>)translator.GetObject(L, 2, typeof(System.Collections.Generic.List<int>));
                gen_to_be_invoked.replaceRedpointIndex = LuaAPI.xlua_tointeger(L, 2);
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);

 System/GatheringSoul/GatherSoulEquipListWin.cs

@@ -75,7 +75,7 @@
            var equipCell = cell as GatherSoulEquipCell;

            if (cell.index < equipList.Count)

            {

                equipCell.Display(equipList[cell.index], cell.index == 0);

                equipCell.Display(equipList[cell.index], false);

            }

        }




 System/GatheringSoul/GatherSoulHoleBehaviour.cs

@@ -111,10 +111,6 @@
                    {

                        data.SetTipsFuncBtn(ItemWinBtnType.LevelUp, OnTipFunc);

                    }

                    if (model.replaceRedHoles.Contains(hole))

                    {

                        data.SetTipsFuncBtn(ItemWinBtnType.Replace, OnTipFunc);

                    }

                    itemTipsModel.SetItemTipsModel(data);

                }

                else

@@ -144,8 +140,7 @@
        void DisplayRedpoint()

        {

            bool requireRedpoint = (model.equipRedpoint.state == RedPointState.Simple && model.equipRedpointHole == hole)

                || (model.levelUpRedpoint.state == RedPointState.Simple && model.levelUpRedpointHole == hole)

                || (model.replaceRedpoint.state == RedPointState.Simple && model.replaceRedHoles.Contains(hole));

                || (model.levelUpRedpoint.state == RedPointState.Simple && model.levelUpRedpointHole == hole);

            m_ContaienrRedpoint.gameObject.SetActive(requireRedpoint);

        }




 System/GatheringSoul/GatherSoulItemBehaviour.cs

@@ -162,8 +162,7 @@
            if (m_Select != null)

            {

                var requireSelect = displayItem.packType == PackType.rptGatherSoul

                    && soulModel.topBestSoulIndexs.Contains(displayItem.index)

                    && soulModel.equipRedpoint.state == RedPointState.Simple;

                    && soulModel.topBestSoulIndexs.Contains(displayItem.index);

                m_Select.gameObject.SetActive(requireSelect);

                if (requireSelect)

                {


 System/GatheringSoul/GatherSoulResolveWin.cs

@@ -106,15 +106,15 @@


        int GetDefaultQuality()

        {

            for (int i = 4; i >= 2; i--)

            {

                model.GetResolveSouls(i, model.resolveItems);

                if (model.resolveItems.Count > 0)

                {

                    return i;

                }

            }

            return 2;

            //for (int i = 4; i >= 2; i--)

            //{

            //    model.GetResolveSouls(i, model.resolveItems);

            //    if (model.resolveItems.Count > 0)

            //    {

            //        return i;

            //    }

            //}

            return GatheringSoulModel.RARA_GATHERSOUL_QUALITY - 1;

        }



        private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType)

@@ -239,9 +239,8 @@
            }



            bool existUnEquipBetterProperty = false;

            bool existRareGatherSoul = false;



            var count = model.holeCount;

            var error = 0;

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

            {

                var item = model.resolveItems[i];

@@ -251,36 +250,44 @@
                    {

                        continue;

                    }

                    if (model.IsSamePropertyCompareHoles(-1, item) == -1)

                    if (item.itemColor >= GatheringSoulModel.RARA_GATHERSOUL_QUALITY)

                    {

                        existUnEquipBetterProperty = true;

                        existRareGatherSoul = true;

                        break;

                    }

                    for (int k = 0; k < count; k++)

                }

            }

            if (!existRareGatherSoul)

            {

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

                {

                    var item = model.resolveItems[i];

                    if (item != null && model.CheckExist(item))

                    {

                        GatherSoulItem holeItem;

                        if (model.TryGetItem(k, out holeItem))

                        if (item.itemType == GatheringSoulModel.GATHERSOUL_ESSENCE_TYPE)

                        {

                            if (model.SatisfyReplace(k, item) && item.Compare(holeItem) == 1)

                            {

                                existUnEquipBetterProperty = true;

                                break;

                            }

                            continue;

                        }

                        else if (model.SatisfyEquipSoul(item, k, out error))

                        if (model.IsSamePropertyCompareHoles(-1, item) == -1)

                        {

                            existUnEquipBetterProperty = true;

                            break;

                        }

                    }

                }

                if (existUnEquipBetterProperty)

                {

                    break;

                }

            }



            if (existUnEquipBetterProperty)

            if (existRareGatherSoul)

            {

                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("RareGatherSoulResolveConfirm"), (bool isOk) =>

                {

                    if (isOk)

                    {

                        TryResolve();

                    }

                });

            }

            else if (existUnEquipBetterProperty)

            {

                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("GatherSoulResolveConfirm"), (bool isOk) =>

                  {


 System/GatheringSoul/GatherSoulTipWin.cs

@@ -155,7 +155,7 @@
                    else if (callBackType == ItemWinBtnType.Replace)

                    {

                        m_Redpoints[index].gameObject.SetActive(model.replaceRedpoint.state == RedPointState.Simple

                            && model.replaceRedHoles.Contains(itemTipsModel.curAttrData.equipHole));

                            && itemTipsModel.curAttrData.index == model.replaceRedpointIndex);

                    }

                }

                index++;


 System/GatheringSoul/GatheringSoulModel.cs

@@ -83,6 +83,8 @@
        public const int SOULSPLINTERS_MONEYTYPE = 29;

        public const int SOULCORE_MONEYTYPE = 30;



        public const int RARA_GATHERSOUL_QUALITY = 3;



        const int GATHERSOUL_REDPOINT_BASE = 10102;

        const int GATHERSOUL_REDPOINT_DEEP = 1010200;

        static int redpointIndex = 5;

@@ -334,7 +336,6 @@
        void SelectBestReplaceSoul()

        {

            List<int> list;

            var count = holeCount;

            if (virtualPack.TryGetItems(PackType.rptGatherSoul, out list))

            {

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

@@ -342,19 +343,17 @@
                    GatherSoulItem packItem;

                    if (virtualPack.TryGetItem(PackType.rptGatherSoul, list[i], out packItem))

                    {

                        for (int k = 0; k < count; k++)

                        var hole = 0;

                        if (SatisfyReplace(packItem, out hole))

                        {

                            if (SatisfyReplace(k, packItem))

                            GatherSoulItem item;

                            if (TryGetItem(hole, out item) && packItem.Compare(item) == 1)

                            {

                                GatherSoulItem item;

                                if (TryGetItem(k, out item) && packItem.Compare(item) == 1)

                                if (!packIndexs.Contains(list[i]))

                                {

                                    if (!packIndexs.Contains(list[i]))

                                    {

                                        packIndexs.Add(list[i]);

                                    }

                                    break;

                                    packIndexs.Add(list[i]);

                                }

                                break;

                            }

                        }

                    }

@@ -592,7 +591,7 @@
                if (TryGetItem(i, out holeItem))

                {

                    if (item.gatherSoulType == holeItem.gatherSoulType

                        && IsSamePropertyCompareHoles(i, item) == -1)

                        && item.ExistSameProperty(holeItem.id))

                    {

                        hole = i;

                        return true;

@@ -1394,6 +1393,10 @@
                        list.Add(item);

                        continue;

                    }

                    if (item.itemType == GATHERSOUL_CORE_TYPE)

                    {

                        continue;

                    }

                    var propertys = gatherSoulPropertys[item.id];

                    if (propertys.Count > 1)

                    {

@@ -1401,7 +1404,7 @@
                    }

                    var property = propertys[0];

                    var config = Config.Instance.Get<ItemConfig>(item.id);

                    if (item.itemType == GATHERSOUL_SOUL_TYPE && config.ItemColor <= 2)

                    if (item.itemType == GATHERSOUL_SOUL_TYPE && config.ItemColor < RARA_GATHERSOUL_QUALITY)

                    {

                        list.Add(item);

                        continue;

@@ -1451,6 +1454,11 @@
                    if (item.itemType == GATHERSOUL_ESSENCE_TYPE)

                    {

                        list.Add(item);

                        continue;

                    }

                    if (item.itemType == GATHERSOUL_SOUL_TYPE ||

                        item.itemColor >= RARA_GATHERSOUL_QUALITY)

                    {

                        continue;

                    }

                    var propertys = gatherSoulPropertys[item.id];

@@ -1532,10 +1540,9 @@
        #region 红点

        public int equipRedpointHole = 0;

        public int levelUpRedpointHole = 0;

        public List<int> replaceRedHoles = new List<int>();

        public int replaceRedpointIndex = 0;

        void UpdateRedpoint()

        {

            replaceRedHoles.Clear();

            equipRedpoint.state = RedPointState.None;

            replaceRedpoint.state = RedPointState.None;

            resolveRedpoint.state = RedPointState.None;

@@ -1563,41 +1570,42 @@
                }

            }

            var count = holeCount;

            if (packIndexs.Count > 0 && topBestSoulIndexs.Count > 0)

            if (packIndexs.Count > 0)

            {

                for (int k = 0; k < count; k++)

                GatherSoulItem item;

                virtualPack.TryGetItem(PackType.rptGatherSoul, packIndexs[0], out item);

                for (int i = 0; i < count; i++)

                {

                    GatherSoulItem holeItem;

                    if (!TryGetItem(k, out holeItem))

                    if (TryGetItem(i, out holeItem))

                    {

                        continue;

                    }

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

                    {

                        GatherSoulItem item;

                        if (virtualPack.TryGetItem(PackType.rptGatherSoul, topBestSoulIndexs[i], out item))

                        if (SatisfyReplace(i, item) && item.Compare(holeItem) == 1)

                        {

                            if (SatisfyReplace(k, item) && item.Compare(holeItem) == 1)

                            {

                                replaceRedHoles.Add(k);

                                break;

                            }

                            replaceRedpointIndex = item.index;

                            replaceRedpoint.state = RedPointState.Simple;

                            return;

                        }

                    }

                }

                if (replaceRedHoles.Count > 0)

                {

                    replaceRedpoint.state = RedPointState.Simple;

                    return;

                }

            }

            List<GatherSoulItem> list = new List<GatherSoulItem>();

            GetResolveSouls(int.MaxValue, list);

            if (list.Count > 0)

            {

                resolveRedpoint.state = RedPointState.Simple;

                list = null;

                return;

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

                {

                    if (list[i] == null)

                    {

                        continue;

                    }

                    if (list[i].itemType == GATHERSOUL_ESSENCE_TYPE

                        || list[i].itemColor < RARA_GATHERSOUL_QUALITY)

                    {

                        resolveRedpoint.state = RedPointState.Simple;

                        list = null;

                        return;

                    }

                }

            }

            GatherSoulItem coreItem;

            if (TryGetItem(coreHole, out coreItem) &&

@@ -1729,12 +1737,6 @@
            if (compareConfig.ItemColor != config.ItemColor)

            {

                return config.ItemColor > compareConfig.ItemColor ? 1 : -1;

            }

            var compareSort = model.GetPropertyHighestSort(model.gatherSoulPropertys[compare.id]);

            var sort = model.GetPropertyHighestSort(model.gatherSoulPropertys[id]);

            if (compareSort != sort)

            {

                return sort < compareSort ? 1 : -1;

            }

            if (level != compare.level)

            {