no miss + skill star in judgement

fix potential crashes when exiting play
This commit is contained in:
minenice55 2024-01-21 16:50:05 -05:00
parent 8507439e0e
commit 5c9a0b2d48
16 changed files with 1221 additions and 213 deletions

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,107 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: KurokaneCommentText
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, 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:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Cube:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FaceTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 7565207379736317986, guid: e5f3069ff426f2546b8168857ad6e0d4, type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OutlineTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Ambient: 0.5
- _Bevel: 0.5
- _BevelClamp: 0
- _BevelOffset: 0
- _BevelRoundness: 0
- _BevelWidth: 0
- _BumpFace: 0
- _BumpOutline: 0
- _ColorMask: 15
- _CullMode: 0
- _Diffuse: 0.5
- _FaceDilate: 0.5
- _FaceUVSpeedX: 0
- _FaceUVSpeedY: 0
- _GlowInner: 0.05
- _GlowOffset: 0
- _GlowOuter: 0.05
- _GlowPower: 0.75
- _GradientScale: 10
- _LightAngle: 3.1416
- _MaskSoftnessX: 0
- _MaskSoftnessY: 0
- _OutlineSoftness: 0
- _OutlineUVSpeedX: 0
- _OutlineUVSpeedY: 0
- _OutlineWidth: 0.6
- _PerspectiveFilter: 0.875
- _Reflectivity: 10
- _ScaleRatioA: 0.6990291
- _ScaleRatioB: 0.28125
- _ScaleRatioC: 0.28125
- _ScaleX: 1
- _ScaleY: 1
- _ShaderFlags: 0
- _Sharpness: 0
- _SpecularPower: 2
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _TextureHeight: 2048
- _TextureWidth: 2048
- _UnderlayDilate: 0
- _UnderlayOffsetX: 0
- _UnderlayOffsetY: 0
- _UnderlaySoftness: 0
- _VertexOffsetX: 0
- _VertexOffsetY: 0
- _WeightBold: 0.75
- _WeightNormal: 0
m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
- _OutlineColor: {r: 1, g: 0.83137256, b: 0, a: 1}
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
m_BuildTextureStacks: []

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 26a467f586143104f8f45e45e84ccd93
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 KiB

View file

@ -0,0 +1,135 @@
fileFormatVersion: 2
guid: 3b87714ab71d9694e86fc4735e5e7da5
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: 1
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: 0
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: 1024
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
- serializedVersion: 3
buildTarget: WebGL
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: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -101,6 +101,18 @@ TextureImporter:
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []

View file

@ -362,7 +362,7 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &57158678 --- !u!21 &52108617
Material: Material:
serializedVersion: 8 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -396,7 +396,7 @@ Material:
- _StencilWriteMask: 255 - _StencilWriteMask: 255
- _UseUIAlphaClip: 0 - _UseUIAlphaClip: 0
m_Colors: m_Colors:
- _WidthHeightRadius: {r: 632, g: 92, b: 84, a: 0} - _WidthHeightRadius: {r: 652, g: 112, b: 96, a: 0}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!1 &98372472 --- !u!1 &98372472
GameObject: GameObject:
@ -5350,6 +5350,143 @@ ParticleSystem:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
vectorLabel1_3: W vectorLabel1_3: W
--- !u!1 &191897034
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 191897035}
- component: {fileID: 191897037}
- component: {fileID: 191897036}
m_Layer: 5
m_Name: NoMissText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &191897035
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 191897034}
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: 1087448017}
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 &191897036
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 191897034}
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: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: No Miss
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: e5f3069ff426f2546b8168857ad6e0d4, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 26a467f586143104f8f45e45e84ccd93, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278551807
m_fontColor: {r: 1, g: 0.5176471, b: 0.019607844, 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: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 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!222 &191897037
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 191897034}
m_CullTransparentMesh: 1
--- !u!1 &230967135 --- !u!1 &230967135
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -10440,6 +10577,8 @@ MonoBehaviour:
rankNg: {fileID: 8300000, guid: 18a000ad217eebc4087bd4777ee9a826, type: 3} rankNg: {fileID: 8300000, guid: 18a000ad217eebc4087bd4777ee9a826, type: 3}
rankOk: {fileID: 8300000, guid: f5a4134018ca0324eaa9b517ed622b94, type: 3} rankOk: {fileID: 8300000, guid: f5a4134018ca0324eaa9b517ed622b94, type: 3}
rankHi: {fileID: 8300000, guid: a56e02719cd43df46b9598fbd62a2b2e, type: 3} rankHi: {fileID: 8300000, guid: a56e02719cd43df46b9598fbd62a2b2e, type: 3}
noMissSound: {fileID: 8300000, guid: 4f397d9490ddeab4689341aa90ef5c37, type: 3}
starSound: {fileID: 8300000, guid: 0e8e6f8aaf23d324dadfed41c568dbbe, type: 3}
musNgStart: {fileID: 8300000, guid: e2d0f21965505d34ab91f07878b11d48, type: 3} musNgStart: {fileID: 8300000, guid: e2d0f21965505d34ab91f07878b11d48, type: 3}
musOkStart: {fileID: 8300000, guid: 8a156afa82eaafe4ba9ec880135824a9, type: 3} musOkStart: {fileID: 8300000, guid: 8a156afa82eaafe4ba9ec880135824a9, type: 3}
musHiStart: {fileID: 8300000, guid: 5ac640a8e787ded4f9c0edd71b0b1355, type: 3} musHiStart: {fileID: 8300000, guid: 5ac640a8e787ded4f9c0edd71b0b1355, type: 3}
@ -10465,6 +10604,8 @@ MonoBehaviour:
epilogueFrmNg: {fileID: 1838915739, guid: 3848a2a724e30844fb59a1825eedf382, type: 3} epilogueFrmNg: {fileID: 1838915739, guid: 3848a2a724e30844fb59a1825eedf382, type: 3}
epilogueFrmOk: {fileID: -1839935755, guid: 3848a2a724e30844fb59a1825eedf382, type: 3} epilogueFrmOk: {fileID: -1839935755, guid: 3848a2a724e30844fb59a1825eedf382, type: 3}
epilogueFrmHi: {fileID: -1348963170, guid: 3848a2a724e30844fb59a1825eedf382, type: 3} epilogueFrmHi: {fileID: -1348963170, guid: 3848a2a724e30844fb59a1825eedf382, type: 3}
noMissComment: {fileID: 1087448016}
starComment: {fileID: 2093805397}
bg: {fileID: 272774269} bg: {fileID: 272774269}
rankLogo: {fileID: 1569344340} rankLogo: {fileID: 1569344340}
justOk: {fileID: 921777198} justOk: {fileID: 921777198}
@ -10899,6 +11040,42 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_AspectMode: 4 m_AspectMode: 4
m_AspectRatio: 1.6153846 m_AspectRatio: 1.6153846
--- !u!21 &840395767
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 &876844699 --- !u!1 &876844699
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -11144,6 +11321,8 @@ RectTransform:
- {fileID: 1021706199} - {fileID: 1021706199}
- {fileID: 1620513236} - {fileID: 1620513236}
- {fileID: 1606897454} - {fileID: 1606897454}
- {fileID: 1087448017}
- {fileID: 2093805398}
m_Father: {fileID: 17428505} m_Father: {fileID: 17428505}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -11199,7 +11378,7 @@ MonoBehaviour:
m_MinValue: 0 m_MinValue: 0
m_MaxValue: 1 m_MaxValue: 1
m_WholeNumbers: 0 m_WholeNumbers: 0
m_Value: 0.247 m_Value: 0.99
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -11340,6 +11519,42 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 921777196} m_GameObject: {fileID: 921777196}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!21 &956787823
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 --- !u!1 &968125319
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -11405,7 +11620,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 1807253055} m_Material: {fileID: 956787823}
m_Color: {r: 0.14901961, g: 0.14901961, b: 0.14901961, a: 1} m_Color: {r: 0.14901961, g: 0.14901961, b: 0.14901961, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@ -11558,7 +11773,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 1929755838} m_Material: {fileID: 52108617}
m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1} m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@ -11598,6 +11813,83 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
radius: 48 radius: 48
image: {fileID: 1021706200} image: {fileID: 1021706200}
--- !u!1 &1087448016
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1087448017}
- component: {fileID: 1087448019}
- component: {fileID: 1087448018}
m_Layer: 5
m_Name: NoMissComment
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1087448017
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1087448016}
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: 191897035}
m_Father: {fileID: 906704161}
m_RootOrder: 3
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: 0, y: 64}
m_SizeDelta: {x: 256, y: 256}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1087448018
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1087448016}
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: 21300000, guid: 3b87714ab71d9694e86fc4735e5e7da5, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1087448019
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1087448016}
m_CullTransparentMesh: 1
--- !u!1 &1134273854 --- !u!1 &1134273854
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -12012,42 +12304,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1238570285} m_GameObject: {fileID: 1238570285}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!21 &1364499906
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 &1432705147 --- !u!1 &1432705147
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -12099,7 +12355,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 1364499906} m_Material: {fileID: 1617358752}
m_Color: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1} m_Color: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@ -12504,6 +12760,143 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1589589767} m_GameObject: {fileID: 1589589767}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1600558307
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1600558308}
- component: {fileID: 1600558310}
- component: {fileID: 1600558309}
m_Layer: 5
m_Name: StarText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1600558308
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1600558307}
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: 2093805398}
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 &1600558309
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1600558307}
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: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Skill Star
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: e5f3069ff426f2546b8168857ad6e0d4, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 26a467f586143104f8f45e45e84ccd93, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278551807
m_fontColor: {r: 1, g: 0.5176471, b: 0.019607844, 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: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 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!222 &1600558310
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1600558307}
m_CullTransparentMesh: 1
--- !u!1 &1606897453 --- !u!1 &1606897453
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -12641,6 +13034,42 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1606897453} m_GameObject: {fileID: 1606897453}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!21 &1617358752
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 &1620513235 --- !u!1 &1620513235
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -12697,7 +13126,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 57158678} m_Material: {fileID: 840395767}
m_Color: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 1} m_Color: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@ -13047,78 +13476,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1702256960} m_GameObject: {fileID: 1702256960}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!21 &1807253055
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!21 &1929755838
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 --- !u!1 &1932988790
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -13542,3 +13899,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2086822065} m_GameObject: {fileID: 2086822065}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &2093805397
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2093805398}
- component: {fileID: 2093805400}
- component: {fileID: 2093805399}
m_Layer: 5
m_Name: StarComment
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2093805398
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2093805397}
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: 1600558308}
m_Father: {fileID: 906704161}
m_RootOrder: 4
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: 0, y: 64}
m_SizeDelta: {x: 256, y: 256}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2093805399
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2093805397}
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: 21300000, guid: 3b87714ab71d9694e86fc4735e5e7da5, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &2093805400
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2093805397}
m_CullTransparentMesh: 1

View file

@ -68,6 +68,7 @@ namespace HeavenStudio
bool AudioLoadDone; bool AudioLoadDone;
bool ChartLoadError; bool ChartLoadError;
bool exiting;
List<double> eventBeats, preSequenceBeats, tempoBeats, volumeBeats, sectionBeats; List<double> eventBeats, preSequenceBeats, tempoBeats, volumeBeats, sectionBeats;
List<RiqEntity> allGameSwitches; List<RiqEntity> allGameSwitches;
@ -104,7 +105,7 @@ namespace HeavenStudio
} }
// input accuracy (%) // input accuracy (%)
bool skillStarCollected = false; bool skillStarCollected = false, noMiss = true;
// cleared sections // cleared sections
List<bool> clearedSections = new List<bool>(); List<bool> clearedSections = new List<bool>();
@ -120,8 +121,8 @@ namespace HeavenStudio
private void Awake() private void Awake()
{ {
// autoplay = true;
instance = this; instance = this;
exiting = false;
} }
public void Init(bool preLoaded = false) public void Init(bool preLoaded = false)
@ -340,11 +341,13 @@ namespace HeavenStudio
weight = weight * MarkerWeight, weight = weight * MarkerWeight,
category = MarkerCategory category = MarkerCategory
}); });
} if (accuracy < Minigame.rankOkThreshold)
if (accuracy < Minigame.rankOkThreshold && weight > 0)
{ {
SkillStarManager.instance.KillStar(); SkillStarManager.instance.KillStar();
GoForAPerfect.instance.Miss();
SectionMedalsManager.instance.MakeIneligible();
noMiss = false;
}
} }
if (SkillStarManager.instance.IsEligible && !skillStarCollected && accuracy >= 1f) if (SkillStarManager.instance.IsEligible && !skillStarCollected && accuracy >= 1f)
@ -363,22 +366,6 @@ namespace HeavenStudio
}); });
} }
static bool StringStartsWith(string a, string b)
{
int aLen = a.Length;
int bLen = b.Length;
int ap = 0; int bp = 0;
while (ap < aLen && bp < bLen && a[ap] == b[bp])
{
ap++;
bp++;
}
return (bp == bLen);
}
public List<Minigames.Minigame> SeekAheadAndPreload(double start, float seekTime = 8f) public List<Minigames.Minigame> SeekAheadAndPreload(double start, float seekTime = 8f)
{ {
List<Minigames.Minigame> gamesToPreload = new(); List<Minigames.Minigame> gamesToPreload = new();
@ -665,6 +652,7 @@ namespace HeavenStudio
TimingAccuracyDisplay.instance.ResetArrow(); TimingAccuracyDisplay.instance.ResetArrow();
SkillStarManager.instance.Reset(); SkillStarManager.instance.Reset();
skillStarCollected = false; skillStarCollected = false;
noMiss = true;
GoForAPerfect.instance.perfect = true; GoForAPerfect.instance.perfect = true;
GoForAPerfect.instance.Disable(); GoForAPerfect.instance.Disable();
@ -791,12 +779,14 @@ namespace HeavenStudio
} }
else if (playMode) else if (playMode)
{ {
exiting = true;
judgementInfo.star = skillStarCollected; judgementInfo.star = skillStarCollected;
judgementInfo.perfect = GoForAPerfect.instance.perfect; judgementInfo.perfect = GoForAPerfect.instance.perfect;
judgementInfo.noMiss = noMiss;
judgementInfo.time = DateTime.Now; judgementInfo.time = DateTime.Now;
JudgementManager.SetPlayInfo(judgementInfo, Beatmap); JudgementManager.SetPlayInfo(judgementInfo, Beatmap);
GlobalGameManager.LoadScene("Judgement", 0.35f, 0f); GlobalGameManager.LoadScene("Judgement", 0.35f, 0f, DestroyGame);
CircleCursor.LockCursor(false); CircleCursor.LockCursor(false);
} }
Application.backgroundLoadingPriority = ThreadPriority.Normal; Application.backgroundLoadingPriority = ThreadPriority.Normal;
@ -1120,6 +1110,11 @@ namespace HeavenStudio
SetCurrentGame(game, useMinigameColor); SetCurrentGame(game, useMinigameColor);
} }
private void DestroyGame()
{
SetGame("noGame");
}
private IEnumerator WaitAndSetGame(string game, bool useMinigameColor = true) private IEnumerator WaitAndSetGame(string game, bool useMinigameColor = true)
{ {
var inf = GetGameInfo(game); var inf = GetGameInfo(game);

View file

@ -741,11 +741,13 @@ namespace HeavenStudio.Games
public override void OnPlay(double beat) public override void OnPlay(double beat)
{ {
queuedCues.Clear();
EntityPreCheck(beat); EntityPreCheck(beat);
} }
void EntityPreCheck(double beat) void EntityPreCheck(double beat)
{ {
if (gameManager == null) return;
List<RiqEntity> prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split(0) == "karateman"); List<RiqEntity> prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split(0) == "karateman");
RiqEntity voice = prevEntities.FindLast(c => c.beat < beat && c.datamodel == "karateman/warnings"); RiqEntity voice = prevEntities.FindLast(c => c.beat < beat && c.datamodel == "karateman/warnings");

View file

@ -302,6 +302,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
NoriManiaInk00.transform.localRotation = Quaternion.Euler(0, 0, inkRot * 360); NoriManiaInk00.transform.localRotation = Quaternion.Euler(0, 0, inkRot * 360);
NoriManiaInk01.transform.localRotation = Quaternion.Euler(0, 0, inkRot * 360); NoriManiaInk01.transform.localRotation = Quaternion.Euler(0, 0, inkRot * 360);
} }
public int CountHitsToEnd(double fromBeat) public int CountHitsToEnd(double fromBeat)
{ {
List<RiqEntity> allHits = EventCaller.GetAllInGameManagerList("karateman", new string[] { "hit", "bulb", "kick", "combo" }); List<RiqEntity> allHits = EventCaller.GetAllInGameManagerList("karateman", new string[] { "hit", "bulb", "kick", "combo" });

View file

@ -392,11 +392,6 @@ namespace HeavenStudio.Games
{ {
double beat = Conductor.instance?.songPositionInBeatsAsDouble ?? -1; double beat = Conductor.instance?.songPositionInBeatsAsDouble ?? -1;
GameManager.instance.ScoreInputAccuracy(beat, 0, true, NgLateTime(), weight, false); GameManager.instance.ScoreInputAccuracy(beat, 0, true, NgLateTime(), weight, false);
if (weight > 0)
{
GoForAPerfect.instance.Miss();
SectionMedalsManager.instance.MakeIneligible();
}
} }
public void ToggleSplitColoursDisplay(bool on) public void ToggleSplitColoursDisplay(bool on)

View file

@ -240,7 +240,8 @@ namespace HeavenStudio
return null; return null;
} }
public static void LoadScene(string scene, float fadeIn = 0.35f, float fadeOut = 0.35f) public delegate void OnLoadSceneFadeInComplete();
public static void LoadScene(string scene, float fadeIn = 0.35f, float fadeOut = 0.35f, OnLoadSceneFadeInComplete callback = null)
{ {
if (scene == loadedScene) if (scene == loadedScene)
return; return;
@ -255,6 +256,7 @@ namespace HeavenStudio
if (fadeIn <= 0) if (fadeIn <= 0)
{ {
instance.fadeImage.color = new Color(0, 0, 0, 1); instance.fadeImage.color = new Color(0, 0, 0, 1);
callback?.Invoke();
AssetBundle.UnloadAllAssetBundles(true); AssetBundle.UnloadAllAssetBundles(true);
instance.StartCoroutine(instance.LoadSceneAsync(scene, fadeOut)); instance.StartCoroutine(instance.LoadSceneAsync(scene, fadeOut));
} }
@ -263,6 +265,7 @@ namespace HeavenStudio
instance.fadeImage.color = new Color(0, 0, 0, 0); instance.fadeImage.color = new Color(0, 0, 0, 0);
instance.fadeImage.DOFade(1, fadeIn).OnComplete(() => instance.fadeImage.DOFade(1, fadeIn).OnComplete(() =>
{ {
callback?.Invoke();
AssetBundle.UnloadAllAssetBundles(true); AssetBundle.UnloadAllAssetBundles(true);
instance.StartCoroutine(instance.LoadSceneAsync(scene, fadeOut)); instance.StartCoroutine(instance.LoadSceneAsync(scene, fadeOut));
}); });

View file

@ -58,7 +58,7 @@ namespace HeavenStudio
public List<MedalInfo> medals; public List<MedalInfo> medals;
public double finalScore; public double finalScore;
public bool star, perfect; public bool star, perfect, noMiss;
public DateTime time; public DateTime time;
} }
@ -85,6 +85,7 @@ namespace HeavenStudio
[SerializeField] AudioClip messageLast; [SerializeField] AudioClip messageLast;
[SerializeField] AudioClip barLoop, barStop; [SerializeField] AudioClip barLoop, barStop;
[SerializeField] AudioClip rankNg, rankOk, rankHi; [SerializeField] AudioClip rankNg, rankOk, rankHi;
[SerializeField] AudioClip noMissSound, starSound;
[SerializeField] AudioClip musNgStart, musOkStart, musHiStart; [SerializeField] AudioClip musNgStart, musOkStart, musHiStart;
[SerializeField] AudioClip musNg, musOk, musHi; [SerializeField] AudioClip musNg, musOk, musHi;
[SerializeField] AudioClip jglNg, jglOk, jglHi; [SerializeField] AudioClip jglNg, jglOk, jglHi;
@ -103,6 +104,8 @@ namespace HeavenStudio
[SerializeField] AspectRatioFitter epilogueFitter; [SerializeField] AspectRatioFitter epilogueFitter;
[SerializeField] Sprite epilogueNg, epilogueOk, epilogueHi; [SerializeField] Sprite epilogueNg, epilogueOk, epilogueHi;
[SerializeField] Sprite epilogueFrmNg, epilogueFrmOk, epilogueFrmHi; [SerializeField] Sprite epilogueFrmNg, epilogueFrmOk, epilogueFrmHi;
[SerializeField] GameObject noMissComment;
[SerializeField] GameObject starComment;
[SerializeField] GameObject bg; [SerializeField] GameObject bg;
[SerializeField] GameObject rankLogo; [SerializeField] GameObject rankLogo;
@ -127,6 +130,10 @@ namespace HeavenStudio
bg.SetActive(false); bg.SetActive(false);
rankLogo.SetActive(false); rankLogo.SetActive(false);
justOk.gameObject.SetActive(false); justOk.gameObject.SetActive(false);
noMissComment.SetActive(false);
starComment.SetActive(false);
subRank = false; subRank = false;
barText.text = "0"; barText.text = "0";
@ -606,6 +613,18 @@ namespace HeavenStudio
barSlider.fillRect.GetComponent<Image>().color = barColourHi; barSlider.fillRect.GetComponent<Image>().color = barColourHi;
} }
if (judgementInfo.star)
{
starComment.SetActive(true);
audioSource.PlayOneShot(starSound);
}
if (judgementInfo.noMiss)
{
noMissComment.SetActive(true);
audioSource.PlayOneShot(noMissSound);
}
StartCoroutine(WaitAndRank()); StartCoroutine(WaitAndRank());
} }
else else

View file

@ -37,5 +37,7 @@ MonoBehaviour:
- Assets/Scripts/Games/KarateMan/KarateManNoriController.cs - Assets/Scripts/Games/KarateMan/KarateManNoriController.cs
- Assets/Scripts/Util/BeatAction.cs - Assets/Scripts/Util/BeatAction.cs
- Assets/Scripts/Games/TossBoys/TossBoys.cs - Assets/Scripts/Games/TossBoys/TossBoys.cs
- Assets/Scripts/Games/DoubleDate/DoubleDate.cs
- Assets/Scripts/Games/AirRally/AirRally.cs
PathsToSkipImportEvent: [] PathsToSkipImportEvent: []
PathsToIgnoreOverwriteSettingOnAttribute: [] PathsToIgnoreOverwriteSettingOnAttribute: []