gaoxin 802881378c Merge branch 'master_xma_local' into gx/xma_local ... # Conflicts: # Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua # Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua		2021-01-26 11:08:54 +08:00
..
BuglyManager.lua	…
BuglyManager.lua.meta	…
CustomEventManager.lua	【重置优化】将游戏中的各个玩法重置时间统一调整至0点	2021-01-08 19:15:08 +08:00
CustomEventManager.lua.meta	…
DataCenterManager.lua	【本地化】还原文本到代码中合并用	2021-01-09 14:20:06 +08:00
DataCenterManager.lua.meta	…
TapDBManager.lua	…
TapDBManager.lua.meta	…
ThinkingAnalyticsManager.lua	【数数】修改判断获取设备id的方法	2021-01-20 19:25:43 +08:00
ThinkingAnalyticsManager.lua.meta	…