diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_shuxingdi.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_shuxingdi.png index 09630db44f..14b0c47c17 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_shuxingdi.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_shuxingdi.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_shuxingdi.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_shuxingdi.png.meta index 018f834568..d9501cd346 100644 --- a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_shuxingdi.png.meta +++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_shuxingdi.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f280bf2be48cca14f8e95a2f780d5d2b +guid: a113a92c6e7dbc44e853a51221e16ace TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -42,7 +42,7 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 0 + spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 @@ -58,6 +58,17 @@ TextureImporter: 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 @@ -80,35 +91,13 @@ TextureImporter: 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 - - 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: be096ada0f81f9242905d8a12fb5bb48 + spriteID: 5fb6380884bfe9a40a8d9e53cad05af4 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 5412a2b3d4..949923c97b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -275,6 +275,7 @@ function this.GetSkillsData() else heroSkill.state = 0 end + heroSkill.star = curHeroData.heroConfig.OpenSkillRules[i][1] heroSkill.quality = 0 heroSkill.skillType = 0 skillIdList[curHeroData.heroConfig.OpenSkillRules[i][2]] = curHeroData.heroConfig.OpenSkillRules[i][2] @@ -295,6 +296,7 @@ function this.GetSkillsData() else heroSkill.state = 0 end + heroSkill.star = curHeroData.heroConfig.OpenPassiveSkillRules[i][2] - 1 heroSkill.quality = 0 heroSkill.skillType = 1 skillIdList[curHeroData.heroConfig.OpenPassiveSkillRules[i][3]] = curHeroData.heroConfig.OpenPassiveSkillRules[i][3] @@ -321,6 +323,7 @@ function this.GetSkillsData() else heroSkill.state = 0 --是否置灰 end + heroSkill.star = 14 heroSkill.quality = 1 --决定技能的品质框 heroSkill.skillType = 0 --是否显示对比技能 table.insert(skillList, heroSkill) @@ -348,6 +351,7 @@ function this.GetAwakenSkill() else heroSkill.state = 0 end + heroSkill.star = curHeroData.heroConfig.OpenPassiveSkillRules[i][2] - 1 heroSkill.quality = 1 heroSkill.skillType = 0 starIdlist[curHeroData.heroConfig.Awaken[i][2]] = curHeroData.heroConfig.Awaken[i][2] @@ -396,8 +400,14 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills this.skillList[i].skillName.text= GetLanguageStrById(this.skillData[i].skillConfig.Name)--(curSkillData.skillId % 10) this.skillList[i].icon.sprite=this.spLoader:LoadSprite(GetResourcePath(this.skillData[i].skillConfig.Icon))--被动技 if this.skillData[i].state == 0 then + local str = this.skillData[i].star.."星" + if this.skillData[i].star > 11 then + str = "飞升"..NumToChinese(this.skillData[i].star - 11) + end + this.skillList[i].skillName.text = str.."解锁" Util.SetGray(this.skillList[i].go,true) else + Util.SetGray(this.skillList[i].go,false) end Util.AddOnceClick(this.skillList[i].icon.gameObject, function() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 0ee435f5f1..483d90d8d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -90,7 +90,6 @@ function RoleInfoPanel:InitComponent() this.reStarBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_huitui") this.powerBtn = Util.GetGameObject(this.roleInfoRoot, "powerBtn") this.force = Util.GetGameObject(this.powerBtn, "value"):GetComponent("Text") - this.powerBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-zhanli_zh") this.upLvEffect = Util.GetGameObject(this.powerBtn,"effect") this.equipBtn=Util.GetGameObject(self.transform,"rightGrid/equipBtn") this.equipBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_zhuanbeianniu_zh")