Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-11-08 11:07:35 +08:00
commit 0fc2ec5b08
7 changed files with 63 additions and 33 deletions

View File

@ -632,7 +632,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 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_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -874,7 +874,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 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_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -8495,7 +8495,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 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_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -19868,7 +19868,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 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_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -19962,7 +19962,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 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_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -22697,7 +22697,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 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_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

View File

@ -1078,6 +1078,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 224669665164019098} - component: {fileID: 224669665164019098}
- component: {fileID: 5492817785588821158}
m_Layer: 0 m_Layer: 0
m_Name: scroll m_Name: scroll
m_TagString: Untagged m_TagString: Untagged
@ -1104,6 +1105,14 @@ RectTransform:
m_AnchoredPosition: {x: 7.5000114, y: -36.800003} m_AnchoredPosition: {x: 7.5000114, y: -36.800003}
m_SizeDelta: {x: 920, y: 1189.6} m_SizeDelta: {x: 920, y: 1189.6}
m_Pivot: {x: 0.5, y: 0.5} 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 --- !u!1 &1787199283794164
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -93,7 +93,7 @@ function RoleInfoPopup:BindEvent()
Util.AddClick(this.ShenhunBtn,function() Util.AddClick(this.ShenhunBtn,function()
local s = function() local s = function()
local pro = {} local pro = {}
local lv = GodSoulManager.GetGodSoulLv(curHeroData.dynamicId) local lv = curHeroData.godSoulLv
local skillList = GodSoulManager.GetGodSoulDataByLv(curHeroData.heroConfig.Id,0) local skillList = GodSoulManager.GetGodSoulDataByLv(curHeroData.heroConfig.Id,0)
for i = 1,LengthOfTable(skillList) do for i = 1,LengthOfTable(skillList) do
@ -284,7 +284,6 @@ function this.RoleInfo1()
this.pinjieRoot.gameObject:SetActive(false) this.pinjieRoot.gameObject:SetActive(false)
this.shenhunRoot.gameObject:SetActive(true) this.shenhunRoot.gameObject:SetActive(true)
for i = 1,#this.shenhunList do for i = 1,#this.shenhunList do
Util.SetGray(this.shenhunList[i].go,true)
if i > star then if i > star then
this.shenhunList[i].fx_shenhun.gameObject:SetActive(false) this.shenhunList[i].fx_shenhun.gameObject:SetActive(false)
this.shenhunList[i].goItem.gameObject:SetActive(true) this.shenhunList[i].goItem.gameObject:SetActive(true)

View File

@ -294,13 +294,19 @@ function this:SortHeroDatas(_heroDatas)
if a.lv == b.lv then if a.lv == b.lv then
--判断战力是否相同 --判断战力是否相同
if a.warPower == b.warPower then if a.warPower == b.warPower then
---判断星级是否相同 local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId)
if a.star == b.star then local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId)
--返回图鉴排序 if aGodLv == bGodLv then
return a.heroConfig.Sort < b.heroConfig.Sort ---判断星级是否相同
if a.star == b.star then
--返回图鉴排序
return a.heroConfig.Sort < b.heroConfig.Sort
else
return a.star > b.star
end
else else
return a.star > b.star return aGodLv >bGodLv
end end
else else
return a.warPower > b.warPower return a.warPower > b.warPower
end end
@ -309,23 +315,29 @@ function this:SortHeroDatas(_heroDatas)
end end
--根据品阶排列 --根据品阶排列
elseif sortType==SortTypeConst.Natural then elseif sortType==SortTypeConst.Natural then
--是否星级相同 local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId)
if a.star == b.star then local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId)
--判断战力是否相同 if aGodLv == bGodLv then
if a.warPower == b.warPower then --是否星级相同
--判断等级是否相同 if a.star == b.star then
if a.lv == b.lv then --判断战力是否相同
--返回图鉴排序 if a.warPower == b.warPower then
return a.heroConfig.Sort < b.heroConfig.Sort --判断等级是否相同
if a.lv == b.lv then
--返回图鉴排序
return a.heroConfig.Sort < b.heroConfig.Sort
else
return a.lv > b.lv
end
else else
return a.lv > b.lv return a.warPower > b.warPower
end end
else else
return a.warPower > b.warPower return a.star > b.star
end end
else else
return a.star > b.star return aGodLv >bGodLv
end end
end end
else else
--一个在一个不在先返回在的+不在的 --一个在一个不在先返回在的+不在的

View File

@ -253,13 +253,13 @@ function this.SingleRideClickShowInfo(data,go)
this.skillList[i].icon.sprite = this.spLoader:LoadSprite(GetResourcePath(data.Icon[i])) this.skillList[i].icon.sprite = this.spLoader:LoadSprite(GetResourcePath(data.Icon[i]))
Util.AddOnceClick(this.skillList[i].btn,function() Util.AddOnceClick(this.skillList[i].btn,function()
this.skillDes.gameObject:SetActive(true) this.skillDes.gameObject:SetActive(true)
local data = {} local data1 = {}
data.icon = GetResourcePath(data.Icon[i]) data1.icon = GetResourcePath(data.Icon[i])
local strs = string.split(data.SkillEffect,"|") local strs = string.split(data.SkillEffect,"|")
local strDes = string.split(strs[i],"#") local strDes = string.split(strs[i],"#")
data.title = strDes[1] data1.title = strDes[1]
data.des = strDes[2] data1.des = strDes[2]
this.SetSkillDes(data) this.SetSkillDes(data1)
end) end)
end end
end end

View File

@ -167,13 +167,21 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
local heroData=HeroManager.GetSingleHeroData(heroTid) local heroData=HeroManager.GetSingleHeroData(heroTid)
self.Heros[index][hero.position].hero:SetActive(true) self.Heros[index][hero.position].hero:SetActive(true)
local star,starType = heroData.GetStar(1) 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) Util.SetParticleSortLayer(self.Heros[index][hero.position].starGrid,self.sortingOrder + 1)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id)
allPower=allPower+heroData.warPower allPower=allPower+heroData.warPower
self.Heros[index][hero.position].proIconsprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) 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].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) SetHeroIcon(self.spLoader, hero,self.Heros[index][hero.position].icon,heroConfig)
local heroData = {} local heroData = {}
Util.AddOnceClick(self.Heros[index][hero.position].icon.gameObject, function() Util.AddOnceClick(self.Heros[index][hero.position].icon.gameObject, function()

View File

@ -168,6 +168,7 @@ function this.RankNodeAdapter(node, data,index)
newHero.level=pro[1] newHero.level=pro[1]
newHero.heroid=hero.realId newHero.heroid=hero.realId
newHero.star=hero.star newHero.star=hero.star
newHero.godSoulLv = hero.godSoulLv
newHero.position=hero.position newHero.position=hero.position
newHero.skinId=hero.skinId newHero.skinId=hero.skinId
table.insert(heroTeam.team,newHero) table.insert(heroTeam.team,newHero)
@ -182,6 +183,7 @@ function this.RankNodeAdapter(node, data,index)
newHero.level=pro[1] newHero.level=pro[1]
newHero.heroid=hero.realId newHero.heroid=hero.realId
newHero.star=hero.star newHero.star=hero.star
newHero.godSoulLv = hero.godSoulLv
newHero.position=hero.position newHero.position=hero.position
newHero.skinId=hero.skinId newHero.skinId=hero.skinId
table.insert(enTeam.team,newHero) table.insert(enTeam.team,newHero)