ZhangBiao 63bcee6168 Merge branch '0活动开发聚集地/十五日登录' into china/dev ... # Conflicts: # Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab # Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua		2021-04-06 15:51:24 +08:00
..
View	【称号坐骑时装】修改	2021-03-30 10:28:03 +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	【本地化】文本导出	2021-04-01 18:36:34 +08:00
GMPanel.lua.meta	…
MainPanel.lua	Merge branch '0活动开发聚集地/十五日登录' into china/dev	2021-04-06 15:51:24 +08:00
MainPanel.lua.meta	…
View.meta	…