图鉴修改
parent
2349eb93f3
commit
8d6569aacb
|
|
@ -34,12 +34,12 @@ RectTransform:
|
|||
- {fileID: 3649706050840085221}
|
||||
- {fileID: 610766482}
|
||||
- {fileID: 3442617186202683567}
|
||||
m_Father: {fileID: 164915241442772717}
|
||||
m_RootOrder: 18
|
||||
m_Father: {fileID: 8871814417429221674}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 409.1, y: -128}
|
||||
m_AnchoredPosition: {x: -0.5, y: -1}
|
||||
m_SizeDelta: {x: 132, y: 127}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &483723575
|
||||
|
|
@ -253,7 +253,7 @@ RectTransform:
|
|||
- {fileID: 2107326077}
|
||||
- {fileID: 7286868055397123877}
|
||||
m_Father: {fileID: 164915241442772717}
|
||||
m_RootOrder: 19
|
||||
m_RootOrder: 18
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -705,7 +705,6 @@ RectTransform:
|
|||
- {fileID: 1973877883734817856}
|
||||
- {fileID: 165381528669676981}
|
||||
- {fileID: 8871814417429221674}
|
||||
- {fileID: 483723571}
|
||||
- {fileID: 760389082}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
|
|
@ -2276,7 +2275,8 @@ RectTransform:
|
|||
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_Children:
|
||||
- {fileID: 483723571}
|
||||
m_Father: {fileID: 164915241442772717}
|
||||
m_RootOrder: 17
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
|||
|
|
@ -64,6 +64,8 @@ MonoBehaviour:
|
|||
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: 36e05fe912e1e9e47aef85f30fd11d93, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -133,7 +135,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 820.8, y: 974}
|
||||
m_SizeDelta: {x: 820.8, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &757349028289488434
|
||||
MonoBehaviour:
|
||||
|
|
@ -165,6 +167,8 @@ MonoBehaviour:
|
|||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &8383661275855795730
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -223,6 +227,8 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &451901376184482249
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -310,6 +316,8 @@ MonoBehaviour:
|
|||
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: ec6d625cd2380cd4ca6e3f6c069f6879, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -488,6 +496,8 @@ MonoBehaviour:
|
|||
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: 32
|
||||
|
|
@ -568,6 +578,8 @@ MonoBehaviour:
|
|||
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: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -678,6 +690,8 @@ MonoBehaviour:
|
|||
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: 45
|
||||
|
|
@ -780,6 +794,8 @@ MonoBehaviour:
|
|||
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: 58c503111f310224a9a04ab39a004308, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -825,7 +841,7 @@ MonoBehaviour:
|
|||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildControlHeight: 1
|
||||
--- !u!1 &4778057793701767630
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -975,6 +991,8 @@ MonoBehaviour:
|
|||
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: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -1170,6 +1188,8 @@ MonoBehaviour:
|
|||
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: 32
|
||||
|
|
@ -1337,6 +1357,8 @@ MonoBehaviour:
|
|||
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: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -1386,6 +1408,8 @@ MonoBehaviour:
|
|||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &9186487489877675353
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1450,6 +1474,8 @@ MonoBehaviour:
|
|||
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: 36e05fe912e1e9e47aef85f30fd11d93, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
|
|||
|
|
@ -85,9 +85,9 @@ function HandBookHeroInfoPanel:InitComponent()
|
|||
|
||||
self.talismanBtn=Util.GetGameObject(self.gameObject,"TalismanBtn")
|
||||
self.talismanIcon=Util.GetGameObject(self.gameObject,"TalismanBtn/Icon"):GetComponent("Image")
|
||||
|
||||
self.talentBtn=Util.GetGameObject(self.gameObject,"talentBtn")
|
||||
self.talentProgress=Util.GetGameObject(self.gameObject,"talentBtn/progress"):GetComponent("Text")
|
||||
self.talentObj=Util.GetGameObject(self.gameObject,"talentBtnBg")
|
||||
self.talentBtn=Util.GetGameObject(self.gameObject,"talentBtnBg/talentBtn")
|
||||
self.talentProgress=Util.GetGameObject(self.gameObject,"talentBtnBg/talentBtn/progress"):GetComponent("Text")
|
||||
self.pizhiImg=Util.GetGameObject(self.gameObject,"pizhiImg"):GetComponent("Image")
|
||||
end
|
||||
|
||||
|
|
@ -315,14 +315,19 @@ function this:UpdateHeroInfoData()
|
|||
end
|
||||
|
||||
--天赋
|
||||
self.talentBtn:SetActive(true)
|
||||
self.talentObj:SetActive(true)
|
||||
local talentBtnImage ="r_hero_tianfu_zh" -- heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
|
||||
self.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage)
|
||||
local OpenPassiveSkillRules = heroStar >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules
|
||||
OpenPassiveSkillRules=GetPassiveByMaxStar(heroConFigData,OpenPassiveSkillRules)
|
||||
if OpenPassiveSkillRules then
|
||||
LogError("#OpenPassiveSkillRules=================="..#OpenPassiveSkillRules)
|
||||
if OpenPassiveSkillRules and #OpenPassiveSkillRules>0 then
|
||||
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId)
|
||||
self.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
||||
|
||||
self.talentObj:SetActive(true)
|
||||
else
|
||||
self.talentObj:SetActive(false)
|
||||
end
|
||||
Util.AddOnceClick(self.talentBtn,function()
|
||||
if heroStar==11 then
|
||||
|
|
|
|||
Loading…
Reference in New Issue