diff --git a/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab index b26563335d..c88ca411c3 100644 --- a/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab @@ -254,10 +254,10 @@ RectTransform: m_Father: {fileID: 3756806480519388516} m_RootOrder: 0 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: 0, y: 439.6} - m_SizeDelta: {x: 1172, y: 1228.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 446.5} + m_SizeDelta: {x: 0, y: -899.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1026965358347488299 CanvasRenderer: @@ -280,14 +280,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.028301895, g: 0.027367398, b: 0.027367398, a: 0.32941177} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c736aaceb44367744b32afe4f178a083, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -24527,7 +24527,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7082714544173305546 RectTransform: m_ObjectHideFlags: 0 @@ -24542,10 +24542,10 @@ RectTransform: m_Father: {fileID: 3756806480519388516} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -584.4, y: -640.4} - m_SizeDelta: {x: 1087.9, y: 1086.8} + m_AnchoredPosition: {x: 0, y: -44.25} + m_SizeDelta: {x: 0, y: 93.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5064043851768288431 CanvasRenderer: @@ -24575,8 +24575,8 @@ 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: 6d592660734caf64596543395316268f, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -29721,8 +29721,8 @@ 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: -12.94, y: -465.96} - m_SizeDelta: {x: 992.32, y: 630.7} + m_AnchoredPosition: {x: -12.94, y: -427.4} + m_SizeDelta: {x: 992.3, y: 707.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7554074949510186445 CanvasRenderer: @@ -30193,7 +30193,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -57.350098, y: -575} + m_AnchoredPosition: {x: -68, y: -586} m_SizeDelta: {x: 114.70001, y: 168.09998} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6094776389478172487 @@ -30400,7 +30400,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 490, y: -465.74} + m_AnchoredPosition: {x: 522, y: -432} m_SizeDelta: {x: 6, y: -1269.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4715674209735125731 @@ -30497,7 +30497,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: 0, y: 383} + m_AnchoredPosition: {x: -12.8, y: 383} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6698283452277567238 @@ -30894,8 +30894,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -3.5004883, y: 7.1000977} - m_SizeDelta: {x: 91.501, y: 188.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4507142556566682274 CanvasRenderer: @@ -30968,8 +30968,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 68, y: 68} + m_AnchoredPosition: {x: -4.2, y: 4.4} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3208073532332124040 CanvasRenderer: @@ -40903,7 +40903,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: 42, y: -2} + m_AnchoredPosition: {x: 54, y: -7} m_SizeDelta: {x: -65.5, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &733143187815832312 @@ -40927,7 +40927,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8000001, g: 0.7725491, b: 0.68235296, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -40986,7 +40986,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 57.350098, y: -575} + m_AnchoredPosition: {x: 57.350098, y: -586.05005} m_SizeDelta: {x: 114.70001, y: 168.09998} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3957528042042170780 @@ -41453,7 +41453,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -101.799805, y: -941.1001} + m_AnchoredPosition: {x: -83.49982, y: -330.1001} m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7239027833556938891 @@ -41587,7 +41587,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 65.6001} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5495645188133268112 @@ -41810,7 +41810,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: 133, y: -527} + m_AnchoredPosition: {x: 82, y: -452} m_SizeDelta: {x: 354, y: 470} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9138231538396098527 @@ -41942,7 +41942,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8708557581736934610 RectTransform: m_ObjectHideFlags: 0 @@ -41959,8 +41959,8 @@ 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: 3, y: 383} - m_SizeDelta: {x: 530, y: 530} + m_AnchoredPosition: {x: -7, y: 382} + m_SizeDelta: {x: 311, y: 309} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2332249307189341976 CanvasRenderer: @@ -41990,7 +41990,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: af3992c4b99fa274aa72b18b8acb40d8, type: 3} + m_Sprite: {fileID: 21300000, guid: c4283383cda9f4549a65cdb209a7705e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -46814,10 +46814,10 @@ RectTransform: m_Father: {fileID: 3756806480519388516} m_RootOrder: 1 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: 0, y: 342} - m_SizeDelta: {x: 1120, y: 1236} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0.024902344, y: 68.200195} + m_SizeDelta: {x: 0, y: 128.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5424774555350716916 CanvasRenderer: @@ -46847,7 +46847,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: e42f12ef3a8af2144b3dcbf611835135, type: 3} + m_Sprite: {fileID: 21300000, guid: 3871582dadbfc39489517bdfd808d2de, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -66107,7 +66107,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -245, y: -1061} + m_AnchoredPosition: {x: -261, y: -988} m_SizeDelta: {x: 366.5, y: 67.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1184980555918334642 @@ -66355,7 +66355,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -101.29999, y: -803} + m_AnchoredPosition: {x: -83, y: -187.7998} m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7577851716765771401 @@ -71880,7 +71880,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 138, y: -129} + m_AnchoredPosition: {x: 142, y: -167} m_SizeDelta: {x: 235, y: 101} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4072144891088174203 @@ -72203,7 +72203,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -51.100098, y: -155.7002} + m_AnchoredPosition: {x: -59.69995, y: -55} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7321994533089698339 @@ -72410,8 +72410,8 @@ 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: 87, y: 373} - m_SizeDelta: {x: 910, y: 880} + m_AnchoredPosition: {x: -9, y: 387} + m_SizeDelta: {x: 1014, y: 974} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5344963713607674964 CanvasRenderer: @@ -72441,7 +72441,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: 7ce3e06226b047a4aa2fcc6494c1df4e, type: 3} + m_Sprite: {fileID: 21300000, guid: 52f714fbb595f7444ac41158c518fcb3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -77386,7 +77386,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.754717, g: 0.5301019, b: 0.3025988, a: 1} + m_Color: {r: 0.81568635, g: 0.83921576, b: 0.8431373, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua index 46a2afa592..fc8be243be 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua @@ -20,7 +20,7 @@ local maxLv=0 --间隔角度 local angle=0 --半径 -local radius=285 +local radius=340 local curHeroData--当前英雄信息 local heroDatas--全部英雄数据 @@ -338,7 +338,7 @@ function this.SetLoopPre(root,type,index,data,curIndex) Util.GetGameObject(lock,"Text"):GetComponent("Text").text=this.GetSoulLockTip()--string.format( Language[11903],data) elseif type==3 then --Util.GetGameObject(bg,"Frame"):GetComponent("Image").enabled=true - Util.GetGameObject(bg,"bg"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[equipConfig[data.equipId].Quality].circleBg1) + Util.GetGameObject(bg,"bg"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[0].circleBg1) --Util.GetGameObject(bg,"Frame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetQuantityImageByqualityPoint(equipConfig[data.equipId].Quality)) Util.GetGameObject(unlock,"circleFrame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[equipConfig[data.equipId].Quality].circleBg2) Util.GetGameObject(unlock,"Icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[data.equipId].ResourceID))