miduo_client/Assets/ManagedResources/~Lua/Modules/Battle/View
gaoxin 1a4c96e88d Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Framework/Framework.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	data_execl/Language_data/LanguageLua.csv
#	data_execl/Language_data/LanguageText.csv
2021-04-02 11:34:27 +08:00
..
Unit Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b 2021-04-02 11:34:27 +08:00
BattleBestPopup.lua 【大闹天宫】战斗结束点击无反应 2021-03-19 17:05:26 +08:00
BattleBestPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
BattleBossInfoPanel.lua 2021-03-18 15:51:14 +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 提交 2020-05-09 13:31:21 +08:00
BattlePanel.lua 【本地化】还原文本 2021-04-01 18:41:50 +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 【本地化】还原文本 2021-04-01 18:45:39 +08:00
BattleStageTipPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
BattleView.lua 【本地化】还原文本 2021-04-01 18:41:50 +08:00
BattleView.lua.meta 提交 2020-05-09 13:31:21 +08:00
DamageResultPanel.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
DamageResultPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuideBattleLogic.lua 【本地化】文本导出 2021-04-01 18:36:34 +08:00
GuideBattleLogic.lua.meta 【引导】2倍速引导增加 2021-03-19 18:14:52 +08:00
GuideBattlePanel.lua 【本地化】还原文本 2021-04-01 18:41:50 +08:00
GuideBattlePanel.lua.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
Unit.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00