miduo_client/Assets/ManagedResources/~Lua/Modules/ActivityGift
ZhangBiao a197f16837 Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-12-17 15:46:53 +08:00
..
ActivityGiftManager.lua Merge branch 'china/dev' into 0功能/命格 2021-12-17 15:46:53 +08:00
ActivityGiftManager.lua.meta
AllActivityManager.lua 【红点】主题活动入口显示红点,签到后或领达人活动奖励后,红点消失 2021-12-13 11:04:27 +08:00
AllActivityManager.lua.meta
CourtesyDressPanel.lua 【【通关奖励】创建新号首次进入通关奖励,通关简单3-10的英雄碎片缺少数量显示,退出该界面在进入数量才显示出来】https://www.tapd.cn/33029060/bugtrace/bugs/view?bug_id=1133029060001019080 2021-11-11 13:49:10 +08:00
CourtesyDressPanel.lua.meta
OpenSeverWelfarePanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
OpenSeverWelfarePanel.lua.meta
View.meta 【命格】加成预览提交 2021-12-08 17:27:22 +08:00
WarPowerSortPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
WarPowerSortPanel.lua.meta