From 1b6422bf6f1262f76da5d836e5c252b147b26d84 Mon Sep 17 00:00:00 2001 From: blank3times <105398129+blank3times@users.noreply.github.com> Date: Sun, 21 Jan 2024 17:21:12 -0800 Subject: [PATCH 1/7] Update AirRally.cs Twilight goes back to Night and then goes over Noon --- Assets/Scripts/Games/AirRally/AirRally.cs | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Assets/Scripts/Games/AirRally/AirRally.cs b/Assets/Scripts/Games/AirRally/AirRally.cs index bbda1ddc8..3a86540e3 100644 --- a/Assets/Scripts/Games/AirRally/AirRally.cs +++ b/Assets/Scripts/Games/AirRally/AirRally.cs @@ -141,7 +141,7 @@ namespace HeavenStudio.Games.Loaders parameters = new List() { 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), - (currentTime == 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.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 => nightColor, + DayNightCycle.Twilight => noonColor, + DayNightCycle.Night => nightColor, _ => throw new System.NotImplementedException() }; bgColorTo = currentTime switch { DayNightCycle.Day => Color.white, - DayNightCycle.Noon => noonColor, - DayNightCycle.Twilight => nightColor, + DayNightCycle.Twilight => noonColor, + DayNightCycle.Night => nightColor, _ => throw new System.NotImplementedException() }; cloudColorFrom = lastTime switch { DayNightCycle.Day => Color.white, - DayNightCycle.Noon => noonColorCloud, - DayNightCycle.Twilight => nightColorCloud, + DayNightCycle.Twilight => noonColorCloud, + DayNightCycle.Night => nightColorCloud, _ => throw new System.NotImplementedException() }; cloudColorTo = currentTime switch { DayNightCycle.Day => Color.white, - DayNightCycle.Noon => noonColorCloud, - DayNightCycle.Twilight => nightColorCloud, + DayNightCycle.Twilight => noonColorCloud, + DayNightCycle.Night => nightColorCloud, _ => throw new System.NotImplementedException() }; DayNightCycleUpdate(); @@ -759,8 +759,8 @@ namespace HeavenStudio.Games public enum DayNightCycle { Day = 0, - Noon = 1, - Twilight = 2 + Twilight = 1, + Night = 2 } public void ServeObject(double beat, double targetBeat, bool type) From f46d769f5f5c9e89dd4e106ef5a1e36192e9a699 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sun, 21 Jan 2024 20:55:31 -0500 Subject: [PATCH 2/7] literal skill star --- Assets/Scenes/Judgement.unity | 302 ++++++++++++++-------------- Assets/Scripts/GlobalGameManager.cs | 2 +- 2 files changed, 152 insertions(+), 152 deletions(-) diff --git a/Assets/Scenes/Judgement.unity b/Assets/Scenes/Judgement.unity index c2179a131..601924cfd 100644 --- a/Assets/Scenes/Judgement.unity +++ b/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 diff --git a/Assets/Scripts/GlobalGameManager.cs b/Assets/Scripts/GlobalGameManager.cs index aa0c816a8..2c2969a37 100644 --- a/Assets/Scripts/GlobalGameManager.cs +++ b/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; From 7d41478ed924740b67145b6570f3c3acfa1ad3f7 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sun, 21 Jan 2024 23:13:39 -0500 Subject: [PATCH 3/7] adjust dj school mixer settings --- Assets/Resources/MainMixer.mixer | 8 +- .../Sprites/Editor/UI/button.png.meta | 12 +++ .../Textbox/TextboxExtras/hsEmoji.png.meta | 12 +++ Assets/Scripts/Games/DJSchool/Student.cs | 97 +++---------------- ...Generator.Editor.ProjectSettingsData.asset | 1 + 5 files changed, 41 insertions(+), 89 deletions(-) diff --git a/Assets/Resources/MainMixer.mixer b/Assets/Resources/MainMixer.mixer index 539be04b3..17fc53323 100644 --- a/Assets/Resources/MainMixer.mixer +++ b/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 diff --git a/Assets/Resources/Sprites/Editor/UI/button.png.meta b/Assets/Resources/Sprites/Editor/UI/button.png.meta index 997b57878..2d13037f1 100644 --- a/Assets/Resources/Sprites/Editor/UI/button.png.meta +++ b/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: [] diff --git a/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/hsEmoji.png.meta b/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/hsEmoji.png.meta index f7ebe6a6e..c2cb89e4f 100644 --- a/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/hsEmoji.png.meta +++ b/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: diff --git a/Assets/Scripts/Games/DJSchool/Student.cs b/Assets/Scripts/Games/DJSchool/Student.cs index 2a965660f..ee1c0021a 100644 --- a/Assets/Scripts/Games/DJSchool/Student.cs +++ b/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() { @@ -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); } } } \ No newline at end of file diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 7a356bfb3..03e0aa529 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -47,5 +47,6 @@ MonoBehaviour: - Assets/Scripts/TitleManager.cs - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs + - Assets/Scripts/Games/DJSchool/Student.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: [] From 9bb98310ccbe975fc836d03d469eebf729dd6bb8 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Mon, 22 Jan 2024 10:58:45 -0500 Subject: [PATCH 4/7] change title screen anti-mash mechanism --- Assets/Resources/tempBuildUI.png | Bin 15706 -> 0 bytes Assets/Resources/tempBuildUI.png.meta | 120 -------------------------- Assets/Scripts/TitleManager.cs | 6 +- 3 files changed, 4 insertions(+), 122 deletions(-) delete mode 100644 Assets/Resources/tempBuildUI.png delete mode 100644 Assets/Resources/tempBuildUI.png.meta diff --git a/Assets/Resources/tempBuildUI.png b/Assets/Resources/tempBuildUI.png deleted file mode 100644 index bf8f37d145f7d5d80ebaadd6b14960ea2a2a1c51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15706 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 diff --git a/Assets/Resources/tempBuildUI.png.meta b/Assets/Resources/tempBuildUI.png.meta deleted file mode 100644 index 79f5cd98e..000000000 --- a/Assets/Resources/tempBuildUI.png.meta +++ /dev/null @@ -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: diff --git a/Assets/Scripts/TitleManager.cs b/Assets/Scripts/TitleManager.cs index 0ed9dc952..ff9e6f757 100644 --- a/Assets/Scripts/TitleManager.cs +++ b/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"); From ca742c85672a76e184f5745baaebd187ba510e4c Mon Sep 17 00:00:00 2001 From: minenice55 Date: Mon, 22 Jan 2024 14:14:16 -0500 Subject: [PATCH 5/7] prod flag gaming --- ProjectSettings/ProjectSettings.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 4f2257a34..b1e288a88 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -684,7 +684,7 @@ PlayerSettings: PS4: UNITY_POST_PROCESSING_STACK_V2 PS5: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2 - Standalone: UNITY_POST_PROCESSING_STACK_V2 + Standalone: UNITY_POST_PROCESSING_STACK_V2;HEAVENSTUDIO_PROD WebGL: UNITY_POST_PROCESSING_STACK_V2 Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2 XboxOne: UNITY_POST_PROCESSING_STACK_V2 From 8348eaa28305bb89f372bc96ed8b13a0428d3261 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Mon, 22 Jan 2024 14:18:41 -0500 Subject: [PATCH 6/7] pause unloads assets on exit --- Assets/Scripts/UI/PauseMenu.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/UI/PauseMenu.cs b/Assets/Scripts/UI/PauseMenu.cs index eccbdf28f..2b3f2f1ce 100644 --- a/Assets/Scripts/UI/PauseMenu.cs +++ b/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(); } } -} \ No newline at end of file +} From 23d9edf5fe507fee81c1ff837dfd7cca6c2b71c3 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Mon, 22 Jan 2024 17:00:57 -0500 Subject: [PATCH 7/7] Revert "prod flag gaming" This reverts commit ca742c85672a76e184f5745baaebd187ba510e4c. --- ProjectSettings/ProjectSettings.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b1e288a88..4f2257a34 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -684,7 +684,7 @@ PlayerSettings: PS4: UNITY_POST_PROCESSING_STACK_V2 PS5: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2 - Standalone: UNITY_POST_PROCESSING_STACK_V2;HEAVENSTUDIO_PROD + Standalone: UNITY_POST_PROCESSING_STACK_V2 WebGL: UNITY_POST_PROCESSING_STACK_V2 Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2 XboxOne: UNITY_POST_PROCESSING_STACK_V2