Merge branch 'master' of https://github.com/vinceiis/HeavenStudio

Assets/Resources/MainMixer.mixer

@@ -85,7 +85,7 @@ AudioMixerController:
   - {fileID: 752586362724348005}
   m_StartSnapshot: {fileID: 24500006}
   m_SuspendThreshold: -80
-  m_EnableSuspend: 1
+  m_EnableSuspend: 0
   m_UpdateMode: 1
   m_ExposedParameters: []
   m_AudioMixerGroupViews:
@@ -95,7 +95,7 @@ AudioMixerController:
     - 4f0b7ddcf4e12a14c888732f2ab0fda0
     name: View
   m_CurrentViewIndex: 0
-  m_TargetSnapshot: {fileID: 24500006}
+  m_TargetSnapshot: {fileID: 752586362724348005}
 --- !u!243 &24300002
 AudioMixerGroupController:
   m_ObjectHideFlags: 0
@@ -144,7 +144,7 @@ AudioMixerSnapshotController:
     9dd04840cf4676047b2e26e659ca4069: 1661
     65da18c00dad8f642a1f04b10bc4d3fa: -9.8
     2b8f30d01b6887a4a9a1c346efb59529: 0.96
-    152a0691009a459488775726d7da2a76: 0
+    152a0691009a459488775726d7da2a76: 0.01
     b32285822a3582a46bc02ae0bb31edd0: 0
     16419c92ecf0c4743a61bae82f0cd39d: 0.96
     3537f1d2761ea514aad24adbde59814c: 0.5
@@ -183,7 +183,7 @@ AudioMixerSnapshotController:
   m_FloatValues:
     8ac1b110f403261418b718a0a6962426: -9.8
     9dd04840cf4676047b2e26e659ca4069: 1661
-    152a0691009a459488775726d7da2a76: 16
+    152a0691009a459488775726d7da2a76: 10
     b32285822a3582a46bc02ae0bb31edd0: 0
     3537f1d2761ea514aad24adbde59814c: 0.5
     1f89dac5f0e643c4ab8774d8ad05e968: 2.79

Assets/Resources/Sprites/Editor/UI/button.png.meta

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

Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/hsEmoji.png.meta

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

Assets/Resources/tempBuildUI.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 66efa60411c6d844da0331543683d5d8
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  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
-  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: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 72
-  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
-  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: 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: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/Judgement.unity

@@ -362,42 +362,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &52108617
-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 &98372472
 GameObject:
   m_ObjectHideFlags: 0
@@ -10827,6 +10791,42 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!21 &605527453
+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 &657777471
 GameObject:
   m_ObjectHideFlags: 0
@@ -11040,42 +11040,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_AspectMode: 4
   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
 GameObject:
   m_ObjectHideFlags: 0
@@ -11152,6 +11116,42 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 876844699}
   m_CullTransparentMesh: 1
+--- !u!21 &890545091
+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 &902003159
 GameObject:
   m_ObjectHideFlags: 0
@@ -11382,6 +11382,42 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!21 &916744101
+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 &921777196
 GameObject:
   m_ObjectHideFlags: 0
@@ -11519,42 +11555,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 921777196}
   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
 GameObject:
   m_ObjectHideFlags: 0
@@ -11620,7 +11620,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 956787823}
+  m_Material: {fileID: 916744101}
   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}
@@ -11773,7 +11773,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 52108617}
+  m_Material: {fileID: 890545091}
   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}
@@ -12355,7 +12355,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 1617358752}
+  m_Material: {fileID: 2076148458}
   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}
@@ -12777,7 +12777,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1600558308
 RectTransform:
   m_ObjectHideFlags: 0
@@ -13034,42 +13034,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1606897453}
   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
 GameObject:
   m_ObjectHideFlags: 0
@@ -13126,7 +13090,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 840395767}
+  m_Material: {fileID: 605527453}
   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}
@@ -13822,6 +13786,42 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2040008466}
   m_CullTransparentMesh: 1
+--- !u!21 &2076148458
+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 &2086822065
 GameObject:
   m_ObjectHideFlags: 0
@@ -13936,7 +13936,7 @@ RectTransform:
   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_SizeDelta: {x: 128, y: 128}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2093805399
 MonoBehaviour:
@@ -13958,7 +13958,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 3b87714ab71d9694e86fc4735e5e7da5, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3db489eb63d759c4f8467d3f5235a244, type: 3}
   m_Type: 0
   m_PreserveAspect: 1
   m_FillCenter: 1

Assets/Scripts/Games/AirRally/AirRally.cs

@@ -141,7 +141,7 @@ namespace HeavenStudio.Games.Loaders
                     parameters = new List<Param>()
                     {
                         new Param("start", AirRally.DayNightCycle.Day, "Start Time", "Set the time of day for the start of the event."),
-                        new Param("end", AirRally.DayNightCycle.Noon, "End Time", "Set the time of day for the end of the event."),
+                        new Param("end", AirRally.DayNightCycle.Twilight, "End Time", "Set the time of day for the end of the event."),
                         new Param("ease", EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.")
                     }
                 },
@@ -643,22 +643,22 @@ namespace HeavenStudio.Games
                 bgMat.SetColor("_Color", bgColorFrom);
                 cloudMat.SetColor("_Color", cloudColorFrom);
                 objectMat.SetColor("_Color", objectsColorFrom);
-                lightsColor = (lastTime == DayNightCycle.Twilight) ? new Color(1, 1, 1, 1) : new Color(1, 1, 1, 0);
+                lightsColor = (lastTime == DayNightCycle.Night) ? new Color(1, 1, 1, 1) : new Color(1, 1, 1, 0);
             }
             else if (normalizedBeat >= 0 && normalizedBeat <= 1f)
             {
                 bgMat.SetColor("_Color", GetEasedColor(bgColorFrom, bgColorTo));
                 cloudMat.SetColor("_Color", GetEasedColor(cloudColorFrom, cloudColorTo));
                 objectMat.SetColor("_Color", GetEasedColor(objectsColorFrom, objectsColorTo));
-                lightsColor = GetEasedColor((lastTime == DayNightCycle.Twilight) ? new Color(1, 1, 1, 1) : new Color(1, 1, 1, 0),
+                lightsColor = GetEasedColor((lastTime == DayNightCycle.Night) ? new Color(1, 1, 1, 1) : new Color(1, 1, 1, 0),
-                    (currentTime == DayNightCycle.Twilight) ? new Color(1, 1, 1, 1) : new Color(1, 1, 1, 0));
+                    (currentTime == DayNightCycle.Night) ? new Color(1, 1, 1, 1) : new Color(1, 1, 1, 0));
             }
             else if (normalizedBeat > 1)
             {
                 bgMat.SetColor("_Color", bgColorTo);
                 cloudMat.SetColor("_Color", cloudColorTo);
                 objectMat.SetColor("_Color", objectsColorTo);
-                lightsColor = (currentTime == DayNightCycle.Twilight) ? new Color(1, 1, 1, 1) : new Color(1, 1, 1, 0);
+                lightsColor = (currentTime == DayNightCycle.Night) ? new Color(1, 1, 1, 1) : new Color(1, 1, 1, 0);
             }
 
             island2Lights.color = lightsColor;
@@ -684,45 +684,45 @@ namespace HeavenStudio.Games
             timeEase = ease;
             objectsColorFrom = lastTime switch
             {
-                DayNightCycle.Noon => Color.black,
+                DayNightCycle.Twilight => Color.black,
                 _ => Color.white,
             };
 
             objectsColorTo = currentTime switch
             {
-                DayNightCycle.Noon => Color.black,
+                DayNightCycle.Twilight => Color.black,
                 _ => Color.white,
             };
 
             bgColorFrom = lastTime switch
             {
                 DayNightCycle.Day => Color.white,
-                DayNightCycle.Noon => noonColor,
+                DayNightCycle.Twilight => noonColor,
-                DayNightCycle.Twilight => nightColor,
+                DayNightCycle.Night => nightColor,
                 _ => throw new System.NotImplementedException()
             };
 
             bgColorTo = currentTime switch
             {
                 DayNightCycle.Day => Color.white,
-                DayNightCycle.Noon => noonColor,
+                DayNightCycle.Twilight => noonColor,
-                DayNightCycle.Twilight => nightColor,
+                DayNightCycle.Night => nightColor,
                 _ => throw new System.NotImplementedException()
             };
 
             cloudColorFrom = lastTime switch
             {
                 DayNightCycle.Day => Color.white,
-                DayNightCycle.Noon => noonColorCloud,
+                DayNightCycle.Twilight => noonColorCloud,
-                DayNightCycle.Twilight => nightColorCloud,
+                DayNightCycle.Night => nightColorCloud,
                 _ => throw new System.NotImplementedException()
             };
 
             cloudColorTo = currentTime switch
             {
                 DayNightCycle.Day => Color.white,
-                DayNightCycle.Noon => noonColorCloud,
+                DayNightCycle.Twilight => noonColorCloud,
-                DayNightCycle.Twilight => nightColorCloud,
+                DayNightCycle.Night => nightColorCloud,
                 _ => throw new System.NotImplementedException()
             };
             DayNightCycleUpdate();
@@ -759,8 +759,8 @@ namespace HeavenStudio.Games
         public enum DayNightCycle
         {
             Day = 0,
-            Noon = 1,
+            Twilight = 1,
-            Twilight = 2
+            Night = 2
         }
 
         public void ServeObject(double beat, double targetBeat, bool type)

Assets/Scripts/Games/DJSchool/Student.cs

@@ -48,36 +48,6 @@ namespace HeavenStudio.Games.Scripts_DJSchool
 
         }
 
-        #region old hold
-        //public void Hold(bool ace)
-        //{
-        //    isHolding = true;
-
-        //    if (ace)
-        //    {
-        //        missed = false;
-        //        shouldBeHolding = true;
-        //        game.SetDJYellowHead(1);
-        //    }
-
-        //    Jukebox.PlayOneShotGame("djSchool/recordStop");
-
-        //    anim.Play("Hold", 0, 0);
-        //    tableAnim.Play("Student_Turntable_Hold", 0, 0);
-        //    if (ace)
-        //    {
-        //        if (soundFX)
-        //        {
-        //            Conductor.instance.djSchoolHold.TransitionTo(.01f);
-        //        }
-
-        //        FlashFX(true);
-        //    }
-
-        //    // Settings.GetMusicMixer().audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(0.15f);
-        //}
-        #endregion
-
         public void ForceHold()
         {
             isHolding = true;
@@ -90,7 +60,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
 
             if (soundFX)
             {
-                mixer.audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(.01f);
+                mixer.audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(.1f);
             }
         }
 
@@ -114,7 +84,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
 
             if (soundFX)
             {
-                mixer.audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(.01f);
+                mixer.audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(.1f);
             }
             FlashFX(true);
         }
@@ -149,6 +119,10 @@ namespace HeavenStudio.Games.Scripts_DJSchool
 
             anim.DoScaledAnimationAsync("Hold", 0.5f);
             tableAnim.DoScaledAnimationAsync("Student_Turntable_StartHold", 0.5f);
+            if (soundFX)
+            {
+                mixer.audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(.1f);
+            }
             if (!game.djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.UpFirst) && !game.djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.UpSecond))
             {
                 game.djYellowScript.ChangeHeadSprite(DJYellow.DJExpression.CrossEyed);
@@ -176,7 +150,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
                 Invoke("EnableBoo", 1f);
             }
             missed = true;
-            mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
+            mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
             tableAnim.DoScaledAnimationAsync("Student_Turntable_Idle", 0.5f);
             if (!game.djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.UpFirst) && !game.djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.UpSecond))
             {
@@ -220,7 +194,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
                 tableAnim.DoScaledAnimationAsync("Student_Turntable_Swipe", 0.5f);
 
                 //Instantiate(slamFX, this.transform.parent).SetActive(true);
-                mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
+                mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
             }
             else
             {
@@ -236,7 +210,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
                 tableAnim.DoScaledAnimationAsync("Student_Turntable_Swipe", 0.5f);
 
                 //Instantiate(slamFX, this.transform.parent).SetActive(true);
-                mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
+                mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
             }
 
         }
@@ -246,7 +220,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
             isHolding = false;
             //swiping = false;
             missed = true;
-            mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
+            // mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
             if (canBoo)
             {
                 Sound booSound = SoundByte.PlayOneShotGame("djSchool/boo", caller.timer + caller.startBeat + 1f, 1, 0.8f);
@@ -273,6 +247,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
             isHolding = false;
 
             missed = true;
+            mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
 
             BeatAction.New(game, new List<BeatAction.Action>()
             {
@@ -297,7 +272,6 @@ namespace HeavenStudio.Games.Scripts_DJSchool
             isHolding = false;
 
             missed = true;
-            mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
 
             OnMissSwipeForPlayerInput(Conductor.instance.songPositionAsDouble + 1);
             SoundByte.PlayOneShotGame("djSchool/recordSwipe");
@@ -305,53 +279,6 @@ namespace HeavenStudio.Games.Scripts_DJSchool
 
         #endregion
 
-        #region old swipe
-        //public void Swipe(bool ace)
-        //{
-        //    isHolding = false;
-
-        //    if (ace)
-        //    {
-        //        missed = false;
-        //        shouldBeHolding = false;
-        //        Jukebox.PlayOneShotGame("djSchool/recordSwipe");
-        //        FlashFX(false);
-        //        swiping = true;
-        //    }
-        //    else
-        //    {
-        //        // Missed record swipe sound should play here.
-        //    }
-
-        //    anim.Play("Swipe", 0, 0);
-
-        //    tableAnim.speed = 1;
-        //    tableAnim.Play("Student_Turntable_Swipe", 0, 0);
-
-        //    Instantiate(slamFX).SetActive(true);
-        //    Conductor.instance.normal.TransitionTo(.01f);
-        //    // Settings.GetMusicMixer().audioMixer.FindSnapshot("Main").TransitionTo(0.15f);
-        //    swiping = false;
-
-        //}
-
-        //public override void OnAce()
-        //{
-        //    if (!shouldBeHolding)
-        //    {
-        //        //Hold(true);
-        //    }
-        //    else
-        //    {
-        //        Conductor.instance.normal.TransitionTo(.01f);
-        //        //Swipe(true);
-        //    }
-
-        //    eligible = false;
-        //}
-
-        #endregion
-
         private void FlashFX(bool inverse)
         {
             GameObject prefab = flashFX;
@@ -381,7 +308,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
         //Not sure but will do?
         private void OnDestroy()
         {
-            mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
+            mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
         }
     }
 }

Assets/Scripts/GlobalGameManager.cs

@@ -37,7 +37,7 @@ namespace HeavenStudio
         public static string PlayOpenFile = null;
 
         public static string buildTime = "00/00/0000 00:00:00";
-        public static string friendlyReleaseName = "Heaven Studio (1.0 Lush)";
+        public static string friendlyReleaseName = "Heaven Studio (1.0.1 Lush)";
 
         public static bool HasShutDown = false;
         public static bool discordDuringTesting = false;

Assets/Scripts/TitleManager.cs

@@ -70,6 +70,7 @@ namespace HeavenStudio
 
         private double lastAbsTime;
         private double startTime;
+        private float playPanelRevealTime;
 
         private bool altBop;
 
@@ -568,7 +569,8 @@ namespace HeavenStudio
                         campaignOption.sprite = campaignOff;
                     }
 
-                    waitingForButtonUp = true;
+                    // waitingForButtonUp = true;
+                    playPanelRevealTime = Time.realtimeSinceStartup + 0.2f;
                     playPanel.SetActive(true);
                     playMenuRevealed = true;
                     SoundByte.PlayOneShot("ui/UISelect");
@@ -585,7 +587,7 @@ namespace HeavenStudio
 
         public void PlayPanelAccept()
         {
-            if (waitingForButtonUp) return;
+            if (playPanelRevealTime > Time.realtimeSinceStartup) return;
             if (exiting) return;
             exiting = true;
             SoundByte.PlayOneShot("ui/UIEnter");

Assets/Scripts/UI/PauseMenu.cs

@@ -236,7 +236,7 @@ namespace HeavenStudio.Common
             isQuitting = true;
             SoundByte.PlayOneShot("ui/PauseQuit");
             GameManager.instance.CircleCursor.LockCursor(false);
-            GlobalGameManager.LoadScene("Title", 0, 0.35f);
+            GlobalGameManager.LoadScene("Title", 0, 0.35f, callback: GameManager.instance.DestroyGame);
         }
 
         void OnSettings()
@@ -245,4 +245,4 @@ namespace HeavenStudio.Common
             settingsDialog.SwitchSettingsDialog();
         }
     }
-}
+}

ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset

@@ -19,5 +19,10 @@ MonoBehaviour:
   ImportedScriptPaths:
   - Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
   - Assets/Scripts/Games/RapMen/RapMen.cs
+  - Assets/Scripts/UI/PauseMenu.cs
+  - Assets/Scripts/TitleManager.cs
+  - Assets/Scripts/Games/AirRally/AirRally.cs
+  - Assets/Scripts/GlobalGameManager.cs
+  - Assets/Scripts/Games/DJSchool/Student.cs
   PathsToSkipImportEvent: []
   PathsToIgnoreOverwriteSettingOnAttribute: []