From 981aba24172778d26799ea81d92ccc4ac85bb4f6 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 14 Jan 2022 11:26:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E5=B0=86=E6=83=85=E6=8A=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/HeroAtlas/r_hero_jineng_fahong.png | Bin 0 -> 7626 bytes .../HeroAtlas/r_hero_jineng_fahong.png.meta | 110 ++++++++++++++++++ .../Atlas/HeroAtlas/r_hero_jineng_fajin.png | Bin 0 -> 8537 bytes .../HeroAtlas/r_hero_jineng_fajin.png.meta | 110 ++++++++++++++++++ .../Prefabs/UI/RoleInfo/RoleInfoLayout.prefab | 4 +- .../~Lua/Modules/Popup/SkillInfoPopup.lua | 14 ++- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 11 +- 7 files changed, 240 insertions(+), 9 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fahong.png create mode 100644 Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fahong.png.meta create mode 100644 Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fajin.png create mode 100644 Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fajin.png.meta diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fahong.png b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fahong.png new file mode 100644 index 0000000000000000000000000000000000000000..75a0d757d382e98333574f6f970edbfaf4b0b50b GIT binary patch literal 7626 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fahong.png.meta b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fahong.png.meta new file mode 100644 index 0000000000..16b8026683 --- /dev/null +++ b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fahong.png.meta @@ -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: diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fajin.png b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_fajin.png new file mode 100644 index 0000000000000000000000000000000000000000..d5d95cd286d88d2c3da8ab0a40a2ce8aa37ce5ba GIT binary patch literal 8537 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 0 then if this.skillData[i].skillConfig.Skilltips == 6 then 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")--被动技 end this.skillList[i].pro.gameObject:SetActive(true) + this.skillList[i].pro:SetNativeSize() this.skillList[i].proText.text=SkillProType[this.skillData[i].skillConfig.Skilltips] else this.skillList[i].pro.gameObject:SetActive(false) @@ -574,6 +576,7 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills this.skillList[i].frame.gameObject:SetActive(true) end 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 == 6 then 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) if this.skillData[i].Type < 5 then 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)) - this.skillGridCanvas.sortingOrder = this.skillPanel.sortingOrder + 1 + if this.skillData[i].Type == 4 and this.skillData[i].state == 0 then + this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId),"\n(法宝25级解锁)") + 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 if this.skillPanel then UIManager.ClosePanel(UIName.SkillInfoPopup)