miduo_client/Assets/ManagedResources/~Lua/Modules/Map
ZhangBiao 620862f64f Merge branch '0活动开发聚集地/新将来袭' into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_01.prefab.meta
#	Assets/ManagedResources/Prefabs/Live2d/live2d_c_bgj_00091.prefab
#	Assets/ManagedResources/Prefabs/Live2d/live2d_c_mjn_00063.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua
2020-12-07 10:33:26 +08:00
..
Config 中文表导出提交 2020-08-25 15:46:38 +08:00
FoodBuff 中文表导出提交 2020-08-25 15:46:38 +08:00
Logic 森罗 无尽 流程优化和界面调整 2020-09-02 13:35:29 +08:00
TrialMiniGame Merge branch '0活动开发聚集地/新将来袭' into master_develop 2020-12-07 10:33:26 +08:00
View 森罗 无尽 流程优化和界面调整 2020-09-02 13:35:29 +08:00
BuffChoosePanel.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
BuffChoosePanel.lua.meta
BuffOptionPanel.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
BuffOptionPanel.lua.meta
Config.meta
EndLessMapManager.lua 【副本】isInMap字段删除bug修复 2020-11-16 15:24:09 +08:00
EndLessMapManager.lua.meta
FoodBuff.meta
FoodBuffManager.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
FoodBuffManager.lua.meta
Logic.meta
MapAwardPanel.lua 【皮肤】修改皮肤显示 2020-11-04 16:51:45 +08:00
MapAwardPanel.lua.meta
MapManager.lua 森罗 无尽 流程优化和界面调整 2020-09-02 13:35:29 +08:00
MapManager.lua.meta
MapOptionPanel.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
MapOptionPanel.lua.meta
MapPanel.lua 无尽副本出图多次请求商店 修复 2020-10-14 11:55:40 +08:00
MapPanel.lua.meta
MapTrialManager.lua 森罗回春散使用bug修改 2020-10-12 15:15:02 +08:00
MapTrialManager.lua.meta
ShowEnemyInfoPanel.lua 【森罗幻境】敌将详情 敌将位置调整 2020-11-17 14:55:21 +08:00
ShowEnemyInfoPanel.lua.meta
TrialMapPanel.lua Merge branch 'master_xma_local' into master_develop 2020-11-10 10:41:02 +08:00
TrialMapPanel.lua.meta
TrialMiniGame.meta
TrialOpPanel.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
TrialOpPanel.lua.meta
View.meta