[神将信息展示]======神将信息修改
After Width: | Height: | Size: 11 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2dc6aec9282ace0459b92a476cb9bd3b
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 2d7e710ac748ba94197b913850a52240
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: PopupAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
@ -111,6 +111,7 @@ RectTransform:
|
|||
- {fileID: 3798081996635404178}
|
||||
- {fileID: 7776034894660127337}
|
||||
- {fileID: 4824128418226270383}
|
||||
- {fileID: 5567616429014450993}
|
||||
m_Father: {fileID: 7775692205861864899}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -696,6 +697,124 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &7157576216350909864
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5567616429014450993}
|
||||
- component: {fileID: 870666202989875779}
|
||||
- component: {fileID: 2243690394106898648}
|
||||
- component: {fileID: 4309986729963937643}
|
||||
- component: {fileID: 8972427927366657161}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5567616429014450993
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7157576216350909864}
|
||||
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: 7083815599514741720}
|
||||
m_RootOrder: 4
|
||||
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_SizeDelta: {x: 476.4, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &870666202989875779
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7157576216350909864}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2243690394106898648
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7157576216350909864}
|
||||
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 &4309986729963937643
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7157576216350909864}
|
||||
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 &8972427927366657161
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7157576216350909864}
|
||||
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 &7226676909508098725
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -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: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 241.52, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 100.75}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222314792653266900
|
||||
|
@ -54352,8 +54352,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -116.80005, y: -306.9004}
|
||||
m_SizeDelta: {x: 198.7, y: 183.8}
|
||||
m_AnchoredPosition: {x: -103.00006, y: -286}
|
||||
m_SizeDelta: {x: 136, y: 136}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6900503861996968449
|
||||
CanvasRenderer:
|
||||
|
@ -54639,7 +54639,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -116.79999, y: -175}
|
||||
m_AnchoredPosition: {x: -103, y: -132}
|
||||
m_SizeDelta: {x: 178.57, y: 178.57}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7345339821710159408
|
||||
|
@ -55737,8 +55737,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -116.80005, y: -436.46973}
|
||||
m_SizeDelta: {x: 133.01, y: 129.07}
|
||||
m_AnchoredPosition: {x: -103.00006, y: -431}
|
||||
m_SizeDelta: {x: 136, y: 136}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2420754012896772010
|
||||
CanvasRenderer:
|
||||
|
@ -57604,10 +57604,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1663310713537604196}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -6.550003, y: 5.599991}
|
||||
m_SizeDelta: {x: 14.389999, y: 4.25}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -63, y: 63}
|
||||
m_SizeDelta: {x: 130, y: 130}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &3127605417484264563
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -2188,6 +2188,7 @@ SkillType={
|
|||
Pu = 1 ,--普技
|
||||
Jue = 2 ,--绝技
|
||||
Bei = 3 ,--被动技
|
||||
Fei = 4, --飞升被动
|
||||
}
|
||||
SkillTypeStr={
|
||||
[1] = Language[12083] ,--普技
|
||||
|
@ -2725,6 +2726,7 @@ EquipTreasureTypeStr = {
|
|||
{"r_hero_pu_zh",
|
||||
"r_hero_jue_zh",
|
||||
"r_hero_bei_zh",
|
||||
"r_hero_fei_zh",
|
||||
"r_hero_jineng_fahong", --法宝 4
|
||||
"r_hero_jineng_tianjin", --天赋角标 9
|
||||
"r_hero_jineng_tianhong", --天赋角标 10
|
||||
|
|
|
@ -585,18 +585,13 @@ function GetPassiveByMaxStar2(heroConfig,list,star)
|
|||
for i = 1,#list do
|
||||
local id=list[i][2]
|
||||
if id<=heroRankUp.Id then
|
||||
--table.insert(aaa,list[i])
|
||||
-- if skillList[id] then
|
||||
-- skillList[id]=
|
||||
-- else
|
||||
|
||||
-- end
|
||||
skillList[id]=list[i]
|
||||
table.insert(aaa,list[i])
|
||||
--skillList[id]=list[i]
|
||||
end
|
||||
end
|
||||
for key, value in pairs(skillList) do
|
||||
table.insert(aaa,value)
|
||||
end
|
||||
-- for key, value in pairs(skillList) do
|
||||
-- table.insert(aaa,value)
|
||||
-- end
|
||||
end
|
||||
return aaa
|
||||
end
|
||||
|
@ -1439,13 +1434,15 @@ end
|
|||
|
||||
--获取技能类型 data 当前技能数据
|
||||
function GetSkillType(data)
|
||||
local SkillIconType={"r_hero_pu_zh","r_hero_jue_zh","r_hero_bei_zh"}
|
||||
local SkillIconType={"r_hero_pu_zh","r_hero_jue_zh","r_hero_bei_zh","r_hero_fei_zh"}
|
||||
if data.skillConfig.Type == SkillType.Pu then
|
||||
return SkillIconType[SkillType.Pu]--普技
|
||||
elseif data.skillConfig.Type == SkillType.Jue then
|
||||
return SkillIconType[SkillType.Jue]--绝技
|
||||
elseif data.skillConfig.Type == SkillType.Bei then
|
||||
return SkillIconType[SkillType.Bei]--被动技
|
||||
elseif data.skillConfig.Type == SkillType.Fei then
|
||||
return SkillIconType[SkillType.Fei]--被动技
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -301,8 +301,8 @@ function this:UpdateHeroInfoData()
|
|||
end
|
||||
|
||||
--天赋
|
||||
self.talentBtn:SetActive(false)
|
||||
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
|
||||
self.talentBtn: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)
|
||||
|
|
|
@ -36,6 +36,7 @@ function HandBookRoleInfoLayout:InitComponent()
|
|||
self.allProButton=Util.GetGameObject(self.gameObject,"allProButton")
|
||||
|
||||
self.skillGrid=Util.GetGameObject(self.gameObject,"skill")
|
||||
self.skillGrid2=Util.GetGameObject(self.gameObject,"skill2")
|
||||
self.line1=Util.GetGameObject(self.skillGrid,"line1")
|
||||
self.line2=Util.GetGameObject(self.skillGrid,"line2")
|
||||
self.line3=Util.GetGameObject(self.gameObject,"skillBtns/line3")
|
||||
|
@ -65,7 +66,7 @@ function HandBookRoleInfoLayout:BindEvent()
|
|||
|
||||
|
||||
end
|
||||
|
||||
local curStar
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function HandBookRoleInfoLayout:OnShow(sortingOrder,parent,_heroConFigData,_curStar)
|
||||
self.gameObject:SetActive(true)
|
||||
|
@ -76,6 +77,7 @@ function HandBookRoleInfoLayout:SetData(sortingOrder,parent,_heroConFigData,_cur
|
|||
orginLayer=self.sortingOrder+2
|
||||
self.btnsLayer.sortingOrder=orginLayer
|
||||
heroConFigData = _heroConFigData
|
||||
curStar=_curStar
|
||||
if _curStar and _curStar > 5 then
|
||||
self:OnShowHeroData(2,_curStar,_lv)
|
||||
else
|
||||
|
@ -292,6 +294,7 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv)
|
|||
Util.AddClick(self.posBtn, function()
|
||||
UIManager.OpenPanel(UIName.RolePosInfoPopup,heroConFigData,star)
|
||||
end)
|
||||
self:SkillInfo()
|
||||
end
|
||||
|
||||
function HandBookRoleInfoLayout:SetBtnsLayer()
|
||||
|
@ -363,6 +366,69 @@ function HandBookRoleInfoLayout:OnHide()
|
|||
self.gameObject:SetActive(false)
|
||||
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)
|
||||
for i = 1, self.skillGrid2.transform.childCount do
|
||||
self.skillGrid2.transform:GetChild(i-1).gameObject:SetActive(false)
|
||||
end
|
||||
for i = 1, #skillList do
|
||||
if skillList[i] and skillList[i].skillConfig and GetLanguageStrById(skillList[i].skillConfig.Name) then
|
||||
local go = self.skillGrid2.transform:GetChild(i-1).gameObject
|
||||
go:SetActive(true)
|
||||
Util.GetGameObject(go.transform,"s"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(skillList[i].skillConfig.Icon))
|
||||
|
||||
local typeImg=Util.GetGameObject(go.transform,"SkillTypeImage")
|
||||
typeImg:GetComponent("Image").sprite=this.spLoader:LoadSprite(GetSkillType(skillList[i]))
|
||||
local sText = Util.GetGameObject(go.transform,"s/Text"):GetComponent("Text")
|
||||
sText.text=GetLanguageStrById(skillList[i].skillConfig.Name)
|
||||
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].."星解锁"
|
||||
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)
|
||||
proText.text=SkillProType[skillList[i].skillConfig.Skilltips]
|
||||
else
|
||||
pro:SetActive(false)
|
||||
end
|
||||
|
||||
Util.AddOnceClick(Util.GetGameObject(go.transform,"s"), function()
|
||||
if Game.GlobalEvent:HasEvent(GameEvent.UI.OnClose, triggerCallBack) then
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack)
|
||||
end
|
||||
self.selsectSkillImage:SetActive(true)
|
||||
self.selsectSkillImage.transform.position=Util.GetGameObject(go.transform,"s").transform.position
|
||||
local skillData = {}
|
||||
skillData.skillConfig = skillList[i].skillConfig
|
||||
local nextData=nil
|
||||
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)
|
||||
self.skillGrid2:GetComponent("Canvas").sortingOrder = panel.sortingOrder + 1
|
||||
triggerCallBack = function (panelType, p)
|
||||
if panelType == UIName.SkillInfoPopup and panel == p then --监听到SkillInfoPopup关闭,把层级设回去
|
||||
self.skillGrid2: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)
|
||||
end)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function HandBookRoleInfoLayout:OnClose()
|
||||
|
||||
|
|
|
@ -2471,6 +2471,7 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas2(sid, star)
|
|||
local allSkillDatas = {}
|
||||
local skillIndex = 1
|
||||
local curHeroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, sid)
|
||||
local heroRankUp = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",star)
|
||||
if curHeroConfig.OpenSkillRules then
|
||||
for i = 1, #curHeroConfig.OpenSkillRules do
|
||||
if curHeroConfig.OpenSkillRules[i][1] == star then
|
||||
|
@ -2488,7 +2489,7 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas2(sid, star)
|
|||
if OpenPassiveSkillRules then
|
||||
local list={}
|
||||
for i = 1, #OpenPassiveSkillRules do
|
||||
if OpenPassiveSkillRules[i][1] <= star then
|
||||
if OpenPassiveSkillRules[i][1] <=heroRankUp.Id then
|
||||
local heroSkill = {}
|
||||
heroSkill.skillId = OpenPassiveSkillRules[i][3]
|
||||
local index=OpenPassiveSkillRules[i][2]
|
||||
|
|
|
@ -75,7 +75,8 @@ function RewardItemSingleShowPopup:BindEvent()
|
|||
if rg.ShowItem then
|
||||
local id = rg.ShowItem[1][1]
|
||||
if itemConfigData.ItemType == ItemType.HeroDebris then
|
||||
local star = itemConfig[id].Quantity
|
||||
local hero = ConfigManager.GetConfigData(ConfigName.HeroConfig, id)
|
||||
local star =hero.MaxRank
|
||||
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, id, star)
|
||||
elseif itemConfigData.ItemType == ItemType.LingShouChip then
|
||||
UIManager.OpenPanel(UIName.PokemonGetInfoPopup, false,id)
|
||||
|
|
|
@ -151,10 +151,13 @@ function RoleGetInfoPopup:OnOpen(...)
|
|||
heroSId=data[2]
|
||||
heroStar=data[3]
|
||||
end
|
||||
|
||||
end
|
||||
function RoleGetInfoPopup:OnShow()
|
||||
allSkillDatas = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(heroSId,10)
|
||||
allSkillDatas = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(heroSId,heroStar)
|
||||
local heroSData=ConfigManager.GetConfigData(ConfigName.HeroConfig, heroSId)
|
||||
--heroStar=heroSData.MaxRank
|
||||
|
||||
if isGet then
|
||||
this.GetShowPanelData()
|
||||
--天赋
|
||||
|
@ -165,15 +168,15 @@ function RoleGetInfoPopup:OnShow()
|
|||
else
|
||||
this.NoGetShowPanelData()
|
||||
end
|
||||
|
||||
LogError("breakid=="..breakId.." upstarid=="..upStarId)
|
||||
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
|
||||
this.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage)
|
||||
local OpenPassiveSkillRules = heroStar == HeroManager.awakeNextStarIndex and heroSData.Awaken or heroSData.OpenPassiveSkillRules
|
||||
local OpenPassiveSkillRules = heroStar >= HeroManager.awakeNextStarIndex and heroSData.Awaken or heroSData.OpenPassiveSkillRules
|
||||
if OpenPassiveSkillRules then
|
||||
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroSData,breakId,upStarId)
|
||||
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
||||
end
|
||||
|
||||
|
||||
--技能 布局变动
|
||||
self.skillLine.gameObject:SetActive(not (heroSData.OpenPassiveSkillRules == nil and heroSData.EquipTalismana==nil))
|
||||
if heroSData.OpenPassiveSkillRules == nil and heroSData.EquipTalismana==nil then
|
||||
|
@ -190,13 +193,19 @@ function RoleGetInfoPopup:OnShow()
|
|||
this.selsectSkillImage:SetActive(false)
|
||||
this.skillGrid:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1
|
||||
local triggerCallBack
|
||||
local skillList = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(heroSData.Id,10)
|
||||
local skillList = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(heroSData.Id,heroStar)
|
||||
local skillList2=nil
|
||||
local isAwake=false
|
||||
if heroStar>11 then
|
||||
isAwake=true
|
||||
skillList2 = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(heroSData.Id,10)
|
||||
else
|
||||
|
||||
end
|
||||
for i = 1, this.skillGrid.transform.childCount do
|
||||
this.skillGrid.transform:GetChild(i-1).gameObject:SetActive(false)
|
||||
end
|
||||
LogError("skill len=="..#skillList)
|
||||
local passList=GetPassiveByMaxStar(heroSData,heroSData.OpenPassiveSkillRules)
|
||||
LogError("pass len=="..#passList)
|
||||
|
||||
for i = 1, #skillList do
|
||||
if skillList[i] and skillList[i].skillConfig and GetLanguageStrById(skillList[i].skillConfig.Name) then
|
||||
local go = this.skillGrid.transform:GetChild(i-1).gameObject
|
||||
|
@ -215,7 +224,19 @@ function RoleGetInfoPopup:OnShow()
|
|||
local skillData = {}
|
||||
skillData.skillConfig = skillList[i].skillConfig
|
||||
local maxLv= HeroManager.GetHeroSkillMaxLevel(heroSData.Id,skillData.skillConfig.Type)
|
||||
local panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
|
||||
local nextData
|
||||
local panel
|
||||
if skillList2 then
|
||||
nextData=skillList2[i]
|
||||
--飞升技能
|
||||
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
|
||||
this.skillGrid:GetComponent("Canvas").sortingOrder = panel.sortingOrder + 1
|
||||
triggerCallBack = function (panelType, p)
|
||||
if panelType == UIName.SkillInfoPopup and panel == p then --监听到SkillInfoPopup关闭,把层级设回去
|
||||
|
|
|
@ -20,7 +20,7 @@ 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.rect=Util.GetGameObject(self.transform,"Content"):GetComponent("RectTransform")
|
||||
end
|
||||
|
||||
|
@ -78,13 +78,14 @@ function this:OnOpen(...)
|
|||
--获取RoleInfoPanel的curUpStarData,以获取妖灵师最高等级
|
||||
this.skillTypeText.gameObject:SetActive(false)
|
||||
this.skillTypeImage.enabled = true
|
||||
if curSkillData.skillConfig.Type == SkillType.Pu then
|
||||
this.skillTypeImage.sprite=this.spLoader:LoadSprite(SkillIconType[SkillType.Pu])--普技
|
||||
elseif curSkillData.skillConfig.Type == SkillType.Jue then
|
||||
this.skillTypeImage.sprite=this.spLoader:LoadSprite(SkillIconType[SkillType.Jue])--绝技
|
||||
elseif curSkillData.skillConfig.Type == SkillType.Bei then
|
||||
this.skillTypeImage.sprite=this.spLoader:LoadSprite(SkillIconType[SkillType.Bei])--被动技
|
||||
end
|
||||
-- if curSkillData.skillConfig.Type == SkillType.Pu then
|
||||
-- this.skillTypeImage.sprite=this.spLoader:LoadSprite(SkillIconType[SkillType.Pu])--普技
|
||||
-- elseif curSkillData.skillConfig.Type == SkillType.Jue then
|
||||
-- this.skillTypeImage.sprite=this.spLoader:LoadSprite(SkillIconType[SkillType.Jue])--绝技
|
||||
-- elseif curSkillData.skillConfig.Type == SkillType.Bei then
|
||||
-- this.skillTypeImage.sprite=this.spLoader:LoadSprite(SkillIconType[SkillType.Bei])--被动技
|
||||
-- end
|
||||
this.skillTypeImage.sprite=this.spLoader:LoadSprite(GetSkillType(curSkillData))
|
||||
-- this.cureffect.transform:DOAnchorPosY(0,0,true)
|
||||
-- this.cureffect.text = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv)
|
||||
for i = 1,#this.desList do
|
||||
|
@ -100,6 +101,14 @@ function this:OnOpen(...)
|
|||
this.desList[2].go.gameObject:SetActive(true)
|
||||
this.desList[2].des.text = "觉醒后效果:\n"..GetCurrSkillConfigDesc(nextCfg.skillConfig,soulLv)
|
||||
end
|
||||
|
||||
if curSkillData.isOpen then
|
||||
--LogError("skillList[i].needStar=="..skillList[i].needStar)
|
||||
this.hintTxt.gameObject:SetActive(true)
|
||||
this.hintTxt.text=" "..NumToSimplenessFont[curSkillData.needStar].."星解锁"
|
||||
else
|
||||
this.hintTxt.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
|
|
|
@ -385,6 +385,8 @@ function this.SkillInfo()
|
|||
this.selsectSkillImage.transform.position=Util.GetGameObject(go.transform,"icon").transform.position
|
||||
local skillData = {}
|
||||
skillData.skillConfig = skillList[i].skillConfig
|
||||
skillData.isOpen=skillList[i].isOpen
|
||||
skillData.needStar=skillList[i].needStar
|
||||
local nextData=nil
|
||||
if curHeroData.star<11 and i>2 then
|
||||
nextData=skillList2[i]
|
||||
|
@ -496,6 +498,7 @@ function this.GetSkillsData()
|
|||
|
||||
local OpenPassiveSkillRules = curHeroData.star >= HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
|
||||
OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules)
|
||||
LogError("breakid=="..curHeroData.breakId.." upstarid=="..curHeroData.upStarId)
|
||||
if OpenPassiveSkillRules then
|
||||
local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
|
||||
-- LogError("#OpenPassiveSkillRules=="..#OpenPassiveSkillRules.." compoundNum=="..compoundNum)
|
||||
|
|
|
@ -866,6 +866,7 @@ function this:UpdateHeroInfoData()
|
|||
tianfuIcon = "r_tongyong_tianfu_icon" --10星
|
||||
end
|
||||
this.tianfuClick:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_tianfu_zh")
|
||||
LogError("breakid=="..curHeroData.breakId.." upstarid=="..curHeroData.upStarId)
|
||||
if OpenPassiveSkillRules then
|
||||
this.tianfuBtn:SetActive(true)
|
||||
local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
|
||||
|
|