Merge branch 'china/dev' into china/dev-c
# Conflicts: # Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab # Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.luadev_chengFeng
commit
0f18eaf86c
|
@ -53,7 +53,7 @@ end
|
|||
--界面销毁时调用(用于子类重写)
|
||||
function NoticePopup:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
|
||||
prelist = {}
|
||||
end
|
||||
|
||||
function this.GetNotice(str)
|
||||
|
|
Loading…
Reference in New Issue