From a8329e280d464db8d537dc4f2b95d5ca554ceff9 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 27 三月 2019 15:01:28 +0800
Subject: [PATCH] 3335 删除法宝魂功能
---
System/Realm/ActivateShow.cs | 92 -----------------------
System/FindPrecious/DemonJarModel.cs | 7 -
Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA317_tagMCAllEquipAttrActiveInfo.cs | 1
System/Treasure/TreasureNewGotWin.cs | 3
System/Realm/RealmPropertyUpWin.cs | 6 -
/dev/null | 12 ---
Lua/Gen/XLuaGenAutoRegister.cs | 3
System/Rune/RuneResolveModel.cs | 12 +--
System/WindowJump/WindowJumpMgr.cs | 20 -----
System/Treasure/FairyTreasureCollectPanelPattern4.cs | 35 +++-----
Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA353_tagMCMWPrivilegeDataInfo.cs | 1
System/MainInterfacePanel/LowSettingTip.cs | 1
System/WindowBase/ModelCenter.cs | 1
System/Treasure/TreasureModel.cs | 40 ++++++---
System/Rune/RuneResolveWin.cs | 5 -
15 files changed, 49 insertions(+), 190 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA317_tagMCAllEquipAttrActiveInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA317_tagMCAllEquipAttrActiveInfo.cs
index 112e628..7f6d992 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA317_tagMCAllEquipAttrActiveInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA317_tagMCAllEquipAttrActiveInfo.cs
@@ -14,7 +14,6 @@
base.Done(vNetPack);
var vNetData = vNetPack as HA317_tagMCAllEquipAttrActiveInfo;
- ModelCenter.Instance.GetModel<TreasureSoulModel>().UpdateTreasurePrivilege(vNetData);
}
}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA353_tagMCMWPrivilegeDataInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA353_tagMCMWPrivilegeDataInfo.cs
index 7945bf5..160be9c 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA353_tagMCMWPrivilegeDataInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA353_tagMCMWPrivilegeDataInfo.cs
@@ -15,7 +15,6 @@
{
base.Done(vNetPack);
var package = vNetPack as HA353_tagMCMWPrivilegeDataInfo;
- ModelCenter.Instance.GetModel<TreasureSoulModel>().UpdateTreasurePrivilege(package);
}
}
diff --git a/Lua/Gen/SnxxzUITreasureSoulModelWrap.cs b/Lua/Gen/SnxxzUITreasureSoulModelWrap.cs
deleted file mode 100644
index e5432c2..0000000
--- a/Lua/Gen/SnxxzUITreasureSoulModelWrap.cs
+++ /dev/null
@@ -1,672 +0,0 @@
-锘�#if USE_UNI_LUA
-using LuaAPI = UniLua.Lua;
-using RealStatePtr = UniLua.ILuaState;
-using LuaCSFunction = UniLua.CSharpFunctionDelegate;
-#else
-using LuaAPI = XLua.LuaDLL.Lua;
-using RealStatePtr = System.IntPtr;
-using LuaCSFunction = XLua.LuaDLL.lua_CSFunction;
-#endif
-
-using XLua;
-using System.Collections.Generic;
-
-
-namespace XLua.CSObjectWrap
-{
- using Utils = XLua.Utils;
- public class SnxxzUITreasureSoulModelWrap
- {
- public static void __Register(RealStatePtr L)
- {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- System.Type type = typeof(Snxxz.UI.TreasureSoulModel);
- Utils.BeginObjectRegister(type, L, translator, 0, 14, 6, 4);
-
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPlayerLoginOk", _m_OnPlayerLoginOk);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetViewTreasureNewGot", _m_SetViewTreasureNewGot);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetTreasureSouls", _m_GetTreasureSouls);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetTreasureSoul", _m_TryGetTreasureSoul);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetTreasureSoulValue", _m_GetTreasureSoulValue);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsGetTreasureSoul", _m_IsGetTreasureSoul);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsOpenTreasureSoul", _m_IsOpenTreasureSoul);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateTreasureSoulStrenthen", _m_UpdateTreasureSoulStrenthen);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateTreasurePrivilege", _m_UpdateTreasurePrivilege);
-
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "treasureSoulEvent", _e_treasureSoulEvent);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "treasureSelectSoulChangeEvent", _e_treasureSelectSoulChangeEvent);
-
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "signAddTreasure", _g_get_signAddTreasure);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "selectSoul", _g_get_selectSoul);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "gotoSoul", _g_get_gotoSoul);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "newGotSoul", _g_get_newGotSoul);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "serverInited", _g_get_serverInited);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "signAddProperty", _g_get_signAddProperty);
-
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "selectSoul", _s_set_selectSoul);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "gotoSoul", _s_set_gotoSoul);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "newGotSoul", _s_set_newGotSoul);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "signAddProperty", _s_set_signAddProperty);
-
-
- Utils.EndObjectRegister(type, L, translator, null, null,
- null, null, null);
-
- Utils.BeginClassRegister(type, L, __CreateInstance, 2, 0, 0);
-
-
- Utils.RegisterObject(L, translator, Utils.CLS_IDX, "TREASURE_SOUL_ID", Snxxz.UI.TreasureSoulModel.TREASURE_SOUL_ID);
-
-
-
-
- Utils.EndClassRegister(type, L, translator);
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int __CreateInstance(RealStatePtr L)
- {
-
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- if(LuaAPI.lua_gettop(L) == 1)
- {
-
- Snxxz.UI.TreasureSoulModel gen_ret = new Snxxz.UI.TreasureSoulModel();
- translator.Push(L, gen_ret);
-
- return 1;
- }
-
- }
- catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.TreasureSoulModel constructor!");
-
- }
-
-
-
-
-
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_Init(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.Init( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_OnBeforePlayerDataInitialize(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.OnBeforePlayerDataInitialize( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_OnPlayerLoginOk(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.OnPlayerLoginOk( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_UnInit(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.UnInit( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_SetViewTreasureNewGot(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.SetViewTreasureNewGot( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetTreasureSouls(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- System.Collections.Generic.List<int> gen_ret = gen_to_be_invoked.GetTreasureSouls( );
- 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_TryGetTreasureSoul(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int __id = LuaAPI.xlua_tointeger(L, 2);
- Snxxz.UI.TreasureSpecialData _special;
-
- bool gen_ret = gen_to_be_invoked.TryGetTreasureSoul( __id, out _special );
- LuaAPI.lua_pushboolean(L, gen_ret);
- translator.Push(L, _special);
-
-
-
-
- return 2;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetTreasureSoulValue(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int __soulId = LuaAPI.xlua_tointeger(L, 2);
-
- int gen_ret = gen_to_be_invoked.GetTreasureSoulValue( __soulId );
- 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_IsGetTreasureSoul(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int __soulId = LuaAPI.xlua_tointeger(L, 2);
-
- bool gen_ret = gen_to_be_invoked.IsGetTreasureSoul( __soulId );
- 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_IsOpenTreasureSoul(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int __soulId = LuaAPI.xlua_tointeger(L, 2);
-
- bool gen_ret = gen_to_be_invoked.IsOpenTreasureSoul( __soulId );
- 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_UpdateTreasureSoulStrenthen(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.UpdateTreasureSoulStrenthen( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_UpdateTreasurePrivilege(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
-
-
- int gen_param_count = LuaAPI.lua_gettop(L);
-
- if(gen_param_count == 2&& translator.Assignable<HA353_tagMCMWPrivilegeDataInfo>(L, 2))
- {
- HA353_tagMCMWPrivilegeDataInfo _package = (HA353_tagMCMWPrivilegeDataInfo)translator.GetObject(L, 2, typeof(HA353_tagMCMWPrivilegeDataInfo));
-
- gen_to_be_invoked.UpdateTreasurePrivilege( _package );
-
-
-
- return 0;
- }
- if(gen_param_count == 2&& translator.Assignable<HA317_tagMCAllEquipAttrActiveInfo>(L, 2))
- {
- HA317_tagMCAllEquipAttrActiveInfo _package = (HA317_tagMCAllEquipAttrActiveInfo)translator.GetObject(L, 2, typeof(HA317_tagMCAllEquipAttrActiveInfo));
-
- gen_to_be_invoked.UpdateTreasurePrivilege( _package );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- return LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.TreasureSoulModel.UpdateTreasurePrivilege!");
-
- }
-
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_signAddTreasure(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.signAddTreasure);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_selectSoul(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.selectSoul);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_gotoSoul(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.gotoSoul);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_newGotSoul(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.newGotSoul);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_serverInited(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- LuaAPI.lua_pushboolean(L, gen_to_be_invoked.serverInited);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_signAddProperty(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.signAddProperty);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_selectSoul(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.selectSoul = LuaAPI.xlua_tointeger(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_gotoSoul(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.gotoSoul = LuaAPI.xlua_tointeger(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_newGotSoul(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.newGotSoul = LuaAPI.xlua_tointeger(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_signAddProperty(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.signAddProperty = (System.Collections.Generic.Dictionary<int, int>)translator.GetObject(L, 2, typeof(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 _e_treasureSoulEvent(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- int gen_param_count = LuaAPI.lua_gettop(L);
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- System.Action<int> gen_delegate = translator.GetDelegate<System.Action<int>>(L, 3);
- if (gen_delegate == null) {
- return LuaAPI.luaL_error(L, "#3 need System.Action<int>!");
- }
-
- if (gen_param_count == 3)
- {
-
- if (LuaAPI.xlua_is_eq_str(L, 2, "+")) {
- gen_to_be_invoked.treasureSoulEvent += gen_delegate;
- return 0;
- }
-
-
- if (LuaAPI.xlua_is_eq_str(L, 2, "-")) {
- gen_to_be_invoked.treasureSoulEvent -= 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.TreasureSoulModel.treasureSoulEvent!");
- return 0;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _e_treasureSelectSoulChangeEvent(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- int gen_param_count = LuaAPI.lua_gettop(L);
- Snxxz.UI.TreasureSoulModel gen_to_be_invoked = (Snxxz.UI.TreasureSoulModel)translator.FastGetCSObj(L, 1);
- System.Action<int> gen_delegate = translator.GetDelegate<System.Action<int>>(L, 3);
- if (gen_delegate == null) {
- return LuaAPI.luaL_error(L, "#3 need System.Action<int>!");
- }
-
- if (gen_param_count == 3)
- {
-
- if (LuaAPI.xlua_is_eq_str(L, 2, "+")) {
- gen_to_be_invoked.treasureSelectSoulChangeEvent += gen_delegate;
- return 0;
- }
-
-
- if (LuaAPI.xlua_is_eq_str(L, 2, "-")) {
- gen_to_be_invoked.treasureSelectSoulChangeEvent -= 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.TreasureSoulModel.treasureSelectSoulChangeEvent!");
- return 0;
- }
-
-
-
- }
-}
diff --git a/Lua/Gen/SnxxzUITreasureSoulModelWrap.cs.meta b/Lua/Gen/SnxxzUITreasureSoulModelWrap.cs.meta
deleted file mode 100644
index 6443d1a..0000000
--- a/Lua/Gen/SnxxzUITreasureSoulModelWrap.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: e9794a3a197a39e4bb48c33b8370971b
-timeCreated: 1550120588
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/Gen/XLuaGenAutoRegister.cs b/Lua/Gen/XLuaGenAutoRegister.cs
index a1d9840..3b280e4 100644
--- a/Lua/Gen/XLuaGenAutoRegister.cs
+++ b/Lua/Gen/XLuaGenAutoRegister.cs
@@ -1386,9 +1386,6 @@
translator.DelayWrapLoader(typeof(PwdKeyboard), PwdKeyboardWrap.__Register);
- translator.DelayWrapLoader(typeof(Snxxz.UI.TreasureSoulModel), SnxxzUITreasureSoulModelWrap.__Register);
-
-
translator.DelayWrapLoader(typeof(Snxxz.UI.TreasureFindHostModel), SnxxzUITreasureFindHostModelWrap.__Register);
diff --git a/System/FindPrecious/DemonJarModel.cs b/System/FindPrecious/DemonJarModel.cs
index 1141093..603cb73 100644
--- a/System/FindPrecious/DemonJarModel.cs
+++ b/System/FindPrecious/DemonJarModel.cs
@@ -94,7 +94,6 @@
FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
- TreasureSoulModel treasureSoulModel { get { return ModelCenter.Instance.GetModel<TreasureSoulModel>(); } }
public override void Init()
{
@@ -131,7 +130,6 @@
public void OnPlayerLoginOk()
{
- demonJarSoulBuf = treasureSoulModel.GetTreasureSoulValue(2);
demonJarSoulIncreaseDelta = 0;
var bossId = GetLatestUnLockBoss();
@@ -332,9 +330,8 @@
public void UpdateDemonJarSoul()
{
- var demonJarSoul = treasureSoulModel.GetTreasureSoulValue(2);
- demonJarSoulIncreaseDelta = demonJarSoul - demonJarSoulBuf;
- demonJarSoulBuf = demonJarSoul;
+ //demonJarSoulIncreaseDelta = demonJarSoul - demonJarSoulBuf;
+ //demonJarSoulBuf = demonJarSoul;
}
private void OnPlayerLevelUp(PlayerDataType _type)
diff --git a/System/MainInterfacePanel/LowSettingTip.cs b/System/MainInterfacePanel/LowSettingTip.cs
index 34cc84c..e0cc117 100644
--- a/System/MainInterfacePanel/LowSettingTip.cs
+++ b/System/MainInterfacePanel/LowSettingTip.cs
@@ -107,7 +107,6 @@
void OnClickTreasureSoul()
{
WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<TreasureSoulWin>();
}
private void GodBeastBtn()
{
diff --git a/System/Realm/ActivateShow.cs b/System/Realm/ActivateShow.cs
index ccaf5db..036bafe 100644
--- a/System/Realm/ActivateShow.cs
+++ b/System/Realm/ActivateShow.cs
@@ -205,97 +205,6 @@
}
- public static void TreasureSoulGetReward(int id, int _beforeLevel, int _currentLevel)
- {
- activateType = ActivateFunc.TreasureSoul;
- treasureSoulId = id;
- titleIconKey = "XT_FBZH_11";
- propertyCompares.Clear();
- lastPropertyDict.Clear();
- currentPropertyDict.Clear();
- var model = ModelCenter.Instance.GetModel<TreasureSoulModel>();
- TreasureSpecialData special;
- if (model.TryGetTreasureSoul(treasureSoulId, out special))
- {
- switch (special.type)
- {
- case TreasurePrivilege.StrengthenAdd:
- var configs = ItemPlusSumAttrConfig.GetValues();
- var before = -1;
- var present = 0;
- for (int i = 0; i < configs.Count; i++)
- {
- if (_beforeLevel >= configs[i].countNeed)
- {
- before = i;
- }
- if (_currentLevel >= configs[i].countNeed)
- {
- present = i;
- }
- }
- ItemPlusSumAttrConfig _beforeConfig = null;
- if (before >= 0 && before < configs.Count)
- {
- _beforeConfig = configs[before];
- }
- List<int> _beforeProperties = new List<int>();
- if (_beforeConfig != null)
- {
- _beforeProperties.AddRange(_beforeConfig.attType);
- for (int i = 0; i < _beforeConfig.attType.Length; i++)
- {
- lastPropertyDict.Add(_beforeConfig.attType[i], _beforeConfig.attValue[i]);
- }
- }
- var config = (present < 0 || present >= configs.Count) ? null : configs[present];
- if (config == null)
- {
- return;
- }
- for (int i = 0; i < config.attType.Length; i++)
- {
- var _index = _beforeProperties.IndexOf(config.attType[i]);
- if (_index == -1 || config.attValue[i] > _beforeConfig.attValue[_index])
- {
- propertyCompares.Add(new PropertyCompare()
- {
- key = config.attType[i],
- beforeValue = _index == -1 ? 0 : _beforeConfig.attValue[_index],
- currentValue = config.attValue[i]
- });
- }
-
- currentPropertyDict.Add(config.attType[i], config.attValue[i]);
- }
- break;
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.MountAtk:
- case TreasurePrivilege.PetHp:
- case TreasurePrivilege.Sp:
- foreach (var _key in special.propertyDict.Keys)
- {
- var beforeValue = special.propertyDict[_key] * _beforeLevel / special.progress;
- var nowValue = special.propertyDict[_key] * _currentLevel / special.progress;
- lastPropertyDict.Add(_key, beforeValue);
- currentPropertyDict.Add(_key, nowValue);
- propertyCompares.Add(new PropertyCompare()
- {
- key = _key,
- beforeValue = beforeValue,
- currentValue = nowValue
- });
- }
- break;
- }
- fightPower = UIHelper.GetFightPower(currentPropertyDict) - UIHelper.GetFightPower(lastPropertyDict);
- if (!WindowCenter.Instance.IsOpen<RealmPropertyUpWin>())
- {
- WindowCenter.Instance.Open<RealmPropertyUpWin>();
- }
- }
- }
-
public static void JadeDynastySkillUnlock(int skillId)
{
activateType = ActivateFunc.JadeDynastySkill;
@@ -337,7 +246,6 @@
Realm,
GodWeapon,
Stove, //鐐间腹鐐夊崌绾�
- TreasureSoul,//娉曞疂榄傞鍙栧睘鎬�
JadeDynastySkill,
}
diff --git a/System/Realm/RealmPropertyUpWin.cs b/System/Realm/RealmPropertyUpWin.cs
index a45e7b9..463b559 100644
--- a/System/Realm/RealmPropertyUpWin.cs
+++ b/System/Realm/RealmPropertyUpWin.cs
@@ -155,11 +155,6 @@
DisplayNewGotSkill();
}
break;
- case ActivateShow.ActivateFunc.TreasureSoul:
- DisplayTreasureSoul();
- DisplayFightPower();
- DisplayProperty();
- break;
case ActivateShow.ActivateFunc.JadeDynastySkill:
DisplayFightPower();
DisplayNewGotSkill();
@@ -207,7 +202,6 @@
m_Properties[i].gameObject.SetActive(true);
switch (ActivateShow.activateType)
{
- case ActivateShow.ActivateFunc.TreasureSoul:
case ActivateShow.ActivateFunc.Realm:
m_Properties[i].Display(ActivateShow.propertyCompares[i].key
, ActivateShow.propertyCompares[i].beforeValue, ActivateShow.propertyCompares[i].currentValue);
diff --git a/System/Rune/RuneResolveModel.cs b/System/Rune/RuneResolveModel.cs
index dd98937..954e7db 100644
--- a/System/Rune/RuneResolveModel.cs
+++ b/System/Rune/RuneResolveModel.cs
@@ -92,18 +92,16 @@
{
var result = 0f;
var config = ItemConfig.Get(id);
- var _treasureSoul = ModelCenter.Instance.GetModel<TreasureSoulModel>();
- var _upper = (float)_treasureSoul.GetTreasureSoulValue((int)TreasurePrivilege.RuneBreakExpAdd) / 10000;
if (config.Type == RuneModel.RUNE_CREAMTYPE)
{
- return config.EffectValueA1 + config.EffectValueA1 * _upper;
+ return config.EffectValueA1 + config.EffectValueA1;
}
for (int i = 1; i <= level; i++)
{
if (i == 1 && !fromCompose)
{
result += m_RuneBaseResolveSplinters[config.ItemColor] +
- m_RuneBaseResolveSplinters[config.ItemColor] * _upper;
+ m_RuneBaseResolveSplinters[config.ItemColor];
}
else
{
@@ -116,15 +114,13 @@
public float GetRuneResolveGetSouls(int id)
{
ItemConfig config = ItemConfig.Get(id);
- var _treasureSoul = ModelCenter.Instance.GetModel<TreasureSoulModel>();
- var _upper = (float)_treasureSoul.GetTreasureSoulValue((int)TreasurePrivilege.RuneBreakExpAdd) / 10000;
if (config.Type == RuneModel.RUNE_CREAMTYPE)
{
- return config.EffectValueA1 * _upper;
+ return config.EffectValueA1;
}
else
{
- return m_RuneBaseResolveSplinters[config.ItemColor] * _upper;
+ return m_RuneBaseResolveSplinters[config.ItemColor];
}
}
diff --git a/System/Rune/RuneResolveWin.cs b/System/Rune/RuneResolveWin.cs
index 3034b84..bb9124e 100644
--- a/System/Rune/RuneResolveWin.cs
+++ b/System/Rune/RuneResolveWin.cs
@@ -35,9 +35,6 @@
RuneModel model { get { return ModelCenter.Instance.GetModel<RuneModel>(); } }
RuneResolveModel runeResolveModel { get { return ModelCenter.Instance.GetModel<RuneResolveModel>(); } }
VirtualPackModel virtualPackModel { get { return ModelCenter.Instance.GetModel<VirtualPackModel>(); } }
-
- TreasureSoulModel treasureSoulModel { get { return ModelCenter.Instance.GetModel<TreasureSoulModel>(); } }
-
RuneComposeModel runeComposeModel { get { return ModelCenter.Instance.GetModel<RuneComposeModel>(); } }
protected override void BindController()
@@ -71,7 +68,7 @@
DisplayRuneItems();
- m_ContainerRuneSoul.gameObject.SetActive(treasureSoulModel.IsGetTreasureSoul((int)TreasurePrivilege.RuneBreakExpAdd));
+ m_ContainerRuneSoul.gameObject.SetActive(false);
}
protected override void OnAfterOpen()
diff --git a/System/Treasure/FairyTreasureCollectPanelPattern4.cs b/System/Treasure/FairyTreasureCollectPanelPattern4.cs
index 6d0715c..32a950d 100644
--- a/System/Treasure/FairyTreasureCollectPanelPattern4.cs
+++ b/System/Treasure/FairyTreasureCollectPanelPattern4.cs
@@ -24,8 +24,6 @@
}
}
- TreasureSoulModel treasureSoulModel { get { return ModelCenter.Instance.GetModel<TreasureSoulModel>(); } }
-
public override void Display(int _treasureId, bool _tween = false)
{
base.Display(_treasureId, _tween);
@@ -82,25 +80,22 @@
private void OnSignRefresh()
{
- if(treasure.id== treasureSoulModel.signAddTreasure)
+ var _property = model.GetSignInPropertys().First();
+ var _propertyCfg = PlayerPropertyConfig.Get(_property.Key);
+ m_SignPropertyEffect.text = Language.Get("FairyTreasure_5",
+ _property.Value, _propertyCfg.Name);
+ m_SignInTotalDays.text = Language.Get("FairyTreasure_6", signInModel.totalSignInCount);
+ if (treasure.state != TreasureState.Collected)
{
- var _property = treasureSoulModel.signAddProperty.First();
- var _propertyCfg = PlayerPropertyConfig.Get(_property.Key);
- m_SignPropertyEffect.text = Language.Get("FairyTreasure_5",
- _property.Value, _propertyCfg.Name);
- m_SignInTotalDays.text = Language.Get("FairyTreasure_6", signInModel.totalSignInCount);
- if (treasure.state != TreasureState.Collected)
- {
- m_ProerptyValue.text = Language.Get("FairyTreasure_7",
- _propertyCfg.Name, signInModel.totalSignInCount * _property.Value);
- m_SignInTip.text = Language.Get("SignInTreasureTip1");
- }
- else
- {
- m_ProerptyValue.text = Language.Get("FairyTreasure_8",
- _propertyCfg.Name, signInModel.totalSignInCount * _property.Value);
- m_SignInTip.text = Language.Get("SignInTreasureTip2");
- }
+ m_ProerptyValue.text = Language.Get("FairyTreasure_7",
+ _propertyCfg.Name, signInModel.totalSignInCount * _property.Value);
+ m_SignInTip.text = Language.Get("SignInTreasureTip1");
+ }
+ else
+ {
+ m_ProerptyValue.text = Language.Get("FairyTreasure_8",
+ _propertyCfg.Name, signInModel.totalSignInCount * _property.Value);
+ m_SignInTip.text = Language.Get("SignInTreasureTip2");
}
}
}
diff --git a/System/Treasure/TreasureModel.cs b/System/Treasure/TreasureModel.cs
index fe982c6..9d10800 100644
--- a/System/Treasure/TreasureModel.cs
+++ b/System/Treasure/TreasureModel.cs
@@ -15,6 +15,17 @@
[XLua.LuaCallCSharp]
public class TreasureModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
+ Dictionary<int, Treasure> treasures = new Dictionary<int, Treasure>();
+ Dictionary<TreasureCategory, List<int>> treasureCategory = new Dictionary<TreasureCategory, List<int>>();
+ Dictionary<int, int> treasureMapDict = new Dictionary<int, int>();
+ Dictionary<int, TreasureDungeon> treasureDungeons = new Dictionary<int, TreasureDungeon>();
+ Dictionary<int, List<int>> treasureTasks = new Dictionary<int, List<int>>();
+ Dictionary<TreasureCategory, int> treasureUnlockShowDict = new Dictionary<TreasureCategory, int>();
+ Dictionary<int, int> treasureTaskCompletedCounts = new Dictionary<int, int>();
+ Dictionary<int, int> treasureSignInPropertys = new Dictionary<int, int>();
+ List<int> eightFurnacesAchievements = new List<int>();
+ List<int> treasureUnOpens = new List<int>();
+
public const int TREASURE_DATAMAPID = 41110;
public const int TREASURE_MAPID = 41110;
public const int TREASURE_GUIDE_ID = 102;
@@ -100,16 +111,6 @@
}
}
}
-
- Dictionary<int, Treasure> treasures = new Dictionary<int, Treasure>();
- Dictionary<TreasureCategory, List<int>> treasureCategory = new Dictionary<TreasureCategory, List<int>>();
- Dictionary<int, int> treasureMapDict = new Dictionary<int, int>();
- Dictionary<int, TreasureDungeon> treasureDungeons = new Dictionary<int, TreasureDungeon>();
- Dictionary<int, List<int>> treasureTasks = new Dictionary<int, List<int>>();
- Dictionary<TreasureCategory, int> treasureUnlockShowDict = new Dictionary<TreasureCategory, int>();
- Dictionary<int, int> treasureTaskCompletedCounts = new Dictionary<int, int>();
- List<int> eightFurnacesAchievements = new List<int>();
- List<int> treasureUnOpens = new List<int>();
public Dictionary<int, int> fairyTreasureGetDict { get; private set; }
@@ -322,6 +323,13 @@
}
tasks.Add(config.TaskID);
}
+
+ funcConfig = FuncConfigConfig.Get("MWSignDayAttr");
+ var jsonData = LitJson.JsonMapper.ToObject(funcConfig.Numerical1);
+ foreach (var _key in jsonData.Keys)
+ {
+ treasureSignInPropertys.Add(int.Parse(_key), int.Parse(jsonData[_key].ToString()));
+ }
}
public void TryOpenRegulusPopWindow()
@@ -501,6 +509,11 @@
public List<int> GetFurnacesAchievements()
{
return eightFurnacesAchievements;
+ }
+
+ public Dictionary<int, int> GetSignInPropertys()
+ {
+ return treasureSignInPropertys;
}
private void PlayerDataRefreshInfoEvent(PlayerDataType refreshType)
@@ -807,8 +820,7 @@
public int GetExtensionPower(int _treasureId)
{
- var treasureSoulModel = ModelCenter.Instance.GetModel<TreasureSoulModel>();
- if (_treasureId == treasureSoulModel.signAddTreasure)
+ if (_treasureId == 304)
{
var signInDays = ModelCenter.Instance.GetModel<SignInModel>().totalSignInCount;
if (signInDays == 0)
@@ -816,9 +828,9 @@
return 0;
}
Dictionary<int, int> dict = new Dictionary<int, int>();
- foreach (var key in treasureSoulModel.signAddProperty.Keys)
+ foreach (var key in treasureSignInPropertys.Keys)
{
- dict.Add(key, treasureSoulModel.signAddProperty[key] * signInDays);
+ dict.Add(key, treasureSignInPropertys[key] * signInDays);
}
return UIHelper.GetFightPower(dict);
}
diff --git a/System/Treasure/TreasureNewGotWin.cs b/System/Treasure/TreasureNewGotWin.cs
index 398aa76..04ea628 100644
--- a/System/Treasure/TreasureNewGotWin.cs
+++ b/System/Treasure/TreasureNewGotWin.cs
@@ -402,8 +402,7 @@
}
break;
case 304://绛惧埌鐩稿叧閰嶇疆绉诲埌鍔熻兘閰嶇疆琛�
- var soulModel = ModelCenter.Instance.GetModel<TreasureSoulModel>();
- var _propertyDict = soulModel.signAddProperty;
+ var _propertyDict = model.GetSignInPropertys();
if (_propertyDict != null)
{
var _keyValue = _propertyDict.First();
diff --git a/System/Treasure/TreasureSoulAchievementCell.cs b/System/Treasure/TreasureSoulAchievementCell.cs
deleted file mode 100644
index 54d247b..0000000
--- a/System/Treasure/TreasureSoulAchievementCell.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
- public class TreasureSoulAchievementCell : CellView
- {
- [SerializeField] Text m_Description;
- [SerializeField] Text m_Progress;
- [SerializeField] Image m_Complete;
- [SerializeField] Button m_Goto;
-
- AchievementModel model { get { return ModelCenter.Instance.GetModel<AchievementModel>(); } }
-
- TreasureSoulModel treasureSoulModel { get { return ModelCenter.Instance.GetModel<TreasureSoulModel>(); } }
-
- int achievementId = 0;
-
- private void OnEnable()
- {
- model.achievementProgressUpdateEvent += AchievementProgressUpdateEvent;
- model.achievementCompletedEvent += AchievementCompletedEvent;
- }
-
- private void OnDisable()
- {
- model.achievementProgressUpdateEvent -= AchievementProgressUpdateEvent;
- model.achievementCompletedEvent -= AchievementCompletedEvent;
- }
-
- private void AchievementProgressUpdateEvent(int _id)
- {
- if (_id == achievementId)
- {
- Display(achievementId);
- }
- }
-
- private void AchievementCompletedEvent(int _id)
- {
- if (_id == achievementId)
- {
- Display(achievementId);
- }
- }
-
- public void Display(int _achievementId)
- {
- achievementId = _achievementId;
- Achievement achievement;
- var config = SuccessConfig.Get(_achievementId);
- if (config != null)
- {
- m_Description.text = UIHelper.ReplaceNewLine(AchievementModel.ParseAchievementDescription(achievementId));
- }
- m_Complete.gameObject.SetActive(false);
- m_Goto.gameObject.SetActive(false);
- m_Goto.RemoveAllListeners();
- if (model.TryGetAchievement(_achievementId, out achievement))
- {
- var progress = achievement.completed ? config.NeedCnt : Mathf.Clamp(achievement.progress, 0, config.NeedCnt);
- m_Progress.text = StringUtility.Contact("(", UIHelper.AppendColor(progress >= config.NeedCnt ? TextColType.Green : TextColType.Red, progress.ToString(), true)
- , "/", config.NeedCnt, ")");
- m_Complete.gameObject.SetActive(achievement.completed);
- m_Goto.gameObject.SetActive(!achievement.completed);
- m_Goto.AddListener(() =>
- {
- model.GotoCompleteAchievement(_achievementId);
- treasureSoulModel.gotoSoul = treasureSoulModel.selectSoul;
- });
- }
- }
- }
-}
-
diff --git a/System/Treasure/TreasureSoulAchievementCell.cs.meta b/System/Treasure/TreasureSoulAchievementCell.cs.meta
deleted file mode 100644
index fed67dc..0000000
--- a/System/Treasure/TreasureSoulAchievementCell.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 5563e9b8650a93448a20b3fa6e58df56
-timeCreated: 1534570886
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Treasure/TreasureSoulBehaviour.cs b/System/Treasure/TreasureSoulBehaviour.cs
deleted file mode 100644
index 483adc2..0000000
--- a/System/Treasure/TreasureSoulBehaviour.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-using System;
-
-namespace Snxxz.UI
-{
- public class TreasureSoulBehaviour : MonoBehaviour
- {
- [SerializeField] Text m_SoulName;
- [SerializeField] Text m_SoulState;
- [SerializeField] Image m_SelectImg;
- [SerializeField] Button m_SelectBtn;
- [SerializeField] RedpointBehaviour m_Redpoint;
-
- int treasureSoulId = 0;
-
- TreasureSpecialData special;
-
- TreasureSoulModel model
- {
- get
- {
- return ModelCenter.Instance.GetModel<TreasureSoulModel>();
- }
- }
-
- AchievementModel achievementModel { get { return ModelCenter.Instance.GetModel<AchievementModel>(); } }
-
- private void Awake()
- {
- m_SelectBtn.onClick.AddListener(OnSelect);
- }
-
- private void OnEnable()
- {
- model.treasureSelectSoulChangeEvent += TreasureSelectSoulChangeEvent;
- model.treasureSoulEvent += TreasureSoulEvent;
- //achievementModel.achievementCompletedEvent += AchievementCompletedEvent;
- }
-
- private void OnDisable()
- {
- model.treasureSelectSoulChangeEvent -= TreasureSelectSoulChangeEvent;
- model.treasureSoulEvent -= TreasureSoulEvent;
- //achievementModel.achievementCompletedEvent -= AchievementCompletedEvent;
- }
-
- //private void AchievementCompletedEvent(int _id)
- //{
- // int achievementId = 0;
- // if (model.TryGetLockAchievement(treasureSoulId, out achievementId))
- // {
- // if (achievementId == _id)
- // {
- // DisplayState();
- // }
- // }
- //}
-
- public void Display(int _id)
- {
- treasureSoulId = _id;
- m_Redpoint.redpointId = 0;
- if (model.TryGetTreasureSoul(_id, out special))
- {
- var config = TreasurePrivilegeConfig.Get(_id);
- if (config == null)
- {
- return;
- }
- m_Redpoint.redpointId = special.redpoint.id;
- m_SoulName.text = config.Name;
- m_SelectImg.SetSprite(model.selectSoul == treasureSoulId ? "ListBtn_Select" : "ListBtn_UnSelect");
- DisplayState();
- }
- }
-
- void DisplayState()
- {
- if (special != null)
- {
- if (special.active)
- {
- m_SoulState.text = Language.Get("TreasureSoul_Awoke");
- }
- else
- {
- m_SoulState.text = Language.Get("TreasureSoul_Awaking");
-
- //int achievementId = 0;
- //bool unlock = true;
- //if (model.TryGetLockAchievement(treasureSoulId, out achievementId))
- //{
- // Achievement achievement;
- // if (achievementModel.TryGetAchievement(achievementId, out achievement))
- // {
- // unlock = achievement.completed;
- // }
- //}
- //if (unlock)
- //{
- // m_SoulState.text = Language.Get("TreasureSoul_Awaking");
- //}
- //else
- //{
- // var successConfig = SuccessConfig.Get(achievementId);
- // m_SoulState.text = Language.Get("TreasureSoulRealm", successConfig.NeedCnt);
- //}
- }
- }
- }
-
- private void TreasureSelectSoulChangeEvent(int _id)
- {
- if (special != null)
- {
- m_SelectImg.SetSprite(model.selectSoul == treasureSoulId ? "ListBtn_Select" : "ListBtn_UnSelect");
- }
- }
-
- private void TreasureSoulEvent(int _id)
- {
- if (_id == treasureSoulId)
- {
- DisplayState();
- }
- }
-
- private void OnSelect()
- {
- model.selectSoul = treasureSoulId;
- }
- }
-}
-
diff --git a/System/Treasure/TreasureSoulBehaviour.cs.meta b/System/Treasure/TreasureSoulBehaviour.cs.meta
deleted file mode 100644
index f6bf398..0000000
--- a/System/Treasure/TreasureSoulBehaviour.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: ec199c4200eda0e4184d3d065cfcafed
-timeCreated: 1527057045
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Treasure/TreasureSoulCell.cs b/System/Treasure/TreasureSoulCell.cs
deleted file mode 100644
index 147de30..0000000
--- a/System/Treasure/TreasureSoulCell.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-namespace Snxxz.UI
-{
- public class TreasureSoulCell : CellView
- {
- [SerializeField] TreasureSoulBehaviour m_TreasureSoul;
- public void Display(int _id)
- {
- m_TreasureSoul.Display(_id);
- }
- }
-}
-
diff --git a/System/Treasure/TreasureSoulCell.cs.meta b/System/Treasure/TreasureSoulCell.cs.meta
deleted file mode 100644
index b4c2ea5..0000000
--- a/System/Treasure/TreasureSoulCell.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: d0e7aa61b419dd243b58f9b8d7f94681
-timeCreated: 1527057093
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Treasure/TreasureSoulModel.cs b/System/Treasure/TreasureSoulModel.cs
deleted file mode 100644
index f1c1649..0000000
--- a/System/Treasure/TreasureSoulModel.cs
+++ /dev/null
@@ -1,572 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-using System;
-
-namespace Snxxz.UI
-{
- [XLua.LuaCallCSharp]
- public class TreasureSoulModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
- {
- public const int TREASURE_SOUL_ID = 115;
- Redpoint treasureSoulRedpoint = new Redpoint(1, TREASURE_SOUL_ID);
- Redpoint treasureSoulNewGotRedpoint = new Redpoint(TREASURE_SOUL_ID, 115100);
-
- Dictionary<int, TreasureSpecialData> treasureSoulDict = new Dictionary<int, TreasureSpecialData>();
- List<int> treasureSouls = new List<int>();
- public Dictionary<int, int> signAddProperty = new Dictionary<int, int>();
- public int signAddTreasure { get; private set; }
-
- public event Action<int> treasureSoulEvent;
- public event Action<int> treasureSelectSoulChangeEvent;
-
- int m_SelectSoul = 0;
- public int selectSoul
- {
- get { return m_SelectSoul; }
- set
- {
- m_SelectSoul = value;
- if (treasureSelectSoulChangeEvent != null)
- {
- treasureSelectSoulChangeEvent(value);
- }
- }
- }
-
- public int gotoSoul { get; set; }
-
- public int newGotSoul { get; set; }
-
- public bool serverInited { get; private set; }
-
- PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
- TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
- AchievementModel achievementModel { get { return ModelCenter.Instance.GetModel<AchievementModel>(); } }
- public override void Init()
- {
- packModel.refreshItemCountEvent += RefreshItemCountAct;
- FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
- ParseConfig();
- }
-
- public void OnBeforePlayerDataInitialize()
- {
- serverInited = false;
- foreach (var special in treasureSoulDict.Values)
- {
- special.presentFinishCount = 0;
- special.presentGetCount = 0;
- special.itemGet = false;
- special.active = false;
- }
- treasureSoulNewGotRedpoint.state = RedPointState.None;
- }
-
- public void OnPlayerLoginOk()
- {
- serverInited = true;
- UpdateRedpoints();
- }
-
- public override void UnInit()
- {
- packModel.refreshItemCountEvent -= RefreshItemCountAct;
- FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
- }
-
- void ParseConfig()
- {
- var configs = TreasurePrivilegeConfig.GetValues();
- for (int i = 0; i < configs.Count; i++)
- {
- var treasureConfig = TreasureConfig.Get(configs[i].treasureId);
- if (treasureConfig == null || treasureConfig.Category != (int)TreasureCategory.Human)
- {
- continue;
- }
- treasureSouls.Add(configs[i].PrivilegeID);
- treasureSoulDict.Add(configs[i].PrivilegeID, new TreasureSpecialData((TreasurePrivilege)configs[i].PrivilegeID));
- }
- var funcConfig = FuncConfigConfig.Get("MWSignDayAttr");
- var jsonData = LitJson.JsonMapper.ToObject(funcConfig.Numerical1);
- signAddTreasure = int.Parse(funcConfig.Numerical2);
- foreach (var _key in jsonData.Keys)
- {
- signAddProperty.Add(int.Parse(_key), int.Parse(jsonData[_key].ToString()));
- }
- }
-
- public void SetViewTreasureNewGot()
- {
- treasureSoulNewGotRedpoint.state = RedPointState.None;
- }
-
- public List<int> GetTreasureSouls()
- {
- return treasureSouls;
- }
-
- public bool TryGetTreasureSoul(int _id, out TreasureSpecialData special)
- {
- return treasureSoulDict.TryGetValue(_id, out special);
- }
-
- public int GetTreasureSoulValue(int _soulId)
- {
- if (treasureSoulDict.ContainsKey(_soulId))
- {
- if (IsGetTreasureSoul(_soulId))
- {
- var _specialData = treasureSoulDict[_soulId];
- return _specialData.GetPrivilegeValue();
- }
- }
- return 0;
- }
-
- public bool IsGetTreasureSoul(int _soulId)
- {
- TreasureSpecialData special;
- return TryGetTreasureSoul(_soulId, out special) && special.active;
- }
-
- public bool IsOpenTreasureSoul(int _soulId)
- {
- TreasureSpecialData special;
- if (TryGetTreasureSoul(_soulId, out special))
- {
- Treasure treasure;
- return treasureModel.TryGetTreasure(special.treasureId, out treasure) && treasure.state == TreasureState.Collected;
- }
- return false;
- }
-
- private void RefreshEquipSTRLv(int obj)
- {
- UpdateTreasureSoulStrenthen();
- }
-
- private void RefreshItemCountAct(PackType packType, int arg2, int arg3)
- {
- if (packType == PackType.Equip)
- {
- UpdateTreasureSoulStrenthen();
- }
- }
-
- public void UpdateTreasureSoulStrenthen()
- {
- UpdateRedpoint((int)TreasurePrivilege.StrengthenAdd);
- if (treasureSoulEvent != null)
- {
- treasureSoulEvent((int)TreasurePrivilege.StrengthenAdd);
- }
- }
-
- private void OnFuncStateChangeEvent(int func)
- {
- if (func == 126)
- {
- UpdateRedpoints();
- }
- }
-
- public void UpdateTreasurePrivilege(HA353_tagMCMWPrivilegeDataInfo package)
- {
- for (int i = 0; i < package.Count; i++)
- {
- var _data = package.InfoList[i];
- TreasureSpecialData special;
- if (!treasureSoulDict.TryGetValue((int)_data.PriID, out special))
- {
- continue;
- }
- bool beforeActived = special.active;
- special.active = _data.State == 1;
- if (!beforeActived && special.active && serverInited
- && !WindowCenter.Instance.IsOpen<TreasureSoulWin>())
- {
- treasureSoulNewGotRedpoint.state = RedPointState.Simple;
- newGotSoul = (int)_data.PriID;
- }
- if ((TreasurePrivilege)_data.PriID == TreasurePrivilege.StrengthenAdd)
- {
- if (treasureSoulEvent != null)
- {
- treasureSoulEvent((int)_data.PriID);
- }
- UpdateRedpoint((int)_data.PriID);
- continue;
- }
-
- int beforeFinishCount = special.presentFinishCount;
-
- special.presentFinishCount = (int)_data.GotValue;
- special.presentGetCount = (int)_data.CurValue;
- special.itemGet = _data.ItemAwardState == 1;
- UpdateRedpoint((int)_data.PriID);
- if (treasureSoulEvent != null)
- {
- treasureSoulEvent((int)_data.PriID);
- }
-
- if (beforeFinishCount < special.presentFinishCount && serverInited && special.active
- && WindowCenter.Instance.IsOpen<TreasureSoulWin>()
- && !WindowCenter.Instance.IsOpen<RealmPropertyUpWin>()
- && !NewBieCenter.Instance.inGuiding)
- {
- ActivateShow.TreasureSoulGetReward((int)_data.PriID, beforeFinishCount, special.presentFinishCount);
- }
- }
- }
-
- public void UpdateTreasurePrivilege(HA317_tagMCAllEquipAttrActiveInfo package)
- {
- for (int i = 0; i < package.ActiveInfo.Length; i++)
- {
- var _data = package.ActiveInfo[i];
- if (_data.Type == 0)
- {
- if (treasureSoulDict.ContainsKey((int)TreasurePrivilege.StrengthenAdd))
- {
- var _specialData = treasureSoulDict[(int)TreasurePrivilege.StrengthenAdd];
- int beforeFinishCount = _specialData.presentFinishCount;
- _specialData.presentFinishCount = (int)_data.Cnt;
- UpdateRedpoint((int)TreasurePrivilege.StrengthenAdd);
- if (beforeFinishCount < _specialData.presentFinishCount && serverInited && _specialData.active
- && WindowCenter.Instance.IsOpen<TreasureSoulWin>()
- && !WindowCenter.Instance.IsOpen<RealmPropertyUpWin>())
- {
- ActivateShow.TreasureSoulGetReward((int)TreasurePrivilege.StrengthenAdd,
- beforeFinishCount, _specialData.presentFinishCount);
- }
- }
- if (treasureSoulEvent != null)
- {
- treasureSoulEvent((int)TreasurePrivilege.StrengthenAdd);
- }
-
- }
- }
- }
-
- private void UpdateRedpoint(int _id)
- {
- if (treasureSoulDict.ContainsKey(_id))
- {
- var special = treasureSoulDict[_id];
- special.UpdateState();
- if (special.privilegeRedpoint != null)
- {
- special.privilegeRedpoint.state = RedPointState.None;
- if (!FuncOpen.Instance.IsFuncOpen(126) || !IsOpenTreasureSoul(_id)
- || !IsGetTreasureSoul(_id))
- {
- return;
- }
- switch (special.type)
- {
- case TreasurePrivilege.StrengthenAdd:
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.MountAtk:
- case TreasurePrivilege.PetHp:
- case TreasurePrivilege.Sp:
- special.privilegeRedpoint.state = special.state == TreasurePrivilegeState.Reward ?
- RedPointState.Simple : RedPointState.None;
- break;
- case TreasurePrivilege.Wash:
- special.privilegeRedpoint.state = special.itemGet ?
- RedPointState.None : RedPointState.Simple;
- break;
- }
- }
- }
- }
-
- private void UpdateRedpoints()
- {
- foreach (var special in treasureSoulDict.Keys)
- {
- UpdateRedpoint(special);
- }
- }
- }
-
- public class TreasureSpecialData
- {
- public TreasurePrivilege type { get; private set; }
- public int progress { get; private set; }
- public int totalProgress { get; private set; }
- public int effectValue { get; private set; }
- public List<Item> items { get; private set; }
- public Dictionary<int, int> propertyDict { get; private set; }
- public Redpoint redpoint { get; private set; }
- public Redpoint privilegeRedpoint { get; private set; }
-
- public int treasureId { get; set; }
- public bool active { get; set; }
-
- private TreasurePrivilegeState m_State = TreasurePrivilegeState.Doing;
- public TreasurePrivilegeState state
- {
- get { return m_State; }
- set { m_State = value; }
- }
-
- public int presentFinishCount { get; set; }
- public int presentGetCount { get; set; }
- public bool itemGet { get; set; }
-
- public TreasureSpecialData(TreasurePrivilege _type)
- {
- type = _type;
- var config = TreasurePrivilegeConfig.Get((int)_type);
- progress = Mathf.Max(1, config.singleValue);
- totalProgress = config.maxValue;
- var _effectValue = 0;
- int.TryParse(config.EffectValue, out _effectValue);
- effectValue = _effectValue;
- treasureId = config.treasureId;
-
- if (!string.IsNullOrEmpty(config.attr))
- {
- var propertyJson = LitJson.JsonMapper.ToObject(config.attr);
- propertyDict = new Dictionary<int, int>();
- foreach (var _key in propertyJson.Keys)
- {
- var _property = int.Parse(_key);
- var _value = int.Parse(propertyJson[_key].ToJson());
- propertyDict.Add(_property, _value);
- }
- }
- if (!string.IsNullOrEmpty(config.itemAward))
- {
- var itemArray = LitJson.JsonMapper.ToObject<int[][]>(config.itemAward);
- if (itemArray != null && itemArray.Length > 0)
- {
- items = new List<Item>();
- for (int i = 0; i < itemArray.Length; i++)
- {
- var _array = itemArray[i];
- items.Add(new Item(_array[0], _array[1]));
- }
- }
- }
-
- if (type == TreasurePrivilege.PetHp)
- {
- var petCount = PetInfoConfig.GetValues().Count;
- totalProgress = petCount;
- }
- else if (type == TreasurePrivilege.MountAtk)
- {
- var mountConfigs = HorseConfig.GetValues();
- var maxlv = 0;
- for (int i = 0; i < mountConfigs.Count; i++)
- {
- maxlv += mountConfigs[i].MaxLV;
- }
- totalProgress = maxlv;
- }
- else if (type == TreasurePrivilege.StrengthenAdd)
- {
- var configs = ItemPlusSumAttrConfig.GetValues();
- totalProgress = configs[configs.Count - 1].countNeed;
- }
-
- redpoint = new Redpoint(TreasureSoulModel.TREASURE_SOUL_ID, TreasureSoulModel.TREASURE_SOUL_ID * 100 + (int)type);
- switch (_type)
- {
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.StrengthenAdd:
- case TreasurePrivilege.MountAtk:
- case TreasurePrivilege.PetHp:
- case TreasurePrivilege.Sp:
- case TreasurePrivilege.Wash:
- privilegeRedpoint = new Redpoint(redpoint.id, redpoint.id * 100 + 2);
- break;
- }
- }
-
- public int GetPrivilegeValue(int _index = 0)
- {
- switch (type)
- {
- case TreasurePrivilege.RuneBreakExpAdd:
- return effectValue;
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.Suit:
- return effectValue;
- case TreasurePrivilege.Wing:
- case TreasurePrivilege.StrengthenAdd:
- return effectValue;
- }
- return 0;
- }
-
- public void UpdateState()
- {
- switch (type)
- {
- case TreasurePrivilege.Property:
- case TreasurePrivilege.RuneBreakExpAdd:
- case TreasurePrivilege.Wing:
- case TreasurePrivilege.Suit:
- state = TreasurePrivilegeState.Complete;
- break;
- case TreasurePrivilege.Sp:
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.PetHp:
- case TreasurePrivilege.MountAtk:
- if (presentFinishCount >= totalProgress && (presentGetCount / progress) >= (totalProgress / progress))
- {
- state = TreasurePrivilegeState.Complete;
- }
- else if (presentGetCount > 0 && presentFinishCount / progress < presentGetCount / progress)
- {
- state = TreasurePrivilegeState.Reward;
- }
- else
- {
- state = TreasurePrivilegeState.Doing;
- }
- break;
- case TreasurePrivilege.Wash:
- state = itemGet ? TreasurePrivilegeState.Doing : TreasurePrivilegeState.Reward;
- break;
- case TreasurePrivilege.StrengthenAdd:
- var playerpack = ModelCenter.Instance.GetModel<PackModel>();
- presentGetCount = 0;
- var configs = ItemPlusSumAttrConfig.GetValues();
- bool contains = configs.FindIndex((x) =>
- {
- return x.countNeed > presentFinishCount && presentGetCount >= x.countNeed;
- }) != -1;
- if (presentFinishCount >= totalProgress && presentGetCount >= totalProgress)
- {
- state = TreasurePrivilegeState.Complete;
- }
- else if (contains)
- {
- state = TreasurePrivilegeState.Reward;
- }
- else
- {
- state = TreasurePrivilegeState.Doing;
- }
- break;
- }
- }
-
- public string ProgressDisplay()
- {
- switch (type)
- {
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.PetHp:
- case TreasurePrivilege.MountAtk:
- case TreasurePrivilege.Sp:
- if (state == TreasurePrivilegeState.Complete) { return UIHelper.AppendColor(TextColType.Green, totalProgress.ToString(), true); }
- else if (state == TreasurePrivilegeState.Doing)
- {
- return StringUtility.Contact(UIHelper.AppendColor(TextColType.Red, presentGetCount.ToString(), true), "/", (presentFinishCount / progress + 1) * progress);
- }
- else if (state == TreasurePrivilegeState.Reward)
- {
- var _completeCount = (presentFinishCount / progress + 1) * progress;
- return StringUtility.Contact(UIHelper.AppendColor(TextColType.Green, presentGetCount.ToString(), true), "/", _completeCount);
- }
- break;
- case TreasurePrivilege.StrengthenAdd:
- var configs = ItemPlusSumAttrConfig.GetValues();
- var next = configs.Count - 1;
- for (int i = 0; i < configs.Count; i++)
- {
- if (configs[i].countNeed > presentFinishCount)
- {
- next = i;
- break;
- }
- }
- if (state == TreasurePrivilegeState.Complete) { return totalProgress.ToString(); }
- else if (state == TreasurePrivilegeState.Doing
- || state == TreasurePrivilegeState.Reward)
- {
- var colortype = presentGetCount >= configs[next].countNeed ? TextColType.Green : TextColType.Red;
- return StringUtility.Contact(UIHelper.AppendColor(colortype, presentGetCount.ToString(), true), "/", configs[next].countNeed);
- }
- break;
- }
- return string.Empty;
- }
-
- public void GetReward()
- {
- switch (type)
- {
- case TreasurePrivilege.MountAtk:
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.PetHp:
- case TreasurePrivilege.Sp:
- case TreasurePrivilege.Wash:
- var _pak = new CA504_tagCMPlayerGetReward();
- _pak.RewardType = (int)GotServerRewardType.Def_RewardType_TreasureSoul;
- _pak.DataEx = (uint)type;
- _pak.DataExStrLen = 0;
- _pak.DataExStr = string.Empty;
- GameNetSystem.Instance.SendInfo(_pak);
- break;
- case TreasurePrivilege.StrengthenAdd:
- var configs = ItemPlusSumAttrConfig.GetValues();
- var present = 0;
- for (int i = 0; i < configs.Count; i++)
- {
- if (presentGetCount >= configs[i].countNeed)
- {
- present = i;
- }
- }
- CA503_tagCMActiveAllEquipAttr pak = new CA503_tagCMActiveAllEquipAttr();
- pak.Type = 0;
- pak.Cnt = (uint)configs[present].countNeed;
- GameNetSystem.Instance.SendInfo(pak);
- break;
- }
- }
-
- public int GetFightPower()
- {
- var _fightPower = 0;
- if (propertyDict != null)
- {
- _fightPower += UIHelper.GetFightPower(propertyDict);
- }
- return _fightPower;
- }
- }
-
- public enum TreasurePrivilegeState
- {
- Doing = 0,
- Reward = 1,
- Complete = 2
- }
-
- public enum TreasurePrivilege
- {
- Property = 1,
- DemonJarAtk = 2,
- StrengthenAdd = 3,
- RuneBreakExpAdd = 4,
- MountAtk = 5,
- PetHp = 6,
- Sp = 7,
- Wing = 8,
- Suit = 9,
- Wash = 10,
- Sign = 11,
- }
-}
-
diff --git a/System/Treasure/TreasureSoulModel.cs.meta b/System/Treasure/TreasureSoulModel.cs.meta
deleted file mode 100644
index 99a29bb..0000000
--- a/System/Treasure/TreasureSoulModel.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 546ae13b091e8c845b2c8d0e1a458b39
-timeCreated: 1534406321
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Treasure/TreasureSoulPattern.cs b/System/Treasure/TreasureSoulPattern.cs
deleted file mode 100644
index cfa7564..0000000
--- a/System/Treasure/TreasureSoulPattern.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-namespace Snxxz.UI
-{
- public class TreasureSoulPattern : MonoBehaviour
- {
- [SerializeField] RectTransform m_ContainerBottom;
- protected TreasureSoulModel model { get { return ModelCenter.Instance.GetModel<TreasureSoulModel>(); } }
- protected TreasureSpecialData special;
-
- public RectTransform bottom
- {
- get { return m_ContainerBottom; }
- }
-
- public virtual void Display(int _id)
- {
- model.TryGetTreasureSoul(_id, out special);
- model.treasureSoulEvent -= TreasurePrivilegeUpdateEvent;
- model.treasureSoulEvent += TreasurePrivilegeUpdateEvent;
- }
-
- protected virtual void TreasurePrivilegeUpdateEvent(int _id)
- {
-
- }
-
- public virtual void Dispose()
- {
- model.treasureSoulEvent -= TreasurePrivilegeUpdateEvent;
- }
- }
-}
-
diff --git a/System/Treasure/TreasureSoulPattern.cs.meta b/System/Treasure/TreasureSoulPattern.cs.meta
deleted file mode 100644
index 9f0454a..0000000
--- a/System/Treasure/TreasureSoulPattern.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 9256378a860c3464d8af0c0c0be9e707
-timeCreated: 1529673103
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Treasure/TreasureSoulPattern1.cs b/System/Treasure/TreasureSoulPattern1.cs
deleted file mode 100644
index a7f18ea..0000000
--- a/System/Treasure/TreasureSoulPattern1.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
- public class TreasureSoulPattern1 : TreasureSoulPattern
- {
- [SerializeField] RectTransform m_ContainerNone;
- [SerializeField] RectTransform m_ContainerHas;
- [SerializeField] List<PropertyBehaviour> properties;
- [SerializeField] Text m_ProgressTitle;
- [SerializeField] Text m_Progress;
- [SerializeField] Image m_Complete;
- [SerializeField] Button m_Goto;
- [SerializeField] Button m_Get;
-
- private void Awake()
- {
- m_Goto.onClick.AddListener(OnGoto);
- m_Get.onClick.AddListener(OnGet);
- }
-
- private void OnGet()
- {
- special.GetReward();
- }
-
- private void OnGoto()
- {
- switch (special.type)
- {
- case TreasurePrivilege.DemonJarAtk:
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.LootPreciousFrameFunc1);
- break;
- case TreasurePrivilege.Sp:
- var treasureModel = ModelCenter.Instance.GetModel<TreasureModel>();
- treasureModel.selectedTreasure = 101;
- treasureModel.currentCategory = TreasureCategory.Human;
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.TreasureCollectSoul);
- break;
- case TreasurePrivilege.MountAtk:
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.PetFunc1);
- break;
- case TreasurePrivilege.PetHp:
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.PetFunc2);
- break;
- }
- model.gotoSoul = (int)special.type;
- }
-
- public override void Display(int _id)
- {
- base.Display(_id);
- switch (special.type)
- {
- case TreasurePrivilege.DemonJarAtk:
- m_ProgressTitle.text = Language.Get("TreasurePrivilege_DemonJar");
- break;
- case TreasurePrivilege.Sp:
- m_ProgressTitle.text = Language.Get("TreasurePrivilege_FairyBoss");
- break;
- case TreasurePrivilege.MountAtk:
- m_ProgressTitle.text = Language.Get("TreasurePrivilege_Mount");
- break;
- case TreasurePrivilege.PetHp:
- m_ProgressTitle.text = Language.Get("TreasurePrivilege_Pet");
- break;
- }
- Display();
- }
-
- private void Display()
- {
- m_Get.gameObject.SetActive(false);
- m_Goto.gameObject.SetActive(false);
- for (int i = 0; i < properties.Count; i++)
- {
- properties[i].gameObject.SetActive(false);
- }
- switch (special.type)
- {
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.Sp:
- case TreasurePrivilege.MountAtk:
- case TreasurePrivilege.PetHp:
- var _index = 0;
- m_ContainerHas.gameObject.SetActive(true);
- m_ContainerNone.gameObject.SetActive(false);
- foreach (var _key in special.propertyDict.Keys)
- {
- var _value = special.propertyDict[_key] * special.presentFinishCount / special.progress;
- if (_value <= 0)
- {
- m_ContainerHas.gameObject.SetActive(false);
- m_ContainerNone.gameObject.SetActive(true);
- break;
- }
- properties[_index].gameObject.SetActive(true);
- properties[_index].DisplayUpper(_key, _value);
- _index++;
- }
- m_Get.gameObject.SetActive(special.state == TreasurePrivilegeState.Reward);
- m_Goto.gameObject.SetActive(special.state == TreasurePrivilegeState.Doing);
- m_Progress.text = special.ProgressDisplay();
- //m_Progress.color = specialData.state == TreasurePrivilegeState.Doing ? UIHelper.GetUIColor(TextColType.Red, true) : UIHelper.GetUIColor(TextColType.Green, true);
- m_Complete.gameObject.SetActive(special.state == TreasurePrivilegeState.Complete);
- break;
- }
- }
-
- protected override void TreasurePrivilegeUpdateEvent(int _id)
- {
- base.TreasurePrivilegeUpdateEvent(_id);
- if (_id == (int)special.type)
- {
- Display();
- }
- }
- }
-}
-
diff --git a/System/Treasure/TreasureSoulPattern1.cs.meta b/System/Treasure/TreasureSoulPattern1.cs.meta
deleted file mode 100644
index 6e8cfbe..0000000
--- a/System/Treasure/TreasureSoulPattern1.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 0971ca8d0d75cb84c996b3326dafb8f3
-timeCreated: 1529672919
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Treasure/TreasureSoulPattern2.cs b/System/Treasure/TreasureSoulPattern2.cs
deleted file mode 100644
index 1a3fc3d..0000000
--- a/System/Treasure/TreasureSoulPattern2.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
- public class TreasureSoulPattern2 : TreasureSoulPattern
- {
- [SerializeField] RectTransform m_ContainerPresentNone;
- [SerializeField] RectTransform m_ContainerPresentHas;
- [SerializeField] RectTransform m_ContainerNextNone;
- [SerializeField] RectTransform m_ContainerNextHas;
- [SerializeField] List<PropertyBehaviour> m_PresentProperties;
- [SerializeField] List<PropertyBehaviour> m_NextProperties;
- [SerializeField] Button m_Goto;
- [SerializeField] Button m_Get;
- [SerializeField] Text m_Progress;
- [SerializeField] Image m_Complete;
-
- private void Awake()
- {
- m_Goto.onClick.AddListener(OnGoto);
- m_Get.onClick.AddListener(OnGet);
- }
-
- public override void Display(int _id)
- {
- base.Display(_id);
- Display();
- }
-
- protected override void TreasurePrivilegeUpdateEvent(int _id)
- {
- base.TreasurePrivilegeUpdateEvent(_id);
- if (_id == (int)TreasurePrivilege.StrengthenAdd)
- {
- Display();
- }
- }
-
- public override void Dispose()
- {
- base.Dispose();
- }
-
- private void Display()
- {
- var configs = ItemPlusSumAttrConfig.GetValues();
- var present = -1;
- var next = 0;
- for (int i = 0; i < configs.Count; i++)
- {
- if (special.presentFinishCount >= configs[i].countNeed)
- {
- present = i;
- }
- }
- next = present + 1;
- m_ContainerPresentNone.gameObject.SetActive(present == -1);
- m_ContainerPresentHas.gameObject.SetActive(present >= 0);
- if (present >= 0)
- {
- var config = configs[present];
- for (int i = 0; i < m_PresentProperties.Count; i++)
- {
- m_PresentProperties[i].gameObject.SetActive(i < config.attType.Length);
- if (i < config.attType.Length)
- {
- m_PresentProperties[i].DisplayUpper(config.attType[i], config.attValue[i]);
- }
- }
- }
- m_ContainerNextNone.gameObject.SetActive(next >= configs.Count);
- m_ContainerNextHas.gameObject.SetActive(next < configs.Count);
- if (next < configs.Count)
- {
- var config = configs[next];
- for (int i = 0; i < m_NextProperties.Count; i++)
- {
- m_NextProperties[i].gameObject.SetActive(i < config.attType.Length);
- if (i < config.attType.Length)
- {
- m_NextProperties[i].DisplayUpper(config.attType[i], config.attValue[i]);
- }
- }
- }
- m_Complete.gameObject.SetActive(special.state == TreasurePrivilegeState.Complete);
- m_Goto.gameObject.SetActive(special.state == TreasurePrivilegeState.Doing);
- m_Get.gameObject.SetActive(special.state == TreasurePrivilegeState.Reward);
- m_Progress.text = special.ProgressDisplay();
- //m_Progress.color = specialData.state == TreasurePrivilegeState.Doing ? UIHelper.GetUIColor(TextColType.Red, true) : UIHelper.GetUIColor(TextColType.Green, true);
- }
-
- private void OnGoto()
- {
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RebornOpenStrength);
- model.gotoSoul = (int)special.type;
- }
-
- private void OnGet()
- {
- special.GetReward();
- }
- }
-}
-
diff --git a/System/Treasure/TreasureSoulPattern2.cs.meta b/System/Treasure/TreasureSoulPattern2.cs.meta
deleted file mode 100644
index bbfd770..0000000
--- a/System/Treasure/TreasureSoulPattern2.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 5719ee18b801a2f4fb6fc3a44a1fc1ea
-timeCreated: 1529673127
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Treasure/TreasureSoulPattern3.cs b/System/Treasure/TreasureSoulPattern3.cs
deleted file mode 100644
index cf98665..0000000
--- a/System/Treasure/TreasureSoulPattern3.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
- public class TreasureSoulPattern3 : TreasureSoulPattern
- {
- [SerializeField] RareItem[] m_Items;
- [SerializeField] Button m_Get;
- [SerializeField] Text m_GetText;
-
- private void Awake()
- {
- m_Get.onClick.AddListener(OnGet);
- }
-
- public override void Display(int _id)
- {
- base.Display(_id);
- Display();
- }
-
- public override void Dispose()
- {
- base.Dispose();
- }
-
- protected override void TreasurePrivilegeUpdateEvent(int _id)
- {
- base.TreasurePrivilegeUpdateEvent(_id);
- if (_id == (int)special.type)
- {
- Display();
- }
- }
-
- private void Display()
- {
- for (int i = 0; i < m_Items.Length; i++)
- {
- m_Items[i].gameObject.SetActive(special.items != null && i < special.items.Count);
- m_Items[i].button.RemoveAllListeners();
- if (special.items != null && i < special.items.Count)
- {
- var award = special.items[i];
- ItemCellModel cellModel = new ItemCellModel(award.id, true, (ulong)award.count);
- m_Items[i].Init(cellModel);
- m_Items[i].button.AddListener(() =>
- {
- ItemAttrData attrData = new ItemAttrData(award.id, true, (ulong)award.count);
- ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData);
- });
- }
- }
- m_Get.SetInteractable(m_GetText, special.state == TreasurePrivilegeState.Reward);
- }
-
- private void OnGet()
- {
- special.GetReward();
- }
- }
-}
-
diff --git a/System/Treasure/TreasureSoulPattern3.cs.meta b/System/Treasure/TreasureSoulPattern3.cs.meta
deleted file mode 100644
index e5e61b7..0000000
--- a/System/Treasure/TreasureSoulPattern3.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: c9822ca7636394241a6ed58a1e2ec891
-timeCreated: 1529741245
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Treasure/TreasureSoulPattern4.cs b/System/Treasure/TreasureSoulPattern4.cs
deleted file mode 100644
index 3651e9b..0000000
--- a/System/Treasure/TreasureSoulPattern4.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-
-using UnityEngine;
-namespace Snxxz.UI
-{
- public class TreasureSoulPattern4 : TreasureSoulPattern
- {
- [SerializeField] RectTransform m_ContainerNone;
- [SerializeField] RectTransform m_ContainerHas;
- [SerializeField] List<PropertyBehaviour> properties;
-
- PackModel pack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
- public StrengthenModel strengthengmodel
- {
- get
- {
- return ModelCenter.Instance.GetModel<StrengthenModel>();
- }
- }
- public override void Display(int _id)
- {
- base.Display(_id);
- Display();
- }
-
- public override void Dispose()
- {
- base.Dispose();
- }
-
- protected override void TreasurePrivilegeUpdateEvent(int _id)
- {
- base.TreasurePrivilegeUpdateEvent(_id);
- if (_id == (int)special.type)
- {
- Display();
- }
- }
-
- private void Display()
- {
- for (int i = 0; i < properties.Count; i++)
- {
- properties[i].gameObject.SetActive(false);
- }
- switch (special.type)
- {
- case TreasurePrivilege.Property:
- m_ContainerHas.gameObject.SetActive(true);
- m_ContainerNone.gameObject.SetActive(false);
- var _index = 0;
- foreach (var _key in special.propertyDict.Keys)
- {
- var _value = special.propertyDict[_key];
- properties[_index].gameObject.SetActive(true);
- properties[_index].DisplayUpper(_key, _value);
- _index++;
- }
- break;
- case TreasurePrivilege.Wing:
- var percentWing = (float)special.propertyDict[86] / 10000;
- var equipPlace = EquipPlaceMapConfig.GetServerPlace(0, (int)RoleEquipType.Wing);
- var itemModel = pack.GetItemByIndex(PackType.Equip, equipPlace);
- m_ContainerHas.gameObject.SetActive(itemModel != null);
- m_ContainerNone.gameObject.SetActive(itemModel == null);
- if (itemModel != null)
- {
- var itemConfig = ItemConfig.Get(itemModel.itemId);
- float value = 0;
- if (ContainsProperty(itemConfig, 6, out value))
- {
- if (itemModel.GetUseData(42) != null)
- {
- value += strengthengmodel.BackpackWings(itemModel.itemId, itemModel.GetUseData(42)[0])[1];
- }
- }
- properties[0].gameObject.SetActive(true);
- properties[0].DisplayUpper(6, (int)(value * percentWing));
- }
- break;
- }
- }
-
- public bool ContainsProperty(ItemConfig config, int _property,out float value)
- {
- value = 0;
- if (config.Effect1== _property&& config.EffectValueA1 > 0)
- {
- value = config.EffectValueA1;
- return true;
- }
- if (config.Effect2 == _property && config.EffectValueA2 > 0)
- {
- value = config.EffectValueA2;
- return true;
- }
- if (config.Effect3 == _property && config.EffectValueA3 > 0)
- {
- value = config.EffectValueA3;
- return true;
- }
- if (config.Effect4 == _property && config.EffectValueA4 > 0)
- {
- value = config.EffectValueA4;
- return true;
- }
- if (config.Effect5 == _property && config.EffectValueA5 > 0)
- {
- value = config.EffectValueA5;
- return true;
- }
- return false;
- }
- }
-}
-
diff --git a/System/Treasure/TreasureSoulPattern4.cs.meta b/System/Treasure/TreasureSoulPattern4.cs.meta
deleted file mode 100644
index 04da7d3..0000000
--- a/System/Treasure/TreasureSoulPattern4.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 72332de45ef9b9641adc2e2217730c90
-timeCreated: 1530349397
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Treasure/TreasureSoulWin.cs b/System/Treasure/TreasureSoulWin.cs
deleted file mode 100644
index 686620a..0000000
--- a/System/Treasure/TreasureSoulWin.cs
+++ /dev/null
@@ -1,438 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, May 23, 2018
-//--------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
-
- public class TreasureSoulWin : Window
- {
- [SerializeField] FunctionButton m_TreasureSoulBtn;
- [SerializeField] Button m_CloseBtn;
-
- [SerializeField] Image m_SelectSoulImg;
-
- [SerializeField] Text m_SoulName;
- [SerializeField] Text m_SoulDescription;
- [SerializeField] Image m_SoulTarget;
- [SerializeField] UIEffect m_SoulEffect;
- [SerializeField] Button m_Active;
- [SerializeField] Text m_ActiveText;
-
- [SerializeField] List<TreasureSoulPattern> m_TreasureSouls;
-
- [SerializeField] ScrollerController m_ScollerControl;
-
- [SerializeField] RectTransform m_ContainerPreview;
- [SerializeField] Text m_PreviewTitle;
- [SerializeField] List<PropertyBehaviour> m_PreviewPropretys;
-
- TreasureSoulModel m_Model;
- TreasureSoulModel model
- {
- get
- {
- return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TreasureSoulModel>());
- }
- }
- PackModel pack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
-
- TreasureModel treasureModel
- {
- get { return ModelCenter.Instance.GetModel<TreasureModel>(); }
- }
-
-
- int m_SelectSoul = 0;
-
- List<int> sortSouls = new List<int>();
-
- #region Built-in
- protected override void BindController()
- {
- }
-
- protected override void AddListeners()
- {
- m_Active.onClick.AddListener(Active);
- m_CloseBtn.onClick.AddListener(CloseClick);
- m_ScollerControl.OnRefreshCell += OnRefreshCell;
- }
-
- protected override void OnPreOpen()
- {
- model.treasureSelectSoulChangeEvent += TreasureSelectSoulChangeEvent;
- PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshInfoEvent;
- model.treasureSoulEvent += TreasureSoulEvent;
- m_TreasureSoulBtn.state = TitleBtnState.Click;
- Display();
- model.SetViewTreasureNewGot();
- }
-
- protected override void OnActived()
- {
- base.OnActived();
- DisplaySelect();
- }
-
- private void PlayerDataRefreshInfoEvent(PlayerDataType refreshType)
- {
- if (refreshType == PlayerDataType.LV)
- {
- m_ScollerControl.m_Scorller.RefreshActiveCellViews();
- }
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- model.treasureSelectSoulChangeEvent -= TreasureSelectSoulChangeEvent;
- PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshInfoEvent;
- model.treasureSoulEvent -= TreasureSoulEvent;
- for (int i = 0; i < m_TreasureSouls.Count; i++)
- {
- m_TreasureSouls[i].Dispose();
- }
- m_SelectSoul = model.selectSoul;
- model.newGotSoul = 0;
- }
-
- protected override void OnAfterClose()
- {
- if (!WindowJumpMgr.Instance.IsJumpState)
- {
- WindowCenter.Instance.Open<MainInterfaceWin>();
- }
- }
- #endregion
-
- private void Display()
- {
- sortSouls.Clear();
- var _list = model.GetTreasureSouls();
- for (int i = 0; i < _list.Count; i++)
- {
- if (model.IsOpenTreasureSoul(_list[i]))
- {
- sortSouls.Add(_list[i]);
- }
- }
- if (m_ScollerControl.GetNumberOfCells(m_ScollerControl.m_Scorller) != sortSouls.Count)
- {
- m_ScollerControl.Refresh();
- for (int i = 0; i < sortSouls.Count; i++)
- {
- m_ScollerControl.AddCell(ScrollerDataType.Header, i);
- }
- m_ScollerControl.Restart();
- }
- sortSouls.Sort(Compare);
- model.selectSoul = CheckOpenSelect();
- var index = sortSouls.FindIndex((x) =>
- {
- return x == model.selectSoul;
- });
- m_ScollerControl.m_Scorller.RefreshActiveCellViews();
- m_ScollerControl.JumpIndex(index);
- }
-
- int CheckOpenSelect()
- {
- if (WindowJumpMgr.Instance.IsJumpState && model.gotoSoul != 0)
- {
- var _soul = model.gotoSoul;
- model.gotoSoul = 0;
- return _soul;
- }
- model.gotoSoul = 0;
- var _select = 0;
- for (int i = 0; i < sortSouls.Count; i++)
- {
- TreasureSpecialData special;
- if (model.TryGetTreasureSoul(sortSouls[i], out special))
- {
- if (special.redpoint.state == RedPointState.Simple)
- {
- return sortSouls[i];
- }
- }
- if (!model.IsGetTreasureSoul(sortSouls[i]) && _select == 0)
- {
- _select = sortSouls[i];
- }
- }
- if (model.newGotSoul != 0 && sortSouls.Contains(model.newGotSoul))
- {
- _select = model.newGotSoul;
- model.newGotSoul = 0;
- }
- _select = _select == 0 ? sortSouls[0] : _select;
- return _select;
- }
-
- private void OnRefreshCell(ScrollerDataType type, CellView cell)
- {
- TreasureSoulCell treasureSoulCell = cell as TreasureSoulCell;
- if (cell.index < sortSouls.Count)
- {
- treasureSoulCell.Display(sortSouls[cell.index]);
- }
- }
-
- private void TreasureSelectSoulChangeEvent(int _id)
- {
- DisplaySelect();
- }
-
- private void TreasureSoulEvent(int _id)
- {
- if (_id == model.selectSoul)
- {
- TreasureSpecialData special;
- if (model.TryGetTreasureSoul(_id, out special))
- {
- DisplaySelect();
- }
- }
- }
-
- private void Active()
- {
- var config = TreasurePrivilegeConfig.Get(model.selectSoul);
- treasureModel.selectedTreasure = config.treasureId;
- treasureModel.currentCategory = TreasureCategory.Human;
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.TreasureCollectSoul);
- }
-
- private void DisplaySelect()
- {
- TreasureSpecialData special;
- model.TryGetTreasureSoul(model.selectSoul, out special);
- if (special != null)
- {
- var config = TreasurePrivilegeConfig.Get((int)special.type);
- if (config != null)
- {
- m_SoulName.text = config.Name;
- m_SoulDescription.text = UIHelper.ReplaceNewLine(config.Description);
- m_SoulTarget.SetSprite(config.targetDescription);
- m_SoulTarget.SetNativeSize();
- DisplayPrivilege(special);
-
- m_SelectSoulImg.SetSprite(config.Icon);
- m_SelectSoulImg.material = special.active ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
- m_SelectSoulImg.SetNativeSize();
-
- m_Active.gameObject.SetActive(!special.active);
-
- m_ContainerPreview.gameObject.SetActive(!special.active);
- m_SoulEffect.StopImediatly();
- if (!special.active)
- {
- DisplayPreview(model.selectSoul);
- }
- else
- {
- m_SoulEffect.effect = config.effectId;
- m_SoulEffect.Play();
- }
- }
- }
- }
-
- private void DisplayPrivilege(TreasureSpecialData special)
- {
- int _pattern = -1;
- switch (special.type)
- {
- case TreasurePrivilege.Property:
- case TreasurePrivilege.Suit:
- case TreasurePrivilege.Wing:
- _pattern = 3;
- break;
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.MountAtk:
- case TreasurePrivilege.PetHp:
- case TreasurePrivilege.Sp:
- _pattern = 0;
- break;
- case TreasurePrivilege.StrengthenAdd:
- _pattern = 1;
- break;
- case TreasurePrivilege.Wash:
- _pattern = 2;
- break;
- }
- for (int i = 0; i < m_TreasureSouls.Count; i++)
- {
- m_TreasureSouls[i].Dispose();
- m_TreasureSouls[i].gameObject.SetActive(_pattern == i && model.IsGetTreasureSoul(model.selectSoul));
- if (m_TreasureSouls[i].bottom != null)
- {
- m_TreasureSouls[i].bottom.gameObject.SetActive(_pattern == i && model.IsGetTreasureSoul(model.selectSoul));
- }
- if (_pattern == i)
- {
- m_TreasureSouls[i].Display((int)special.type);
- }
- }
- }
-
- private void DisplayPreview(int _id)
- {
- m_ContainerPreview.gameObject.SetActive(false);
- TreasureSpecialData special;
- model.TryGetTreasureSoul(_id, out special);
- switch (special.type)
- {
- case TreasurePrivilege.Wing:
- case TreasurePrivilege.Suit:
- case TreasurePrivilege.Property:
- m_PreviewTitle.text = Language.Get("TreasureSoulAddPropertyTitle");
- break;
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.StrengthenAdd:
- case TreasurePrivilege.MountAtk:
- case TreasurePrivilege.PetHp:
- case TreasurePrivilege.Sp:
- m_PreviewTitle.text = Language.Get("TreasureSoulGetPropertyTitle");
- break;
- }
- for (int i = 0; i < m_PreviewPropretys.Count; i++)
- {
- m_PreviewPropretys[i].gameObject.SetActive(false);
- }
- switch (special.type)
- {
- case TreasurePrivilege.Property:
- var _index = 0;
- m_ContainerPreview.gameObject.SetActive(true);
- foreach (var _key in special.propertyDict.Keys)
- {
- var _value = special.propertyDict[_key];
- m_PreviewPropretys[_index].gameObject.SetActive(true);
- m_PreviewPropretys[_index].DisplayUpper(_key, _value);
- _index++;
- }
- break;
- case TreasurePrivilege.Wing:
- var percentWing = (float)special.propertyDict[86] / 10000;
- var equipPlace = EquipPlaceMapConfig.GetServerPlace(0, (int)RoleEquipType.Wing);
- var itemModel = pack.GetItemByIndex(PackType.Equip, equipPlace);
- m_ContainerPreview.gameObject.SetActive(itemModel != null);
- if (itemModel != null)
- {
- var itemConfig = ItemConfig.Get(itemModel.itemId);
- float value = 0;
- m_PreviewPropretys[0].gameObject.SetActive(true);
- m_PreviewPropretys[0].DisplayUpper(6, (int)(value * percentWing));
- }
- break;
- case TreasurePrivilege.DemonJarAtk:
- case TreasurePrivilege.PetHp:
- case TreasurePrivilege.MountAtk:
- case TreasurePrivilege.Sp:
- var index = 0;
- m_ContainerPreview.gameObject.SetActive(true);
- foreach (var _key in special.propertyDict.Keys)
- {
- var _value = special.propertyDict[_key] * (special.presentGetCount / special.progress);
- if (_value <= 0)
- {
- m_ContainerPreview.gameObject.SetActive(false);
- break;
- }
- m_PreviewPropretys[index].gameObject.SetActive(true);
- m_PreviewPropretys[index].DisplayUpper(_key, _value);
- index++;
- }
- break;
- case TreasurePrivilege.StrengthenAdd:
- var configs = ItemPlusSumAttrConfig.GetValues();
- var present = -1;
- var next = 0;
- var presentGetCount = 0;
- for (int i = 0; i < configs.Count; i++)
- {
- if (presentGetCount >= configs[i].countNeed)
- {
- present = i;
- }
- }
- next = present + 1;
- m_ContainerPreview.gameObject.SetActive(present >= 0);
- if (present >= 0)
- {
- var config = configs[present];
- for (int i = 0; i < m_PreviewPropretys.Count; i++)
- {
- m_PreviewPropretys[i].gameObject.SetActive(i < config.attType.Length);
- if (i < config.attType.Length)
- {
- m_PreviewPropretys[i].DisplayUpper(config.attType[i], config.attValue[i]);
- }
- }
- }
- break;
- }
- }
-
- int Compare(int x, int y)
- {
- var leftConfig = TreasurePrivilegeConfig.Get(x);
- var rightConfig = TreasurePrivilegeConfig.Get(y);
- if (leftConfig != null && rightConfig != null)
- {
- return leftConfig.sort.CompareTo(rightConfig.sort);
- }
- return x.CompareTo(y);
- }
-
- bool ContainsProperty(ItemConfig config, int _property, out float value)
- {
- value = 0;
- if (config.Effect1 == _property && config.EffectValueA1 > 0)
- {
- value = config.EffectValueA1;
- return true;
- }
- if (config.Effect2 == _property && config.EffectValueA2 > 0)
- {
- value = config.EffectValueA2;
- return true;
- }
- if (config.Effect3 == _property && config.EffectValueA3 > 0)
- {
- value = config.EffectValueA3;
- return true;
- }
- if (config.Effect4 == _property && config.EffectValueA4 > 0)
- {
- value = config.EffectValueA4;
- return true;
- }
- if (config.Effect5 == _property && config.EffectValueA5 > 0)
- {
- value = config.EffectValueA5;
- return true;
- }
- return false;
- }
- }
-
-}
-
-
-
-
diff --git a/System/Treasure/TreasureSoulWin.cs.meta b/System/Treasure/TreasureSoulWin.cs.meta
deleted file mode 100644
index b01e430..0000000
--- a/System/Treasure/TreasureSoulWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: e753584a4c20d074887a2a99a834e564
-timeCreated: 1527055665
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/WindowBase/ModelCenter.cs b/System/WindowBase/ModelCenter.cs
index 9675f26..d830cfa 100644
--- a/System/WindowBase/ModelCenter.cs
+++ b/System/WindowBase/ModelCenter.cs
@@ -182,7 +182,6 @@
RegisterModel<MultipleRealmPointModel>();
RegisterModel<DogzDungeonModel>();
RegisterModel<DogzModel>();
- RegisterModel<TreasureSoulModel>();
RegisterModel<FairyGrabBossModel>();
RegisterModel<GodBeastModel>();
RegisterModel<PrayForDurgModel>();
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 3edb74e..1faa0e2 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -543,7 +543,6 @@
SetJumpLogic<RolePanel>(_tagWinSearchModel.TABID);
break;
case JumpUIType.TreasureSoul:
- SetJumpLogic<TreasureSoulWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.TreasureCollectSoul:
SetJumpLogic<TreasureBaseWin>(0);
@@ -652,12 +651,6 @@
case JumpUIType.FaBaoSoul_Wings:
case JumpUIType.FaBaoSoul_Suit:
case JumpUIType.FaBaoSoul_Wash:
- var soulId = 0;
- if (int.TryParse(_tagWinSearchModel.SelectActive, out soulId))
- {
- ModelCenter.Instance.GetModel<TreasureSoulModel>().gotoSoul = soulId;
- }
- SetJumpLogic<TreasureSoulWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.XianBaguaIntr:
case JumpUIType.XyjJs:
@@ -847,19 +840,6 @@
case JumpUIType.FaBaoSoul_Wings:
case JumpUIType.FaBaoSoul_Suit:
case JumpUIType.FaBaoSoul_Wash:
- var soulId = 0;
- if (int.TryParse(_tagWinSearchModel.SelectActive, out soulId))
- {
- var soulModel = ModelCenter.Instance.GetModel<TreasureSoulModel>();
- if (!soulModel.IsOpenTreasureSoul(soulId))
- {
- return false;
- }
- }
- else
- {
- return false;
- }
break;
case JumpUIType.TrialExchange:
case JumpUIType.TrialExchange2:
--
Gitblit v1.8.0