diff --git a/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px/rounded-bg-6px.png b/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px/rounded-bg-6px.png index dc40a6df5..111ff3765 100644 Binary files a/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px/rounded-bg-6px.png and b/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px/rounded-bg-6px.png differ diff --git a/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px/rounded-bg-6px.png.meta b/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px/rounded-bg-6px.png.meta index 8f41980cc..9b3c1c62b 100644 --- a/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px/rounded-bg-6px.png.meta +++ b/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px/rounded-bg-6px.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 + filterMode: 1 aniso: 1 mipBias: 0 wrapU: 1 @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 400 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -134,16 +134,16 @@ TextureImporter: serializedVersion: 2 x: 0 y: 0 - width: 64 - height: 64 + width: 256 + height: 256 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 6, y: 6, z: 6, w: 6} + border: {x: 24, y: 24, z: 24, w: 24} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 5695434ae09b7894888b9766c0fafe5c + spriteID: 360790ebffffffff0800000000000000 internalID: -1106677661 vertices: [] indices: @@ -153,18 +153,18 @@ TextureImporter: name: top rect: serializedVersion: 2 - x: 64 + x: 257 y: 0 - width: 64 - height: 64 + width: 256 + height: 256 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 6, y: 6, z: 6, w: 6} + border: {x: 24, y: 24, z: 24, w: 24} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 1350a8d457f4c424f98c69ce6e6df1be + spriteID: d6320914000000000800000000000000 internalID: 1099965293 vertices: [] indices: @@ -174,18 +174,18 @@ TextureImporter: name: topleft rect: serializedVersion: 2 - x: 128 + x: 515 y: 0 - width: 64 - height: 64 + width: 256 + height: 256 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 6, y: 6, z: 6, w: 6} + border: {x: 24, y: 24, z: 24, w: 24} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 3f2592c6e00f5894ab312ff3ce6f5dc1 + spriteID: f50c884cffffffff0800000000000000 internalID: -997670817 vertices: [] indices: @@ -195,18 +195,18 @@ TextureImporter: name: topright rect: serializedVersion: 2 - x: 192 + x: 771 y: 0 - width: 64 - height: 64 + width: 256 + height: 256 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 6, y: 6, z: 6, w: 6} + border: {x: 24, y: 24, z: 24, w: 24} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 782584f2863184b458a12717d9678b79 + spriteID: 7fd72819ffffffff0800000000000000 internalID: -1853719049 vertices: [] indices: @@ -216,18 +216,18 @@ TextureImporter: name: all rect: serializedVersion: 2 - x: 256 + x: 1028 y: 0 - width: 64 - height: 64 + width: 256 + height: 256 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 6, y: 6, z: 6, w: 6} + border: {x: 24, y: 24, z: 24, w: 24} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 0f3cd91703739b04b86d55ba7d1b25e9 + spriteID: 85846835000000000800000000000000 internalID: 1401309272 vertices: [] indices: @@ -237,18 +237,18 @@ TextureImporter: name: bottom rect: serializedVersion: 2 - x: 320 + x: 1285 y: 0 - width: 64 - height: 64 + width: 256 + height: 256 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 6, y: 6, z: 6, w: 6} + border: {x: 24, y: 24, z: 24, w: 24} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: e3d49d09c750a384aac9b16bb51b26a2 + spriteID: 384ae3a6000000000800000000000000 internalID: 1782490243 vertices: [] indices: @@ -258,18 +258,18 @@ TextureImporter: name: bottomleft rect: serializedVersion: 2 - x: 384 + x: 1542 y: 0 - width: 64 - height: 64 + width: 256 + height: 256 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 6, y: 6, z: 6, w: 6} + border: {x: 24, y: 24, z: 24, w: 24} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: ed9f01dd79b2205449a42f45cb342289 + spriteID: 9cfd7a57000000000800000000000000 internalID: 1973936073 vertices: [] indices: @@ -279,18 +279,18 @@ TextureImporter: name: bottomright rect: serializedVersion: 2 - x: 448 + x: 1798 y: 0 - width: 64 - height: 64 + width: 256 + height: 256 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 6, y: 6, z: 6, w: 6} + border: {x: 24, y: 24, z: 24, w: 24} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 03b889313964dcb47baff7696505e9c8 + spriteID: 6a55bf0effffffff0800000000000000 internalID: -520399450 vertices: [] indices: @@ -300,18 +300,18 @@ TextureImporter: name: left rect: serializedVersion: 2 - x: 512 + x: 2057 y: 0 - width: 64 - height: 64 + width: 255 + height: 256 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 6, y: 6, z: 6, w: 6} + border: {x: 24, y: 24, z: 24, w: 24} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: c40d45e6189a98a4c873384925aab9f1 + spriteID: 3ed72837000000000800000000000000 internalID: 1937931747 vertices: [] indices: diff --git a/Assets/Scenes/Judgement.unity b/Assets/Scenes/Judgement.unity index cfbebb30d..23225ca52 100644 --- a/Assets/Scenes/Judgement.unity +++ b/Assets/Scenes/Judgement.unity @@ -10235,6 +10235,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272774269} m_CullTransparentMesh: 1 +--- !u!21 &498369510 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 632, g: 92, b: 84, a: 0} + m_BuildTextureStacks: [] --- !u!1 &513457786 GameObject: m_ObjectHideFlags: 0 @@ -10362,11 +10398,11 @@ MonoBehaviour: barRankWait: 1 rankMusWait: 1.5 barColourNg: {r: 0, g: 0.78431374, b: 1, a: 1} - barColourOk: {r: 0, g: 1, b: 0, a: 1} - barColourHi: {r: 1, g: 0, b: 0, a: 1} + barColourOk: {r: 0.43137255, g: 0.9490196, b: 0.22745098, a: 1} + barColourHi: {r: 1, g: 0.12156863, b: 0.09411765, a: 1} numColourNg: {r: 0, g: 0, b: 1, a: 1} - numColourOk: {r: 0, g: 0.78431374, b: 0, a: 1} - numColourHi: {r: 0.78431374, g: 0, b: 0, a: 1} + numColourOk: {r: 0.07450981, g: 0.6862745, b: 0.28627452, a: 1} + numColourHi: {r: 0.7372549, g: 0.09411765, b: 0.25490198, a: 1} messageMid: {fileID: 8300000, guid: c8214d9f68da85749bb54818c69e6909, type: 3} messageLast: {fileID: 8300000, guid: 50705073a61e8df44943462793889ad1, type: 3} barLoop: {fileID: 8300000, guid: b161062216def1548b7ec775263782ab, type: 3} @@ -10938,7 +10974,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -160, y: -96} + m_SizeDelta: {x: -256, y: -96} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &902003161 MonoBehaviour: @@ -10987,12 +11023,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 42.8 + m_fontSize: 50 m_fontSizeBase: 72 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_fontSizeMax: 50 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -11055,7 +11091,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &906704161 RectTransform: m_ObjectHideFlags: 0 @@ -11070,7 +11106,6 @@ RectTransform: m_Children: - {fileID: 1021706199} - {fileID: 1620513236} - - {fileID: 2003623135} - {fileID: 1606897454} m_Father: {fileID: 17428505} m_RootOrder: 2 @@ -11127,7 +11162,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0.872 + m_Value: 0.247 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -11268,6 +11303,97 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 921777196} m_CullTransparentMesh: 1 +--- !u!1 &968125319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 968125320} + - component: {fileID: 968125323} + - component: {fileID: 968125322} + - component: {fileID: 968125321} + m_Layer: 5 + m_Name: Shine (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &968125320 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968125319} + 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: 1620513236} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 34.3} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &968125321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968125319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 40 + image: {fileID: 968125322} +--- !u!114 &968125322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968125319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 1212936234} + m_Color: {r: 0.14901961, g: 0.14901961, b: 0.14901961, 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: 0} + 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: 0.15 +--- !u!222 &968125323 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968125319} + m_CullTransparentMesh: 1 --- !u!1 &989164489 GameObject: m_ObjectHideFlags: 0 @@ -11302,7 +11428,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.247, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -11319,14 +11445,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.5019608, b: 0, a: 1} + m_Color: {r: 1, g: 0.12156863, b: 0.09411765, 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: 1401309272, guid: bd48ded17f064414eb670529c2375358, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11335,7 +11461,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 0.175 --- !u!222 &989164492 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11355,6 +11481,7 @@ GameObject: - component: {fileID: 1021706199} - component: {fileID: 1021706201} - component: {fileID: 1021706200} + - component: {fileID: 1021706202} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -11394,7 +11521,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 1910015450} m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -11402,7 +11529,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1401309272, guid: bd48ded17f064414eb670529c2375358, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11411,7 +11538,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 0.75 + m_PixelsPerUnitMultiplier: 0.15 --- !u!222 &1021706201 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11420,6 +11547,56 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1021706198} m_CullTransparentMesh: 1 +--- !u!114 &1021706202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1021706198} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 48 + image: {fileID: 1021706200} +--- !u!21 &1096103988 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 648, g: 74, b: 80, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1134273854 GameObject: m_ObjectHideFlags: 0 @@ -11758,6 +11935,209 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!21 &1212936234 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 632, g: 34.3, b: 80, a: 0} + m_BuildTextureStacks: [] +--- !u!1 &1238570285 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1238570286} + - component: {fileID: 1238570288} + - component: {fileID: 1238570287} + m_Layer: 5 + m_Name: Col + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1238570286 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238570285} + 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: 1620513236} + m_RootOrder: 0 + 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!114 &1238570287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238570285} + 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.09411765, g: 0.09411765, b: 0.09411765, 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: 0} + 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: 0.15 +--- !u!222 &1238570288 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238570285} + m_CullTransparentMesh: 1 +--- !u!1 &1432705147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1432705148} + - component: {fileID: 1432705151} + - component: {fileID: 1432705150} + - component: {fileID: 1432705152} + m_Layer: 5 + m_Name: Shine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1432705148 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432705147} + 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: 1620513236} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 16, y: 74} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1432705150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432705147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 1096103988} + m_Color: {r: 0.11764706, g: 0.11764706, b: 0.11764706, 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: 0} + 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: 0.15 +--- !u!222 &1432705151 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432705147} + m_CullTransparentMesh: 1 +--- !u!114 &1432705152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432705147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 40 + image: {fileID: 1432705150} --- !u!1 &1475451632 GameObject: m_ObjectHideFlags: 0 @@ -11858,7 +12238,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1569344340} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -11871,7 +12251,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -8311545614704615405, guid: 444fe02d3b82ac4488cd49e924016de7, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -12078,7 +12458,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 906704161} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} @@ -12114,15 +12494,15 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} + rgba: 4282456252 + m_fontColor: {r: 0.7372549, g: 0.09411765, b: 0.25490198, a: 1} m_enableVertexGradient: 0 - m_colorMode: 3 + m_colorMode: 0 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} + topLeft: {r: 1, g: 1, b: 1, a: 0.98039216} + topRight: {r: 1, g: 1, b: 1, a: 0.98039216} + bottomLeft: {r: 1, g: 1, b: 1, a: 0.98039216} + bottomRight: {r: 1, g: 1, b: 1, a: 0.98039216} m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 @@ -12195,6 +12575,8 @@ GameObject: - component: {fileID: 1620513236} - component: {fileID: 1620513238} - component: {fileID: 1620513237} + - component: {fileID: 1620513240} + - component: {fileID: 1620513239} m_Layer: 5 m_Name: BgFill m_TagString: Untagged @@ -12213,7 +12595,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1238570286} + - {fileID: 1432705148} + - {fileID: 968125320} + - {fileID: 2003623135} m_Father: {fileID: 906704161} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12234,7 +12620,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 498369510} m_Color: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -12242,7 +12628,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1401309272, guid: bd48ded17f064414eb670529c2375358, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12251,7 +12637,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 0.175 --- !u!222 &1620513238 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12260,6 +12646,33 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1620513235} m_CullTransparentMesh: 1 +--- !u!114 &1620513239 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620513235} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1620513240 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620513235} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 42 + image: {fileID: 1620513237} --- !u!1 &1625794067 GameObject: m_ObjectHideFlags: 0 @@ -12557,6 +12970,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1702256960} m_CullTransparentMesh: 1 +--- !u!21 &1910015450 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 652, g: 112, b: 96, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1932988790 GameObject: m_ObjectHideFlags: 0 @@ -12800,13 +13249,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 989164490} - m_Father: {fileID: 906704161} - m_RootOrder: 2 + m_Father: {fileID: 1620513236} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2040008466 GameObject: @@ -12939,7 +13388,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -42} - m_SizeDelta: {x: 864, y: 240} + m_SizeDelta: {x: 1128, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2086822067 MonoBehaviour: diff --git a/Packages/manifest.json b/Packages/manifest.json index f4661ad4d..d75cb6112 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.coffee.softmask-for-ugui": "https://github.com/mob-sakai/SoftMaskForUGUI.git", "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask", "com.nobi.roundedcorners": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git", "com.rheavenstudio.jukebox": "https://github.com/RHeavenStudio/Jukebox.git?path=/Assets/Scripts/Jukebox", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d008b4704..b05d27e6b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,12 @@ { "dependencies": { + "com.coffee.softmask-for-ugui": { + "version": "https://github.com/mob-sakai/SoftMaskForUGUI.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "0a9cf7a1809a289ca7bedecee594cdf256e26935" + }, "com.cysharp.unitask": { "version": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask", "depth": 0,