适配修改

zhangqiang 2020-08-19 03:31:43 +08:00
parent 00d93db9a0
commit 93c1913a73
4 changed files with 23 additions and 22 deletions

View File

@ -105334,7 +105334,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: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
m_Sprite: {fileID: 21300000, guid: a161265dfd6867a49aca5d36643e9075, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -127303,7 +127303,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: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
m_Sprite: {fileID: 21300000, guid: 048cdcd08f5e14d4c8ca93fdc5a015a0, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -172,7 +172,7 @@ RectTransform:
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, y: 0}
m_AnchoredPosition: {x: 0, y: -0.000061035156}
m_SizeDelta: {x: 1080, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1212535056
@ -3122,10 +3122,10 @@ RectTransform:
m_Father: {fileID: 1431282765006110110}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 125}
m_SizeDelta: {x: 1080, y: 250}
m_SizeDelta: {x: 0, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3653625794756047923
CanvasRenderer:
@ -8752,7 +8752,7 @@ ParticleSystem:
--- !u!199 &5083064443145554512
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -13517,7 +13517,7 @@ ParticleSystem:
--- !u!199 &5083064443575096463
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -18469,7 +18469,7 @@ ParticleSystem:
--- !u!199 &5083064444079536328
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -23388,7 +23388,7 @@ ParticleSystem:
--- !u!199 &5083064444368836343
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -28298,7 +28298,7 @@ ParticleSystem:
--- !u!199 &5083064444783947928
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -33639,7 +33639,7 @@ ParticleSystem:
--- !u!199 &6264962240844129843
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -38770,7 +38770,7 @@ ParticleSystem:
--- !u!199 &6264962241779056732
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -43612,7 +43612,7 @@ ParticleSystem:
--- !u!199 &6264962242335619732
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -48400,7 +48400,7 @@ ParticleSystem:
--- !u!199 &6264962242685257740
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -53165,7 +53165,7 @@ ParticleSystem:
--- !u!199 &6264962242711413835
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -58927,7 +58927,7 @@ ParticleSystem:
--- !u!199 &7877157627030819769
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -381,7 +381,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 4.7, y: 0.000015258789}
m_AnchoredPosition: {x: 4.699997, y: 0.000015258789}
m_SizeDelta: {x: -20, y: -13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3749457891957033103
@ -1825,9 +1825,9 @@ RectTransform:
m_Father: {fileID: 3715668556982058870}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 513}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -447}
m_SizeDelta: {x: 910, y: 144.15002}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5434942133102595557

View File

@ -199,6 +199,8 @@ function this.FormationAdapter(teamInfo)
for i, demon in ipairs(this.Demons) do
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(1))
Util.GetGameObject(demon, "hero"):SetActive(false)
Util.AddOnceClick(frameBtn, function()
end)
end
for i, hero in ipairs(teamInfo.team) do
local demonId = teamInfo.team[i].heroTid
@ -219,7 +221,6 @@ function this.FormationAdapter(teamInfo)
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
end)
end)
end
end