坐骑界面技能描述修改提交
parent
09ca5f98ad
commit
5425fc980a
|
@ -2223,6 +2223,82 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 0.95
|
m_LineSpacing: 0.95
|
||||||
m_Text: "\u7ADE\u6280\u7B2C\u4E00"
|
m_Text: "\u7ADE\u6280\u7B2C\u4E00"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
|
--- !u!1 &1362327388285561604
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4844056222847831456}
|
||||||
|
- component: {fileID: 8015118520618151676}
|
||||||
|
- component: {fileID: 1257705017484933903}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: bottom
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &4844056222847831456
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1362327388285561604}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 1797157087769229872}
|
||||||
|
- {fileID: 8188669192013431924}
|
||||||
|
m_Father: {fileID: 7490232213493654859}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 27.5, y: -140.14}
|
||||||
|
m_SizeDelta: {x: 600, y: 90.28}
|
||||||
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
|
--- !u!114 &8015118520618151676
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1362327388285561604}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Padding:
|
||||||
|
m_Left: 0
|
||||||
|
m_Right: 0
|
||||||
|
m_Top: 0
|
||||||
|
m_Bottom: 0
|
||||||
|
m_ChildAlignment: 0
|
||||||
|
m_Spacing: 0
|
||||||
|
m_ChildForceExpandWidth: 0
|
||||||
|
m_ChildForceExpandHeight: 0
|
||||||
|
m_ChildControlWidth: 0
|
||||||
|
m_ChildControlHeight: 1
|
||||||
|
--- !u!114 &1257705017484933903
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1362327388285561604}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_HorizontalFit: 0
|
||||||
|
m_VerticalFit: 2
|
||||||
--- !u!1 &1471797474550407823
|
--- !u!1 &1471797474550407823
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -3896,12 +3972,12 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1797757743707336698}
|
- {fileID: 1797757743707336698}
|
||||||
m_Father: {fileID: 7490232213493654859}
|
m_Father: {fileID: 4844056222847831456}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 59.5, y: -140}
|
m_AnchoredPosition: {x: 45.14, y: -45.14}
|
||||||
m_SizeDelta: {x: 90.28, y: 90.28}
|
m_SizeDelta: {x: 90.28, y: 90.28}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1799280588757647610
|
--- !u!222 &1799280588757647610
|
||||||
|
@ -3953,11 +4029,11 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_IgnoreLayout: 1
|
m_IgnoreLayout: 0
|
||||||
m_MinWidth: -1
|
m_MinWidth: -1
|
||||||
m_MinHeight: -1
|
m_MinHeight: -1
|
||||||
m_PreferredWidth: -1
|
m_PreferredWidth: 90.28
|
||||||
m_PreferredHeight: -1
|
m_PreferredHeight: 90.28
|
||||||
m_FlexibleWidth: -1
|
m_FlexibleWidth: -1
|
||||||
m_FlexibleHeight: -1
|
m_FlexibleHeight: -1
|
||||||
m_LayoutPriority: 1
|
m_LayoutPriority: 1
|
||||||
|
@ -9921,13 +9997,13 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7490232213493654859}
|
m_Father: {fileID: 4844056222847831456}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 583.30005, y: -95}
|
m_AnchoredPosition: {x: 566.07996, y: -0}
|
||||||
m_SizeDelta: {x: 466.6, y: 30}
|
m_SizeDelta: {x: 475.8, y: 30}
|
||||||
m_Pivot: {x: 1, y: 1}
|
m_Pivot: {x: 1, y: 1}
|
||||||
--- !u!222 &6354023907938239484
|
--- !u!222 &6354023907938239484
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -13639,15 +13715,14 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1797012938004847544}
|
- {fileID: 1797012938004847544}
|
||||||
- {fileID: 1797157087769229872}
|
- {fileID: 4844056222847831456}
|
||||||
- {fileID: 8188669192013431924}
|
|
||||||
m_Father: {fileID: 1797499810126149018}
|
m_Father: {fileID: 1797499810126149018}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -196, y: -536}
|
m_AnchoredPosition: {x: -196, y: -536}
|
||||||
m_SizeDelta: {x: 600, y: 214.8}
|
m_SizeDelta: {x: 600, y: 205.28}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7490232213493654862
|
--- !u!222 &7490232213493654862
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -13664,20 +13739,20 @@ MonoBehaviour:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7490232213493654858}
|
m_GameObject: {fileID: 7490232213493654858}
|
||||||
m_Enabled: 0
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Padding:
|
m_Padding:
|
||||||
m_Left: 100
|
m_Left: 55
|
||||||
m_Right: 0
|
m_Right: 0
|
||||||
m_Top: 95
|
m_Top: 95
|
||||||
m_Bottom: 20
|
m_Bottom: 20
|
||||||
m_ChildAlignment: 4
|
m_ChildAlignment: 4
|
||||||
m_Spacing: 0
|
m_Spacing: 0
|
||||||
m_ChildForceExpandWidth: 0
|
m_ChildForceExpandWidth: 0
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 0
|
||||||
m_ChildControlWidth: 0
|
m_ChildControlWidth: 0
|
||||||
m_ChildControlHeight: 1
|
m_ChildControlHeight: 1
|
||||||
--- !u!114 &2232953979548161381
|
--- !u!114 &2232953979548161381
|
||||||
|
@ -13687,7 +13762,7 @@ MonoBehaviour:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7490232213493654858}
|
m_GameObject: {fileID: 7490232213493654858}
|
||||||
m_Enabled: 0
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -16906,7 +16981,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &1094151485460785958
|
--- !u!224 &1094151485460785958
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -61,10 +61,11 @@ function SettingPlayerRide:InitComponent(gameObject)
|
||||||
|
|
||||||
this.skillDes = Util.GetGameObject(gameObject, "PokemonSkillInfoPopup")
|
this.skillDes = Util.GetGameObject(gameObject, "PokemonSkillInfoPopup")
|
||||||
this.skillDesClose = Util.GetGameObject(this.skillDes, "Button")
|
this.skillDesClose = Util.GetGameObject(this.skillDes, "Button")
|
||||||
this.skillDesIcon = Util.GetGameObject(this.skillDes, "Content/IconBG/Icon"):GetComponent("Image")
|
this.skillDesContent = Util.GetGameObject(this.skillDes, "Content")
|
||||||
this.skillDesTitle = Util.GetGameObject(this.skillDes, "Content/Title")
|
this.skillDesIcon = Util.GetGameObject(this.skillDesContent,"bottom/IconBG/Icon"):GetComponent("Image")
|
||||||
|
this.skillDesTitle = Util.GetGameObject(this.skillDesContent,"Title")
|
||||||
this.skillDesTitleText = Util.GetGameObject(this.skillDesTitle,"Text"):GetComponent("Text")
|
this.skillDesTitleText = Util.GetGameObject(this.skillDesTitle,"Text"):GetComponent("Text")
|
||||||
this.skillDesText = Util.GetGameObject(this.skillDes, "Content/curinfo"):GetComponent("Text")
|
this.skillDesText = Util.GetGameObject(this.skillDesContent,"bottom/curinfo"):GetComponent("Text")
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
|
@ -78,6 +79,7 @@ function this.SetSkillDes(data)
|
||||||
this.skillDesIcon.sprite = this.spLoader:LoadSprite(data.icon)
|
this.skillDesIcon.sprite = this.spLoader:LoadSprite(data.icon)
|
||||||
this.skillDesTitleText.text = data.title
|
this.skillDesTitleText.text = data.title
|
||||||
this.skillDesText.text = data.des
|
this.skillDesText.text = data.des
|
||||||
|
ForceRebuildLayout(this.skillDesContent.transform)
|
||||||
end
|
end
|
||||||
|
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
|
@ -100,7 +102,6 @@ function SettingPlayerRide:OnShow()
|
||||||
end
|
end
|
||||||
--显示信息
|
--显示信息
|
||||||
function this.ShowPanelData()
|
function this.ShowPanelData()
|
||||||
|
|
||||||
local rideList = ConfigManager.GetAllConfigsDataByKey(ConfigName.PlayerHeadIcon,"Type",PlayerHeadIconType.Ride)
|
local rideList = ConfigManager.GetAllConfigsDataByKey(ConfigName.PlayerHeadIcon,"Type",PlayerHeadIconType.Ride)
|
||||||
LogGreen("rideList:"..#rideList)
|
LogGreen("rideList:"..#rideList)
|
||||||
--设置滚动区信息
|
--设置滚动区信息
|
||||||
|
|
Loading…
Reference in New Issue