ZhangBiao 86fdb9395b Merge branch '0功能/本周版本优化内容' into china/dev ... # Conflicts: # Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab # Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua		2021-03-15 10:51:17 +08:00
..
View	Merge branch '0功能/本周版本优化内容' into china/dev	2021-03-15 10:51:17 +08:00
ExpeditionHalidomPanel.lua	【圣物选择】	2021-03-04 14:58:41 +08:00
ExpeditionHalidomPanel.lua.meta	…
ExpeditionHeroListInfoPopup.lua	还原lua	2021-03-02 16:53:12 +08:00
ExpeditionHeroListInfoPopup.lua.meta	…
ExpeditionHeroListResurgencePopup.lua	还原lua	2021-03-02 16:53:12 +08:00
ExpeditionHeroListResurgencePopup.lua.meta	…
ExpeditionMainPanel.lua	还原lua	2021-03-02 16:53:12 +08:00
ExpeditionMainPanel.lua.meta	…
ExpeditionManager.lua	文字提交	2021-03-12 14:31:52 +08:00
ExpeditionManager.lua.meta	…
ExpeditionMonsterInfoPopup.lua	中文表导出提交	2020-08-25 15:46:38 +08:00
ExpeditionMonsterInfoPopup.lua.meta	…
ExpeditionPreView.lua	中文表导出提交	2020-08-25 15:46:38 +08:00
ExpeditionPreView.lua.meta	…
ExpeditionSelectHalidomPanel.lua	【圣物选择】	2021-03-04 14:58:41 +08:00
ExpeditionSelectHalidomPanel.lua.meta	…
View.meta	…