miduo_client/Assets/ManagedResources/~Lua/Modules/Battle/View
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
..
Unit Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 17:02:04 +08:00
BattleBestPopup.lua 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
BattleBestPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
BattleEndPanel.lua 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
BattleEndPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
BattlePanel.lua Merge branch 'master_xma_local' into 0功能/silingshilian 2021-03-08 11:14:15 +08:00
BattlePanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
BattleRoleShowView.lua 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
BattleRoleShowView.lua.meta 提交 2020-05-09 13:31:21 +08:00
BattleStageTipPopup.lua 还原lua 2021-03-02 16:53:12 +08:00
BattleStageTipPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
BattleView.lua 还原lua 2021-03-02 16:53:12 +08:00
BattleView.lua.meta 提交 2020-05-09 13:31:21 +08:00
DamageResultPanel.lua 【本地化】战斗统计部分效果添加翻译 2021-03-05 16:56:27 +08:00
DamageResultPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuideBattlePanel.lua 还原lua 2021-03-02 16:53:12 +08:00
GuideBattlePanel.lua.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
Unit.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00