From 8a0a8d73548bd0f22b909e50e8d19017ae63a5a5 Mon Sep 17 00:00:00 2001 From: Ino Date: Tue, 18 Feb 2025 12:04:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=A5=EB=B9=84=20=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EC=9D=BC=EB=8B=A8=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Image/Equipment/equipment slot.png | Bin 0 -> 557 bytes .../Image/Equipment/equipment slot.png.meta | 153 ++ .../UI/Image/Equipment/equipment window.png | Bin 0 -> 779 bytes .../Image/Equipment/equipment window.png.meta | 153 ++ .../UIPrefabs/Equipment/EquipItemCard.prefab | 20 +- .../Equipment/EquipmentSimpleCard.prefab | 100 +- Assets/Res_Addr/MainUI/NewGameUI.prefab | 1454 +++++++---------- Assets/Script/UI/Eqiupment/EquipmentPopup.cs | 3 - .../Eqiupment/EquipmentPopupItemInfoBase.cs | 6 +- 9 files changed, 971 insertions(+), 918 deletions(-) create mode 100644 Assets/ResWork/UI/Image/Equipment/equipment slot.png create mode 100644 Assets/ResWork/UI/Image/Equipment/equipment slot.png.meta create mode 100644 Assets/ResWork/UI/Image/Equipment/equipment window.png create mode 100644 Assets/ResWork/UI/Image/Equipment/equipment window.png.meta diff --git a/Assets/ResWork/UI/Image/Equipment/equipment slot.png b/Assets/ResWork/UI/Image/Equipment/equipment slot.png new file mode 100644 index 0000000000000000000000000000000000000000..ecfa8f7324789e558d6985f4e17864fafbfadcbf GIT binary patch literal 557 zcmeAS@N?(olHy`uVBq!ia0vp^MIg+<1|<9Mw$=hE&H|6fVg?3oVGw3ym^DX&fr0V9 zr;B4q#hka-?DMWTNH}~&p>F+sW3~%?^AAiBXcP9DkhRX?- z=TH5yl)VtY%1u#~OEb`;)5%LDXwd|r)+riGT!y*OYx~#21$XZ4togq+>gR6ldWP)> z65AIR?Tda;7p?#L+e5w|411X8y)%h8_nEumXwLUy$>g57?57UTz2SF7bO+nI8Sbwb kHQqelVDSDVFVdQ&MBb@04I&p-v9sr literal 0 HcmV?d00001 diff --git a/Assets/ResWork/UI/Image/Equipment/equipment slot.png.meta b/Assets/ResWork/UI/Image/Equipment/equipment slot.png.meta new file mode 100644 index 000000000..733f35f92 --- /dev/null +++ b/Assets/ResWork/UI/Image/Equipment/equipment slot.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: fc01b16d6a28db648b3d8e3b13e044eb +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/UI/Image/Equipment/equipment window.png b/Assets/ResWork/UI/Image/Equipment/equipment window.png new file mode 100644 index 0000000000000000000000000000000000000000..02ae147f7204a31bc8707f8011bcfda5754b3dc3 GIT binary patch literal 779 zcmeAS@N?(olHy`uVBq!ia0vp^?m!&D!3HFk8@vhxQk(@Ik;M!Q+`=Ht$S`Y;1Oo%p zUQZXtkcv5P@0`pQaTICzm~Zu1Lr;K7N`O_|rO=Vzi7&51DB$s@^}ARPHggnOYp^*9 zC@xZPI>Or7A~C&U1rKN9GvDt%d*8iU_1%$g=F(pu7aLFJnwuHm7u`7f0LO-yONQ(# zS%pcp2SZe7565u$ zn_0r+<|y8gG+txwRq^!b%mv5lt6prkv3Pty?k!NG_&HXkTOMM*ha{Q%rki?nlpeP1 zyzQeFt3K!Oft#DyIXCuN{BAfcdPXqib)lPQ!v2sYX6FnFWHUm5rkOT2AFxa)J_@vg zO-6a)-=K*`5Av@%w?wh639)rqks0q1@S4Z{L_rG%p|SXxxT)5*)8}Lq4+|Qh5~mt| zu4?Dla=z>thh*P`hscEAcd53^dsPp=yi@%kQ*wT4;Pz*Yo>T1CE$pjhf48aX?4*Zl zwstiCyt?mTLCpR}>jQ^=N%J26%W;=^U*4X>1rHcMth_9{^05umz0%#rsdLf~tohOq zQW(d)zRFg^bx!01&w1?2+Kk()=bjApvXC!)@3YgJ^*MLJ{uh&j4*X=i!}d?4HtCH; zx5bR5b@OD5&l&NhExgXWTU7g;{T;VYw-vgNbQyQHXEP)nspP2nurVOVqQ7zbKCy1j zbgmg6cP8jqoNvs$-+ip%bJ5q+)uqR09-C{bbyYH*?Yq_Du(sbP+ID?q`+jaol<@b{ qm-rs2Km5;J$GttiD)89Bf6Tp3K7SuPHQ5SG-3*?telF{r5}E*fcvv_9 literal 0 HcmV?d00001 diff --git a/Assets/ResWork/UI/Image/Equipment/equipment window.png.meta b/Assets/ResWork/UI/Image/Equipment/equipment window.png.meta new file mode 100644 index 000000000..2a77c6ee6 --- /dev/null +++ b/Assets/ResWork/UI/Image/Equipment/equipment window.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 68b2f4743be214445b585c759ff3e368 +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: 31, y: 44, z: 35, w: 37} + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UIPrefabs/Equipment/EquipItemCard.prefab b/Assets/ResWork/UIPrefabs/Equipment/EquipItemCard.prefab index 475fddc1c..da7d3c743 100644 --- a/Assets/ResWork/UIPrefabs/Equipment/EquipItemCard.prefab +++ b/Assets/ResWork/UIPrefabs/Equipment/EquipItemCard.prefab @@ -566,7 +566,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e0d3ecdd44da1e84199421d169a27098, type: 3} m_Name: m_EditorClassIdentifier: - go_empty: {fileID: 2535212310525736161} + IsCenterEquipItem: 0 images: - {fileID: 7223306809476952113} - {fileID: 6660228379390463995} @@ -872,7 +872,8 @@ MonoBehaviour: m_text: Lv.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: [] @@ -974,7 +975,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 15, y: -15} - m_SizeDelta: {x: 30, y: 30} + m_SizeDelta: {x: 37, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &289868753006032845 CanvasRenderer: @@ -997,15 +998,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.37254903, a: 1} + 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: ad122a8c78efb654ea39a3021f2605e5, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1082,14 +1083,15 @@ MonoBehaviour: m_text: 0 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: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4280427072 + m_fontColor: {r: 0.2509804, g: 0.13333334, b: 0.13333334, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/ResWork/UIPrefabs/Equipment/EquipmentSimpleCard.prefab b/Assets/ResWork/UIPrefabs/Equipment/EquipmentSimpleCard.prefab index a6861ce06..84204857c 100644 --- a/Assets/ResWork/UIPrefabs/Equipment/EquipmentSimpleCard.prefab +++ b/Assets/ResWork/UIPrefabs/Equipment/EquipmentSimpleCard.prefab @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -150, y: -160} - m_SizeDelta: {x: 75, y: 5} + m_AnchoredPosition: {x: -150, y: -92.500015} + m_SizeDelta: {x: 25, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2911550491251227834 CanvasRenderer: @@ -58,14 +58,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.37254903, a: 1} + 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: 6a34bb730ed40974f8a29071ce592d7f, type: 3} + m_Sprite: {fileID: 21300000, guid: 9aa7a5f2db51006418768da92b079a2c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -107,8 +107,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -247.2} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 0, y: -163} + m_SizeDelta: {x: 114, y: 114} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1901235824856408247 GameObject: @@ -144,8 +144,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -122} - m_SizeDelta: {x: 144.58, y: 5} + m_AnchoredPosition: {x: 0, y: -81.2} + m_SizeDelta: {x: 48, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2022046842317807181 CanvasRenderer: @@ -168,14 +168,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.37254903, a: 1} + 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: 6a34bb730ed40974f8a29071ce592d7f, type: 3} + m_Sprite: {fileID: 21300000, guid: 9aa7a5f2db51006418768da92b079a2c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -367,7 +367,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: -96, y: -247.2} + m_AnchoredPosition: {x: -96, y: -163} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3014111742660209513 @@ -404,8 +404,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -125} - m_SizeDelta: {x: 200, y: 5} + m_AnchoredPosition: {x: 0, y: -81.2} + m_SizeDelta: {x: 155, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5169632562895176144 CanvasRenderer: @@ -428,14 +428,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.37254903, a: 1} + 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: 6a34bb730ed40974f8a29071ce592d7f, type: 3} + m_Sprite: {fileID: 21300000, guid: 9aa7a5f2db51006418768da92b079a2c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -520,8 +520,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -97, y: -160} - m_SizeDelta: {x: 75, y: 5} + m_AnchoredPosition: {x: -76.6, y: -92.5} + m_SizeDelta: {x: 25, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2305307392081269984 CanvasRenderer: @@ -544,14 +544,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.37254903, a: 1} + 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: 6a34bb730ed40974f8a29071ce592d7f, type: 3} + m_Sprite: {fileID: 21300000, guid: 9aa7a5f2db51006418768da92b079a2c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -628,7 +628,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 771e7fe0adffe774baf7b7b042a59215, type: 3} + m_Sprite: {fileID: 21300000, guid: fc01b16d6a28db648b3d8e3b13e044eb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -782,8 +782,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -125} - m_SizeDelta: {x: 300, y: 5} + m_AnchoredPosition: {x: 0, y: -81.2} + m_SizeDelta: {x: 302, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5219512657682581450 CanvasRenderer: @@ -806,14 +806,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.37254903, a: 1} + 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: 6a34bb730ed40974f8a29071ce592d7f, type: 3} + m_Sprite: {fileID: 21300000, guid: 9aa7a5f2db51006418768da92b079a2c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -840,7 +840,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &256108943895153093 RectTransform: m_ObjectHideFlags: 0 @@ -857,7 +857,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: -64.3} + m_AnchoredPosition: {x: 0, y: -54.6} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7012155148243739088 @@ -989,8 +989,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: -150, y: -247.2} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -150, y: -163} + m_SizeDelta: {x: 114, y: 114} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6206949335652090867 GameObject: @@ -1033,7 +1033,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 114, y: 114} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4532782297094255189 MonoBehaviour: @@ -1098,8 +1098,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 150, y: -160} - m_SizeDelta: {x: 75, y: 5} + m_AnchoredPosition: {x: 150, y: -92.5} + m_SizeDelta: {x: 25, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4323378122633542763 CanvasRenderer: @@ -1122,14 +1122,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.37254903, a: 1} + 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: 6a34bb730ed40974f8a29071ce592d7f, type: 3} + m_Sprite: {fileID: 21300000, guid: 9aa7a5f2db51006418768da92b079a2c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1171,7 +1171,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: 96, y: -247.2} + m_AnchoredPosition: {x: 96, y: -163} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8018298787513237599 @@ -1208,8 +1208,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 97, y: -160} - m_SizeDelta: {x: 75, y: 5} + m_AnchoredPosition: {x: 76.6, y: -92.500015} + m_SizeDelta: {x: 25, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1363644833399760698 CanvasRenderer: @@ -1232,14 +1232,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.37254903, a: 1} + 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: 6a34bb730ed40974f8a29071ce592d7f, type: 3} + m_Sprite: {fileID: 21300000, guid: 9aa7a5f2db51006418768da92b079a2c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1283,8 +1283,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -87} - m_SizeDelta: {x: 75, y: 5} + m_AnchoredPosition: {x: 0, y: -69.1} + m_SizeDelta: {x: 25, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7513809877016283269 CanvasRenderer: @@ -1307,14 +1307,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.37254903, a: 1} + 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: 6a34bb730ed40974f8a29071ce592d7f, type: 3} + m_Sprite: {fileID: 21300000, guid: 9aa7a5f2db51006418768da92b079a2c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1356,8 +1356,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: 150, y: -247.2} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 150, y: -163} + m_SizeDelta: {x: 114, y: 114} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &9133574504470990419 GameObject: @@ -1384,17 +1384,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9133574504470990419} - 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: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 877588666381945270} - 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: 84, y: 0} - m_SizeDelta: {x: 24, y: 19} + m_AnchoredPosition: {x: 112.62, y: 0} + m_SizeDelta: {x: 18.34, y: 23.14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3307229664108551266 CanvasRenderer: @@ -1417,14 +1417,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.06666667, g: 0.2784314, b: 0.39607847, a: 1} + 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: 152933107c1c0794fa1b3035f46b4797, type: 3} + m_Sprite: {fileID: 21300000, guid: 35f842dbf84b12641982033ea323962b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index b53a95c87..9c3f46ff2 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -552,8 +552,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -901,7 +901,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6916818859616992336 RectTransform: m_ObjectHideFlags: 0 @@ -916,7 +916,6 @@ RectTransform: m_Children: - {fileID: 2961941243035769175} - {fileID: 1931376250412314802} - - {fileID: 5350118437241465123} m_Father: {fileID: 4320856396428848798} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3853,8 +3852,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -101, y: -101} - m_SizeDelta: {x: 45, y: 45} + m_AnchoredPosition: {x: -190.4, y: -52} + m_SizeDelta: {x: 35, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6613178756705054947 CanvasRenderer: @@ -3884,7 +3883,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 79b8ca635d9d8054192fcfd6c1527c9f, type: 3} + m_Sprite: {fileID: 21300000, guid: d8722df040e3b9e45a81f3809b0eada6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4389,7 +4388,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6374052843477865561 RectTransform: m_ObjectHideFlags: 0 @@ -4934,7 +4933,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4812218294237161657 RectTransform: m_ObjectHideFlags: 0 @@ -5362,9 +5361,9 @@ RectTransform: - {fileID: 1291482605501448486} m_Father: {fileID: 6678857581749354256} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 332.7998, y: -154.2998} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -627.2002, y: 385.7002} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2966918718451625825 @@ -8658,6 +8657,7 @@ RectTransform: - {fileID: 3232924465422865911} - {fileID: 6916818859616992336} - {fileID: 3168228426446811910} + - {fileID: 5350118437241465123} - {fileID: 7684755804196160290} - {fileID: 2815953702369124136} - {fileID: 4700765416352369191} @@ -10122,141 +10122,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &934603075281129545 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7481588679423237212} - - component: {fileID: 551904244162397592} - - component: {fileID: 2302810386755006342} - m_Layer: 5 - m_Name: btnName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7481588679423237212 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 934603075281129545} - 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: 7684755804196160290} - 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 &551904244162397592 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 934603075281129545} - m_CullTransparentMesh: 1 ---- !u!114 &2302810386755006342 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 934603075281129545} - 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: + - 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: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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!1 &936732000731601462 GameObject: m_ObjectHideFlags: 0 @@ -12903,7 +12768,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -192.7998} + m_AnchoredPosition: {x: 394.6, y: -199} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2300206531550454273 @@ -12944,8 +12809,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4280647227 - m_fontColor: {r: 0.23137257, g: 0.49411768, b: 0.14509805, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -12962,8 +12827,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -14595,6 +14460,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1254288075051321098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4152121606644259511} + - component: {fileID: 7276636795476872222} + - component: {fileID: 8815792034749977914} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4152121606644259511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254288075051321098} + 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: 1929293313172071507} + 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: 59} + m_SizeDelta: {x: 513.43, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7276636795476872222 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254288075051321098} + m_CullTransparentMesh: 1 +--- !u!114 &8815792034749977914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254288075051321098} + 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: 9aa7a5f2db51006418768da92b079a2c, 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 &1254302869882342954 GameObject: m_ObjectHideFlags: 0 @@ -16443,7 +16383,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -140} + m_AnchoredPosition: {x: 394.6, y: -129.5} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7763257615838611420 @@ -16484,8 +16424,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4280647227 - m_fontColor: {r: 0.23137257, g: 0.49411768, b: 0.14509805, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -16502,8 +16442,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -18089,141 +18029,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1634614389421738676 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6312892387559882547} - - component: {fileID: 363759655132205893} - - component: {fileID: 3126663204751781478} - m_Layer: 5 - m_Name: itemname - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6312892387559882547 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634614389421738676} - 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: 1929293313172071507} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -97} - m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &363759655132205893 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634614389421738676} - m_CullTransparentMesh: 1 ---- !u!114 &3126663204751781478 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634614389421738676} - 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: "\uD574\uACE8 \uC7A5\uAC11" - 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: 4279448845 - m_fontColor: {r: 0.050980393, g: 0.20784314, b: 0.07450981, 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: 30 - m_fontSizeBase: 30 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - 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!1 &1664641475252569696 GameObject: m_ObjectHideFlags: 0 @@ -18827,9 +18632,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 915794159400544783} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -283, y: -181} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 677, y: 359} m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &570542743827028761 @@ -20815,7 +20620,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -167.40039} + m_AnchoredPosition: {x: 394.6, y: -164.5} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3852905313092655861 @@ -20856,8 +20661,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4280647227 - m_fontColor: {r: 0.23137257, g: 0.49411768, b: 0.14509805, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -20874,8 +20679,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -21330,8 +21135,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -23514,8 +23319,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -1, y: -150} - m_SizeDelta: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: -136.6} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2188352651237493007 MonoBehaviour: @@ -23535,7 +23340,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 50 + m_Spacing: 44 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -24920,8 +24725,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: 26.5, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 116.12, y: -30.500006} + m_SizeDelta: {x: 64.4, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &840008049314494041 CanvasRenderer: @@ -24944,15 +24749,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.37254903, 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: ad122a8c78efb654ea39a3021f2605e5, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -29354,17 +29159,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2376970915107298543} - 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3678107361007672082} + m_Father: {fileID: 9128226773256001739} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -40, y: 0} - m_SizeDelta: {x: 54, y: 60} + m_AnchoredPosition: {x: -39.034973, y: 387.75583} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8643907899104915162 CanvasRenderer: @@ -29389,12 +29194,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_RaycastPadding: {x: -20, y: -20, z: -20, w: -20} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b7b9999169296404a806626d12bad78f, type: 3} + m_Sprite: {fileID: 21300000, guid: 59ce7eb8a2136b4499a5f3cbe977c799, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -29502,18 +29307,18 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3678107361007672082} + - {fileID: 5230258766999400258} + - {fileID: 5354303412010063636} - {fileID: 3170807036336194148} - {fileID: 3700178102637278528} - {fileID: 2532374405180349160} - - {fileID: 4341651098111598145} - {fileID: 7370117396862910807} m_Father: {fileID: 2798508324005988114} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 312.5, y: 0} - m_SizeDelta: {x: -655, y: -30} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -398.76, y: -85.45001} + m_SizeDelta: {x: 622.06995, y: 840.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &608126718198484236 CanvasRenderer: @@ -29543,7 +29348,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4204c252fcbac504e8a50f23a3420d1d, type: 3} + m_Sprite: {fileID: 21300000, guid: 68b2f4743be214445b585c759ff3e368, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -30049,141 +29854,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2440905130361413704 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9154253104684578921} - - component: {fileID: 6309352453229606073} - - component: {fileID: 1539682160444014838} - m_Layer: 5 - m_Name: btnName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9154253104684578921 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2440905130361413704} - 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: 3168228426446811910} - 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 &6309352453229606073 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2440905130361413704} - m_CullTransparentMesh: 1 ---- !u!114 &1539682160444014838 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2440905130361413704} - 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: _ - 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: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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!1 &2442733550320429818 GameObject: m_ObjectHideFlags: 0 @@ -37578,8 +37248,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 70, y: 0} - m_SizeDelta: {x: 100, y: 50} + m_AnchoredPosition: {x: 174.47, y: 0} + m_SizeDelta: {x: 96.12, y: 42.24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6615007339305731664 CanvasRenderer: @@ -37602,14 +37272,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.49411768, b: 0.14509805, a: 1} + 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: 8d5013a0a4fa7534583f7b0a327b3750, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -38082,7 +37752,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: 178, y: -46} + m_AnchoredPosition: {x: 264.1, y: -65.5} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6865054945846477194 @@ -38113,7 +37783,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 000% + m_text: 12% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -38123,8 +37793,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -38141,8 +37811,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 - m_fontSizeBase: 25 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -40121,8 +39791,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 - m_fontSizeBase: 25 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -41940,10 +41610,10 @@ RectTransform: - {fileID: 7853837219095294745} m_Father: {fileID: 6678857581749354256} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 452.92, y: -588.3005} - m_SizeDelta: {x: 286.66, y: 655.77} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -507.08, y: -48.300476} + m_SizeDelta: {x: 286.66003, y: 655.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2297552932747190140 CanvasRenderer: @@ -44175,83 +43845,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &3473278545327764336 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4341651098111598145} - - component: {fileID: 2106577357944722582} - - component: {fileID: 1292964943998525165} - m_Layer: 5 - m_Name: Needmaterial - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4341651098111598145 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3473278545327764336} - 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: - - {fileID: 195233247355243223} - - {fileID: 7658972542637254489} - m_Father: {fileID: 9128226773256001739} - 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: -101, y: -278} - m_SizeDelta: {x: 150, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2106577357944722582 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3473278545327764336} - m_CullTransparentMesh: 1 ---- !u!114 &1292964943998525165 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3473278545327764336} - 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: b1514129703bd434eb2e324593899314, type: 3} - m_Type: 1 - 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 &3479687770452989418 GameObject: m_ObjectHideFlags: 0 @@ -46308,7 +45901,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5937904892543587595 RectTransform: m_ObjectHideFlags: 0 @@ -51088,20 +50681,20 @@ RectTransform: m_Children: - {fileID: 2697403350766445263} - {fileID: 8813601775983850870} - - {fileID: 6312892387559882547} - {fileID: 972316426383668212} - {fileID: 4712866204584516064} - {fileID: 3247498695070627217} - {fileID: 3217846209754240021} - {fileID: 179135776788942054} + - {fileID: 4152121606644259511} - {fileID: 5937904892543587595} - {fileID: 5075522899500778625} m_Father: {fileID: 789809089060598572} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -312.5, y: 0} - m_SizeDelta: {x: -655, y: -30} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -83.29, y: -86.51} + m_SizeDelta: {x: 621.05, y: 841.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6296943081183318736 CanvasRenderer: @@ -51131,7 +50724,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4204c252fcbac504e8a50f23a3420d1d, type: 3} + m_Sprite: {fileID: 21300000, guid: 68b2f4743be214445b585c759ff3e368, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -51818,10 +51411,10 @@ RectTransform: - {fileID: 8346101053915934078} m_Father: {fileID: 6678857581749354256} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 408.5, y: 222} - m_SizeDelta: {x: 281.41, y: 70.78} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 408.5, y: -318} + m_SizeDelta: {x: 281.41, y: 70.78003} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3273404139508595804 CanvasRenderer: @@ -51983,7 +51576,6 @@ MonoBehaviour: texts_iteminfo: - {fileID: 986883333296786315} - {fileID: 4643182670360652768} - - {fileID: 3126663204751781478} - {fileID: 6095776291396081181} texts_stat: - {fileID: 8398308708002638768} @@ -57169,83 +56761,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 326 ---- !u!1 &4527707595255321002 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3678107361007672082} - - component: {fileID: 6443060617678001848} - - component: {fileID: 6843942510877791669} - m_Layer: 5 - m_Name: top_grade - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3678107361007672082 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4527707595255321002} - 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: - - {fileID: 5354303412010063636} - - {fileID: 5230258766999400258} - m_Father: {fileID: 9128226773256001739} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -32.65918} - m_SizeDelta: {x: 624, y: 65.32001} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6443060617678001848 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4527707595255321002} - m_CullTransparentMesh: 1 ---- !u!114 &6843942510877791669 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4527707595255321002} - 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: 0.043137256, g: 0.18431373, b: 0.25490198, 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_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 &4542648532402223689 GameObject: m_ObjectHideFlags: 0 @@ -61189,13 +60704,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9154253104684578921} + m_Children: [] m_Father: {fileID: 4320856396428848798} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -73.39999, y: 30.000006} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.6, y: -40.2} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1636208607475502150 @@ -61221,13 +60735,13 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_RaycastPadding: {x: -15, y: -15, z: -15, w: -15} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 043eec3bab8b14540aa8158837c6af73, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: eda5119f451fea248a06ffe5bc34c77e, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -61392,7 +60906,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: 178, y: -11} + m_AnchoredPosition: {x: 262.6, y: -38.2} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3700737343459755610 @@ -61433,8 +60947,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -61451,8 +60965,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 17 + m_fontSizeBase: 17 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -63926,8 +63440,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 49.999508} - m_SizeDelta: {x: -620, y: 0} + m_AnchoredPosition: {x: 0.000091967704, y: 62.9} + m_SizeDelta: {x: -570.30994, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &3010770995073461454 MonoBehaviour: @@ -63961,7 +63475,7 @@ MonoBehaviour: m_Top: 5 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 70 + m_Spacing: 98.7 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -64889,9 +64403,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5366708532861094367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 408.5996, y: -186.8999} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -551.4004, y: 353.1001} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &647719854388424418 @@ -66323,6 +65837,141 @@ MonoBehaviour: - {fileID: 2794429696635918067} texts: - {fileID: 6283613084704500478} +--- !u!1 &5414836192020329147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6498101950566511491} + - component: {fileID: 5505687023581186865} + - component: {fileID: 4664180441166650073} + m_Layer: 5 + m_Name: t_smeling_After + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6498101950566511491 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5414836192020329147} + 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: 8296254884609126443} + 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: 210.5, y: -100} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5505687023581186865 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5414836192020329147} + m_CullTransparentMesh: 1 +--- !u!114 &4664180441166650073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5414836192020329147} + 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: 34% + 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: 4279491843 + m_fontColor: {r: 0.011764706, g: 0.8666667, b: 0.07450981, 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: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 20 + 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!1 &5415595708530692618 GameObject: m_ObjectHideFlags: 0 @@ -66936,6 +66585,8 @@ RectTransform: - {fileID: 2602686681775246783} - {fileID: 3917897339767494900} - {fileID: 1377521345366427959} + - {fileID: 5486130183237286005} + - {fileID: 6498101950566511491} - {fileID: 5156202660941235862} - {fileID: 2991606319620278104} - {fileID: 992118872563921620} @@ -70723,7 +70374,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: 26.499985, y: -32} + m_AnchoredPosition: {x: 114.999985, y: -75.09999} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &935203636822665474 @@ -70764,8 +70415,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -72097,7 +71748,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5889654477426572594} - 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_ConstrainProportionsScale: 0 @@ -72107,8 +71758,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -239} - m_SizeDelta: {x: 300, y: 100} + m_AnchoredPosition: {x: -0.1499939, y: 104.29001} + m_SizeDelta: {x: 151.59, y: 55.76001} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5625557354653286214 CanvasRenderer: @@ -72131,15 +71782,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.043137256, g: 0.18823531, b: 0.25490198, a: 1} + m_Color: {r: 0.92549026, g: 0.2509804, b: 0.27450982, 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 66cbaebc252c3a641a4947c281c01b01, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -76353,8 +76004,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -26.8} - m_SizeDelta: {x: 100, y: 60} + m_AnchoredPosition: {x: -92.91, y: -147.9} + m_SizeDelta: {x: 154.61, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8662877359925124022 CanvasRenderer: @@ -76377,15 +76028,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.043137256, g: 0.18823531, b: 0.25490198, 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -79171,7 +78822,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 237652c2ae4f9564ebcb1a1a00b76cfb, type: 3} + m_Sprite: {fileID: 21300000, guid: b5f82ab03360cd048b239673a417964f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -80092,7 +79743,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: 105, y: 0} + m_AnchoredPosition: {x: 95.1, y: -2.3} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9014950067441704918 @@ -80133,8 +79784,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -80353,8 +80004,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -80807,13 +80458,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7481588679423237212} + m_Children: [] m_Father: {fileID: 4320856396428848798} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 76.50001, y: 30.000006} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 89.5, y: -40.199974} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9021450433906678351 @@ -80839,13 +80489,13 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_RaycastPadding: {x: -15, y: -15, z: -15, w: -15} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 043eec3bab8b14540aa8158837c6af73, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 1641f7904b03dd54e9a747324d2dc2bb, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -82074,10 +81724,10 @@ RectTransform: - {fileID: 2639294083504980263} m_Father: {fileID: 1929293313172071507} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -79, y: -184} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.1499939, y: 104.29001} + m_SizeDelta: {x: 151.59, y: 55.76001} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2419372971150478249 CanvasRenderer: @@ -82100,15 +81750,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.043137256, g: 0.18823531, b: 0.25490198, 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -82669,16 +82319,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6905885049701238549} - 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4341651098111598145} + m_Father: {fileID: 7370117396862910807} 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: 11.999989} + m_AnchoredPosition: {x: -62.6, y: 0} m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5676241825111871039 @@ -82813,8 +82463,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -84069,10 +83719,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2602686681775246783} 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_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -3} + m_SizeDelta: {x: 64, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7686865215575764328 CanvasRenderer: @@ -84102,7 +83752,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0 + m_text: 1 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -84112,8 +83762,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4280427072 + m_fontColor: {r: 0.2509804, g: 0.13333334, b: 0.13333334, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -84130,8 +83780,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -84316,7 +83966,6 @@ GameObject: m_Component: - component: {fileID: 3170807036336194148} - component: {fileID: 5609048312242769659} - - component: {fileID: 8707346833767103315} - component: {fileID: 2725412409768023474} m_Layer: 5 m_Name: scrollview_ @@ -84342,8 +83991,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -118} - m_SizeDelta: {x: 0, y: 100} + m_AnchoredPosition: {x: 23.38, y: -184.26} + m_SizeDelta: {x: -46.76, y: 132.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5609048312242769659 CanvasRenderer: @@ -84353,36 +84002,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7106810911609836876} m_CullTransparentMesh: 1 ---- !u!114 &8707346833767103315 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7106810911609836876} - 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: 0.5137255, g: 0.7960785, b: 0.92549026, 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: 65f581562538e304cbbfe8ee3beab09c, 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!114 &2725412409768023474 MonoBehaviour: m_ObjectHideFlags: 0 @@ -87000,8 +86619,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -32.65918} - m_SizeDelta: {x: 624, y: 65.32001} + m_AnchoredPosition: {x: 0, y: -46.35} + m_SizeDelta: {x: 624, y: 52.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1284385257309537800 CanvasRenderer: @@ -87024,15 +86643,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.050980397, g: 0.20784315, b: 0.07450981, 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: ee00527f5a79caa40ba0822ab5aa8edd, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -88831,16 +88450,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7458617669617851827} - 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6916818859616992336} + m_Father: {fileID: 4320856396428848798} 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: 45.6, y: -40.1} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3122929647105651883 @@ -88871,10 +88490,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00/00 + m_text: 12 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -88898,8 +88518,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -89300,9 +88920,9 @@ RectTransform: - {fileID: 6666107677646236944} m_Father: {fileID: 915794159400544783} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 131.5, y: -170.9} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -828.5, y: 369.1} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4177146815410830654 @@ -90631,7 +90251,7 @@ GameObject: - component: {fileID: 6480572917250615529} - component: {fileID: 7917044040285265190} m_Layer: 5 - m_Name: smeltingeffect + m_Name: t_smeling_Before m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -90653,7 +90273,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: 26.49998, y: -60} + m_AnchoredPosition: {x: 125.1, y: -99.2} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6480572917250615529 @@ -90684,7 +90304,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: '{0}% >> {1}%' + m_text: 12% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -90694,8 +90314,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -90712,14 +90332,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + 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_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 m_characterSpacing: 0 @@ -91266,12 +90886,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5000966524572111408} + - {fileID: 195233247355243223} + - {fileID: 7658972542637254489} m_Father: {fileID: 9128226773256001739} 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: 124, y: -278} - m_SizeDelta: {x: 100, y: 70} + m_AnchoredPosition: {x: 22.48, y: -355.68} + m_SizeDelta: {x: 242.72, y: 55.36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7938194699440758851 CanvasRenderer: @@ -91294,15 +90916,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.043137256, g: 0.18431373, b: 0.25490198, 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -91600,7 +91222,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3232924465422865911 RectTransform: m_ObjectHideFlags: 0 @@ -92458,7 +92080,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -40, y: 0} - m_SizeDelta: {x: 54, y: 60} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4805552442498425070 CanvasRenderer: @@ -92483,12 +92105,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_RaycastPadding: {x: -15, y: -15, z: -15, w: -15} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b7b9999169296404a806626d12bad78f, type: 3} + m_Sprite: {fileID: 21300000, guid: 59ce7eb8a2136b4499a5f3cbe977c799, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -95181,7 +94803,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: 14.6, y: -3.1} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7901292903085939550 @@ -96437,8 +96059,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: 492, y: -31} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 261.72, y: -150.57} + m_SizeDelta: {x: 154.77, y: 56.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &15529812484269248 CanvasRenderer: @@ -96461,15 +96083,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.043137256, g: 0.18823531, b: 0.25490198, 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -99018,8 +98640,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: 200, y: 3.3} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 87.3, y: -147.9} + m_SizeDelta: {x: 154.61, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8820471675121262144 CanvasRenderer: @@ -99042,15 +98664,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.043137256, g: 0.18823531, b: 0.25490198, 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -100179,7 +99801,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: 45.5, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4828907668962172836 @@ -100238,8 +99860,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -100544,7 +100166,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC7A5\uCC29\n/\n\uBBF8\uBCF4\uC720" + m_text: "\uC7A5\uCC29/\uBBF8\uBCF4\uC720" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -100582,7 +100204,7 @@ MonoBehaviour: m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -5 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -101546,6 +101168,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8296254884609126443} + - {fileID: 9147273932310428556} - {fileID: 4320856396428848798} m_Father: {fileID: 1929293313172071507} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -107391,11 +107014,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3678107361007672082} + m_Father: {fileID: 9128226773256001739} 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: 363.85587} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1227761032590672905 @@ -107454,8 +107077,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -107690,9 +107313,9 @@ RectTransform: - {fileID: 3981901099563870773} m_Father: {fileID: 5366708532861094367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -581.98, y: -51} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 378.02002, y: -51} m_SizeDelta: {x: 856.03, y: 878.64} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8933631038733826006 @@ -108117,6 +107740,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8962670622226769758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5486130183237286005} + - component: {fileID: 5300842506242941783} + - component: {fileID: 8876569922549767632} + m_Layer: 5 + m_Name: arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5486130183237286005 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8962670622226769758} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8296254884609126443} + 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: 115.73, y: -98.94} + m_SizeDelta: {x: 15.32, y: 15.77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5300842506242941783 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8962670622226769758} + m_CullTransparentMesh: 1 +--- !u!114 &8876569922549767632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8962670622226769758} + 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: f17e0d68299b3a24586345fdf99113a2, 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 &8962871037171913781 GameObject: m_ObjectHideFlags: 0 @@ -109571,16 +109269,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9052787780311022840} - 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4341651098111598145} + m_Father: {fileID: 7370117396862910807} 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: -28} + m_AnchoredPosition: {x: 33.3, y: 0} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2754785190848615946 @@ -109621,8 +109319,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -109646,10 +109344,10 @@ MonoBehaviour: m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -5 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -110539,6 +110237,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 320 +--- !u!1 &9099571525387993276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9147273932310428556} + - component: {fileID: 7573380973802305377} + - component: {fileID: 3970831298405185203} + m_Layer: 5 + m_Name: line (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9147273932310428556 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9099571525387993276} + 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: 5075522899500778625} + 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: -163} + m_SizeDelta: {x: 513.43, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7573380973802305377 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9099571525387993276} + m_CullTransparentMesh: 1 +--- !u!114 &3970831298405185203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9099571525387993276} + 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: 9aa7a5f2db51006418768da92b079a2c, 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 &9101868089543540923 GameObject: m_ObjectHideFlags: 0 @@ -111337,9 +111110,9 @@ RectTransform: - {fileID: 3239661910951373017} m_Father: {fileID: 5366708532861094367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 455.5996, y: -588.3003} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -504.4004, y: -48.300293} m_SizeDelta: {x: 292.01, y: 655.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1842387937674693953 @@ -113308,12 +113081,12 @@ PrefabInstance: - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 332 + value: 420.5 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_AnchoredPosition.y - value: -23 + value: -59.5 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} @@ -117456,12 +117229,12 @@ PrefabInstance: - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 114 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 114 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} @@ -117501,7 +117274,7 @@ PrefabInstance: - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 463 + value: 469.03497 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} @@ -121991,22 +121764,22 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -122056,12 +121829,12 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.x - value: 639 + value: 211 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.y - value: -229 + value: 210 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -126945,12 +126718,12 @@ PrefabInstance: - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 114 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 114 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} @@ -126995,7 +126768,7 @@ PrefabInstance: - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_AnchoredPosition.y - value: 97 + value: 24.4 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} @@ -127012,31 +126785,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1192729509063090000, guid: b63abcc76ffe49a45888350a450144b7, - type: 3} - propertyPath: m_SizeDelta.x - value: 150 - objectReference: {fileID: 0} - - target: {fileID: 3472520152290861284, guid: b63abcc76ffe49a45888350a450144b7, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -75 - objectReference: {fileID: 0} - - target: {fileID: 3856196257142083065, guid: b63abcc76ffe49a45888350a450144b7, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4234537026881912517, guid: b63abcc76ffe49a45888350a450144b7, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4803956767592713781, guid: b63abcc76ffe49a45888350a450144b7, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 75 - objectReference: {fileID: 0} - target: {fileID: 6206949335652090867, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_Name @@ -127258,12 +127006,12 @@ PrefabInstance: - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 114 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 114 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} @@ -127303,7 +127051,7 @@ PrefabInstance: - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 163 + value: 153.03497 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} @@ -132742,12 +132490,12 @@ PrefabInstance: - target: {fileID: 2427202657838919516, guid: 14c28ebbe688ad44f942d237e0d2cf3f, type: 3} propertyPath: m_AnchoredPosition.x - value: 68 + value: 159.3 objectReference: {fileID: 0} - target: {fileID: 2427202657838919516, guid: 14c28ebbe688ad44f942d237e0d2cf3f, type: 3} propertyPath: m_AnchoredPosition.y - value: -134 + value: -183.7 objectReference: {fileID: 0} - target: {fileID: 2427202657838919516, guid: 14c28ebbe688ad44f942d237e0d2cf3f, type: 3} @@ -137812,12 +137560,12 @@ PrefabInstance: - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 114 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 114 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} @@ -137857,7 +137605,7 @@ PrefabInstance: - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 313 + value: 311.03497 objectReference: {fileID: 0} - target: {fileID: 877588666381945270, guid: b63abcc76ffe49a45888350a450144b7, type: 3} diff --git a/Assets/Script/UI/Eqiupment/EquipmentPopup.cs b/Assets/Script/UI/Eqiupment/EquipmentPopup.cs index 141208840..bc62cfac9 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentPopup.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentPopup.cs @@ -1,7 +1,4 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; -using UnityEngine; public class EquipmentPopup : EquipmentPopupItemInfoBase { diff --git a/Assets/Script/UI/Eqiupment/EquipmentPopupItemInfoBase.cs b/Assets/Script/UI/Eqiupment/EquipmentPopupItemInfoBase.cs index f359282e5..3b9490557 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentPopupItemInfoBase.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentPopupItemInfoBase.cs @@ -4,7 +4,7 @@ using UnityEngine.UI; public class EquipmentPopupItemInfoBase : BackKeyAdd { public EquipItemCard m_Card; - public TextMeshProUGUI[] texts_iteminfo; // 0 top등급, 1 top이름, 2 이름, 3 종류 + public TextMeshProUGUI[] texts_iteminfo; // 0 top등급, 1 top이름, 2 종류 public TextMeshProUGUI[] texts_stat; // 0 ~ 2 장비 능력 public Image[] images_iteminfo; // 0 top이름bg, 1 top등급bg, 2 종류 @@ -29,8 +29,8 @@ public class EquipmentPopupItemInfoBase : BackKeyAdd m_Card.Set_CardType(eUICardType.UIEquip); texts_iteminfo[0].text = table_itemlist.Ins.Get_GradeName(m_ItemData.n_ItemID); - texts_iteminfo[1].text = texts_iteminfo[2].text = table_itemlist.Ins.Get_ItemName(m_ItemData.n_ItemID); - texts_iteminfo[3].text = m_ItemData.Get_ItemTypeName(); + texts_iteminfo[1].text = table_itemlist.Ins.Get_ItemName(m_ItemData.n_ItemID); + texts_iteminfo[2].text = m_ItemData.Get_ItemTypeName(); images_iteminfo[2].sprite = UIAtlasMgr.Ins.Get_Sprite(DSUtil.Format("chest_{0}", m_ItemData.e_ItemType.ToString().ToLower()));