miduo_client/Assets/ManagedResources/~Lua/Modules/DynamicActivity
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
..
ActivityDetail.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
ActivityDetail.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
ActivityMainPanel.lua 活动 动态加载改名 2021-03-31 11:26:55 +08:00
ActivityMainPanel.lua.meta 成长礼包,每日礼包修改提交 2021-03-29 15:16:32 +08:00
DynamicActivityManager.lua 【本地化】还原文本 2021-04-01 18:41:50 +08:00
DynamicActivityManager.lua.meta 【社稷大典】提交5 2020-10-24 18:49:32 +08:00
DynamicActivityPanel.lua 主题活动 2021-03-24 13:57:08 +08:00
DynamicActivityPanel.lua.meta 限时召唤 乾坤宝盒 页面整合 2020-07-28 09:48:02 +08:00
DynamicTaskPage.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
DynamicTaskPage.lua.meta 勇冠三军,叱咤风云活动添加 2020-09-27 16:09:55 +08:00
LeiJiChongZhiPage.lua 【本地化】还原文本 2021-04-01 18:41:50 +08:00
LeiJiChongZhiPage.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
LingShouBaoGe.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
LingShouBaoGe.lua.meta 【灵兽抽卡】 开坑 2020-11-10 11:34:19 +08:00
LingShouBaoGeOneResultPanel.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
LingShouBaoGeOneResultPanel.lua.meta 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
LingShouBaoGeTenResultPanel.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
LingShouBaoGeTenResultPanel.lua.meta 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
LingShowTeHui.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
LingShowTeHui.lua.meta [灵兽特惠] 提交 2020-11-12 11:31:33 +08:00
QianKunBox.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
QianKunBox.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
QianKunBoxBuyOnePanel.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
QianKunBoxBuyOnePanel.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
QianKunBoxBuyTenPanel.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
QianKunBoxBuyTenPanel.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
RewardPreview.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
RewardPreview.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
SheJiDaDian.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
SheJiDaDian.lua.meta 【社稷大典】提交 2020-10-24 18:20:43 +08:00
ShengXingYouLi.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
ShengXingYouLi.lua.meta 【升星有礼】完成 2020-12-21 15:41:31 +08:00
ShengYiTianJiang.lua 【本地化】还原文本 2021-04-01 18:41:50 +08:00
ShengYiTianJiang.lua.meta 皮肤提交 2020-11-06 20:36:38 +08:00
TimeLimitedCall.lua Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b 2021-04-02 11:34:27 +08:00
TimeLimitedCall.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
XianShiShangShi.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
XianShiShangShi.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
XiangYaoDuoBao.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
XiangYaoDuoBao.lua.meta 【降妖夺宝】开坑 2020-12-21 17:13:05 +08:00
XinJiangLaiXi.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
XinJiangLaiXi.lua.meta 【新将来袭】开坑 2020-12-01 13:51:13 +08:00
YiJingBaoKu.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
YiJingBaoKu.lua.meta 【易经宝库】开坑 搭界面 和做动画 2020-11-02 18:05:24 +08:00
ZhenQiYiBaoPage.lua 【本地化】还原文本 2021-04-01 18:45:39 +08:00
ZhenQiYiBaoPage.lua.meta 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00