神将情报修改提交
parent
8377e33b31
commit
981aba2417
Binary file not shown.
|
After Width: | Height: | Size: 7.4 KiB |
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 12b518f244a46aa47be669ddda3f22bb
|
||||||
|
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: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- 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
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 25ff60cec96318b418f2eb70b99a19ec
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: HeroAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 8.3 KiB |
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bb87d74a17056ae41aa3742c1263dd3a
|
||||||
|
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: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- 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
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 20d26a812af53f944be92dca1f0226af
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: HeroAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -3177,7 +3177,7 @@ RectTransform:
|
||||||
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: 0.00000095367}
|
m_AnchoredPosition: {x: 0, y: 0.00000095367}
|
||||||
m_SizeDelta: {x: 127, y: 127}
|
m_SizeDelta: {x: 110, y: 110}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2731153773792852711
|
--- !u!222 &2731153773792852711
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -6247,7 +6247,7 @@ RectTransform:
|
||||||
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: 0.00000095367}
|
m_AnchoredPosition: {x: 0, y: 0.00000095367}
|
||||||
m_SizeDelta: {x: 127, y: 127}
|
m_SizeDelta: {x: 110, y: 110}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3572788638532369534
|
--- !u!222 &3572788638532369534
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ function this:OnOpen(...)
|
||||||
local maxLv=1--args[4]
|
local maxLv=1--args[4]
|
||||||
local skilltype =args[5]
|
local skilltype =args[5]
|
||||||
local soulLv=args[7]
|
local soulLv=args[7]
|
||||||
local nextCfg = args[8]
|
local isFaBao = args[8]
|
||||||
if openType == 1 then
|
if openType == 1 then
|
||||||
this.content.anchoredPosition = Vector2.New(0, 0)
|
this.content.anchoredPosition = Vector2.New(0, 0)
|
||||||
elseif openType == 2 then
|
elseif openType == 2 then
|
||||||
|
|
@ -92,11 +92,15 @@ function this:OnOpen(...)
|
||||||
this.desList[i].go.gameObject:SetActive(false)
|
this.desList[i].go.gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
this.desList[1].go.gameObject:SetActive(true)
|
this.desList[1].go.gameObject:SetActive(true)
|
||||||
this.desList[1].des.text = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv)
|
if isFaBao then
|
||||||
if nextCfg then
|
this.desList[1].des.text = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv)..isFaBao
|
||||||
this.desList[2].go.gameObject:SetActive(true)
|
else
|
||||||
this.desList[2].des.text = "觉醒后效果:\n"..GetCurrSkillConfigDesc(nextCfg.skillConfig,soulLv)
|
this.desList[1].des.text = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv)
|
||||||
end
|
end
|
||||||
|
-- if nextCfg then
|
||||||
|
-- this.desList[2].go.gameObject:SetActive(true)
|
||||||
|
-- this.desList[2].des.text = "觉醒后效果:\n"..GetCurrSkillConfigDesc(nextCfg.skillConfig,soulLv)
|
||||||
|
-- end
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
|
|
|
||||||
|
|
@ -508,6 +508,7 @@ function this.UpdateHeroUpStarProUpSkillShowOld(skillGridGO,skillTabs,passiveSki
|
||||||
this.skillList[i].frame.gameObject:SetActive(true)
|
this.skillList[i].frame.gameObject:SetActive(true)
|
||||||
end
|
end
|
||||||
this.skillList[i].pos.sprite=this.spLoader:LoadSprite(SkillIconType[this.skillData[i].skillConfig.Type])--被动技
|
this.skillList[i].pos.sprite=this.spLoader:LoadSprite(SkillIconType[this.skillData[i].skillConfig.Type])--被动技
|
||||||
|
this.skillList[i].pos:SetNativeSize()
|
||||||
if this.skillData[i].skillConfig.Skilltips and this.skillData[i].skillConfig.Skilltips > 0 then
|
if this.skillData[i].skillConfig.Skilltips and this.skillData[i].skillConfig.Skilltips > 0 then
|
||||||
if this.skillData[i].skillConfig.Skilltips == 6 then
|
if this.skillData[i].skillConfig.Skilltips == 6 then
|
||||||
this.skillList[i].pro.sprite=this.spLoader:LoadSprite("r_hero_lvdi")--被动技
|
this.skillList[i].pro.sprite=this.spLoader:LoadSprite("r_hero_lvdi")--被动技
|
||||||
|
|
@ -515,6 +516,7 @@ function this.UpdateHeroUpStarProUpSkillShowOld(skillGridGO,skillTabs,passiveSki
|
||||||
this.skillList[i].pro.sprite=this.spLoader:LoadSprite("r_hero_hongdi")--被动技
|
this.skillList[i].pro.sprite=this.spLoader:LoadSprite("r_hero_hongdi")--被动技
|
||||||
end
|
end
|
||||||
this.skillList[i].pro.gameObject:SetActive(true)
|
this.skillList[i].pro.gameObject:SetActive(true)
|
||||||
|
this.skillList[i].pro:SetNativeSize()
|
||||||
this.skillList[i].proText.text=SkillProType[this.skillData[i].skillConfig.Skilltips]
|
this.skillList[i].proText.text=SkillProType[this.skillData[i].skillConfig.Skilltips]
|
||||||
else
|
else
|
||||||
this.skillList[i].pro.gameObject:SetActive(false)
|
this.skillList[i].pro.gameObject:SetActive(false)
|
||||||
|
|
@ -574,6 +576,7 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills
|
||||||
this.skillList[i].frame.gameObject:SetActive(true)
|
this.skillList[i].frame.gameObject:SetActive(true)
|
||||||
end
|
end
|
||||||
this.skillList[i].pos.sprite=this.spLoader:LoadSprite(SkillIconType[this.skillData[i].Type])--被动技
|
this.skillList[i].pos.sprite=this.spLoader:LoadSprite(SkillIconType[this.skillData[i].Type])--被动技
|
||||||
|
this.skillList[i].pos:SetNativeSize()
|
||||||
if this.skillData[i].Skilltips and this.skillData[i].Skilltips > 0 then
|
if this.skillData[i].Skilltips and this.skillData[i].Skilltips > 0 then
|
||||||
if this.skillData[i].Skilltips == 6 then
|
if this.skillData[i].Skilltips == 6 then
|
||||||
this.skillList[i].pro.sprite=this.spLoader:LoadSprite("r_hero_lvdi")--被动技
|
this.skillList[i].pro.sprite=this.spLoader:LoadSprite("r_hero_lvdi")--被动技
|
||||||
|
|
@ -603,8 +606,12 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills
|
||||||
this.SetSelectSkillImage(this.skillList[i].icon.gameObject)
|
this.SetSelectSkillImage(this.skillList[i].icon.gameObject)
|
||||||
if this.skillData[i].Type < 5 then
|
if this.skillData[i].Type < 5 then
|
||||||
local maxLv= HeroManager.GetHeroSkillMaxLevel(curHeroData.heroConfig.Id,this.skillData[i].Type)
|
local maxLv= HeroManager.GetHeroSkillMaxLevel(curHeroData.heroConfig.Id,this.skillData[i].Type)
|
||||||
this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId))
|
if this.skillData[i].Type == 4 and this.skillData[i].state == 0 then
|
||||||
this.skillGridCanvas.sortingOrder = this.skillPanel.sortingOrder + 1
|
this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId),"\n<color=#FF0000>(法宝25级解锁)</color>")
|
||||||
|
else
|
||||||
|
this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId))
|
||||||
|
end
|
||||||
|
this.skillGridCanvas.sortingOrder = this.skillPanel.sortingOrder + 1
|
||||||
else
|
else
|
||||||
if this.skillPanel then
|
if this.skillPanel then
|
||||||
UIManager.ClosePanel(UIName.SkillInfoPopup)
|
UIManager.ClosePanel(UIName.SkillInfoPopup)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue