miduo_client/Assets/ManagedResources/~Lua/Modules/ActivityGift
DESKTOP-98AVA47\Administrator 36f04065fc Merge branch 'china/dev' into 0优化/主题活动
# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-15 12:59:20 +08:00
..
View 【ios】图片回收 2021-04-21 13:12:04 +08:00
ActivityGiftManager.lua Merge branch 'china/dev' into 0优化/主题活动 2021-07-15 12:59:20 +08:00
ActivityGiftManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
AllActivityManager.lua 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
AllActivityManager.lua.meta 百宝商会活动添加 2020-09-27 16:52:40 +08:00
CourtesyDressPanel.lua 【去掉无用打印】 2021-07-01 21:07:53 +08:00
CourtesyDressPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
OpenSeverWelfarePanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
OpenSeverWelfarePanel.lua.meta 六月三号开发提交 2020-06-03 19:09:01 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00
WarPowerSortPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
WarPowerSortPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00