Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2022-01-14 19:14:04 +08:00
commit 9f5addf443
6 changed files with 1861 additions and 564 deletions

View File

@ -626,7 +626,7 @@ RectTransform:
- {fileID: 4126197808121152527} - {fileID: 4126197808121152527}
- {fileID: 2338646928782581046} - {fileID: 2338646928782581046}
- {fileID: 5299528613146693474} - {fileID: 5299528613146693474}
- {fileID: 2913791122365382009} - {fileID: 7531203555981472525}
- {fileID: 5757746324695005508} - {fileID: 5757746324695005508}
- {fileID: 458271444932364388} - {fileID: 458271444932364388}
- {fileID: 3260307931949129323} - {fileID: 3260307931949129323}
@ -1093,80 +1093,6 @@ MonoBehaviour:
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
--- !u!1 &487430414648990448
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1956582454896893773}
- component: {fileID: 3647314878640057488}
- component: {fileID: 1405756206126575999}
m_Layer: 5
m_Name: posImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1956582454896893773
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 487430414648990448}
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: 2913791122365382009}
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: 0, y: 127.5}
m_SizeDelta: {x: 62, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3647314878640057488
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 487430414648990448}
m_CullTransparentMesh: 0
--- !u!114 &1405756206126575999
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 487430414648990448}
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: 0
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: 83432f17b727aa740aa065d3a17c5484, 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 &488706421313352623 --- !u!1 &488706421313352623
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1201,9 +1127,9 @@ RectTransform:
m_Father: {fileID: 458271444932364388} m_Father: {fileID: 458271444932364388}
m_RootOrder: 0 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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 60.5, y: -60.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 121, y: 121} m_SizeDelta: {x: 121, y: 121}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8004742619526726022 --- !u!222 &8004742619526726022
@ -1745,7 +1671,7 @@ RectTransform:
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: 6, y: 307} m_AnchoredPosition: {x: 6, y: -783}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1975961723663747274 --- !u!222 &1975961723663747274
@ -1814,7 +1740,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.4117647} m_Color: {r: 1, g: 1, b: 1, a: 0.72156864}
m_RaycastTarget: 0 m_RaycastTarget: 0
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
@ -2314,17 +2240,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2648744741846724642} m_GameObject: {fileID: 2648744741846724642}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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: 2913791122365382009} m_Father: {fileID: 164915241442772717}
m_RootOrder: 3 m_RootOrder: 11
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: 0, y: -223.1} m_AnchoredPosition: {x: -408, y: 632}
m_SizeDelta: {x: 44, y: 78} m_SizeDelta: {x: 156, y: 422}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6359757417219209894 --- !u!222 &6359757417219209894
CanvasRenderer: CanvasRenderer:
@ -2458,84 +2384,6 @@ MonoBehaviour:
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u5929\u7F5A" m_Text: "\u5929\u7F5A"
LanguageIndex: 0 LanguageIndex: 0
--- !u!1 &3307556153244026145
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2913791122365382009}
- component: {fileID: 874222423629139252}
- component: {fileID: 2896363578790891051}
m_Layer: 5
m_Name: pos
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2913791122365382009
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3307556153244026145}
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: 1956582454896893773}
- {fileID: 260420168377369215}
- {fileID: 2218525686091326255}
- {fileID: 7531203555981472525}
m_Father: {fileID: 164915241442772717}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 91, y: -219.90002}
m_SizeDelta: {x: 76, y: 317}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &874222423629139252
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3307556153244026145}
m_CullTransparentMesh: 0
--- !u!114 &2896363578790891051
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3307556153244026145}
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: 0
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: 160f9d20d35bf3c47937e17cd7060d09, 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 &3325061291961311195 --- !u!1 &3325061291961311195
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2580,160 +2428,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3325061291961311195} m_GameObject: {fileID: 3325061291961311195}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &3763748343114761602
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2218525686091326255}
- component: {fileID: 2087227656840821367}
- component: {fileID: 1985437995846659539}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2218525686091326255
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3763748343114761602}
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: 2913791122365382009}
m_RootOrder: 2
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: 0, y: -245.1}
m_SizeDelta: {x: 48, y: 176}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2087227656840821367
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3763748343114761602}
m_CullTransparentMesh: 0
--- !u!114 &1985437995846659539
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3763748343114761602}
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: e1054332255e28e44afe693ae13dee47, 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 &3831220815321076678
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 260420168377369215}
- component: {fileID: 8997818386439090239}
- component: {fileID: 249716340935257}
m_Layer: 5
m_Name: posText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &260420168377369215
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3831220815321076678}
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: 2913791122365382009}
m_RootOrder: 1
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: 0, y: -12.275}
m_SizeDelta: {x: 46.01, y: 217.55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8997818386439090239
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3831220815321076678}
m_CullTransparentMesh: 0
--- !u!114 &249716340935257
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3831220815321076678}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.90196085, g: 0.7803922, b: 0.49803925, a: 1}
m_RaycastTarget: 0
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: 38
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u707C\u70E7\u961F\u8F85\u52A9"
LanguageIndex: 0
--- !u!1 &4126197808121152524 --- !u!1 &4126197808121152524
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3898,7 +3592,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 594.1} m_SizeDelta: {x: 0, y: 571.6}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!222 &7242359267838046273 --- !u!222 &7242359267838046273
CanvasRenderer: CanvasRenderer:

View File

@ -1110,6 +1110,24 @@ function GetHeroPosBgStr(_i)
end end
end end
function GetTianFuIcon(star)
local aaa="r_tongyong_feisheng_icon"
if star==14 then
aaa="r_tongyong_feisheng_icon3"
elseif star==13 then
aaa="r_tongyong_feisheng_icon2"
elseif star==12 then
aaa="r_tongyong_feisheng_icon1"
elseif star==11 then
aaa="r_tongyong_tianfu_icon"
end
return aaa
end
--根据角色定位Id 获取角色定位图 --根据角色定位Id 获取角色定位图
function GetHeroPosStr(_i) function GetHeroPosStr(_i)
if _i==1 then if _i==1 then

View File

@ -60,10 +60,6 @@ function HandBookHeroInfoPanel:InitComponent()
self.profession = Util.GetGameObject(self.transform, "info/nameAndPossLayout/proImage/proImage"):GetComponent("Image") self.profession = Util.GetGameObject(self.transform, "info/nameAndPossLayout/proImage/proImage"):GetComponent("Image")
--定位描述 --定位描述
self.posBgImage=Util.GetGameObject(self.transform,"pos"):GetComponent("Image")
self.posImage=Util.GetGameObject(self.transform,"pos/posImage"):GetComponent("Image")
self.posText=Util.GetGameObject(self.transform,"pos/posText"):GetComponent("Text")
self.layout=Util.GetGameObject(self.transform,"layout") self.layout=Util.GetGameObject(self.transform,"layout")
self.PageList = {} self.PageList = {}
@ -92,7 +88,7 @@ function HandBookHeroInfoPanel:InitComponent()
self.talentBtn=Util.GetGameObject(self.gameObject,"talentBtn") self.talentBtn=Util.GetGameObject(self.gameObject,"talentBtn")
self.talentProgress=Util.GetGameObject(self.gameObject,"talentBtn/progress"):GetComponent("Text") self.talentProgress=Util.GetGameObject(self.gameObject,"talentBtn/progress"):GetComponent("Text")
self.pizhiImg=Util.GetGameObject(self.gameObject,"pos/pizhiImg"):GetComponent("Image") self.pizhiImg=Util.GetGameObject(self.gameObject,"pizhiImg"):GetComponent("Image")
end end
--绑定事件(用于子类重写) --绑定事件(用于子类重写)
@ -256,12 +252,9 @@ function this:UpdateHeroInfoData()
this.heroName.text = GetLanguageStrById(heroConFigData.ReadingName) this.heroName.text = GetLanguageStrById(heroConFigData.ReadingName)
this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(heroConFigData.PropertyName)) this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(heroConFigData.PropertyName))
--定位描述相关 --定位描述相关
this.posBgImage.sprite=this.spLoader:LoadSprite(GetHeroPosBgStr(heroConFigData.Profession))
this.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(heroConFigData.Profession))
this.posText.text=GetLanguageStrById(heroConFigData.HeroLocation)
LogError("heroConFigData.natural=="..heroConFigData.Natural) LogError("heroConFigData.natural=="..heroConFigData.Natural)
self.pizhiImg.sprite=this.spLoader:LoadSprite(GetHeroNaturalImg(heroConFigData.Natural)) self.pizhiImg.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(heroConFigData.Natural))
SetTextVerTial(self.posText,Vector3.New(72,0,0)) self.pizhiImg:SetNativeSize()
if _CurPageIndex == RoleInfoPanelIndex.pifu then if _CurPageIndex == RoleInfoPanelIndex.pifu then
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id) local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id)
local HeoSkin = {} local HeoSkin = {}
@ -286,10 +279,11 @@ function this:UpdateHeroInfoData()
self:SetSelectBtn(_CurPageIndex) self:SetSelectBtn(_CurPageIndex)
self:OnPageTabChange(_CurPageIndex) self:OnPageTabChange(_CurPageIndex)
this.godSoulBtn.gameObject:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.shenhun) and heroConFigData.IsSoulOpen == 1 and heroStar > 10) this.godSoulBtn.gameObject:SetActive(false)
--角色定位按钮 --角色定位按钮
this.posBtn.gameObject:SetActive(heroConFigData.ShowHeroLocation==1) this.posBtn.gameObject:SetActive(heroConFigData.ShowHeroLocation==1)
self.talismanBtn.gameObject:SetActive(heroConFigData.EquipTalismana~=nil) this.posBtn.gameObject:SetActive(false)
self.talismanBtn.gameObject:SetActive(false)
if heroConFigData.EquipTalismana~=nil then if heroConFigData.EquipTalismana~=nil then
self.talismanIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(itemConfig[heroConFigData.EquipTalismana[2]].ResourceID)) self.talismanIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(itemConfig[heroConFigData.EquipTalismana[2]].ResourceID))
end end
@ -308,7 +302,7 @@ function this:UpdateHeroInfoData()
end end
--天赋 --天赋
self.talentBtn:SetActive(heroConFigData.OpenPassiveSkillRules ~= nil) self.talentBtn:SetActive(false)
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh" local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
self.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage) self.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage)
local OpenPassiveSkillRules = heroStar == HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules local OpenPassiveSkillRules = heroStar == HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules

View File

@ -34,11 +34,15 @@ function HandBookRoleInfoLayout:InitComponent()
self.magDef=Util.GetGameObject(self.gameObject,"pro/magDef/proValue"):GetComponent("Text") self.magDef=Util.GetGameObject(self.gameObject,"pro/magDef/proValue"):GetComponent("Text")
self.allProButton=Util.GetGameObject(self.gameObject,"allProButton") self.allProButton=Util.GetGameObject(self.gameObject,"allProButton")
self.skillGrid=Util.GetGameObject(self.gameObject,"Panel/Skill/skill") self.skillGrid=Util.GetGameObject(self.gameObject,"skill")
self.line1=Util.GetGameObject(self.skillGrid,"line1")
self.line2=Util.GetGameObject(self.skillGrid,"line2")
self.selsectSkillImage=Util.GetGameObject(self.gameObject,"selsectSkillImage") self.selsectSkillImage=Util.GetGameObject(self.gameObject,"selsectSkillImage")
self.posBtn= Util.GetGameObject(self.gameObject,"posBtn") self.posBtn= Util.GetGameObject(self.gameObject,"dingwei/posBtn")
self.posTxt=Util.GetGameObject(self.gameObject,"posText"):GetComponent("Text") self.posTxt=Util.GetGameObject(self.gameObject,"dingwei/posText"):GetComponent("Text")
self.lvTxt=Util.GetGameObject(self.gameObject,"lvTxt"):GetComponent("Text") self.lvTxt=Util.GetGameObject(self.gameObject,"lvObj/lvTxt"):GetComponent("Text")
self.proImg=Util.GetGameObject(self.gameObject,"posImage"):GetComponent("Image")
self.proTxt=Util.GetGameObject(self.gameObject,"posText2"):GetComponent("Text")
end end
@ -87,6 +91,7 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv)
lv=1 lv=1
end end
end end
--计算面板属性 --计算面板属性
allAddProVal=self:CalculateHeroAllProValList(_starType,star,lv) allAddProVal=self:CalculateHeroAllProValList(_starType,star,lv)
self.atkPro.text=allAddProVal[HeroProType.Attack] self.atkPro.text=allAddProVal[HeroProType.Attack]
@ -94,75 +99,144 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv)
self.phyDef.text=allAddProVal[HeroProType.PhysicalDefence] self.phyDef.text=allAddProVal[HeroProType.PhysicalDefence]
self.magDef.text=allAddProVal[HeroProType.MagicDefence] self.magDef.text=allAddProVal[HeroProType.MagicDefence]
self.lvTxt.text="等级:"..lv self.lvTxt.text= " "..lv
LogError("star=="..star.." lv=="..lv) LogError("star=="..star.." lv=="..lv)
self.posTxt.text=star >= HeroManager.awakeNextStarIndex and GetLanguageStrById(heroConFigData.HeroLocationDesc4) or GetLanguageStrById(heroConFigData.HeroLocationDesc1) self.posTxt.text=star >= HeroManager.awakeNextStarIndex and GetLanguageStrById(heroConFigData.HeroLocationDesc4) or GetLanguageStrById(heroConFigData.HeroLocationDesc1)
self.proImg.sprite=this.spLoader:LoadSprite(GetHeroPosStr(heroConFigData.Profession))
self.proTxt.text=GetLanguageStrById(heroConFigData.HeroLocation)
--技能点击特殊处理 --技能点击特殊处理
self.posTxt.gameObject:SetActive(heroConFigData.ShowHeroLocation==1)
self.posBtn.gameObject:SetActive(heroConFigData.ShowHeroLocation==1)
self.selsectSkillImage:SetActive(false) self.selsectSkillImage:SetActive(false)
self.skillGrid:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1 self.skillGrid:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1
local triggerCallBack local triggerCallBack
local skillList = HeroManager.GetCurHeroAllSkillDatas(heroConFigData.Id,star) local skillList = HeroManager.GetCurHeroSkillDatasAndEquip(heroConFigData.Id,star)
local awakeSkillList=HeroManager.GetCurHeroAllAwakeSkillDatas(heroConFigData.Id,star) --local awakeSkillList=HeroManager.GetCurHeroAllAwakeSkillDatas(heroConFigData.Id,star)
LogError("awake skill len=="..#awakeSkillList)
for i = 1, self.skillGrid.transform.childCount do for i = 1, self.skillGrid.transform.childCount do
self.skillGrid.transform:GetChild(i-1).gameObject:SetActive(false) self.skillGrid.transform:GetChild(i-1).gameObject:SetActive(false)
end end
LogError("skill len=="..#skillList) local len=#skillList
for i = 1, #skillList do local btnCount=len
if heroConFigData.OpenPassiveSkillRules then
btnCount=btnCount+1
local passObj=Util.GetGameObject(self.skillGrid,"sBg"..len+1)--self.skillGrid.transform:GetChild(len).gameObject
passObj:SetActive(true)
Util.GetGameObject(passObj,"s"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetTianFuIcon(star))
local aaa=5
if star>9 then
if star>=11 then
aaa=7
else
aaa=star-4
end
end
local bg=Util.GetGameObject(passObj,"Image"):GetComponent("Image")
if star>=11 then
bg.sprite=this.spLoader:LoadSprite("r_hero_jinengfeisheng")
else
bg.sprite=this.spLoader:LoadSprite("r_hero_jinengmoren")
end
Util.GetGameObject(passObj,"SkillTypeImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SkillIconType[aaa])
local OpenPassiveSkillRules = star >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId)
Util.GetGameObject(passObj,"Text"):GetComponent("Text").text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
Util.AddOnceClick(Util.GetGameObject(passObj,"s"),function()
if star==11 then
UIManager.OpenPanel(UIName.RoleAwakeTalentPopup,heroConFigData)
else
UIManager.OpenPanel(UIName.RoleTalentPopup,heroConFigData,breakId,upStarId)
end
end)
end
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.shenhun) and heroConFigData.IsSoulOpen == 1 and star > 10 then
btnCount=btnCount+1
local passObj=Util.GetGameObject(self.skillGrid,"sBg"..len+2)--self.skillGrid.transform:GetChild(len+1).gameObject
passObj:SetActive(true)
Util.GetGameObject(passObj,"s"):GetComponent("Image").sprite=this.spLoader:LoadSprite("r_tongyong_shenhun_icon")
Util.GetGameObject(passObj,"s/Text"):SetActive(false)
Util.GetGameObject(passObj,"SkillTypeImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SkillIconType[8])
Util.AddOnceClick(Util.GetGameObject(passObj,"s"),function()
UIManager.OpenPanel(UIName.RoleGodSoulLayout,heroConFigData,star)
end)
end
for i = 1, len do
--and GetLanguageStrById(skillList[i].skillConfig.Name) --and GetLanguageStrById(skillList[i].skillConfig.Name)
if skillList[i] and skillList[i].skillConfig then if skillList[i] and skillList[i].skillConfig then
local go = self.skillGrid.transform:GetChild(i-1).gameObject local go = Util.GetGameObject(self.skillGrid,"sBg"..i) --self.skillGrid.transform:GetChild(i-1).gameObject
go:SetActive(true) go:SetActive(true)
local line=Util.GetGameObject(go.transform,"line") local line=Util.GetGameObject(go.transform,"line")
line:SetActive(false) line:SetActive(false)
if #skillList>2 and i==2 then
line:SetActive(true)
end
if #skillList>5 and i==5 then
line:SetActive(true)
end
local bg=Util.GetGameObject(go.transform,"Image"):GetComponent("Image") local bg=Util.GetGameObject(go.transform,"Image"):GetComponent("Image")
if star>=11 then
bg.sprite=this.spLoader:LoadSprite("r_hero_jinengfeisheng")
else
bg.sprite=this.spLoader:LoadSprite("r_hero_jinengmoren")
end
Util.GetGameObject(go.transform,"s"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(skillList[i].skillConfig.Icon)) Util.GetGameObject(go.transform,"s"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(skillList[i].skillConfig.Icon))
if GetCurLanguage() ~= 0 and LengthString(GetLanguageStrById(skillList[i].skillConfig.Name)) > 10 then -- if GetCurLanguage() ~= 0 and LengthString(GetLanguageStrById(skillList[i].skillConfig.Name)) > 10 then
Util.GetGameObject(go.transform,"s/Text"):GetComponent("Text").text = SubString(GetLanguageStrById(skillList[i].skillConfig.Name),10).."..." -- Util.GetGameObject(go.transform,"s/Text"):GetComponent("Text").text = SubString(GetLanguageStrById(skillList[i].skillConfig.Name),10).."..."
-- else
-- Util.GetGameObject(go.transform,"s/Text"):GetComponent("Text").text=GetLanguageStrById(skillList[i].skillConfig.Name)--Language[10453].. 1(skillList[i].skillConfig.Id % 10)
-- end
Util.GetGameObject(go.transform,"s/Text"):SetActive(false)
local index=i
if index==3 then
Util.GetGameObject(go.transform,"SkillTypeImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SkillIconType[4])
else else
Util.GetGameObject(go.transform,"s/Text"):GetComponent("Text").text=GetLanguageStrById(skillList[i].skillConfig.Name)--Language[10453].. 1(skillList[i].skillConfig.Id % 10) Util.GetGameObject(go.transform,"SkillTypeImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetSkillType(skillList[i]))
end end
local di=Util.GetGameObject(go.transform,"pro"):GetComponent("Image")
Util.GetGameObject(go.transform,"SkillTypeImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetSkillType(skillList[i])) local diTxt=Util.GetGameObject(go.transform,"pro/Text"):GetComponent("Text")
Util.AddOnceClick(Util.GetGameObject(go.transform,"s"), function() if skillList[i].skillConfig.Skilltips and skillList[i].skillConfig.Skilltips > 0 then
if Game.GlobalEvent:HasEvent(GameEvent.UI.OnClose, triggerCallBack) then if skillList[i].skillConfig.Skilltips == 6 then
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack) di.sprite=this.spLoader:LoadSprite("r_hero_lvdi")--被动技
else
di.sprite=this.spLoader:LoadSprite("r_hero_hongdi")--被动技
end end
di.gameObject:SetActive(true)
di:SetNativeSize()
diTxt.text=SkillProType[skillList[i].skillConfig.Skilltips]
else
di.gameObject:SetActive(false)
end
Util.AddOnceClick(Util.GetGameObject(go.transform,"s"), function()
self.selsectSkillImage:SetActive(true) self.selsectSkillImage:SetActive(true)
self.selsectSkillImage.transform.position=Util.GetGameObject(go.transform,"s").transform.position self.selsectSkillImage.transform.position=Util.GetGameObject(go.transform,"s").transform.position
local skillData = {} local skillData = {}
skillData.skillConfig = skillList[i].skillConfig skillData.skillConfig = skillList[i].skillConfig
local maxLv= HeroManager.GetHeroSkillMaxLevel(heroConFigData.Id,skillData.skillConfig.Type) local maxLv= HeroManager.GetHeroSkillMaxLevel(heroConFigData.Id,skillData.skillConfig.Type)
local panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
if star==11 then if index<len then
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i,nil,star,awakeSkillList[i]) if Game.GlobalEvent:HasEvent(GameEvent.UI.OnClose, triggerCallBack) then
elseif star==13 then
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,awakeSkillList[i],1,10,maxLv,i,nil)
end
self.skillGrid:GetComponent("Canvas").sortingOrder = panel.sortingOrder + 1
triggerCallBack = function (panelType, p)
if panelType == UIName.SkillInfoPopup and panel == p then --监听到SkillInfoPopup关闭把层级设回去
self.skillGrid:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack) Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack)
self.selsectSkillImage:SetActive(false)
end end
local panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
self.skillGrid:GetComponent("Canvas").sortingOrder = panel.sortingOrder + 1
triggerCallBack = function (panelType, p)
if panelType == UIName.SkillInfoPopup and panel == p then --监听到SkillInfoPopup关闭把层级设回去
self.skillGrid:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack)
self.selsectSkillImage:SetActive(false)
end
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack)
else
UIManager.OpenPanel(UIName.TalismanInfoPopup,heroConFigData,1,1)
end end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack)
end) end)
end end
end end
Util.AddClick(this.posBtn, function() if btnCount>2 then
self.line1:SetActive(true)
else
self.line1:SetActive(false)
end
if btnCount>4 then
self.line2:SetActive(true)
else
self.line2:SetActive(false)
end
Util.AddClick(self.posBtn, function()
UIManager.OpenPanel(UIName.RolePosInfoPopup,heroConFigData,star) UIManager.OpenPanel(UIName.RolePosInfoPopup,heroConFigData,star)
end) end)
end end

View File

@ -2396,7 +2396,7 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas(sid, star)
end end
end end
end end
local OpenPassiveSkillRules = star == this.awakeNextStarIndex and curHeroConfig.Awaken or curHeroConfig.OpenPassiveSkillRules local OpenPassiveSkillRules = star >= this.awakeNextStarIndex and curHeroConfig.Awaken or curHeroConfig.OpenPassiveSkillRules
if OpenPassiveSkillRules then if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == star then if OpenPassiveSkillRules[i][1] == star then
@ -2411,6 +2411,40 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas(sid, star)
return allSkillDatas return allSkillDatas
end end
function this.GetCurHeroSkillDatasAndEquip(sid, star)
local allSkillDatas = {}
local skillIndex = 1
local curHeroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, sid)
if curHeroConfig.OpenSkillRules then
for i = 1, #curHeroConfig.OpenSkillRules do
if curHeroConfig.OpenSkillRules[i][1] == star then
local heroSkill = {}
heroSkill.skillId = curHeroConfig.OpenSkillRules[i][2]
heroSkill.skillConfig = skillConfig[heroSkill.skillId]
allSkillDatas[skillIndex] = heroSkill
skillIndex = skillIndex + 1
end
end
end
--法宝
if curHeroConfig.EquipTalismana then
local heroSkill = {}
local equip=curHeroConfig.EquipTalismana[2]
LogError("equip=="..equip)
local equipConfig=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",equip,"Level",25)
if equipConfig then
heroSkill.skillId = equipConfig.OpenSkillRules[1]
LogError("equipConfig.OpenSkillRules[1]=="..equipConfig.OpenSkillRules[1])
heroSkill.skillConfig = passiveSkillConfig[heroSkill.skillId]
allSkillDatas[skillIndex] = heroSkill
skillIndex = skillIndex + 1
end
end
return allSkillDatas
end
--获取当前技能信息 --获取当前技能信息
function this.GetCurHeroAllSkillDatas(sid, star) function this.GetCurHeroAllSkillDatas(sid, star)
local allSkillDatas = {} local allSkillDatas = {}