Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
212d6f92c6
|
|
@ -776,6 +776,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8458557718928898840}
|
||||
- component: {fileID: 455843809901100221}
|
||||
- component: {fileID: 7189829901857102122}
|
||||
m_Layer: 0
|
||||
m_Name: box
|
||||
m_TagString: Untagged
|
||||
|
|
@ -825,6 +826,20 @@ MonoBehaviour:
|
|||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!114 &7189829901857102122
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2084043858434005442}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 1
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &2324518939165282330
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ local tabs = {
|
|||
tabName = "法宝",
|
||||
rpType = RedPointType.Treasure_Fetter,
|
||||
funcType = -1,
|
||||
bg = "t_tianshumijuan_lingshouditu"
|
||||
bg = "GSX116"
|
||||
,
|
||||
zi = "GodWeaponAtlas_handbook_title_zh",
|
||||
},
|
||||
|
|
@ -45,7 +45,7 @@ local tabs = {
|
|||
tabName = "法相",
|
||||
rpType = RedPointType.FaXiang_Fetter,
|
||||
funcType = FUNCTION_OPEN_TYPE.FaXiang,
|
||||
bg = "t_tianshumijuan_lingshouditu"
|
||||
bg = "GSX116"
|
||||
,
|
||||
zi = "GodWeaponAtlas_handbook_title_zh",
|
||||
},
|
||||
|
|
@ -56,7 +56,7 @@ local tabs = {
|
|||
tabName = "身外化身",
|
||||
rpType = RedPointType.HuaShen_Fetter,
|
||||
funcType = FUNCTION_OPEN_TYPE.Incarnation,
|
||||
bg = "t_tianshumijuan_lingshouditu"
|
||||
bg = "GSX116"
|
||||
,
|
||||
zi = "GodWeaponAtlas_handbook_title_zh",
|
||||
},
|
||||
|
|
@ -74,7 +74,7 @@ local curData = {}
|
|||
function TianShuMiJuanMainPanel:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
self.itemPreList = {}
|
||||
|
||||
self.shenjibtn = Util.GetGameObject(self.gameObject,"bg/shenjibtn")
|
||||
self.tabbox = Util.GetGameObject(self.gameObject,"bg/tabbox")
|
||||
self.bg = Util.GetGameObject(self.gameObject,"bg/Bg"):GetComponent("Image")
|
||||
self.title = Util.GetGameObject(self.gameObject,"bg/title"):GetComponent("Image")
|
||||
|
|
@ -160,6 +160,9 @@ function TianShuMiJuanMainPanel:BindEvent()
|
|||
curData = self:ShaiData()
|
||||
self:RefreshData(curData)
|
||||
end)
|
||||
Util.AddClick(self.shenjibtn, function()
|
||||
UIManager.OpenPanel(UIName.PracticeImprintPanel)
|
||||
end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
|
|
|||
Loading…
Reference in New Issue