diff --git a/Assets/Resources/Models/Games/RhythmRally/materials/field/L_stage.png b/Assets/Resources/Models/Games/RhythmRally/materials/field/L_stage.png index 31669b32..ec980219 100644 Binary files a/Assets/Resources/Models/Games/RhythmRally/materials/field/L_stage.png and b/Assets/Resources/Models/Games/RhythmRally/materials/field/L_stage.png differ diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss.meta index 5b0f93d2..d05dd15a 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss.meta +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: pcomeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy.meta index 00fd6242..c029623b 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy.meta +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: pcomeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Gear.controller.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Gear.controller.meta index 7f019479..17b16bb9 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Gear.controller.meta +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Gear.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: pcomeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinLeft.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinLeft.anim.meta index 84050cf8..2b97f407 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinLeft.anim.meta +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinLeft.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcomeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinOnceLeft.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinOnceLeft.anim.meta index cd4a93f8..e9989a3e 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinOnceLeft.anim.meta +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinOnceLeft.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcomeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinOnceRight.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinOnceRight.anim.meta index ffcdf9d6..ec6481d8 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinOnceRight.anim.meta +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinOnceRight.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcomeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinRight.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinRight.anim.meta index bd060b4b..8f7c846e 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinRight.anim.meta +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/GearSpinRight.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcomeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat.meta index 5bfb88c7..0eb71a6c 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat.meta +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: pcomeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack.meta index 3bae88c8..f74af9fa 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack.meta +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: pcomeat/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Ratings/Epilogue_text_boxes_and_frames.png b/Assets/Resources/Sprites/UI/Ratings/Epilogue_text_boxes_and_frames.png new file mode 100644 index 00000000..f9404340 Binary files /dev/null and b/Assets/Resources/Sprites/UI/Ratings/Epilogue_text_boxes_and_frames.png differ diff --git a/Assets/Resources/Sprites/UI/Ratings/Epilogue_text_boxes_and_frames.png.meta b/Assets/Resources/Sprites/UI/Ratings/Epilogue_text_boxes_and_frames.png.meta new file mode 100644 index 00000000..5f6d46e5 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Ratings/Epilogue_text_boxes_and_frames.png.meta @@ -0,0 +1,255 @@ +fileFormatVersion: 2 +guid: 3848a2a724e30844fb59a1825eedf382 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 0 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Epilogue_text_boxes_and_frames_0 + rect: + serializedVersion: 2 + x: 129 + y: 1454 + width: 1460 + height: 422 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 131701d6a6b92e64db1a9ad7039c4197 + internalID: -364617298 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Epilogue_text_boxes_and_frames_1 + rect: + serializedVersion: 2 + x: 1760 + y: 1389 + width: 982 + height: 553 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cbd64e88af960ac47a4bd945b954996b + internalID: -1348963170 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Epilogue_text_boxes_and_frames_2 + rect: + serializedVersion: 2 + x: 157 + y: 848 + width: 1404 + height: 305 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 64f300bf41dd29d45b7235e12881bd08 + internalID: -990750151 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Epilogue_text_boxes_and_frames_3 + rect: + serializedVersion: 2 + x: 1760 + y: 727 + width: 982 + height: 552 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1f65521a239920345902da63ba679d1b + internalID: -1839935755 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Epilogue_text_boxes_and_frames_4 + rect: + serializedVersion: 2 + x: 159 + y: 189 + width: 1400 + height: 304 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 639808f6b3fbca84bbb30de29b3136f2 + internalID: -154833397 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Epilogue_text_boxes_and_frames_5 + rect: + serializedVersion: 2 + x: 1760 + y: 66 + width: 982 + height: 552 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7dafc89490a170a4f95c4f44a35dff8b + internalID: 1838915739 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Epilogue_text_boxes_and_frames_0: -364617298 + Epilogue_text_boxes_and_frames_1: -1348963170 + Epilogue_text_boxes_and_frames_2: -990750151 + Epilogue_text_boxes_and_frames_3: -1839935755 + Epilogue_text_boxes_and_frames_4: -154833397 + Epilogue_text_boxes_and_frames_5: 1838915739 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Judgement.unity b/Assets/Scenes/Judgement.unity index 41ff0971..cd8e130a 100644 --- a/Assets/Scenes/Judgement.unity +++ b/Assets/Scenes/Judgement.unity @@ -134,7 +134,6 @@ GameObject: - component: {fileID: 2289007} - component: {fileID: 2289009} - component: {fileID: 2289012} - - component: {fileID: 2289011} - component: {fileID: 2289010} m_Layer: 5 m_Name: EdImageHolder @@ -185,20 +184,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!114 &2289011 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2289006} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} - m_Name: - m_EditorClassIdentifier: - radius: 16 - image: {fileID: 2289012} --- !u!114 &2289012 MonoBehaviour: m_ObjectHideFlags: 0 @@ -211,7 +196,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1062448520} + 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} @@ -409,7 +394,7 @@ RectTransform: m_Children: - {fileID: 1932988791} m_Father: {fileID: 2040008467} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10280,7 +10265,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272774269} m_CullTransparentMesh: 1 ---- !u!21 &508094648 +--- !u!21 &353272174 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -10314,7 +10299,7 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _WidthHeightRadius: {r: 632, g: 92, b: 84, a: 0} + - _WidthHeightRadius: {r: 652, g: 112, b: 96, a: 0} m_BuildTextureStacks: [] --- !u!1 &513457786 GameObject: @@ -10472,10 +10457,14 @@ MonoBehaviour: barSlider: {fileID: 906704162} epilogueMessage: {fileID: 1932988792} epilogueImage: {fileID: 780969117} + epilogueFrame: {fileID: 1482920933} epilogueFitter: {fileID: 780969119} epilogueNg: {fileID: 21300000, guid: 437c333ec979a6c49bb32db442e39706, type: 3} epilogueOk: {fileID: 21300000, guid: b6162e825a2eb5b44b14b92178a18c28, type: 3} epilogueHi: {fileID: 21300000, guid: 9b3f95efdb121574e8ffa3e4345d5d28, type: 3} + epilogueFrmNg: {fileID: 1838915739, guid: 3848a2a724e30844fb59a1825eedf382, type: 3} + epilogueFrmOk: {fileID: -1839935755, guid: 3848a2a724e30844fb59a1825eedf382, type: 3} + epilogueFrmHi: {fileID: -1348963170, guid: 3848a2a724e30844fb59a1825eedf382, type: 3} bg: {fileID: 272774269} rankLogo: {fileID: 1569344340} justOk: {fileID: 921777198} @@ -11351,42 +11340,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 921777196} m_CullTransparentMesh: 1 ---- !u!21 &948719009 -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 &968125319 GameObject: m_ObjectHideFlags: 0 @@ -11452,7 +11405,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 948719009} + m_Material: {fileID: 1805959308} 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} @@ -11605,7 +11558,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1701320129} + m_Material: {fileID: 353272174} 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} @@ -11645,42 +11598,6 @@ MonoBehaviour: m_EditorClassIdentifier: radius: 48 image: {fileID: 1021706200} ---- !u!21 &1062448520 -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: 800, g: 450, b: 32, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1134273854 GameObject: m_ObjectHideFlags: 0 @@ -11712,7 +11629,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2040008467} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12146,7 +12063,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1723764897} + m_Material: {fileID: 2127234886} 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} @@ -12234,6 +12151,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1475451632} m_CullTransparentMesh: 1 +--- !u!1 &1482920931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1482920932} + - component: {fileID: 1482920934} + - component: {fileID: 1482920933} + m_Layer: 5 + m_Name: Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1482920932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482920931} + 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: 2040008467} + m_RootOrder: 2 + 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: 150} + m_SizeDelta: {x: 852, y: 502} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1482920933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482920931} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1348963170, guid: 3848a2a724e30844fb59a1825eedf382, 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!222 &1482920934 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482920931} + m_CullTransparentMesh: 1 --- !u!1 &1569344340 GameObject: m_ObjectHideFlags: 0 @@ -12668,7 +12661,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 508094648} + m_Material: {fileID: 1918595244} 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} @@ -12881,42 +12874,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &1701320129 -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 &1702256960 GameObject: m_ObjectHideFlags: 0 @@ -13054,7 +13011,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1702256960} m_CullTransparentMesh: 1 ---- !u!21 &1723764897 +--- !u!21 &1805959308 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -13088,7 +13045,43 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _WidthHeightRadius: {r: 648, g: 74, b: 80, a: 0} + - _WidthHeightRadius: {r: 632, g: 34.3, b: 80, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &1918595244 +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 &1932988790 GameObject: @@ -13374,6 +13367,7 @@ RectTransform: m_Children: - {fileID: 1943435224} - {fileID: 2289007} + - {fileID: 1482920932} - {fileID: 98372473} - {fileID: 1134273855} m_Father: {fileID: 669709241} @@ -13512,3 +13506,39 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2086822065} m_CullTransparentMesh: 1 +--- !u!21 &2127234886 +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: [] diff --git a/Assets/Scenes/Title.unity b/Assets/Scenes/Title.unity index b59a60d0..d544c735 100644 --- a/Assets/Scenes/Title.unity +++ b/Assets/Scenes/Title.unity @@ -482,7 +482,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: 444.5, y: -0} + m_AnchoredPosition: {x: 444.5, y: 0} m_SizeDelta: {x: 1149.1, y: 139.9575} m_Pivot: {x: 0.5, y: 1} --- !u!114 &75677143 @@ -2720,6 +2720,82 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &700351695 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 700351696} + - component: {fileID: 700351698} + - component: {fileID: 700351697} + m_Layer: 0 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &700351696 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 700351695} + 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: 745132517} + 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 &700351697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 700351695} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -9052558874090446877, guid: d25eab4740f92b74087acaa572d8a1c4, 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!222 &700351698 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 700351695} + m_CullTransparentMesh: 1 --- !u!1 &720687238 GameObject: m_ObjectHideFlags: 0 @@ -2798,6 +2874,109 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 720687238} m_CullTransparentMesh: 1 +--- !u!1 &745132516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 745132517} + - component: {fileID: 745132520} + - component: {fileID: 745132518} + m_Layer: 0 + m_Name: PerfectChallengeButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &745132517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745132516} + 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: 700351696} + m_Father: {fileID: 1012016923} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -52, y: 52} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 1, y: 0} +--- !u!114 &745132518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745132516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1811344142} + m_TargetAssemblyTypeName: HeavenStudio.TitleManager, Assembly-CSharp + m_MethodName: ToggleCampaign + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!222 &745132520 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745132516} + m_CullTransparentMesh: 1 --- !u!1 &747832156 GameObject: m_ObjectHideFlags: 0 @@ -4354,6 +4533,7 @@ RectTransform: - {fileID: 177207010} - {fileID: 1959183876} - {fileID: 429465179} + - {fileID: 745132517} m_Father: {fileID: 1925566737} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7713,6 +7893,9 @@ MonoBehaviour: chartIdolText: {fileID: 1570836018} chartDescText: {fileID: 177207008} chartStyleText: {fileID: 1959183877} + campaignOption: {fileID: 700351697} + campaignOn: {fileID: 5181778189044111492, guid: d25eab4740f92b74087acaa572d8a1c4, type: 3} + campaignOff: {fileID: -9052558874090446877, guid: d25eab4740f92b74087acaa572d8a1c4, type: 3} mainSelectables: - {fileID: 2079077664} - {fileID: 1336149019} diff --git a/Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs b/Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs index 8ec72561..2e6295b9 100644 --- a/Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs +++ b/Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs @@ -52,8 +52,8 @@ namespace HeavenStudio.InputSystem (int)KeyCode.D, (int)KeyCode.J, (int)KeyCode.K, - (int)KeyCode.I, (int)KeyCode.U, + (int)KeyCode.I, (int)KeyCode.E, (int)KeyCode.U, (int)KeyCode.Escape, diff --git a/Assets/Scripts/JudgementManager.cs b/Assets/Scripts/JudgementManager.cs index 55f93a56..2b1a080d 100644 --- a/Assets/Scripts/JudgementManager.cs +++ b/Assets/Scripts/JudgementManager.cs @@ -99,8 +99,10 @@ namespace HeavenStudio [SerializeField] TMP_Text epilogueMessage; [SerializeField] Image epilogueImage; + [SerializeField] Image epilogueFrame; [SerializeField] AspectRatioFitter epilogueFitter; [SerializeField] Sprite epilogueNg, epilogueOk, epilogueHi; + [SerializeField] Sprite epilogueFrmNg, epilogueFrmOk, epilogueFrmHi; [SerializeField] GameObject bg; [SerializeField] GameObject rankLogo; @@ -258,6 +260,13 @@ namespace HeavenStudio } break; } + + epilogueFrame.sprite = rank switch + { + Rank.Ok => epilogueFrmOk, + Rank.Hi => epilogueFrmHi, + _ => epilogueFrmNg + }; } header.text = playedBeatmap != null ? playedBeatmap["resultcaption"] : "Rhythm League Notes"; diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 2ee577b9..67489352 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -82,9 +82,9 @@ namespace HeavenStudio {"resultcat3_hi", "You followed the example well."}, // "Superb" message for input category 3 "repeat" (two-liner) {"resultcat3_ng", "Next time, follow the example better."}, // "Try Again" message for input category 3 "repeat" (two-liner) - {"epilogue_hi", "Superb picture"}, // epilogue "Superb" message - {"epilogue_ok", "OK picture"}, // epilogue "OK" message - {"epilogue_ng", "Try Again picture"}, // epilogue "Try Again" message + {"epilogue_hi", "Superb"}, // epilogue "Superb" message + {"epilogue_ok", "OK"}, // epilogue "OK" message + {"epilogue_ng", "Try Again"}, // epilogue "Try Again" message {"epilogue_hi_res", new EntityTypes.Resource(EntityTypes.Resource.ResourceType.Image, "Images/Epilogue/", "Hi")}, // epilogue "Superb" image resource path {"epilogue_ok_res", new EntityTypes.Resource(EntityTypes.Resource.ResourceType.Image, "Images/Epilogue/", "Ok")}, // epilogue "OK" image resource path diff --git a/Assets/Scripts/TitleManager.cs b/Assets/Scripts/TitleManager.cs index bed13f77..5be75cd5 100644 --- a/Assets/Scripts/TitleManager.cs +++ b/Assets/Scripts/TitleManager.cs @@ -47,6 +47,9 @@ namespace HeavenStudio [SerializeField] private TMP_Text chartIdolText; [SerializeField] private TMP_Text chartDescText; [SerializeField] private TMP_Text chartStyleText; + [SerializeField] private Image campaignOption; + [SerializeField] private Sprite campaignOn; + [SerializeField] private Sprite campaignOff; [SerializeField] private Selectable[] mainSelectables; [SerializeField] private Selectable defaultSelectable; @@ -250,6 +253,9 @@ namespace HeavenStudio case (int)InputController.ActionsPad.South: PlayPanelBack(); break; + case (int)InputController.ActionsPad.North: + ToggleCampaign(); + break; } } } @@ -542,6 +548,15 @@ namespace HeavenStudio chartIdolText.text = "♪ " + beatmap["idolcredit"]; chartStyleText.text = $"Recommended Control Style: {beatmap["playstyle"].ToString()}"; + if (PersistentDataManager.gameSettings.perfectChallengeType == PersistentDataManager.PerfectChallengeType.On) + { + campaignOption.sprite = campaignOn; + } + else + { + campaignOption.sprite = campaignOff; + } + playPanel.SetActive(true); playMenuRevealed = true; SoundByte.PlayOneShot("ui/UISelect"); @@ -561,6 +576,7 @@ namespace HeavenStudio if (exiting) return; exiting = true; SoundByte.PlayOneShot("ui/UIEnter"); + PersistentDataManager.SaveSettings(); GlobalGameManager.LoadScene("Game", 0.35f, -1); } @@ -568,10 +584,26 @@ namespace HeavenStudio { RiqFileHandler.ClearCache(); SoundByte.PlayOneShot("ui/UICancel"); + PersistentDataManager.SaveSettings(); playPanel.SetActive(false); playMenuRevealed = false; } + public void ToggleCampaign() + { + SoundByte.PlayOneShot("ui/UIOption"); + if (PersistentDataManager.gameSettings.perfectChallengeType == PersistentDataManager.PerfectChallengeType.On) + { + PersistentDataManager.gameSettings.perfectChallengeType = PersistentDataManager.PerfectChallengeType.Off; + campaignOption.sprite = campaignOff; + } + else + { + PersistentDataManager.gameSettings.perfectChallengeType = PersistentDataManager.PerfectChallengeType.On; + campaignOption.sprite = campaignOn; + } + } + public void SocialsPressed() { // snsRevealed = true; @@ -582,7 +614,7 @@ namespace HeavenStudio // #endif // snsPanel.SetActive(true); SoundByte.PlayOneShot("ui/UISelect"); - Application.OpenURL("https://github.com/RHeavenStudio/HeavenStudio"); + Application.OpenURL("https://linktr.ee/RHeavenStudio"); // show a panel with our SNS links } @@ -617,6 +649,7 @@ namespace HeavenStudio public void QuitPressed() { SoundByte.PlayOneShot("ui/PauseQuit"); + PersistentDataManager.SaveSettings(); Application.Quit(); } }