Merge branch 'china/dev' into china/dev-c

# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab
#	Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua
dev_chengFeng
gaoxin 2021-05-24 14:15:30 +08:00
commit 0f18eaf86c
1 changed files with 1 additions and 1 deletions

View File

@ -53,7 +53,7 @@ end
--界面销毁时调用(用于子类重写)
function NoticePopup:OnDestroy()
this.spLoader:Destroy()
prelist = {}
end
function this.GetNotice(str)