【觉醒】bug
parent
adf9c87ac2
commit
0ca5e4ea13
Binary file not shown.
Before Width: | Height: | Size: 23 KiB |
|
@ -1,110 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: aea010ebd79bbf94f8d1ccf401e5b0e0
|
|
||||||
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: 0
|
|
||||||
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: 65
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 1
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
- serializedVersion: 2
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: 4
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 1
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 26459023ba04f844f88f012ed194f410
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
spritePackingTag: RoleInfoAtlas
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
pSDShowRemoveMatteOption: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
|
@ -134,14 +134,17 @@ end
|
||||||
function RoleGetInfoPopup:OnShow()
|
function RoleGetInfoPopup:OnShow()
|
||||||
allSkillDatas = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas(heroSId,heroStar)
|
allSkillDatas = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas(heroSId,heroStar)
|
||||||
local heroSData=ConfigManager.GetConfigData(ConfigName.HeroConfig, heroSId)
|
local heroSData=ConfigManager.GetConfigData(ConfigName.HeroConfig, heroSId)
|
||||||
|
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2" or "r_hero_tianfu1"
|
||||||
|
this.talentBtn:GetComponent("Image").sprite = Util.LoadSprite(talentBtnImage)
|
||||||
|
local OpenPassiveSkillRules = heroStar == HeroManager.awakeNextStarIndex and heroSData.Awaken or heroSData.OpenPassiveSkillRules
|
||||||
|
if OpenPassiveSkillRules then
|
||||||
|
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroSData,0,0)
|
||||||
|
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
||||||
|
end
|
||||||
if isGet then
|
if isGet then
|
||||||
this.GetShowPanelData()
|
this.GetShowPanelData()
|
||||||
--天赋
|
--天赋
|
||||||
this.talentBtn:SetActive(heroSData.OpenPassiveSkillRules ~= nil)
|
this.talentBtn:SetActive(heroSData.OpenPassiveSkillRules ~= nil)
|
||||||
if heroSData.OpenPassiveSkillRules then
|
|
||||||
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroSData,0,0)
|
|
||||||
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#heroSData.OpenPassiveSkillRules - compoundNum
|
|
||||||
end
|
|
||||||
Util.AddOnceClick(this.talentBtn,function()
|
Util.AddOnceClick(this.talentBtn,function()
|
||||||
UIManager.OpenPanel(UIName.RoleTalentPopup,heroSData,0,0)
|
UIManager.OpenPanel(UIName.RoleTalentPopup,heroSData,0,0)
|
||||||
end)
|
end)
|
||||||
|
@ -368,10 +371,6 @@ function this.CalculateHeroAllProValList(heroConFigData,_starNum,isCalculateStar
|
||||||
Util.AddOnceClick(this.talentBtn,function()
|
Util.AddOnceClick(this.talentBtn,function()
|
||||||
UIManager.OpenPanel(UIName.RoleTalentPopup,heroConFigData,breakId,upStarId)
|
UIManager.OpenPanel(UIName.RoleTalentPopup,heroConFigData,breakId,upStarId)
|
||||||
end)
|
end)
|
||||||
if heroConFigData.OpenPassiveSkillRules then
|
|
||||||
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId)
|
|
||||||
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#heroConFigData.OpenPassiveSkillRules - compoundNum
|
|
||||||
end
|
|
||||||
return allAddProVal
|
return allAddProVal
|
||||||
end
|
end
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
|
|
|
@ -224,9 +224,12 @@ function this.RoleInfo0()
|
||||||
this.radar.color = Color.New(238 / 255, 211 / 255, 156 / 255, 102 / 255)
|
this.radar.color = Color.New(238 / 255, 211 / 255, 156 / 255, 102 / 255)
|
||||||
--天赋
|
--天赋
|
||||||
this.talentBtn:SetActive(curHeroData.heroConfig.OpenPassiveSkillRules ~= nil)
|
this.talentBtn:SetActive(curHeroData.heroConfig.OpenPassiveSkillRules ~= nil)
|
||||||
if curHeroData.heroConfig.OpenPassiveSkillRules then
|
local talentBtnImage = curHeroData.star == HeroManager.awakeNextStarIndex and "r_hero_tianfu2" or "r_hero_tianfu1"
|
||||||
|
this.talentBtn:GetComponent("Image").sprite = Util.LoadSprite(talentBtnImage)
|
||||||
|
local OpenPassiveSkillRules = curHeroData.star == HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
|
||||||
|
if OpenPassiveSkillRules then
|
||||||
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
|
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
|
||||||
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#curHeroData.heroConfig.OpenPassiveSkillRules - compoundNum
|
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
||||||
end
|
end
|
||||||
--法宝
|
--法宝
|
||||||
this.TalismanInfo()
|
this.TalismanInfo()
|
||||||
|
|
|
@ -545,7 +545,7 @@ function this:UpdateHeroInfoData()
|
||||||
end
|
end
|
||||||
--天赋
|
--天赋
|
||||||
this.talentBtn:SetActive(curHeroData.heroConfig.OpenPassiveSkillRules ~= nil)
|
this.talentBtn:SetActive(curHeroData.heroConfig.OpenPassiveSkillRules ~= nil)
|
||||||
local talentBtnImage = curHeroData.star == HeroManager.awakeNextStarIndex and "r_hero_tianfu1" or "r_hero_tianfu2"
|
local talentBtnImage = curHeroData.star == HeroManager.awakeNextStarIndex and "r_hero_tianfu2" or "r_hero_tianfu1"
|
||||||
this.talentBtn:GetComponent("Image").sprite = Util.LoadSprite(talentBtnImage)
|
this.talentBtn:GetComponent("Image").sprite = Util.LoadSprite(talentBtnImage)
|
||||||
local OpenPassiveSkillRules = curHeroData.star == HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
|
local OpenPassiveSkillRules = curHeroData.star == HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
|
||||||
if OpenPassiveSkillRules then
|
if OpenPassiveSkillRules then
|
||||||
|
|
Loading…
Reference in New Issue