diff --git a/Assets/Scripts/Const/GameConst.cs b/Assets/Scripts/Const/GameConst.cs index 724e92375..1594e912a 100644 --- a/Assets/Scripts/Const/GameConst.cs +++ b/Assets/Scripts/Const/GameConst.cs @@ -37,6 +37,20 @@ namespace BF public const bool SKIP_VERSION = false; #endif +#if BF_APP_DEV + public const bool BF_APP_DEV = true; + public const bool BF_APP_TEST = false; + public const bool BF_APP_PUBLISH = false; +#elif BF_APP_TEST + public const bool BF_APP_DEV = false; + public const bool BF_APP_TEST = true; + public const bool BF_APP_PUBLISH = false; +#else + public const bool BF_APP_DEV = false; + public const bool BF_APP_TEST = false; + public const bool BF_APP_PUBLISH = true; +#endif + public static char[] C_FREE_CHAR = new char[16] { (char)('g' ^ (0x29 - 0)), (char)('w' ^ (0x29 - 1)), diff --git a/Assets/XLua/Gen/BF_GameConstWrap.cs b/Assets/XLua/Gen/BF_GameConstWrap.cs index 9b8e243ac..579f84532 100644 --- a/Assets/XLua/Gen/BF_GameConstWrap.cs +++ b/Assets/XLua/Gen/BF_GameConstWrap.cs @@ -31,7 +31,7 @@ namespace XLua.CSObjectWrap Utils.EndObjectRegister(type, L, translator, null, null, null, null, null); - Utils.BeginClassRegister(type, L, __CreateInstance, 9, 2, 2); + Utils.BeginClassRegister(type, L, __CreateInstance, 12, 2, 2); Utils.RegisterObject(L, translator, Utils.CLS_IDX, "DESIGN_RESOLUTION_WIDTH", BF.GameConst.DESIGN_RESOLUTION_WIDTH); @@ -42,6 +42,9 @@ namespace XLua.CSObjectWrap Utils.RegisterObject(L, translator, Utils.CLS_IDX, "DEBUG", BF.GameConst.DEBUG); Utils.RegisterObject(L, translator, Utils.CLS_IDX, "USE_AB", BF.GameConst.USE_AB); Utils.RegisterObject(L, translator, Utils.CLS_IDX, "SKIP_VERSION", BF.GameConst.SKIP_VERSION); + Utils.RegisterObject(L, translator, Utils.CLS_IDX, "BF_APP_DEV", BF.GameConst.BF_APP_DEV); + Utils.RegisterObject(L, translator, Utils.CLS_IDX, "BF_APP_TEST", BF.GameConst.BF_APP_TEST); + Utils.RegisterObject(L, translator, Utils.CLS_IDX, "BF_APP_PUBLISH", BF.GameConst.BF_APP_PUBLISH); Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "C_FREE_CHAR", _g_get_C_FREE_CHAR); Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "C_CONFIG_CHAR", _g_get_C_CONFIG_CHAR); diff --git a/Assets/lua/app/module/equip/equip_manager.lua.bytes b/Assets/lua/app/module/equip/equip_manager.lua.bytes index 74a1f8d5e..cd6d679cb 100644 Binary files a/Assets/lua/app/module/equip/equip_manager.lua.bytes and b/Assets/lua/app/module/equip/equip_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/equip_cell.lua.bytes b/Assets/lua/app/ui/common/cell/equip_cell.lua.bytes index 5b2a3c1e1..c10887ee1 100644 Binary files a/Assets/lua/app/ui/common/cell/equip_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/equip_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/equip/equip_get_resonate_ui.lua.bytes b/Assets/lua/app/ui/equip/equip_get_resonate_ui.lua.bytes index 19bba61db..00ffd1dfa 100644 Binary files a/Assets/lua/app/ui/equip/equip_get_resonate_ui.lua.bytes and b/Assets/lua/app/ui/equip/equip_get_resonate_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes b/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes index 66b04db17..161c906ad 100644 Binary files a/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes and b/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/equip/equip_info_ui.lua.bytes b/Assets/lua/app/ui/equip/equip_info_ui.lua.bytes index 096b5bf04..8cef36a0e 100644 Binary files a/Assets/lua/app/ui/equip/equip_info_ui.lua.bytes and b/Assets/lua/app/ui/equip/equip_info_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/equip_info_comp.lua.bytes b/Assets/lua/app/ui/hero/equip_info_comp.lua.bytes index cbec6ac78..859dd4dcb 100644 Binary files a/Assets/lua/app/ui/hero/equip_info_comp.lua.bytes and b/Assets/lua/app/ui/hero/equip_info_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes index f362ff688..d557d3bac 100644 Binary files a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/equip/equip_data.lua.bytes b/Assets/lua/app/userdata/equip/equip_data.lua.bytes index 625bbb3d6..fd1fb4fb1 100644 Binary files a/Assets/lua/app/userdata/equip/equip_data.lua.bytes and b/Assets/lua/app/userdata/equip/equip_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes index 964cd5d24..3e1c9b3be 100644 Binary files a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes and b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes differ diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index 3cf503a25..84fa3ee89 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -1191,7 +1191,7 @@ GameObject: - component: {fileID: 3046896116386291497} - component: {fileID: 2607224896316937992} m_Layer: 5 - m_Name: auto_waer_btn + m_Name: auto_wear_btn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -12718,12 +12718,12 @@ MonoBehaviour: hashName: 2981769748 objectType: 1 gameObject: {fileID: 1661029733709084910} - - name: equip_info.equip_node.auto_waer_btn - hashName: 2318243480 + - name: equip_info.equip_node.auto_wear_btn + hashName: 1458774304 objectType: 0 gameObject: {fileID: 684252214749597924} - - name: equip_info.equip_node.auto_waer_btn.text - hashName: 3338618563 + - name: equip_info.equip_node.auto_wear_btn.text + hashName: 2452820283 objectType: 0 gameObject: {fileID: 3305500014741335493} - name: equip_info.equip_node.up_btn