miduo_client/Assets/ManagedResources/~Lua/Modules/ActivityGift
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00
..
View 【ios】图片回收 2021-04-21 13:12:04 +08:00
ActivityGiftManager.lua Merge branch 'china/dev-c' into 0优化/无尽副本 2021-05-24 13:53:28 +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 【ios】图片回收 2021-04-21 13:12:04 +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