miduo_client/Assets/ManagedResources/~Lua/Modules/Main
gaoxin 357a27c100 Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-04-26 19:03:05 +08:00
..
View 称号bug修改 2021-04-21 14:42:06 +08:00
BattleData1.lua 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
BattleData1.lua.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
GMPanel.lua 【限时活动】完成?删除loggreen 2021-04-21 16:36:12 +08:00
GMPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
MainPanel.lua Merge remote-tracking branch 'origin/剧情' into china/dev 2021-04-26 19:03:05 +08:00
MainPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
RedpotDebugPanel.lua 【青龙秘宝】文字跳帧 2021-04-09 17:13:03 +08:00
RedpotDebugPanel.lua.meta 【GM】添加红点数据查看工具 2021-04-09 16:14:24 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00