miduo_client/Assets/ManagedResources/Prefabs/UI/Map
jiaoyangna 8291a48e73 Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
#	Assets/ManagedResources/Icon/ChengHao.meta
#	Assets/ManagedResources/Icon/ZuoQi.meta
#	Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/View/FetterItem.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-04-09 12:24:01 +08:00
..
BuffChoosePanel.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
BuffChoosePanel.prefab.meta 提交 2020-05-09 13:31:21 +08:00
MapAwardPanel.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
MapAwardPanel.prefab.meta 提交 2020-05-09 13:31:21 +08:00
MapPanel.prefab 【适配】森罗幻境 2021-03-31 15:06:41 +08:00
MapPanel.prefab.meta 提交 2020-05-09 13:31:21 +08:00
ShowEnemyInfoPanel.prefab 轩辕,森罗修改 2021-02-24 17:37:56 +08:00
ShowEnemyInfoPanel.prefab.meta 版本开发提交 2020-06-28 17:52:29 +08:00
TrialMiniGamePanel.prefab Merge branch 'china_dev_merge' into xma_dev_b_merge 2021-04-09 12:24:01 +08:00
TrialMiniGamePanel.prefab.meta 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
TrialOpPanel.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
TrialOpPanel.prefab.meta 提交 2020-05-09 13:31:21 +08:00