miduo_client/Assets/ManagedResources/~Lua/Modules/Battle/View
jiaoyangna 9662b5f236 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/ArtFont_vi/x_xianshishangshi_banner_png_vi.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity3/shenjiang33_change.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_shangdian_xingchen_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner_solgan_zh.png.meta
#	Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua
2021-05-15 16:37:00 +08:00
..
Unit 【踏碎凌霄】boss不再放大 2021-04-28 00:22:18 +08:00
BattleBestPopup.lua 【大闹天宫】战斗结束点击无反应 2021-03-19 17:05:26 +08:00
BattleBestPopup.lua.meta
BattleBossInfoPanel.lua 【boss来袭】越南语BOSS展示显示中文修复 2021-04-10 13:30:32 +08:00
BattleBossInfoPanel.lua.meta 【boss介绍界面】创建提交 2021-02-22 20:19:16 +08:00
BattleEndPanel.lua 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
BattleEndPanel.lua.meta
BattlePanel.lua Merge branch 'china/dev' into china/dev-c 2021-05-15 16:37:00 +08:00
BattlePanel.lua.meta
BattleRoleShowView.lua 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
BattleRoleShowView.lua.meta
BattleStageTipPopup.lua 导出 文本提交 2021-04-09 12:26:35 +08:00
BattleStageTipPopup.lua.meta
BattleView.lua 【踏碎凌霄】boss放大添加 2021-04-27 13:32:41 +08:00
BattleView.lua.meta
DamageResultPanel.lua 【ID1008678】 2021-04-19 16:08:15 +08:00
DamageResultPanel.lua.meta
GuideBattleLogic.lua 【引导战斗】所有剧情放到战斗里 2021-04-13 15:10:40 +08:00
GuideBattleLogic.lua.meta 【引导】2倍速引导增加 2021-03-19 18:14:52 +08:00
GuideBattlePanel.lua 【踏碎凌霄】资源提交 2021-04-27 21:45:04 +08:00
GuideBattlePanel.lua.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
Unit.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00