gaoxin 357a27c100 Merge remote-tracking branch 'origin/剧情' into china/dev ... # Conflicts: # Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta # Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta # Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta # Assets/ManagedResources/Atlas/Story/wzs.jpg.meta # Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta # Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta # Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset # Assets/ManagedResources/~Lua/Data/UIData.lua		2021-04-26 19:03:05 +08:00
..
CardRendererManager.lua	…
CardRendererManager.lua.meta	…
PoolManager.lua	【对象池】偶现回收出现空物体，导致报错的问题	2021-04-25 16:48:41 +08:00
PoolManager.lua.meta	…
RoleRenderManager.lua	【限时活动】完成？删除loggreen	2021-04-21 16:36:12 +08:00
RoleRenderManager.lua.meta	…
ServerConfigManager.lua	【配置文件】添加对游戏语音，健康提示显示的配置	2021-04-09 17:38:18 +08:00
ServerConfigManager.lua.meta	【热更配置】应用到lua层	2021-01-26 10:38:48 +08:00
SoundManager.lua	【音效】在关卡界面开关排行榜，背景音乐不会随着切换	2021-01-21 13:53:12 +08:00
SoundManager.lua.meta	…
SubUIManager.lua	Merge branch '0功能/挂机界面' into china/dev-c	2021-04-20 17:51:14 +08:00
SubUIManager.lua.meta	…
UIManager.lua	剧情提交	2021-04-26 09:41:41 +08:00
UIManager.lua.meta	…