root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
miduo_client/Assets/ManagedResources/Prefabs/UI/Expedition
History
zhangqiang ed53f7e760 Merge branch 'master_develop' into master_develop2 
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	data_execl/base_data/BeStronger.xlsx
#	data_execl/base_data/EquipTalismana.xlsx
#	data_execl/base_data/GlobalActivity.xlsx
 		2020-08-07 06:54:04 +08:00
..
ExpeditionHalidomPanel.prefab 内网 0.15.20 2020-06-23 18:36:24 +08:00
ExpeditionHalidomPanel.prefab.meta 提交 2020-05-09 13:31:21 +08:00
ExpeditionHeroListInfoPopup.prefab 修改星星提交 2020-07-24 20:03:06 +08:00
ExpeditionHeroListInfoPopup.prefab.meta 提交 2020-05-09 13:31:21 +08:00
ExpeditionHeroListResurgencePopup.prefab 修改星星提交 2020-07-24 20:03:06 +08:00
ExpeditionHeroListResurgencePopup.prefab.meta 提交 2020-05-09 13:31:21 +08:00
ExpeditionMainPanel.prefab Merge branch 'master_develop' into master_develop2 2020-08-07 06:54:04 +08:00
ExpeditionMainPanel.prefab.meta 提交 2020-05-09 13:31:21 +08:00
ExpeditionMonsterInfoPopup.prefab formation commit 2020-07-25 22:58:55 +08:00
ExpeditionMonsterInfoPopup.prefab.meta 提交 2020-05-09 13:31:21 +08:00
ExpeditionPreView.prefab 内网 0.15.20 2020-06-23 18:36:24 +08:00
ExpeditionPreView.prefab.meta 提交 2020-05-09 13:31:21 +08:00
ExpeditionSelectHalidomPanel.prefab 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
ExpeditionSelectHalidomPanel.prefab.meta 提交 2020-05-09 13:31:21 +08:00