diff --git a/Assets/ResWork/UI/Image/Battle/Layer-41.png b/Assets/ResWork/UI/Image/Battle/Layer-41.png deleted file mode 100644 index b12ad0d48..000000000 Binary files a/Assets/ResWork/UI/Image/Battle/Layer-41.png and /dev/null differ diff --git a/Assets/ResWork/UI/Image/Battle/Layer-41.png.meta b/Assets/ResWork/UI/Image/Battle/Layer-41.png.meta deleted file mode 100644 index 85ec871dc..000000000 --- a/Assets/ResWork/UI/Image/Battle/Layer-41.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: 4d17ce63fabb9a7478d259f65db88afa -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - 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: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UIPrefabs/Common/BattleUI.prefab b/Assets/ResWork/UIPrefabs/Common/BattleUI.prefab index 2baec96f0..676a22778 100644 --- a/Assets/ResWork/UIPrefabs/Common/BattleUI.prefab +++ b/Assets/ResWork/UIPrefabs/Common/BattleUI.prefab @@ -37,7 +37,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: 269, y: -106} + m_AnchoredPosition: {x: 288, y: -115.9} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3464558102048653457 @@ -146,6 +146,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2636027649394852014 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1399918668994270110} + - component: {fileID: 5703750343862071117} + - component: {fileID: 3634173034595472238} + m_Layer: 5 + m_Name: img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1399918668994270110 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2636027649394852014} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3930374343575347658} + 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: 89, y: 83} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5703750343862071117 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2636027649394852014} + m_CullTransparentMesh: 1 +--- !u!114 &3634173034595472238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2636027649394852014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5fe23778afeb41641b0622fc1c91dc8d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3104046232039160936 GameObject: m_ObjectHideFlags: 0 @@ -211,8 +286,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: abfaf37dcfcf2fe4a946a9bcd48f7f7d, type: 3} - m_Type: 3 + m_Sprite: {fileID: 21300000, guid: 4204c252fcbac504e8a50f23a3420d1d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -362,7 +437,8 @@ MonoBehaviour: m_text: 00.00 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -428,7 +504,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5301090690554160873 +--- !u!1 &5641889882583879855 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -436,54 +512,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8538851119552412991} - - component: {fileID: 6260768289978342411} - - component: {fileID: 6924786140129219121} - - component: {fileID: 5156468330993999064} + - component: {fileID: 6730958588570254048} + - component: {fileID: 4313858018977191423} + - component: {fileID: 2611921259136813526} m_Layer: 5 - m_Name: btnName + m_Name: icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8538851119552412991 +--- !u!224 &6730958588570254048 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5301090690554160873} + m_GameObject: {fileID: 5641889882583879855} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3930374343575347658} + m_Father: {fileID: 9013564077672272476} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 73, y: 78} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6260768289978342411 +--- !u!222 &4313858018977191423 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5301090690554160873} + m_GameObject: {fileID: 5641889882583879855} m_CullTransparentMesh: 1 ---- !u!114 &6924786140129219121 +--- !u!114 &2611921259136813526 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5301090690554160873} + m_GameObject: {fileID: 5641889882583879855} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -494,88 +569,16 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uD68C\uD53C" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &5156468330993999064 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5301090690554160873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} - m_Name: - m_EditorClassIdentifier: - m_localtextKey: 211 + m_Sprite: {fileID: 21300000, guid: 3de6be90f6bd88749aff84b2516f0fe0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5661378587943002927 GameObject: m_ObjectHideFlags: 0 @@ -609,14 +612,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8538851119552412991} + - {fileID: 1399918668994270110} - {fileID: 3434695980465431164} - {fileID: 8843483644745299078} m_Father: {fileID: 4460242486586314136} 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: 269, y: -106} + m_AnchoredPosition: {x: 288.3, y: -115.3} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6639470656715560532 @@ -640,15 +643,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.94117653, g: 0.8078432, b: 0.7490196, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4204c252fcbac504e8a50f23a3420d1d, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -778,7 +781,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: 286, y: 0} + m_AnchoredPosition: {x: 291.8, y: -14.8} m_SizeDelta: {x: 61, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3524211390582903338 @@ -887,154 +890,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &7458501873685806933 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5063232020181026548} - - component: {fileID: 9048073318336889032} - - component: {fileID: 4746297611230873448} - - component: {fileID: 1189519953095167750} - m_Layer: 5 - m_Name: btnName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5063232020181026548 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7458501873685806933} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5348763621509571247} - 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_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9048073318336889032 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7458501873685806933} - m_CullTransparentMesh: 1 ---- !u!114 &4746297611230873448 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7458501873685806933} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\uAE30\uBCF8\n\uACF5\uACA9" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &1189519953095167750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7458501873685806933} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} - m_Name: - m_EditorClassIdentifier: - m_localtextKey: 210 --- !u!1 &8796712154759432766 GameObject: m_ObjectHideFlags: 0 @@ -1065,14 +920,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5063232020181026548} + m_Children: [] m_Father: {fileID: 4460242486586314136} 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: 161.00002, y: 0} - m_SizeDelta: {x: 120, y: 120} + m_AnchoredPosition: {x: 156.9, y: 1.5} + m_SizeDelta: {x: 172, y: 172} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5452232696913076983 CanvasRenderer: @@ -1095,15 +949,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4204c252fcbac504e8a50f23a3420d1d, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1324,87 +1178,108 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4460242486586314136} m_Modifications: - - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Name value: SkillCard (1) objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 116.98 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 117.72 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.x - value: -83 + value: -103.7 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.y - value: -122 + value: -134 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -1415,7 +1290,8 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} --- !u!114 &1998944837787812551 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 259998291952226932} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1426,7 +1302,8 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!224 &6138592328938586116 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 259998291952226932} m_PrefabAsset: {fileID: 0} --- !u!1001 &2741816812563768531 @@ -1437,87 +1314,108 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4460242486586314136} m_Modifications: - - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Name value: SkillCard (4) objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 116.98 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 117.72 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.x - value: 171 + value: 177.4 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.y value: 171 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -1528,7 +1426,8 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} --- !u!114 &4479671444904244320 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 2741816812563768531} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1539,7 +1438,8 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!224 &8117731731153974947 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 2741816812563768531} m_PrefabAsset: {fileID: 0} --- !u!1001 &3151823642681622572 @@ -1550,98 +1450,129 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4460242486586314136} m_Modifications: - - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} + propertyPath: images.Array.data[0] + value: + objectReference: {fileID: 2611921259136813526} + - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Name value: SkillCard objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 116.98 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 117.72 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -19.43 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -3.22 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} + insertIndex: 1 + addedObject: {fileID: 6730958588570254048} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} --- !u!114 &3718733369362845855 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 3151823642681622572} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1652,7 +1583,8 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!224 &9013564077672272476 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 3151823642681622572} m_PrefabAsset: {fileID: 0} --- !u!1001 &4532663390670824716 @@ -1663,87 +1595,108 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4460242486586314136} m_Modifications: - - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Name value: SkillCard (5) objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 116.98 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 117.72 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.x - value: 288 + value: 308.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.y - value: 120 + value: 95.3 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -1754,7 +1707,8 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} --- !u!114 &2792618771975435711 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 4532663390670824716} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1765,7 +1719,8 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!224 &7515482432184645500 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 4532663390670824716} m_PrefabAsset: {fileID: 0} --- !u!1001 &4951466569658813539 @@ -1776,87 +1731,108 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4460242486586314136} m_Modifications: - - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Name value: SkillCard (2) objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 116.98 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 117.72 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.x - value: 85 + value: 44.8 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.y - value: -122 + value: -131.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -1867,12 +1843,14 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} --- !u!224 &1304986981166194195 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 4951466569658813539} m_PrefabAsset: {fileID: 0} --- !u!114 &6670176504942992592 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 4951466569658813539} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1889,87 +1867,108 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4460242486586314136} m_Modifications: - - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Name value: SkillCard (3) objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 116.98 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 117.72 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.x - value: 54 + value: 35.7 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_AnchoredPosition.y - value: 119 + value: 128.1 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -1980,12 +1979,14 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} --- !u!224 &674809742569461444 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 6914852541687956660} m_PrefabAsset: {fileID: 0} --- !u!114 &5174745289813152775 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} + m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, + type: 3} m_PrefabInstance: {fileID: 6914852541687956660} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} diff --git a/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab b/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab index 537ce4243..7f81438e1 100644 --- a/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab +++ b/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab @@ -15,7 +15,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8396956566727566944 RectTransform: m_ObjectHideFlags: 0 @@ -68,9 +68,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6245114044720075376} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 79.5, y: 12.9} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 7.5} m_SizeDelta: {x: 150, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5806709692520320161 @@ -104,7 +104,8 @@ MonoBehaviour: m_text: "\uC7A5\uCC29\uC911" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -135,7 +136,7 @@ MonoBehaviour: m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 m_characterSpacing: 0 @@ -218,10 +219,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6245114044720075376} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3624701311081739651 CanvasRenderer: @@ -251,7 +252,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: af531fab5e25291419383940932dde83, type: 3} + m_Sprite: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -565,7 +566,8 @@ MonoBehaviour: m_text: 000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -661,6 +663,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5158015191648705450} + - {fileID: 2403893713390902708} - {fileID: 7263991783333387616} - {fileID: 6764527112815540176} - {fileID: 8396956566727566944} @@ -670,7 +673,7 @@ RectTransform: 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: 100, y: 100} + m_SizeDelta: {x: 116.98, y: 117.72} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1740112032792105139 MonoBehaviour: @@ -688,7 +691,82 @@ MonoBehaviour: sprite_cooltime: {fileID: 1189055321421896372} label_cooltime: {fileID: 4529520284872784749} images: - - {fileID: 9106799318411996304} + - {fileID: 947158813515997121} gos: - {fileID: 1188724857551080037} - {fileID: 2727674756677301650} +--- !u!1 &6247733475211238780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2403893713390902708} + - component: {fileID: 7347588006284354083} + - component: {fileID: 947158813515997121} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2403893713390902708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6247733475211238780} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6245114044720075376} + 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: 73, y: 78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7347588006284354083 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6247733475211238780} + m_CullTransparentMesh: 1 +--- !u!114 &947158813515997121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6247733475211238780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3de6be90f6bd88749aff84b2516f0fe0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index d78ac1134..a6c10b1cb 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -115287,12 +115287,12 @@ PrefabInstance: - target: {fileID: 4460242486586314136, guid: c327e063c90438e419668019b3490455, type: 3} propertyPath: m_AnchoredPosition.x - value: -355 + value: -398 objectReference: {fileID: 0} - target: {fileID: 4460242486586314136, guid: c327e063c90438e419668019b3490455, type: 3} propertyPath: m_AnchoredPosition.y - value: 184 + value: 218 objectReference: {fileID: 0} - target: {fileID: 4460242486586314136, guid: c327e063c90438e419668019b3490455, type: 3}