diff --git a/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_guanqiamingcheng.png b/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_guanqiamingcheng.png new file mode 100644 index 0000000000..0d659c29a5 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_guanqiamingcheng.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_guanqiamingcheng.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_guanqiamingcheng.png.meta new file mode 100644 index 0000000000..158bf07484 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_guanqiamingcheng.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 05d70385eb588cb4d837df271e18f56f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 155, y: 4, z: 29, w: 107} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7561c2aeef0c6494ebfc1dd85165daad + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 4e0e8e2cc3..1960c80b70 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -54790,7 +54790,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1288921183789880} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -54801,7 +54801,7 @@ RectTransform: - {fileID: 6434840553229058696} m_Father: {fileID: 224353427390833726} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 306.6, y: 33} @@ -54835,7 +54835,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: 45dda5affd95b8443917c1e5b0241751, type: 3} + m_Sprite: {fileID: 21300000, guid: a23721c4e85c1f94799bd9c71c225a6a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -55475,7 +55475,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509409260145998} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: [] @@ -55484,7 +55484,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: 0} + m_AnchoredPosition: {x: -0.000061035156, y: 0.000049591064} m_SizeDelta: {x: 80, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222911817612100296 @@ -55920,7 +55920,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1573022948334062} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -55931,11 +55931,11 @@ RectTransform: - {fileID: 8440128951764089854} m_Father: {fileID: 224353427390833726} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -312, y: -200} - m_SizeDelta: {x: 134.54, y: 134.66} + m_AnchoredPosition: {x: -316.4, y: -200} + m_SizeDelta: {x: 130, y: 134.66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222124911073487956 CanvasRenderer: @@ -55965,7 +55965,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: 45dda5affd95b8443917c1e5b0241751, type: 3} + m_Sprite: {fileID: 21300000, guid: a23721c4e85c1f94799bd9c71c225a6a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -56213,7 +56213,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: 45dda5affd95b8443917c1e5b0241751, type: 3} + m_Sprite: {fileID: 21300000, guid: a23721c4e85c1f94799bd9c71c225a6a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -61747,7 +61747,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1873193013393720} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -61758,11 +61758,11 @@ RectTransform: - {fileID: 1901042942284068930} m_Father: {fileID: 224353427390833726} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 306.6, y: -200} - m_SizeDelta: {x: 134.54, y: 134.66} + m_SizeDelta: {x: 130, y: 134.66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222468961234188874 CanvasRenderer: @@ -61792,7 +61792,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: 45dda5affd95b8443917c1e5b0241751, type: 3} + m_Sprite: {fileID: 21300000, guid: a23721c4e85c1f94799bd9c71c225a6a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -67756,7 +67756,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: 3.6683016, y: -3.8787808} + m_AnchoredPosition: {x: 3.668274, y: -3.8787289} m_SizeDelta: {x: 133.31, y: 135.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8653565348717953195 @@ -77572,7 +77572,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 828656887579548897} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -77581,7 +77581,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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -0.000061035156} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5521902049049111822 @@ -92964,7 +92964,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1343281714113288269} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -92973,7 +92973,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: 0} + m_AnchoredPosition: {x: 2.9, y: -5.8} m_SizeDelta: {x: 133.92, y: 133.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4527356442873545557 @@ -103482,7 +103482,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1741443791654214028} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -119021,7 +119021,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2678555668121063264} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -119030,7 +119030,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: 0, y: 0} + m_AnchoredPosition: {x: -0, y: -5.8} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6603615840407764809 @@ -135200,7 +135200,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3115902982070308889} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -135209,7 +135209,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: 3.6683016, y: -3.8787808} + m_AnchoredPosition: {x: -3.6683044, y: 3.8787842} m_SizeDelta: {x: 133.31, y: 135.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4855957357864088144 @@ -135363,7 +135363,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3162063504329752923} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -135372,7 +135372,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: 0} + m_AnchoredPosition: {x: 0, y: -0.000061035156} m_SizeDelta: {x: 133.92, y: 133.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5598217016900164547 @@ -135407,7 +135407,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3198226727112469355} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -135421,7 +135421,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: 3.6, y: -4.72} + m_AnchoredPosition: {x: -3.600006, y: 4.7199707} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &5454617975793447304 @@ -140286,7 +140286,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3440082816415215180} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: [] @@ -140295,7 +140295,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: 0, y: 0} + m_AnchoredPosition: {x: -0.000061035156, y: 0.000015258789} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2852339856873687854 @@ -140469,7 +140469,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3486827883680287183} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -140483,7 +140483,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: 3.6, y: -4.72} + m_AnchoredPosition: {x: -3.600006, y: -4.7200565} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &5483690699823426910 @@ -140987,7 +140987,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3797554959509923932} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -140996,7 +140996,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: 3.6683016, y: -3.8787808} + m_AnchoredPosition: {x: -3.6683044, y: -3.8788376} m_SizeDelta: {x: 133.31, y: 135.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2087227569429858272 @@ -160252,7 +160252,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4322341310390862808} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -160261,7 +160261,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: 0} + m_AnchoredPosition: {x: 0, y: -5.7} m_SizeDelta: {x: 133.92, y: 133.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6464089953370378685 @@ -247409,7 +247409,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: 0} + m_AnchoredPosition: {x: 0, y: 3.4} m_SizeDelta: {x: 133.92, y: 133.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &227278624032698613 @@ -276728,7 +276728,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7218779524996460926} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -276737,7 +276737,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: 3.6683016, y: -3.8787808} + m_AnchoredPosition: {x: -3.9, y: -9.5} m_SizeDelta: {x: 133.31, y: 135.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9027403504495232127 @@ -305940,7 +305940,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: 0} + m_AnchoredPosition: {x: 0, y: 3.4} m_SizeDelta: {x: 133.92, y: 133.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3606057059099593581 @@ -316332,7 +316332,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: 0} + m_AnchoredPosition: {x: -0.000061035156, y: 0.000049591064} m_SizeDelta: {x: 133.92, y: 133.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8518017555763564686 @@ -326063,7 +326063,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8600284997694258007} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -326077,7 +326077,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: 3.6, y: -4.72} + m_AnchoredPosition: {x: -4.7, y: -9.4} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1271363615599951448 @@ -326603,7 +326603,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8852480829553467312} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -326612,7 +326612,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: 0} + m_AnchoredPosition: {x: 0, y: -5.8} m_SizeDelta: {x: 87, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8775275377859903094 @@ -326693,7 +326693,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8852513480144206442} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -326702,7 +326702,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: 0} + m_AnchoredPosition: {x: 0, y: -0.000061035156} m_SizeDelta: {x: 87, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8775311787537306746 @@ -327296,7 +327296,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8852926111584287292} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -337491,7 +337491,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9178617880212278494} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: @@ -337505,7 +337505,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: 3.6, y: -4.72} + m_AnchoredPosition: {x: 3.5999146, y: -4.719948} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &5750034563957002551 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab index 8e4157b38a..2f3405d9e1 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab @@ -8594,15 +8594,35 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3461041183831773760, guid: 5499cdbed3f400441b21a8becb5b5e84, + - target: {fileID: 1025001012133774991, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1676758215422761462, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -3.99 + objectReference: {fileID: 0} + - target: {fileID: 1676758215422761462, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 228.93 + objectReference: {fileID: 0} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 35.4 + objectReference: {fileID: 0} + - target: {fileID: 3461869958402333818, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -71.4 objectReference: {fileID: 0} - target: {fileID: 3461869958402333818, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_AnchoredPosition.y - value: -176.6 + value: -189.8 objectReference: {fileID: 0} - target: {fileID: 3639078397396446894, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} @@ -8654,26 +8674,6 @@ PrefabInstance: propertyPath: m_TargetGraphic value: objectReference: {fileID: 3290334893541118100} - - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 381753831834081747, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_SizeDelta.x @@ -8684,6 +8684,17 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 40 objectReference: {fileID: 0} + - target: {fileID: 9133329911980805997, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 827dcfbc94695f6409666ea8d292c935, + type: 3} + - target: {fileID: 9133329911980805997, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_Type + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1165092670158494079, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_Bones.Array.data[0] diff --git a/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab b/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab index c37a850f50..859966d821 100644 --- a/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab +++ b/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab @@ -672,7 +672,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3272370163553093863} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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_Children: [] @@ -681,8 +681,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.00080508, y: -158.6} - m_SizeDelta: {x: 180, y: 36} + m_AnchoredPosition: {x: 14.15, y: -168.03} + m_SizeDelta: {x: 163.98, y: 50.26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8011244553051810059 CanvasRenderer: @@ -705,14 +705,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.627451} 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: a468f2b67c0640b4c8f398ee16e99235, type: 3} + m_Sprite: {fileID: 21300000, guid: 05d70385eb588cb4d837df271e18f56f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -754,8 +754,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 30, y: 2.600006} - m_SizeDelta: {x: 291.48, y: 30} + m_AnchoredPosition: {x: 46.8, y: 2.600006} + m_SizeDelta: {x: 282.6, y: 30} m_Pivot: {x: 0, y: 0} --- !u!222 &3458859693125887700 CanvasRenderer: @@ -1219,18 +1219,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3680026035316547080} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3461094561493497734} m_Father: {fileID: 3396417040355110936} m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -69.4, y: -159} - m_SizeDelta: {x: 35.6, y: 31.3} + m_AnchoredPosition: {x: -69.61, y: -189.69} + m_SizeDelta: {x: 55.98, y: 38.11} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3458935048380602088 CanvasRenderer: @@ -1260,8 +1260,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: 4072d8ffe2facfe429f8a4224ce41df3, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9ab91bc6a2bbb8a4e8f776c2b83c3e1c, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1369,7 +1369,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3681390695755262918} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -1378,8 +1378,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.5, y: 0} - m_SizeDelta: {x: 57.37, y: 35.96} + m_AnchoredPosition: {x: 0.929863, y: -0.10997009} + m_SizeDelta: {x: 55.2, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3459576128698058178 CanvasRenderer: @@ -1472,7 +1472,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.00071812, y: -189.46} + m_AnchoredPosition: {x: 38.4, y: -189.46} m_SizeDelta: {x: 180.34, y: 28.405} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4188349076629962175 @@ -1503,7 +1503,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: 3871582dadbfc39489517bdfd808d2de, type: 3} + m_Sprite: {fileID: 21300000, guid: ae849a52a4591b248925111768a304fc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1559,6 +1559,7 @@ GameObject: - component: {fileID: 1025001012133774991} - component: {fileID: 5066838088690374912} - component: {fileID: 7932863959212435681} + - component: {fileID: 2001293176988581899} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -1582,7 +1583,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: 3, y: -160} + m_AnchoredPosition: {x: 58.4, y: -161.9} m_SizeDelta: {x: 57.37, y: 35.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5066838088690374912 @@ -1606,7 +1607,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.0754717, g: 0.0754717, b: 0.0754717, a: 1} + m_Color: {r: 0.8962264, g: 0.8962264, b: 0.8962264, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1620,13 +1621,28 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 199 +--- !u!114 &2001293176988581899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5415482170501943705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5566712360850589757 GameObject: m_ObjectHideFlags: 0 @@ -2189,12 +2205,6 @@ PrefabInstance: objectReference: {fileID: 1271572592464149432} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} ---- !u!4 &1271572592464149430 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 1745768441} - m_PrefabAsset: {fileID: 0} --- !u!4 &1271572592464149426 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572593135907915, guid: 4c8639a41d5af934d933d50f22d40218, @@ -2309,6 +2319,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} +--- !u!4 &1165092670169827401 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 1745768441} + m_PrefabAsset: {fileID: 0} --- !u!4 &1165092670169827399 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218, @@ -2339,12 +2355,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} ---- !u!4 &1165092670169827401 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 1745768441} - m_PrefabAsset: {fileID: 0} --- !u!224 &7128533549541609610 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, @@ -2357,6 +2367,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} +--- !u!4 &1271572592464149430 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 1745768441} + m_PrefabAsset: {fileID: 0} --- !u!4 &1165092670169827409 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218,