diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 3b1d5cb539..3c211ea844 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -5420,7 +5420,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Material: {fileID: 2100000, guid: 42263669b8cc5c04a96720be44775913, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -32980,7 +32980,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1234173661531444072 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab b/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab index f619554a6c..05a31e2bf3 100644 --- a/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab @@ -5421,7 +5421,7 @@ PrefabInstance: - target: {fileID: 2190909609007774115, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -8 objectReference: {fileID: 0} - target: {fileID: 2190909609007774115, guid: b3059016602827b498a9d22dcc4876c0, type: 3} diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 7314dc5561..12edbfcf65 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -205232,6 +205232,111 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224359105046491170} m_Modifications: + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -13 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 3228300391096871728, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} propertyPath: m_Name @@ -205387,111 +205492,6 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 8944061103535072730} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} --- !u!4 &9048018877149632029 stripped diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index e61fc01899..c16ea004de 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -513,7 +513,7 @@ function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer) long2:SetActive(false) bg1:SetActive(false) bg2:SetActive(false) - if _star<=11 then + if _star<=13 then bg1:SetActive(true) else bg2:SetActive(true) @@ -523,7 +523,6 @@ function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer) local img=Util.GetGameObject(par,"flyImg") if img==nil then if _star<=11 then - LogError("aaaaaaaaaa") return end img = poolManager:LoadAsset("FlyUpImg", PoolManager.AssetType.GameObject) @@ -532,18 +531,15 @@ function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer) img.transform.localScale = Vector3.one img:GetComponent("RectTransform").sizeDelta = Vector2.New(126,110) img.transform.localPosition = Vector3.New(95,180,0) - else img:SetActive(false) end if _star<=11 then img:SetActive(false) - LogError("11111111111111") return end img=img:GetComponent("Image") img.gameObject:SetActive(true) - LogError("222222222222") if _star==12 then img.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_kapai1") elseif _star==13 then @@ -1090,7 +1086,7 @@ function GetQuantityImageByquality(quality,star) return "r_characterbg_goden" elseif star >= 6 and star <=10 then return "r_characterbg_gules" - elseif star >= 10 then + elseif star == 11 then return "t_tongyong_topkaung" else return "r_characterbg_lanjin" @@ -1360,7 +1356,10 @@ function GetHeroPosStr(_i) end --根据角色定位Id 获取角色定位图 -function GetHeroQualityStr(_i) +function GetHeroQualityStr(_i,star) + if star and star>11 then + return "r_hero_pinzhi_shenhua" + end if _i==1 then return "r_hero_pinzhi_putong" elseif _i==2 then @@ -1376,6 +1375,7 @@ function GetHeroQualityStr(_i) elseif _i==7 then return "r_hero_pinzhi_shenhua" end + end --根据角色职业Id 获取角色职业图标 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index d91078de2d..e71bb72627 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -258,7 +258,7 @@ function this.FreshTeam() this.myBaby[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) this.myBaby[hero.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon) this.myBaby[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) - SetHeroFlyEffect(this.myBaby[hero.position].hero,this.spLoader,heroData.star,orginLayer+1,0.95) + SetHeroFlyEffect(this.myBaby[hero.position].hero,this.spLoader,heroData.star,orginLayer+1,0.9) end end function this.SetNotJionInfo() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index e1050fcd35..e7ee192bba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -10670,6 +10670,9 @@ local passivityList = { if skill and not skill.isTriggerJudge and judge==1 then return end + if skill.type~=BattleSkillType.Special then + return + end local arr=RoleManager.Query(function(v) return v.camp~=role.camp end) if arr==nil or #arr==0 then return diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua index dffba2de6e..1fb4b1bfc0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua @@ -181,7 +181,11 @@ function this.SetCardSingleData(o,monsterId, _pos) pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) local star,starType = GetStarOrGodSoulLv(1,monsterId) if starType == 3 then - fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006") + if monsterId.star>11 then + fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_lanjin02") + else + fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006") + end end SetCardStars(starGrid,star,starType) Util.SetParticleSortLayer(starGrid, sortingOrder + 1) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index dedce72056..08cfc29232 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -110,7 +110,7 @@ function this:InitComponent() this.scroll = Util.GetGameObject(this.gameObject, "Scroll") this.scrollBar = Util.GetGameObject(this.gameObject, "Scrollbar"):GetComponent("Scrollbar") this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scroll.transform, - this.heroPre, this.scrollBar, Vector2.New(1010, 490), 1, 5, Vector2.New(40, 30)) + this.heroPre, this.scrollBar, Vector2.New(1010, 490), 1, 5, Vector2.New(40, 35)) this.scrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, 0) this.scrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) this.scrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5) @@ -559,7 +559,11 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) local star,starType = heroData.GetStar() if starType == 3 then - fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006") + if heroData.star>11 then + fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_lanjin02") + else + fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006") + end end SetCardStars(starGrid,star,starType) if heroData.star > 9 then diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua index 0379102f7b..e0c22eb164 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua @@ -117,6 +117,14 @@ function this:ShowSingleData(go,heroData,index) end local star,starType = heroData.GetStar(1) SetHeroStars(self.spLoader, starGrid, star,starType) + SetHeroFlyEffect(Util.GetGameObject(go, "GameObject"),self.spLoader,heroData.star,sortingOrder + 1,1,3,0,true) + local meshs1=starGrid:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(meshs1:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="UI Particles/Additive" then + mat.material.shader=poolManager:LoadAsset("UI-Particle-Add_1",poolManager.AssetType.Other) + end + end Util.SetParticleSortLayer(starGrid,sortingOrder + 1) Util.AddOnceClick(go, function() for i = 1, #self.maskList do diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua index aac018f226..896ddba90f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua @@ -48,7 +48,7 @@ function this:InitComponent(gameObject,Golds,DemonCrystals,stage) local scrollParent = Util.GetGameObject(gameObject, "HarmonyPanel/scroll"):GetComponent("RectTransform").rect this.NumText = Util.GetGameObject(gameObject,"HarmonyPanel/itemNumText"):GetComponent("Text") this.ScrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,Util.GetGameObject(gameObject,"HarmonyPanel/scroll").transform, - this.item,this.scrollbar,Vector2.New(-scrollParent.x*2,-scrollParent.y*2),1,5,Vector2.New(42,15)) + this.item,this.scrollbar,Vector2.New(-scrollParent.x*2,-scrollParent.y*2),1,5,Vector2.New(42,35)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 1 @@ -265,7 +265,7 @@ function this.SingleItemDataShow(clone,Itemdata) local starGrid = Util.GetGameObject(clone.transform, "GameObject/star") local star,starType = Itemdata.GetStar(1) SetHeroStars(this.spLoader, starGrid, star,starType,nil,nil,Vector2.New(0,1)) - local effect=SetHeroFlyEffect(Util.GetGameObject(clone.transform, "GameObject"),this.spLoader,Itemdata.star,this.sortingOrder+1,1,4,20) + local effect=SetHeroFlyEffect(Util.GetGameObject(clone.transform, "GameObject"),this.spLoader,Itemdata.star,this.sortingOrder+1,1,3,20) if effect then local particles=effect:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) for key, value in pairs(particles:ToTable()) do diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index d935bbc888..680d996b2d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2430,11 +2430,9 @@ function this.GetCurHeroSkillDatasAndEquip(sid, star) if curHeroConfig.EquipTalismana then local heroSkill = {} local equip=curHeroConfig.EquipTalismana[2] - LogError("equip=="..equip) local equipConfig=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",equip,"Level",25) if equipConfig then heroSkill.skillId = equipConfig.OpenSkillRules[1] - LogError("equipConfig.OpenSkillRules[1]=="..equipConfig.OpenSkillRules[1]) heroSkill.skillConfig = passiveSkillConfig[heroSkill.skillId] allSkillDatas[skillIndex] = heroSkill skillIndex = skillIndex + 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua index 9d7a37d382..ca6a40a1d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua @@ -368,7 +368,7 @@ function SingleRecruitPanel:UpdataPanelData(_heroData) this.info:SetActive(heroStaticData.Star == 5 or heroStaticData.Star == 4) this.infoBodyGo:SetActive(heroStaticData.Star == 5) this.infoTitle.text=GetLanguageStrById(heroStaticData.HeroLocationDesc1) - this.posQuality.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(heroStaticData.Natural)) + this.posQuality.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(heroStaticData.Natural,heroStaticData.star)) if heroStaticData.Star == 5 then local t={} local upStarSkillDataList={} --数据容器 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 0d392dfc88..c411145b9a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -747,7 +747,7 @@ function this:UpdateHeroInfoData() ------------------------------------------ this.heroName.text = curHeroData.name this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName)) - this.posQuality.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(curHeroData.heroConfig.Natural)) + this.posQuality.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(curHeroData.heroConfig.Natural,curHeroData.star)) this.unlockImage:SetActive(curHeroData.lockState == 0) this.lockImage:SetActive(curHeroData.lockState == 1) --魂印