xiaoyao commit

dev_chengFeng
jiaoyangna 2020-10-19 23:37:24 +08:00
parent 589e535e73
commit d39c078888
5 changed files with 1053 additions and 18 deletions

File diff suppressed because it is too large Load Diff

View File

@ -3249,6 +3249,7 @@ GameObject:
m_Component:
- component: {fileID: 6915837880485352805}
- component: {fileID: 2259622164056777083}
- component: {fileID: 457957334378148376}
m_Layer: 5
m_Name: grid
m_TagString: Untagged
@ -3298,6 +3299,18 @@ MonoBehaviour:
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!114 &457957334378148376
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6082646870708111396}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6241305051190274946
GameObject:
m_ObjectHideFlags: 0

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5e3bb92fe05e6f541a6ff21f45c5bed6
guid: c5aeeac8f9b313c4a99bf9e24c6fcb09
DefaultImporter:
externalObjects: {}
userData:

View File

@ -62,7 +62,7 @@ end
function XiaoYaoLuckyBossPopup:OnOpen()
this.title.text = "入侵"
this.title.text = "入侵"
local config = ConfigManager.GetConfigDataByKey(ConfigName.FreeTravel,"MapID",XiaoYaoManager.curMapId)
cost = config.BossConsume
end

View File

@ -229,10 +229,7 @@ function this.UpdateYunYouVleShow()
end
--界面关闭时调用(用于子类重写)
function this:OnClose()
if this.timer then
this.timer:Stop()
end
this.timer = nil
end
--界面销毁时调用(用于子类重写)