Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
b74258e7fc
|
@ -2730,7 +2730,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u5723\u5668\u653E\u7F6E"
|
m_Text: "\u5723\u5668\u5206\u89E3"
|
||||||
--- !u!114 &586208661
|
--- !u!114 &586208661
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -24,6 +24,7 @@ function this.Initialize()
|
||||||
this.Insert(FUNCTION_OPEN_TYPE.RECURITY, mainCity)
|
this.Insert(FUNCTION_OPEN_TYPE.RECURITY, mainCity)
|
||||||
this.Insert(FUNCTION_OPEN_TYPE.ELEMENT_RECURITY, mainCity)
|
this.Insert(FUNCTION_OPEN_TYPE.ELEMENT_RECURITY, mainCity)
|
||||||
this.Insert(FUNCTION_OPEN_TYPE.COMPOUND_HERO, mainCity)
|
this.Insert(FUNCTION_OPEN_TYPE.COMPOUND_HERO, mainCity)
|
||||||
|
this.Insert(FUNCTION_OPEN_TYPE.HongMengZhen, mainCity)
|
||||||
-- this.Insert(FUNCTION_OPEN_TYPE.SECRETBOX, mainCity)
|
-- this.Insert(FUNCTION_OPEN_TYPE.SECRETBOX, mainCity)
|
||||||
-- this.Insert(FUNCTION_OPEN_TYPE.TALENT_TREE, mainCity)
|
-- this.Insert(FUNCTION_OPEN_TYPE.TALENT_TREE, mainCity)
|
||||||
-- this.Insert(FUNCTION_OPEN_TYPE.DIFFER_DEMONS, mainCity)
|
-- this.Insert(FUNCTION_OPEN_TYPE.DIFFER_DEMONS, mainCity)
|
||||||
|
|
|
@ -723,6 +723,7 @@ function this:BindEvent()
|
||||||
UIManager.OpenPanel(UIName.HongMengPanel)
|
UIManager.OpenPanel(UIName.HongMengPanel)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.HongMengZhen)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddClick(this.btnGMChange,function()
|
Util.AddClick(this.btnGMChange,function()
|
||||||
|
|
Loading…
Reference in New Issue