Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo

xiejun 2024-06-03 00:15:27 +08:00
commit 7d57b3ed5f
4 changed files with 8 additions and 6 deletions

View File

@ -2919,7 +2919,7 @@ RectTransform:
m_GameObject: {fileID: 1489774606337484869}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children:
- {fileID: 198712826036977332}
- {fileID: 1632999133975324295}

View File

@ -2377,7 +2377,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -868, y: 424.7}
m_AnchoredPosition: {x: -929.3, y: 424.7}
m_SizeDelta: {x: 120, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6051762811617121871
@ -2657,7 +2657,7 @@ RectTransform:
m_GameObject: {fileID: 5831921954147426977}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.92, y: 1, z: 1}
m_Children:
- {fileID: 6050385202233921357}
- {fileID: 6264921143566215}
@ -2942,7 +2942,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -60, y: -25}
m_AnchoredPosition: {x: -60, y: -60}
m_SizeDelta: {x: 117.880005, y: 32.190002}
m_Pivot: {x: 0, y: 0}
--- !u!222 &7225143497615663008

View File

@ -491,6 +491,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
UIManager.OpenPanel(UIName.TrainingItemListPanel,curData,
function(selectItems,selectHeroOrItems)
itemIcon.gameObject:SetActive(true)
LogError("curData.type==========="..curData.type)
if curData.type==1 then
selectSkillUnlockItems1={}
if #selectItems>0 then
@ -533,10 +534,10 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
elseif curData.type==3 then
selectSkillUnlockItems1={}
if #selectItems>0 then
LogError("selectItems======================"..#selectItems.." selectItems[1].type==="..selectItems[1].type)
if selectItems[1].type==1 or selectItems[1].type==3 then
itemIcon.sprite=self.spLoader:LoadSprite(selectItems[1].icon)
needNum.text=#selectItems.."/"..neednum
else
local itemConfig = ConfigManager.TryGetConfigData(ConfigName.ItemConfig,selectItems[1].id)
if not itemConfig then return end

View File

@ -426,6 +426,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
local lockImage = Util.GetGameObject(formationMask.transform, "lockImage")
local noumenon = Util.GetGameObject(go, "noumenon")
local starGrid = Util.GetGameObject(go.transform, "star")
starGrid.transform.position=Vector3.New(-60,-60,0)
local cardBtn = Util.GetGameObject(go.transform, "icon")
local GongMingMask = Util.GetGameObject(go.transform, "GongMingMask")
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.pokemonData.config.Quality,heroData.star))