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

dev_chengFeng
jiaoyangna 2021-11-08 10:20:34 +08:00
commit cb41ba3991
6 changed files with 33 additions and 2114 deletions

View File

@ -13771,7 +13771,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u8FD9\u662F\u4E00\u5806\u903C\u903C\u8D56\u8D56" m_Text:
LanguageIndex: 11147 LanguageIndex: 11147
--- !u!1 &2437786074645525552 --- !u!1 &2437786074645525552
GameObject: GameObject:
@ -33185,7 +33185,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000030517578} m_AnchoredPosition: {x: 0, y: -0.00009152636}
m_SizeDelta: {x: -894.3, y: -817.3} m_SizeDelta: {x: -894.3, y: -817.3}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &7488345345668227506 --- !u!114 &7488345345668227506

View File

@ -401,7 +401,13 @@ function this.HeadAdapter(head, data)
star = data.roleData.godSoulLv star = data.roleData.godSoulLv
starType = 3 starType = 3
end end
SetHeroStars(this.spLoader, starRoot, star,starType) local starSize=Vector2.New(35,35)
if starType==3 then
starSize=Vector2.New(0.8,-15)
elseif starType==2 then
starSize=Vector2.New(48,48)
end
SetHeroStars(this.spLoader, starRoot, star,starType,starSize)
Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1) Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1)
-- 职业 -- 职业
prefess:SetActive(false) prefess:SetActive(false)

View File

@ -74,15 +74,16 @@ function PlayerView:onCreate(go, role, position, root)
self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element)) self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element))
self.bg1.sprite = self.spLoader:LoadSprite(GetBattleHeroCardStarBg[role.roleData.star]) self.bg1.sprite = self.spLoader:LoadSprite(GetBattleHeroCardStarBg[role.roleData.star])
self.bg2.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[role.roleData.star]) self.bg2.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[role.roleData.star])
local starGrid = Util.GetGameObject(go, "StarGrid") self.starGrid = Util.GetGameObject(go, "StarGrid")
local star = role.roleData.star or 5 local star = role.roleData.star or 5
local starType = 1 local starType = 1
if role.roleData.godSoulLv and role.roleData.godSoulLv > 0 then if role.roleData.godSoulLv and role.roleData.godSoulLv > 0 then
star = role.roleData.godSoulLv star = role.roleData.godSoulLv
starType = 3 starType = 3
self.bg2.sprite = self.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006") self.bg2.sprite = self.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006")
-- self.starGrid:GetComponent("Image").enabled = false
end end
SetCardStars(starGrid, star,starType) SetCardStars(self.starGrid, star, starType)
local zs = Util.GetGameObject(go, "zs") local zs = Util.GetGameObject(go, "zs")
local zsName = GetHeroCardStarZs[role.roleData.star] local zsName = GetHeroCardStarZs[role.roleData.star]
if zsName == "" then if zsName == "" then
@ -210,6 +211,7 @@ function PlayerView:ChangeCardSorting(sortingOrder)
self.effect_dead:GetComponent("Canvas").sortingOrder = sortingOrder self.effect_dead:GetComponent("Canvas").sortingOrder = sortingOrder
Util.AddParticleSortLayer(self.effect_rage, sortingOrder - self.oSortingOrder) Util.AddParticleSortLayer(self.effect_rage, sortingOrder - self.oSortingOrder)
Util.AddParticleSortLayer(self.effect_dead, sortingOrder - self.oSortingOrder) Util.AddParticleSortLayer(self.effect_dead, sortingOrder - self.oSortingOrder)
Util.SetParticleSortLayer(self.starGrid, sortingOrder + 1)
self.oSortingOrder = sortingOrder self.oSortingOrder = sortingOrder
end end

View File

@ -57,12 +57,15 @@ function XiangYaoDuoBao:InitComponent()
self.progressValue = Util.GetGameObject(self.gameObject, "mid/progress/value"):GetComponent("Image")--fillAmount self.progressValue = Util.GetGameObject(self.gameObject, "mid/progress/value"):GetComponent("Image")--fillAmount
self.reward = Util.GetGameObject(self.gameObject, "mid/reward") self.reward = Util.GetGameObject(self.gameObject, "mid/reward")
self.value = Util.GetGameObject(self.gameObject, "mid/value") self.value = Util.GetGameObject(self.gameObject, "mid/value")
self.iconPre = Util.GetGameObject(self.reward, "iconPre")
self.iconPre:SetActive(false)
self.effect1 = Util.GetGameObject(self.gameObject, "Effect_xiaozhuanfeng_hit01") self.effect1 = Util.GetGameObject(self.gameObject, "Effect_xiaozhuanfeng_hit01")
self.effect2 = Util.GetGameObject(self.gameObject, "Effect_xiaozhuanfeng_hit02") self.effect2 = Util.GetGameObject(self.gameObject, "Effect_xiaozhuanfeng_hit02")
self.effect1:SetActive(false) self.effect1:SetActive(false)
self.effect2:SetActive(false) self.effect2:SetActive(false)
self.iconList = {}
end end
function XiangYaoDuoBao:BindEvent() function XiangYaoDuoBao:BindEvent()
@ -159,8 +162,16 @@ function XiangYaoDuoBao:SetData()
Util.GetGameObject(self.value, "num"):GetComponent("Text").text = curScore Util.GetGameObject(self.value, "num"):GetComponent("Text").text = curScore
Util.GetGameObject(self.value, "tips"):GetComponent("Text").text = Language[12129] Util.GetGameObject(self.value, "tips"):GetComponent("Text").text = Language[12129]
for i = 1, self.reward.transform.childCount do for i = 1, #LSrewardData do
local item = self.reward.transform:GetChild(i-1) local number = LSrewardData[i].Values[1][1]/LSrewardData[#LSrewardData].Values[1][1]
local item = self.iconList[i]
if not item then
item = newObjToParent(self.iconPre,self.reward.transform)
item:SetActive(true)
item:GetComponent("RectTransform").transform.localPosition = Vector3.New(number*750-360,0,0)
self.iconList[i] = item
end
Util.GetGameObject(item, "num/Text"):GetComponent("Text").text = LSrewardData[i].Reward[1][2] Util.GetGameObject(item, "num/Text"):GetComponent("Text").text = LSrewardData[i].Reward[1][2]
Util.GetGameObject(item, "Text"):GetComponent("Text").text = LSrewardData[i].Values[1][1] Util.GetGameObject(item, "Text"):GetComponent("Text").text = LSrewardData[i].Values[1][1]
@ -179,7 +190,6 @@ function XiangYaoDuoBao:SetData()
end end
end) end)
end end
end end
function XiangYaoDuoBao:refreshBtnShow() function XiangYaoDuoBao:refreshBtnShow()
@ -377,6 +387,7 @@ function XiangYaoDuoBao:OnDestroy()
end end
Live = nil Live = nil
self.btn = nil self.btn = nil
self.iconList = {}
end end
--添加事件监听(用于子类重写) --添加事件监听(用于子类重写)

View File

@ -366,7 +366,7 @@ function RoleAwakeLayout:StarUpClick()
end) end)
end end
end) end)
CheckRedPointStatus(RedPointType.ShengXingYouLi)
CheckRedPointStatus(RedPointType.HongMeng_UpTower) CheckRedPointStatus(RedPointType.HongMeng_UpTower)
end) end)
-- 进阶音效 -- 进阶音效