[英雄详情修改i]

dev_chengFeng
wangzhenxing 2022-05-19 20:43:41 +08:00
parent 588df24b29
commit d97c84a543
9 changed files with 6382 additions and 5621 deletions

View File

@ -29,7 +29,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5567616429014450993}
- {fileID: 7775848301174822185}
- {fileID: 2844460808957678779}
- {fileID: 7992648649537905317}
- {fileID: 2175105752741210708}
m_Father: {fileID: 7083815599514741720}
m_RootOrder: 3
@ -57,7 +60,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 33.04
m_Spacing: 5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -111,7 +114,6 @@ RectTransform:
- {fileID: 3798081996635404178}
- {fileID: 7776034894660127337}
- {fileID: 4824128418226270383}
- {fileID: 5567616429014450993}
m_Father: {fileID: 7775692205861864899}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -213,7 +215,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2175105752741210708
RectTransform:
m_ObjectHideFlags: 0
@ -227,12 +229,12 @@ RectTransform:
m_Children:
- {fileID: 3819545475011276067}
m_Father: {fileID: 4824128418226270383}
m_RootOrder: 1
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 228.64, y: -522.54004}
m_SizeDelta: {x: 400, y: 353}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 228.64, y: 0}
m_SizeDelta: {x: 400, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2701847110321517952
CanvasRenderer:
@ -496,6 +498,119 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &5736849390346563381
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2844460808957678779}
- component: {fileID: 6618502649577932062}
- component: {fileID: 464397955765409667}
- component: {fileID: 7293410218325161918}
- component: {fileID: 1800068506274812119}
m_Layer: 5
m_Name: line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2844460808957678779
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736849390346563381}
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: []
m_Father: {fileID: 4824128418226270383}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 228.64, y: 0}
m_SizeDelta: {x: 430, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6618502649577932062
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736849390346563381}
m_CullTransparentMesh: 0
--- !u!114 &464397955765409667
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736849390346563381}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 1
--- !u!114 &7293410218325161918
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736849390346563381}
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!114 &1800068506274812119
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736849390346563381}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: ce8ced78fa9fe2b478e391b6802f34b2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5964526303709957152
GameObject:
m_ObjectHideFlags: 0
@ -531,7 +646,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 4.58, y: -13.59}
m_AnchoredPosition: {x: 4.58, y: -13.589996}
m_SizeDelta: {x: 441.4, y: 2}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8829336512539161530
@ -728,12 +843,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7083815599514741720}
m_RootOrder: 4
m_Father: {fileID: 4824128418226270383}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 360, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 476.4, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &870666202989875779
@ -785,7 +900,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7157576216350909864}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -808,7 +923,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7157576216350909864}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -847,10 +962,10 @@ RectTransform:
m_Father: {fileID: 2175105752741210708}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: 0}
m_SizeDelta: {x: 400, y: 353}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 400, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6845780260907203575
CanvasRenderer:
@ -1081,7 +1196,7 @@ RectTransform:
m_Children:
- {fileID: 7776147267272310759}
m_Father: {fileID: 4824128418226270383}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -1306,7 +1421,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.2
m_Text:
m_Text: 11111111111111111111111111
LanguageIndex: 0
--- !u!1 &7562022872577451307
GameObject:
@ -1441,7 +1556,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 300, y: -42.3}
m_AnchoredPosition: {x: 300, y: -42.299988}
m_SizeDelta: {x: 265.96, y: 54.44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7773804748318421315
@ -1668,6 +1783,124 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u51A5\u754C\u5904\u5211\u4EBA"
LanguageIndex: 0
--- !u!1 &8524919174404237294
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7992648649537905317}
- component: {fileID: 1170074132256267591}
- component: {fileID: 7270814490766436914}
- component: {fileID: 3652410018319383736}
- component: {fileID: 2936409003327644606}
m_Layer: 5
m_Name: Text2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7992648649537905317
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8524919174404237294}
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: []
m_Father: {fileID: 4824128418226270383}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 228.64, y: 0}
m_SizeDelta: {x: 476.4, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1170074132256267591
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8524919174404237294}
m_CullTransparentMesh: 0
--- !u!114 &7270814490766436914
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8524919174404237294}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6415094, g: 0.078133725, b: 0.069597736, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: ' New Text'
--- !u!114 &3652410018319383736
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8524919174404237294}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 1
--- !u!114 &2936409003327644606
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8524919174404237294}
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 &8866575903447892443
GameObject:
m_ObjectHideFlags: 0
@ -1783,7 +2016,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 530, y: -42.3}
m_AnchoredPosition: {x: 530, y: -42.299988}
m_SizeDelta: {x: 91, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8043241130779036553

View File

@ -29842,7 +29842,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 241.52, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 100.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222314792653266900
@ -57545,8 +57545,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -116, y: 1159}
m_SizeDelta: {x: 100, y: 446}
m_AnchoredPosition: {x: -116, y: 1174.1}
m_SizeDelta: {x: 100, y: 501.1}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &6706216607764804969
MonoBehaviour:
@ -58713,7 +58713,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1761062799490895474
RectTransform:
m_ObjectHideFlags: 0
@ -58730,9 +58730,9 @@ RectTransform:
m_Father: {fileID: 7086677512586395648}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -235.15}
m_SizeDelta: {x: 151.3, y: 159.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8440567242530909706
@ -58801,7 +58801,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 7
m_Spacing: 0
m_Spacing: 30
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0

View File

@ -368,8 +368,14 @@ end
function HandBookRoleInfoLayout:SkillInfo()
self.skillGrid2:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1
local skillList = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(heroConFigData.Id,curStar)
local skillList2 = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(heroConFigData.Id,12)
local skillList = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(heroConFigData.Id,heroConFigData.MaxRank)
local skillList2
local maxStar=heroConFigData.MaxRank
if maxStar>9 then
skillList2 = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(heroConFigData.Id,10)
else
end
for i = 1, self.skillGrid2.transform.childCount do
self.skillGrid2.transform:GetChild(i-1).gameObject:SetActive(false)
end
@ -387,12 +393,18 @@ function HandBookRoleInfoLayout:SkillInfo()
Util.SetGray(go,skillList[i].isOpen)
if skillList[i].isOpen then
LogError("skillList[i].needStar=="..skillList[i].needStar)
sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁"
if skillList[i].needStar==14 then
sText.text="飞升3解锁"
else
sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁"
end
end
local pro=Util.GetGameObject(go.transform,"pro")
local proText=Util.GetGameObject(go.transform,"pro/Text"):GetComponent("Text")
if skillList[i].skillConfig.Skilltips and skillList[i].skillConfig.Skilltips~=0 then
pro:SetActive(true)
LogError("skillList[i].skillConfig.Skilltips="..skillList[i].skillConfig.Skilltips)
proText.text=SkillProType[skillList[i].skillConfig.Skilltips]
else
pro:SetActive(false)
@ -407,11 +419,24 @@ function HandBookRoleInfoLayout:SkillInfo()
local skillData = {}
skillData.skillConfig = skillList[i].skillConfig
local nextData=nil
if curStar<11 and i>2 then
nextData=skillList2[i]
end
-- if curStar<11 and i>2 then
-- nextData=skillList2[i]
-- end
local maxLv= HeroManager.GetHeroSkillMaxLevel(heroConFigData.Id,skillData.skillConfig.Type)
local panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i,nextData)
--local panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i,nextData)
if skillList2 and skillList2[i] then
nextData=skillList2[i]
nextData.isOpen=skillList2[i].isOpen
nextData.needStar=skillList2[i].needStar
--飞升技能
if i==6 then
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
else
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,nextData,1,10,maxLv,i,skillData)
end
else
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
end
self.skillGrid2:GetComponent("Canvas").sortingOrder = panel.sortingOrder + 1
triggerCallBack = function (panelType, p)
if panelType == UIName.SkillInfoPopup and panel == p then --监听到SkillInfoPopup关闭把层级设回去

View File

@ -2467,11 +2467,16 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas(sid, star)
return allSkillDatas
end
function this.GetCurHeroSidAndCurStarAllSkillDatas2(sid, star)
function this.GetCurHeroSidAndCurStarAllSkillDatas2(sid, star,star2)
local allSkillDatas = {}
local skillIndex = 1
local aaa=star
if star2 then
aaa=star2
end
LogError("aaa=="..aaa)
local curHeroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, sid)
local heroRankUp = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",star)
local heroRankUp = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",aaa)
if curHeroConfig.OpenSkillRules then
for i = 1, #curHeroConfig.OpenSkillRules do
if curHeroConfig.OpenSkillRules[i][1] == star then
@ -2495,7 +2500,7 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas2(sid, star)
local index=OpenPassiveSkillRules[i][2]
heroSkill.skillConfig = passiveSkillConfig[heroSkill.skillId]
if heroSkill.skillConfig and heroSkill.skillConfig.Icon and heroSkill.skillConfig.Icon~=0 then
if heroRankUpConfig[index].OpenStar>star then
if heroRankUpConfig[index].OpenStar>aaa then
heroSkill.isOpen=true
else
heroSkill.isOpen=false

View File

@ -2,7 +2,7 @@
require("Modules/RoleInfo/RoleInfoPanel")
SkillInfoPopup = Inherit(BasePanel)
local this = SkillInfoPopup
local nextCfg
--初始化组件(用于子类重写)
function this:InitComponent()
this.spLoader = SpriteLoader.New()
@ -20,7 +20,9 @@ function this:InitComponent()
this.desList[i].go = Util.GetGameObject(this.desGrid, "des"..i)
this.desList[i].des = Util.GetGameObject(this.desList[i].go, "Text"):GetComponent("Text")
end
this.hintTxt=Util.GetGameObject(self.transform,"Content/Text"):GetComponent("Text")
this.hintTxt=Util.GetGameObject(self.transform,"Content/desGrid/Text"):GetComponent("Text")
this.hintTxt2=Util.GetGameObject(self.transform,"Content/desGrid/Text2"):GetComponent("Text")
this.line=Util.GetGameObject(self.transform,"Content/desGrid/line")
this.rect=Util.GetGameObject(self.transform,"Content"):GetComponent("RectTransform")
end
@ -92,20 +94,43 @@ function this:OnOpen(...)
this.desList[i].go.gameObject:SetActive(false)
end
this.desList[1].go.gameObject:SetActive(true)
local des1
if isFaBao then
this.desList[1].des.text = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv)..isFaBao
des1 = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv)..isFaBao
else
this.desList[1].des.text = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv)
des1 = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv)
end
if curSkillData.isOpen then
if curSkillData.needStar==14 then
--this.hintTxt.text=" ".."飞升3解锁"
des1="<color=red>".."飞升3解锁".."</color>".."\n"..des1
else
--this.hintTxt.text=" "..
des1="<color=red>"..NumToSimplenessFont[curSkillData.needStar].."星解锁\n".."</color>"..des1
end
--des1=""
end
this.desList[1].des.text=des1
if nextCfg then
this.desList[2].go.gameObject:SetActive(true)
this.hintTxt2.gameObject:SetActive(false)
this.line:SetActive(true)
this.hintTxt2.text=" ".."11星解锁"
this.desList[2].des.text = "觉醒后效果:\n"..GetCurrSkillConfigDesc(nextCfg.skillConfig,soulLv)
else
this.hintTxt2.gameObject:SetActive(false)
this.line:SetActive(false)
end
if curSkillData.isOpen then
--LogError("skillList[i].needStar=="..skillList[i].needStar)
this.hintTxt.gameObject:SetActive(true)
this.hintTxt.text=" "..NumToSimplenessFont[curSkillData.needStar].."星解锁"
this.hintTxt.gameObject:SetActive(false)
if curSkillData.needStar==14 then
this.hintTxt.text=" ".."飞升3解锁"
else
this.hintTxt.text=" "..NumToSimplenessFont[curSkillData.needStar].."星解锁"
end
else
this.hintTxt.gameObject:SetActive(false)
end

View File

@ -347,8 +347,15 @@ end
function this.SkillInfo()
this.skillGrid2:GetComponent("Canvas").sortingOrder = this.sortingOrder + 1
local skillList = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(curHeroData.heroConfig.Id,curHeroData.star)
local skillList2 = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(curHeroData.heroConfig.Id,12)
local maxStar=curHeroData.heroConfig.MaxRank
local skillList = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(curHeroData.heroConfig.Id,maxStar,curHeroData.star)
local skillList2
if maxStar>9 then
skillList2 = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(curHeroData.heroConfig.Id,10,curHeroData.star)
else
end
for i = 1, this.skillGrid2.transform.childCount do
this.skillGrid2.transform:GetChild(i-1).gameObject:SetActive(false)
end
@ -365,8 +372,11 @@ function this.SkillInfo()
sText.fontSize = GetCurLanguage() ~= 2 and 30 or 25
Util.SetGray(go,skillList[i].isOpen)
if skillList[i].isOpen then
LogError("skillList[i].needStar=="..skillList[i].needStar)
sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁"
if skillList[i].needStar==14 then
sText.text="飞升3解锁"
else
sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁"
end
end
local pro=Util.GetGameObject(go.transform,"pro")
local proText=Util.GetGameObject(go.transform,"pro/Text"):GetComponent("Text")
@ -388,11 +398,24 @@ function this.SkillInfo()
skillData.isOpen=skillList[i].isOpen
skillData.needStar=skillList[i].needStar
local nextData=nil
if curHeroData.star<11 and i>2 then
nextData=skillList2[i]
end
-- if curHeroData.star<11 and i>2 then
-- nextData=skillList2[i]
-- end
local maxLv= HeroManager.GetHeroSkillMaxLevel(curHeroData.heroConfig.Id,skillData.skillConfig.Type)
local panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i,nextData)
if skillList2 and skillList2[i] then
nextData=skillList2[i]
nextData.isOpen=skillList2[i].isOpen
nextData.needStar=skillList2[i].needStar
--飞升技能
if i==6 then
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
else
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,nextData,1,10,maxLv,i,skillData)
end
else
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
end
--local panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i,nextData)
this.skillGrid2:GetComponent("Canvas").sortingOrder = panel.sortingOrder + 1
triggerCallBack = function (panelType, p)
if panelType == UIName.SkillInfoPopup and panel == p then --监听到SkillInfoPopup关闭把层级设回去

View File

@ -545,7 +545,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
--self.heroStage.sprite = self.spLoader:LoadSprite(HeroStageSprite[heroConfigData.HeroStage])
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(heroConfigData.ReadingName),5)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id,star)
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id,heroConfigData.MaxRank)
end)
local did = _reward[5] or nil
local starType = 1