神魂提交

dev_chengFeng
jiaoyangna 2021-11-03 11:18:37 +08:00
parent 0468c865db
commit 604b1d6819
3 changed files with 82 additions and 9 deletions

View File

@ -558,6 +558,7 @@ GameObject:
- component: {fileID: 1192127436118750043}
- component: {fileID: 7266364021255335440}
- component: {fileID: 6743949729572594254}
- component: {fileID: 3352646862535078710}
m_Layer: 5
m_Name: bgdi
m_TagString: Untagged
@ -623,6 +624,29 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &3352646862535078710
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1956657142415125405}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 175
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &2009075262315622579
GameObject:
m_ObjectHideFlags: 0
@ -1093,9 +1117,9 @@ RectTransform:
m_Father: {fileID: 1192127436118750043}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.11999512, y: -748.9}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 914.1, y: 1147.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6127808348039670114
@ -2551,6 +2575,7 @@ GameObject:
- component: {fileID: 1160826661265422651}
- component: {fileID: 6025562427588020142}
- component: {fileID: 1482316580801188443}
- component: {fileID: 4222284150700596478}
m_Layer: 5
m_Name: topLayout
m_TagString: Untagged
@ -2618,6 +2643,26 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &4222284150700596478
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7034793843308806072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &7110473040349877686
GameObject:
m_ObjectHideFlags: 0

View File

@ -179,6 +179,11 @@ function GeneralBigPopup_RoleGodSoulUp:OnShow(_parent,_Data)
self.lv = _Data[3]
self.curPage = _Data[4] or 1
self.choosedIdList = GodSoulManager.GetBindHeroDatasByLevel(self.curHeroData.dynamicId,self.lv)
if LengthOfTable(self.choosedIdList) < 1 then
for i = 1,#self.costItems do
self.choosedIdList[i] = ""
end
end
curList = GodSoulManager.GetBindHeroDatasByLevel(self.curHeroData.dynamicId,self.lv)
self:Refresh(true,true)
self:SetCostItem(true)
@ -457,20 +462,23 @@ function GeneralBigPopup_RoleGodSoulUp:RefreshCostItemNums2(isAllRefresh)
if starType == 3 then
starSize = Vector2.New(33.43,83.61)
starScale = -13.77
elseif starType == 2 then
starSize = Vector2.New(60,57)
end
SetHeroStars(self.spLoader,self.reSelectList[i].star,star,starType)
self.reSelectList[i].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(tempHeroData.heroConfig.PropertyName))
self.reSelectList[i].posIcon.sprite = self.spLoader:LoadSprite(tempHeroData.professionIcon)
Util.SetGray(self.reSelectList[i].go,false)
Util.SetGray(self.select,false)
Util.SetGray(self.reSelectList[i].icon.gameObject,false)
Util.SetGray(self.reSelectList[i].name.gameObject,false)
else
self.reSelectList[i].name.text = string.format("<color=#FFE18D>%s</color>",str)
self.reSelectList[i].frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(self.costItems[i].star,self.costItems[i].star))
SetHeroStars(self.spLoader,self.reSelectList[i].star,self.costItems[i].star,1)
SetHeroStars(self.spLoader,self.reSelectList[i].star,self.costItems[i].star,1,Vector2.New(60,57))
self.reSelectList[i].posIcon.gameObject:SetActive(false)
self.reSelectList[i].proIcon.gameObject:SetActive(false)
if self.costItems[i].id > 0 then
self.reSelectList[i].icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroConfig[self.costItems[i].id].Icon))
Util.SetGray(self.reSelectList[i].icon.gameObject,true)
else
self.reSelectList[i].icon.sprite = self.spLoader:LoadSprite("r_hero_jinjie-touxiang2")
if self.costItems[i].property > 0 then
@ -481,9 +489,9 @@ function GeneralBigPopup_RoleGodSoulUp:RefreshCostItemNums2(isAllRefresh)
self.reSelectList[i].posIcon.sprite = self.spLoader:LoadSprite(GetHeroPosStr(self.costItems[i].profession))
else
end
Util.SetGray(self.reSelectList[i].icon.gameObject,false)
end
Util.SetGray(self.reSelectList[i].go,true)
Util.SetGray(self.select,false)
Util.SetGray(self.reSelectList[i].name.gameObject,true)
end
end
end

View File

@ -16,6 +16,10 @@ function RoleGodSoulLayout:InitComponent()
self.costPre = Util.GetGameObject(self.gameObject,"costPre")
self.heroPre = Util.GetGameObject(self.gameObject,"HeroPre")
self.singlePre = Util.GetGameObject(self.gameObject,"singlePre")
self.scroll = Util.GetGameObject(self.gameObject,"bgdi/scroll")
self.scrollPos = self.scroll:GetComponent("RectTransform").sizeDelta
self.bgdi = Util.GetGameObject(self.gameObject,"bgdi")
self.bgdiPos = self.bgdi:GetComponent("RectTransform").sizeDelta
self.grid = Util.GetGameObject(self.gameObject,"bgdi/scroll/grid")
self.gridPos = self.grid:GetComponent("RectTransform").anchoredPosition
self.gridList = {}
@ -77,6 +81,22 @@ function RoleGodSoulLayout:SetData()
self:UpdateGodList()
self:SetHeroData(self.curHeroGo,self.curHeroData,true)
self.curHeroName.text = self.heroConfig.ReadingName
local scrollPos1 = 0
local bgdiPos1 = 175
for i = 1,#self.gridList do
scrollPos1 = scrollPos1 + GetPreferredHeight(self.gridList[i].go.transform)
end
bgdiPos1 = bgdiPos1 + scrollPos1
if bgdiPos1 > 1334 then
self.bgdiPos.y = 1334
self.scrollPos.y = 1334 - 180
else
self.bgdiPos.y = bgdiPos1
self.scrollPos.y = bgdiPos1 - 180
end
self.bgdi:GetComponent("RectTransform").sizeDelta = self.bgdiPos
self.scroll:GetComponent("RectTransform").sizeDelta = self.scrollPos
local pos = Vector3.New(self.gridPos.x,self.gridPos.y,self.gridPos.z)
for i = 1,self.lv - 1 do
pos.y = pos.y + GetPreferredHeight(self.gridList[i].go.transform)