miduo_client/Assets/ManagedResources/~Lua/Modules/Battle
jiaoyangna cf3c571182 Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
2021-03-08 11:14:15 +08:00
..
Config 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
Logic Merge branch 'local_to_dev' into xma/dev 2021-03-02 16:44:38 +08:00
Test 还原lua 2021-03-02 16:53:12 +08:00
View Merge branch 'master_xma_local' into 0功能/silingshilian 2021-03-08 11:14:15 +08:00
BattleAnalysisManager.lua 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
BattleAnalysisManager.lua.meta 【战斗统计】第一版 2021-01-16 16:22:57 +08:00
BattleManager.lua 【本地化】战斗内字体修改 2021-03-05 14:55:44 +08:00
BattleManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
BattlePool.lua 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
BattlePool.lua.meta 提交 2020-05-09 13:31:21 +08:00
BattleRecordManager.lua 还原lua 2021-03-02 16:53:12 +08:00
BattleRecordManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
Config.meta 提交 2020-05-09 13:31:21 +08:00
Logic.meta 提交 2020-05-09 13:31:21 +08:00
Test.meta 提交 2020-05-09 13:31:21 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00