From 9fe5c809b885e5ccdb34a2f6c0a32c360f124d28 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 8 Nov 2021 10:20:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=81=B5=E5=85=BD=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=8F=8F=E8=BF=B0=E7=99=BD=E7=89=87=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 --- .../~Lua/Modules/Setting/SettingPlayerRide.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua index dbef38fccf..98f6def045 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua @@ -253,13 +253,13 @@ function this.SingleRideClickShowInfo(data,go) this.skillList[i].icon.sprite = this.spLoader:LoadSprite(GetResourcePath(data.Icon[i])) Util.AddOnceClick(this.skillList[i].btn,function() this.skillDes.gameObject:SetActive(true) - local data = {} - data.icon = GetResourcePath(data.Icon[i]) + local data1 = {} + data1.icon = GetResourcePath(data.Icon[i]) local strs = string.split(data.SkillEffect,"|") local strDes = string.split(strs[i],"#") - data.title = strDes[1] - data.des = strDes[2] - this.SetSkillDes(data) + data1.title = strDes[1] + data1.des = strDes[2] + this.SetSkillDes(data1) end) end end From e8433d10261985117712dfb3b3d41901839cd081 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 8 Nov 2021 10:30:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=8E=89=E8=99=9A=E8=AE=BA=E9=81=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=A5=9E=E9=AD=82=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E7=A5=9E=E5=B0=86=E7=95=8C=E9=9D=A2=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 --- .../WorldArena/WorldArenaRecordPopup.prefab | 9 ++++ .../~Lua/Modules/RoleInfo/RoleListPanel.lua | 48 ++++++++++++------- .../WorldArena/WorldArenaRecordPopup.lua | 2 + 3 files changed, 41 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab index cf0ed53ac9..5cfb3911ae 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab @@ -1078,6 +1078,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224669665164019098} + - component: {fileID: 5492817785588821158} m_Layer: 0 m_Name: scroll m_TagString: Untagged @@ -1104,6 +1105,14 @@ RectTransform: m_AnchoredPosition: {x: 7.5000114, y: -36.800003} m_SizeDelta: {x: 920, y: 1189.6} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5492817785588821158 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1571024332592318} + m_CullTransparentMesh: 0 --- !u!1 &1787199283794164 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 93067dd37b..d9e6d64fd4 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -294,13 +294,19 @@ function this:SortHeroDatas(_heroDatas) if a.lv == b.lv then --判断战力是否相同 if a.warPower == b.warPower then - ---判断星级是否相同 - if a.star == b.star then - --返回图鉴排序 - return a.heroConfig.Sort < b.heroConfig.Sort + local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId) + local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId) + if aGodLv == bGodLv then + ---判断星级是否相同 + if a.star == b.star then + --返回图鉴排序 + return a.heroConfig.Sort < b.heroConfig.Sort + else + return a.star > b.star + end else - return a.star > b.star - end + return aGodLv >bGodLv + end else return a.warPower > b.warPower end @@ -309,23 +315,29 @@ function this:SortHeroDatas(_heroDatas) end --根据品阶排列 elseif sortType==SortTypeConst.Natural then - --是否星级相同 - if a.star == b.star then - --判断战力是否相同 - if a.warPower == b.warPower then - --判断等级是否相同 - if a.lv == b.lv then - --返回图鉴排序 - return a.heroConfig.Sort < b.heroConfig.Sort + local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId) + local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId) + if aGodLv == bGodLv then + --是否星级相同 + if a.star == b.star then + --判断战力是否相同 + if a.warPower == b.warPower then + --判断等级是否相同 + if a.lv == b.lv then + --返回图鉴排序 + return a.heroConfig.Sort < b.heroConfig.Sort + else + return a.lv > b.lv + end else - return a.lv > b.lv + return a.warPower > b.warPower end else - return a.warPower > b.warPower + return a.star > b.star end else - return a.star > b.star - end + return aGodLv >bGodLv + end end else --一个在一个不在先返回在的+不在的 diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua index 265fd18fc1..a95145b861 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua @@ -168,6 +168,7 @@ function this.RankNodeAdapter(node, data,index) newHero.level=pro[1] newHero.heroid=hero.realId newHero.star=hero.star + newHero.godSoulLv = hero.godSoulLv newHero.position=hero.position newHero.skinId=hero.skinId table.insert(heroTeam.team,newHero) @@ -182,6 +183,7 @@ function this.RankNodeAdapter(node, data,index) newHero.level=pro[1] newHero.heroid=hero.realId newHero.star=hero.star + newHero.godSoulLv = hero.godSoulLv newHero.position=hero.position newHero.skinId=hero.skinId table.insert(enTeam.team,newHero) From 024b684999c7ab9a23241744d4392126375b0e12 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 8 Nov 2021 10:51:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E7=A5=9E?= =?UTF-8?q?=E9=AD=82=E6=94=BE=E5=A4=A7=E9=95=9C=E6=98=BE=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/RoleInfoPopup.prefab | 12 ++++++------ .../~Lua/Modules/Popup/RoleInfoPopup.lua | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab index ff6d18a9a8..08d404d971 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab @@ -632,7 +632,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -874,7 +874,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8495,7 +8495,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19868,7 +19868,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19962,7 +19962,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22697,7 +22697,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8edce2c7e5337742b17f23e6207f305, type: 3} + m_Sprite: {fileID: 21300000, guid: c2658e130a761bc4089e86824750a4dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 7d5d43ae29..c54f91215d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -93,7 +93,7 @@ function RoleInfoPopup:BindEvent() Util.AddClick(this.ShenhunBtn,function() local s = function() local pro = {} - local lv = GodSoulManager.GetGodSoulLv(curHeroData.dynamicId) + local lv = curHeroData.godSoulLv local skillList = GodSoulManager.GetGodSoulDataByLv(curHeroData.heroConfig.Id,0) for i = 1,LengthOfTable(skillList) do @@ -284,7 +284,6 @@ function this.RoleInfo1() this.pinjieRoot.gameObject:SetActive(false) this.shenhunRoot.gameObject:SetActive(true) for i = 1,#this.shenhunList do - Util.SetGray(this.shenhunList[i].go,true) if i > star then this.shenhunList[i].fx_shenhun.gameObject:SetActive(false) this.shenhunList[i].goItem.gameObject:SetActive(true) From 67c6e7d92d11d210b6aa014513efdb8b5245fab6 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 8 Nov 2021 11:06:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=8E=89=E8=99=9A=E8=AE=BA=E9=81=93?= =?UTF-8?q?=E7=BC=96=E9=98=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/WorldArena/WorldArenaMyTeamPanel.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua index 35e85a0895..18783c931a 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua @@ -167,13 +167,21 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index) local heroData=HeroManager.GetSingleHeroData(heroTid) self.Heros[index][hero.position].hero:SetActive(true) local star,starType = heroData.GetStar(1) - SetHeroStars(self.spLoader, self.Heros[index][hero.position].starGrid, star,starType) + local starScale = -15 + local starSize = Vector2.New(32,32) + if starType == 3 then + starScale = -16 + starSize = Vector2.New(0.8,-15) + elseif starType == 2 then + starSize = Vector2.New(48,48) + end + SetHeroStars(self.spLoader, self.Heros[index][hero.position].starGrid, star,starType,starSize,starScale) Util.SetParticleSortLayer(self.Heros[index][hero.position].starGrid,self.sortingOrder + 1) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id) allPower=allPower+heroData.warPower self.Heros[index][hero.position].proIconsprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) self.Heros[index][hero.position].levelText.text = heroData.lv - self.Heros[index][hero.position].framesprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) + self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) SetHeroIcon(self.spLoader, hero,self.Heros[index][hero.position].icon,heroConfig) local heroData = {} Util.AddOnceClick(self.Heros[index][hero.position].icon.gameObject, function()