From b94a70fbc61b0c9ef975e9d530729f086111ecc8 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Wed, 24 Jan 2024 00:17:35 -0500 Subject: [PATCH 1/6] fix certain types of sounds firing a frame late --- Assets/Scripts/Conductor.cs | 7 +-- Assets/Scripts/GameManager.cs | 58 ++++++++++++------- Assets/Scripts/Minigames.cs | 28 +++------ Assets/Scripts/Util/Sound.cs | 30 ++++++++-- ...Generator.Editor.ProjectSettingsData.asset | 3 + 5 files changed, 74 insertions(+), 52 deletions(-) diff --git a/Assets/Scripts/Conductor.cs b/Assets/Scripts/Conductor.cs index 11076f7fc..1acff611c 100644 --- a/Assets/Scripts/Conductor.cs +++ b/Assets/Scripts/Conductor.cs @@ -189,6 +189,7 @@ namespace HeavenStudio RiqBeatmap chart = GameManager.instance.Beatmap; double offset = chart.data.offset; double dspTime = AudioSettings.dspTime; + dspStart = dspTime; startPos = GetSongPosFromBeat(beat); firstBeatOffset = offset; @@ -213,10 +214,6 @@ namespace HeavenStudio musicSource.pitch = timelinePitch; Debug.Log($"playback scheduled for dsptime {dspStart}"); } - if (musicSource.clip == null) - { - dspStart = dspTime; - } songPosBeat = beat; startBeat = songPosBeat; @@ -404,7 +401,7 @@ namespace HeavenStudio } } - double MapTimeToPitchChanges(double time) + public double MapTimeToPitchChanges(double time) { double counter = 0; double lastChangeTime = 0; diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 8bdd8eef5..821d01245 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -21,7 +21,7 @@ namespace HeavenStudio [Header("Lists")] [NonSerialized] public RiqBeatmap Beatmap = new(); - private List preloadedGames = new(); + private Dictionary cachedGamePrefabs = new(); [NonSerialized] public ObjectPool SoundObjects; [Header("Components")] @@ -1092,9 +1092,11 @@ namespace HeavenStudio { ResetCamera(); // resetting camera before setting new minigame so minigames can set camera values in their awake call - Rasmus - Destroy(currentGameO); + GameObject prefab = GetGame(game); + if (prefab == null) return; - currentGameO = Instantiate(GetGame(game)); + Destroy(currentGameO); + currentGameO = Instantiate(prefab); if (currentGameO.TryGetComponent(out var minigame)) { _currentMinigame = minigame; @@ -1112,6 +1114,7 @@ namespace HeavenStudio public void DestroyGame() { + cachedGamePrefabs.Clear(); SetGame("noGame"); } @@ -1152,29 +1155,40 @@ namespace HeavenStudio .Select(x => GetGameInfo(x)) .Where(x => x != null) .Where(x => !x.fxOnly) - .Select(x => x.LoadableName); - name = gameInfos.FirstOrDefault() ?? "noGame"; - } - else - { - if (gameInfo.usesAssetBundle) + .Where(x => x.LoadableName is not "noGame" or "" or null); + if (gameInfos.Count() > 0) { - //game is packed in an assetbundle, load from that instead - if (gameInfo.AssetsLoaded && gameInfo.LoadedPrefab != null) return gameInfo.LoadedPrefab; - - try - { - return gameInfo.GetCommonAssetBundle().LoadAsset(name); - } - catch (Exception e) - { - Debug.LogWarning($"Failed to load assetbundle for game {name}, using sync loading: {e.Message}"); - return Resources.Load($"Games/{name}"); - } + gameInfo = gameInfos.FirstOrDefault(); + if (gameInfo == null) return Resources.Load($"Games/noGame"); + } + else + { + return Resources.Load($"Games/noGame"); } } + if (gameInfo.usesAssetBundle) + { + //game is packed in an assetbundle, load from that instead + if (gameInfo.AssetsLoaded && gameInfo.LoadedPrefab != null) return gameInfo.LoadedPrefab; + // couldn't load cached prefab, try loading from assetbundle + try + { + Debug.LogWarning($"Game prefab wasn't cached, loading from assetbundle for game {name}"); + return gameInfo.LoadGamePrefab(); + } + catch (Exception e) + { + Debug.LogWarning($"Failed to load assetbundle for game {name}, using sync loading: {e.Message}"); + return Resources.Load($"Games/{name}"); + } + } + return Resources.Load($"Games/{name}"); + } + else + { + Debug.LogWarning($"Game {name} not found, using noGame"); + return Resources.Load($"Games/noGame"); } - return Resources.Load($"Games/{name}"); } public Minigames.Minigame GetGameInfo(string name) diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 63e6d0988..98542264b 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -479,9 +479,7 @@ namespace HeavenStudio { if (AssetsLoaded || !usesAssetBundle) return; await UniTask.WhenAll(LoadCommonAssetBundleAsync(), LoadLocalizedAssetBundleAsync()); - await UniTask.WhenAll(LoadGamePrefabAsync()); - await UniTask.WhenAll(LoadCommonAudioClips()); - await UniTask.WhenAll(LoadLocalizedAudioClips()); + await UniTask.WhenAll(LoadGamePrefabAsync(), LoadCommonAudioClips(), LoadLocalizedAudioClips()); } public async UniTask LoadCommonAssetBundleAsync() @@ -547,6 +545,14 @@ namespace HeavenStudio } } + public GameObject LoadGamePrefab() + { + if (!usesAssetBundle) return null; + + loadedPrefab = GetCommonAssetBundle().LoadAsset(name); + return loadedPrefab; + } + public async UniTask LoadCommonAudioClips() { if (!commonLoaded) return; @@ -556,14 +562,6 @@ namespace HeavenStudio var assets = bundleCommon.LoadAllAssetsAsync(); await assets; - - // await UniTask.SwitchToThreadPool(); - // foreach (var asset in assets.allAssets) - // { - // AudioClip clip = asset as AudioClip; - // commonAudioClips.Add(clip.name, clip); - // } - // await UniTask.SwitchToMainThread(); } public async UniTask LoadLocalizedAudioClips() @@ -575,14 +573,6 @@ namespace HeavenStudio var assets = bundleLocalized.LoadAllAssetsAsync(); await assets; - - // await UniTask.SwitchToThreadPool(); - // foreach (var asset in assets.allAssets) - // { - // AudioClip clip = asset as AudioClip; - // localeAudioClips.Add(clip.name, clip); - // } - // await UniTask.SwitchToMainThread(); } public async UniTask UnloadAllAssets() diff --git a/Assets/Scripts/Util/Sound.cs b/Assets/Scripts/Util/Sound.cs index e41f88b39..5084bdbad 100644 --- a/Assets/Scripts/Util/Sound.cs +++ b/Assets/Scripts/Util/Sound.cs @@ -70,6 +70,7 @@ namespace HeavenStudio.Util audioSource = GetComponent(); cond = Conductor.instance; + double dspTime = AudioSettings.dspTime; available = false; audioSource.clip = clip; @@ -85,8 +86,8 @@ namespace HeavenStudio.Util { playInstant = true; played = true; - startTime = AudioSettings.dspTime; - audioSource.PlayScheduled(startTime); + startTime = dspTime; + audioSource.Play(); } else { @@ -94,15 +95,17 @@ namespace HeavenStudio.Util if (cond != null) { scheduledPitch = cond.SongPitch; - startTime = (AudioSettings.dspTime + (cond.GetSongPosFromBeat(beat) - cond.songPositionAsDouble) / (double)scheduledPitch) - offset; + startTime = (dspTime + (cond.GetSongPosFromBeat(beat) - cond.songPositionAsDouble) / (double)scheduledPitch) - offset; } - if (scheduledPitch != 0 && AudioSettings.dspTime >= startTime) + if (scheduledPitch != 0 && dspTime >= startTime) { audioSource.PlayScheduled(startTime); + played = true; queued = true; } } + Update(); } private void Update() @@ -157,7 +160,7 @@ namespace HeavenStudio.Util audioSource.UnPause(); } scheduledPitch = cond.SongPitch; - startTime = (dspTime + (cond.GetSongPosFromBeat(beat) - cond.songPositionAsDouble) / (double)scheduledPitch); + startTime = (dspTime + (cond.GetSongPosFromBeat(beat) - cond.songPositionAsDouble) / (double)scheduledPitch) - offset; if (queued) audioSource.SetScheduledStartTime(startTime); } @@ -203,7 +206,7 @@ namespace HeavenStudio.Util { if (looping && loopEndBeat != -1) // Looping sounds play forever unless params are set. { - if (cond.songPositionInBeatsAsDouble > loopEndBeat) + if (cond.songPositionInBeatsAsDouble >= loopEndBeat) { KillLoop(fadeTime); loopDone = true; @@ -257,12 +260,22 @@ namespace HeavenStudio.Util { if (!gameObject.activeSelf) return; this.bendedPitch = bendedPitch; + if (bendTime == 0) + { + audioSource.pitch = bendedPitch; + return; + } StartCoroutine(BendUpLoop(bendTime)); } public void BendDown(float bendTime) { if (!gameObject.activeSelf) return; + if (bendTime == 0) + { + audioSource.pitch = pitch; + return; + } StartCoroutine(BendDownLoop(bendTime)); } @@ -301,6 +314,11 @@ namespace HeavenStudio.Util public void KillLoop(double fadeTime) { if (!gameObject.activeSelf) return; + if (fadeTime == 0) + { + GameManager.instance.SoundObjects.Release(this); + return; + } StartCoroutine(FadeLoop(fadeTime)); } diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 03e0aa529..a7875bb46 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -48,5 +48,8 @@ MonoBehaviour: - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs - Assets/Scripts/Games/DJSchool/Student.cs + - Assets/Scripts/UI/PauseMenu.cs + - Assets/Scripts/Util/Sound.cs + - Assets/Scripts/Conductor.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: [] From ba3960d142c7dd4decebe5e8e5fef9fd2a52f62e Mon Sep 17 00:00:00 2001 From: minenice55 Date: Wed, 24 Jan 2024 00:40:29 -0500 Subject: [PATCH 2/6] linear rgb for textures that get remapping shaders applied --- .../Games/CoinToss/foreground.png.meta | 43 ++++++++++++++++++- .../Games/FanClub/fanClub_DVLight.png.meta | 43 ++++++++++++++++++- .../Games/FanClub/idol_wink_circle.png.meta | 31 ++++++++++++- .../Games/FanClub/idol_wink_star.png.meta | 43 ++++++++++++++++++- .../Games/KarateMan/bg_gradient.png.meta | 14 +++++- .../effect/barrelPartsRecolorable00.png.meta | 31 ++++++++++++- .../effect/barrelPartsRecolorable01.png.meta | 31 ++++++++++++- .../effect/barrelWoodRecolorable.png.meta | 43 ++++++++++++++++++- .../Games/KarateMan/effect/fire.png.meta | 14 +++++- .../Games/KarateMan/effect/impact.png.meta | 31 ++++++++++++- .../effect/karateman_bulbhit_fx_0.png.meta | 31 ++++++++++++- .../effect/karateman_bulbhit_fx_1.png.meta | 31 ++++++++++++- .../KarateMan/effect/kickFragment.png.meta | 31 ++++++++++++- .../Games/KarateMan/effect/kickHit.png.meta | 31 ++++++++++++- .../Games/KarateMan/effect/other.png.meta | 14 +++++- .../Games/KarateMan/effect/potStar.png.meta | 31 ++++++++++++- .../KarateMan/effect/rockEmitter.png.meta | 14 +++++- .../KarateMan/karate_bg_rings_1.png.meta | 31 ++++++++++++- .../KarateMan/karate_bg_rings_2.png.meta | 31 ++++++++++++- .../KarateMan/karate_bg_sunburst_1.png.meta | 19 +++++++- .../KarateMan/karate_bg_sunburst_2.png.meta | 19 +++++++- .../KarateMan/karateman_bulb_light.png.meta | 31 ++++++++++++- .../Games/KarateMan/karateman_main.png.meta | 2 +- .../Games/KarateMan/radial_gradient.png.meta | 14 +++++- .../Games/Lockstep/locksteptiled.png.meta | 14 +++++- .../Games/MarchingOrders/marcher_bg.png.meta | 2 +- .../Games/OctopusMachine/octopus_new.png.meta | 2 +- .../Games/QuizShow/quizeffects.png.meta | 14 +++++- .../Games/TramAndPauline/smoke.png.meta | 14 +++++- .../StarAndAccuracy/child.png.meta | 31 ++++++++++++- .../StarAndAccuracy/circle.png.meta | 29 ++++++++++++- .../StarAndAccuracy/line.png.meta | 29 ++++++++++++- .../StarAndAccuracy/main.png.meta | 29 ++++++++++++- .../StarAndAccuracy/sphere.png.meta | 29 ++++++++++++- .../StarAndAccuracy/star0.png.meta | 29 ++++++++++++- .../StarAndAccuracy/star1.png.meta | 29 ++++++++++++- Assets/Resources/Sprites/UI/bgGlow.png.meta | 31 ++++++++++++- 37 files changed, 879 insertions(+), 57 deletions(-) diff --git a/Assets/Resources/Sprites/Games/CoinToss/foreground.png.meta b/Assets/Resources/Sprites/Games/CoinToss/foreground.png.meta index 3f21b0501..0aeb7cb4e 100644 --- a/Assets/Resources/Sprites/Games/CoinToss/foreground.png.meta +++ b/Assets/Resources/Sprites/Games/CoinToss/foreground.png.meta @@ -3,11 +3,11 @@ guid: 9c7b469fa013d7f4582d8c430ee498dd TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,6 +77,42 @@ TextureImporter: 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: [] @@ -88,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/FanClub/fanClub_DVLight.png.meta b/Assets/Resources/Sprites/Games/FanClub/fanClub_DVLight.png.meta index 371928e29..9a7d5984e 100644 --- a/Assets/Resources/Sprites/Games/FanClub/fanClub_DVLight.png.meta +++ b/Assets/Resources/Sprites/Games/FanClub/fanClub_DVLight.png.meta @@ -3,11 +3,11 @@ guid: e6acfd14be9fd524cacaf4125ce77349 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,6 +77,42 @@ TextureImporter: 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: [] @@ -88,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/FanClub/idol_wink_circle.png.meta b/Assets/Resources/Sprites/Games/FanClub/idol_wink_circle.png.meta index cb3597a41..45af504d6 100644 --- a/Assets/Resources/Sprites/Games/FanClub/idol_wink_circle.png.meta +++ b/Assets/Resources/Sprites/Games/FanClub/idol_wink_circle.png.meta @@ -3,11 +3,11 @@ guid: 91c216f35d3c30b4bb14d55a732a42fe TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: 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: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/FanClub/idol_wink_star.png.meta b/Assets/Resources/Sprites/Games/FanClub/idol_wink_star.png.meta index 3e2306589..28eeb78f6 100644 --- a/Assets/Resources/Sprites/Games/FanClub/idol_wink_star.png.meta +++ b/Assets/Resources/Sprites/Games/FanClub/idol_wink_star.png.meta @@ -3,11 +3,11 @@ guid: 279d2e06ad69399469db0628823eeac6 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,6 +77,42 @@ TextureImporter: 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: [] @@ -88,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/bg_gradient.png.meta b/Assets/Resources/Sprites/Games/KarateMan/bg_gradient.png.meta index 609b42ba2..e997e3d26 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/bg_gradient.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/bg_gradient.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -101,6 +101,18 @@ TextureImporter: 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: [] diff --git a/Assets/Resources/Sprites/Games/KarateMan/effect/barrelPartsRecolorable00.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/barrelPartsRecolorable00.png.meta index 3b3e2019c..1b2841171 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/barrelPartsRecolorable00.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/barrelPartsRecolorable00.png.meta @@ -3,11 +3,11 @@ guid: 0ff5e12838ee98e42b99349792067ea4 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 256 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/effect/barrelPartsRecolorable01.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/barrelPartsRecolorable01.png.meta index 6310cf04f..7652dc9d9 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/barrelPartsRecolorable01.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/barrelPartsRecolorable01.png.meta @@ -3,11 +3,11 @@ guid: d5fab48b3071cd440ba6a10c739e699b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 256 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/effect/barrelWoodRecolorable.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/barrelWoodRecolorable.png.meta index c6a51479a..209d3f6fa 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/barrelWoodRecolorable.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/barrelWoodRecolorable.png.meta @@ -3,11 +3,11 @@ guid: 504ca8701fa54274888135321e06bd90 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,6 +77,42 @@ TextureImporter: 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: [] @@ -88,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/effect/fire.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/fire.png.meta index 73ff15052..de8a7dbb3 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/fire.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/fire.png.meta @@ -31,7 +31,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -125,6 +125,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/Resources/Sprites/Games/KarateMan/effect/impact.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/impact.png.meta index 1519f9022..f6af6ef83 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/impact.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/impact.png.meta @@ -3,11 +3,11 @@ guid: 7fa1620223ad93746ad7571a680a5775 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_0.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_0.png.meta index 74ab6a236..c1eb1fde1 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_0.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_0.png.meta @@ -3,11 +3,11 @@ guid: cac5251c0e7aab44990d8723e310d574 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: 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: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_1.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_1.png.meta index 1eda30fda..d0af176eb 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_1.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_1.png.meta @@ -3,11 +3,11 @@ guid: 9e641cec187c54c43af5ff2b37402828 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: 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: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/effect/kickFragment.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/kickFragment.png.meta index 1e5b61884..d7a01a24d 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/kickFragment.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/kickFragment.png.meta @@ -3,11 +3,11 @@ guid: 2eb0d3761511a00419304b7fea4b6c8f TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 256 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/effect/kickHit.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/kickHit.png.meta index cea0a6933..f051b2823 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/kickHit.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/kickHit.png.meta @@ -3,11 +3,11 @@ guid: cef1be909e33cc2489b731bc34d43aae TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 512 + 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: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/effect/other.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/other.png.meta index ff539aed0..871e91420 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/other.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/other.png.meta @@ -31,7 +31,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -125,6 +125,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/Resources/Sprites/Games/KarateMan/effect/potStar.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/potStar.png.meta index d2622051d..d74c22e0e 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/potStar.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/potStar.png.meta @@ -3,11 +3,11 @@ guid: d1c32ab4032db6e44acd95f4d8820e98 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/effect/rockEmitter.png.meta b/Assets/Resources/Sprites/Games/KarateMan/effect/rockEmitter.png.meta index 3e4da2927..874ff4413 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/effect/rockEmitter.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/effect/rockEmitter.png.meta @@ -19,7 +19,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -113,6 +113,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + 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/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png.meta index 594840a68..40b9a7096 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png.meta @@ -3,11 +3,11 @@ guid: 02bb4d7e097a4524db553cfabcdbcf10 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: 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: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png.meta index 75a4cb2b2..aa078554e 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png.meta @@ -3,11 +3,11 @@ guid: c19e325e2bac3e44d9464debd23372c5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: 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: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_1.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_1.png.meta index d489ba208..b4eacbc00 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_1.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_1.png.meta @@ -3,11 +3,11 @@ guid: 72431c7c58f54e848bcb7527635bb72b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -99,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -112,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_2.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_2.png.meta index 689eca6e0..1e9422e9e 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_2.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_2.png.meta @@ -3,11 +3,11 @@ guid: f05694d1ff974fe4387e487d025edede TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -99,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -112,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta index a4f8ac200..78b36ee65 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png.meta @@ -3,11 +3,11 @@ guid: 2dcc4a0e0420a8e4097445cac4b2e1ab TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 512 + 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: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png.meta index cdace8d06..5e99c5fe2 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png.meta @@ -280,7 +280,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/radial_gradient.png.meta b/Assets/Resources/Sprites/Games/KarateMan/radial_gradient.png.meta index f59bc69cc..b3fdec910 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/radial_gradient.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/radial_gradient.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -101,6 +101,18 @@ TextureImporter: 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: [] diff --git a/Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png.meta b/Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png.meta index f10cc7e95..18587bcae 100644 --- a/Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png.meta +++ b/Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png.meta @@ -67,7 +67,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -161,6 +161,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 4096 + 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/Resources/Sprites/Games/MarchingOrders/marcher_bg.png.meta b/Assets/Resources/Sprites/Games/MarchingOrders/marcher_bg.png.meta index 6cb07eaeb..7fb263ffa 100644 --- a/Assets/Resources/Sprites/Games/MarchingOrders/marcher_bg.png.meta +++ b/Assets/Resources/Sprites/Games/MarchingOrders/marcher_bg.png.meta @@ -22,7 +22,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/Assets/Resources/Sprites/Games/OctopusMachine/octopus_new.png.meta b/Assets/Resources/Sprites/Games/OctopusMachine/octopus_new.png.meta index a3a7e74c5..747ef7c67 100644 --- a/Assets/Resources/Sprites/Games/OctopusMachine/octopus_new.png.meta +++ b/Assets/Resources/Sprites/Games/OctopusMachine/octopus_new.png.meta @@ -103,7 +103,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/Assets/Resources/Sprites/Games/QuizShow/quizeffects.png.meta b/Assets/Resources/Sprites/Games/QuizShow/quizeffects.png.meta index aa33cfda7..df458a81a 100644 --- a/Assets/Resources/Sprites/Games/QuizShow/quizeffects.png.meta +++ b/Assets/Resources/Sprites/Games/QuizShow/quizeffects.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -101,6 +101,18 @@ TextureImporter: 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: diff --git a/Assets/Resources/Sprites/Games/TramAndPauline/smoke.png.meta b/Assets/Resources/Sprites/Games/TramAndPauline/smoke.png.meta index 1b19fab06..9c177af45 100644 --- a/Assets/Resources/Sprites/Games/TramAndPauline/smoke.png.meta +++ b/Assets/Resources/Sprites/Games/TramAndPauline/smoke.png.meta @@ -31,7 +31,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -125,6 +125,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/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/child.png.meta b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/child.png.meta index 2bd92a8f4..b768ec6df 100644 --- a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/child.png.meta +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/child.png.meta @@ -3,11 +3,11 @@ guid: d928ab5632064c745ad9efd56e374b02 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: 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: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/circle.png.meta b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/circle.png.meta index 08125fc25..4d551d522 100644 --- a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/circle.png.meta +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/circle.png.meta @@ -3,7 +3,7 @@ guid: 1c67c30b2a1acf145a7f58f54d7b7e19 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 1 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/line.png.meta b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/line.png.meta index bcc95a077..7565f5cbc 100644 --- a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/line.png.meta +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/line.png.meta @@ -3,7 +3,7 @@ guid: a4227bd02b95b2e43808333c42dcbce5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 1 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/main.png.meta b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/main.png.meta index ffa93fb18..2385587a9 100644 --- a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/main.png.meta +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/main.png.meta @@ -3,7 +3,7 @@ guid: f32373bf1e076534c9a5bd0eb82f073f TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 64 + 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: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/sphere.png.meta b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/sphere.png.meta index 1908e9747..752bac2bc 100644 --- a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/sphere.png.meta +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/sphere.png.meta @@ -3,7 +3,7 @@ guid: d9d16c51e9288074d81bd3f7bad3d1f9 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 1 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/star0.png.meta b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/star0.png.meta index 2f28cf03a..b92edcd82 100644 --- a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/star0.png.meta +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/star0.png.meta @@ -3,7 +3,7 @@ guid: bbf0b563660df5543be9504599afb095 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 1 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/star1.png.meta b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/star1.png.meta index a209119f0..19debe6f4 100644 --- a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/star1.png.meta +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/star1.png.meta @@ -3,7 +3,7 @@ guid: 52d7d393f99934c43a8ffb32d844c88b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 1 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/UI/bgGlow.png.meta b/Assets/Resources/Sprites/UI/bgGlow.png.meta index b90ff0cfd..004f53ca4 100644 --- a/Assets/Resources/Sprites/UI/bgGlow.png.meta +++ b/Assets/Resources/Sprites/UI/bgGlow.png.meta @@ -3,11 +3,11 @@ guid: 8be59c4bde4258c429ac39251f5f681b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,30 @@ TextureImporter: 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: [] @@ -100,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 From 9f0a48e9ff26cbefcb778c71937dc85cc57fdd89 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Thu, 25 Jan 2024 12:29:05 -0500 Subject: [PATCH 3/6] event caller refactoring change operation order of minigame loading --- Assets/Scripts/EventCaller.cs | 51 ++-------- Assets/Scripts/GameInitializer.cs | 2 +- Assets/Scripts/GameManager.cs | 96 +++++++++++-------- Assets/Scripts/Games/TrickClass/TrickClass.cs | 35 ++++--- Assets/Scripts/LevelEditor/Editor.cs | 2 +- .../Scripts/LevelEditor/Timeline/Timeline.cs | 4 +- Assets/Scripts/Minigames.cs | 6 +- ...Generator.Editor.ProjectSettingsData.asset | 4 + 8 files changed, 94 insertions(+), 106 deletions(-) diff --git a/Assets/Scripts/EventCaller.cs b/Assets/Scripts/EventCaller.cs index 8460cf560..65426e950 100644 --- a/Assets/Scripts/EventCaller.cs +++ b/Assets/Scripts/EventCaller.cs @@ -8,6 +8,7 @@ namespace HeavenStudio { public class EventCaller : MonoBehaviour { + public GameManager gameManager { get; private set; } public Transform GamesHolder; public RiqEntity currentEntity = new RiqEntity(); public string currentSwitchGame; @@ -18,6 +19,7 @@ namespace HeavenStudio public Dictionary minigames = new(); + public Minigames.Minigame GetMinigame(string gameName) { if (!minigames.ContainsKey(gameName)) @@ -55,34 +57,14 @@ namespace HeavenStudio return GetGameAction(gameName, action).parameters.Find(c => c.propertyName == param); } - public void Init() + public void Init(GameManager mgr) { + gameManager = mgr; instance = this; currentEntity = new RiqEntity(); Minigames.Init(this); - - List minigamesInBeatmap = new List(); - for (int i = 0; i < GameManager.instance.Beatmap.Entities.Count; i++) - { - //go through every entity in the timeline and add the game that they're from to the minigamesInBeatmap list (ignore entities from FX only categories, i.e. Game Manager and Count-Ins) - Minigames.Minigame game = GetMinigame(GameManager.instance.Beatmap.Entities[i].datamodel.Split('/')[0]); - if (!minigamesInBeatmap.Contains(game) && !FXOnlyGames().Contains(game)) - { - minigamesInBeatmap.Add(game); - } - } - - for (int i = 0; i < minigamesInBeatmap.Count; i++) - { - // minigames[minigames.FindIndex(c => c.name == minigamesInBeatmap[i].name)].holder = Resources.Load($"Games/{minigamesInBeatmap[i].name}"); - } - } - - private void Update() - { - } public void CallEvent(RiqEntity entity, bool gameActive) @@ -128,30 +110,9 @@ 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 static bool IsGameSwitch(RiqEntity entity) - { - return StringStartsWith(entity.datamodel, "gameManager/switchGame"); - } - public static List GetAllInGameManagerList(string gameName, string[] include) { - List temp1 = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split('/')[0] == gameName); + List temp1 = instance.gameManager.Beatmap.Entities.FindAll(c => c.datamodel.Split('/')[0] == gameName); List temp2 = new List(); foreach (string s in include) { @@ -162,7 +123,7 @@ namespace HeavenStudio public static List GetAllInGameManagerListExclude(string gameName, string[] exclude) { - List temp1 = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split('/')[0] == gameName); + List temp1 = instance.gameManager.Beatmap.Entities.FindAll(c => c.datamodel.Split('/')[0] == gameName); List temp2 = new List(); foreach (string s in exclude) { diff --git a/Assets/Scripts/GameInitializer.cs b/Assets/Scripts/GameInitializer.cs index eba226c0c..18eff4d83 100644 --- a/Assets/Scripts/GameInitializer.cs +++ b/Assets/Scripts/GameInitializer.cs @@ -68,7 +68,7 @@ namespace HeavenStudio GameObject Games = new GameObject(); Games.name = "Games"; - gameManager.playMode = playOnStart; + gameManager.TogglePlayMode(playOnStart); gameManager.GamesHolder = Games; gameManager.CircleCursor = Cursor.transform.GetChild(0).GetComponent(); diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 821d01245..007c43850 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -32,30 +32,31 @@ namespace HeavenStudio [NonSerialized] public Games.Global.Filter filter; [Header("Games")] - [NonSerialized] public string currentGame; Coroutine currentGameSwitchIE; - [Header("Properties")] - [NonSerialized] public string txt = null; - [NonSerialized] public string ext = null; - [NonSerialized] public int currentEvent, currentTempoEvent, currentVolumeEvent, currentSectionEvent, currentPreEvent, currentPreSwitch, currentPreSequence; - [NonSerialized] public double endBeat; - [NonSerialized] public float startOffset; - [NonSerialized] public bool playMode; - [NonSerialized] public double startBeat; - [NonSerialized] public GameObject currentGameO; - private Minigame _currentMinigame; - [NonSerialized] public bool autoplay; - [NonSerialized] public bool canInput = true; - [NonSerialized] public RiqEntity lastSection, currentSection; - [NonSerialized] public double nextSectionBeat; + + public string currentGame { get; private set; } + public GameObject minigameObj { get; private set; } + public Minigame minigame { get; private set; } + public RiqEntity lastSection { get; private set; } + public RiqEntity currentSection { get; private set; } + + public double endBeat { get; private set; } + public double startBeat { get; private set; } + + public double nextSectionBeat { get; private set; } public double SectionProgress { get; private set; } public float MarkerWeight { get; private set; } + public int MarkerCategory { get; private set; } + public bool playMode { get; private set; } + public bool autoplay { get; private set; } + public bool canInput { get; private set; } + public bool GameHasSplitColours { get @@ -138,7 +139,9 @@ namespace HeavenStudio eventCaller = this.gameObject.AddComponent(); eventCaller.GamesHolder = GamesHolder.transform; - eventCaller.Init(); + eventCaller.Init(this); + + canInput = true; // note: serialize this shit in the inspector // GameObject textbox = Instantiate(Resources.Load("Prefabs/Common/Textbox")); @@ -429,9 +432,10 @@ namespace HeavenStudio { if (currentPreSequence < Beatmap.Entities.Count && currentPreSequence >= 0) { - if (start >= preSequenceBeats[currentPreSequence]) + List entitiesInRange = ListPool.Get(); + while (currentPreSequence < preSequenceBeats.Count && start >= preSequenceBeats[currentPreSequence]) { - List entitiesInRange = ListPool.Get(); + entitiesInRange.Clear(); foreach (RiqEntity entity in Beatmap.Entities) { string[] entityDatamodel = entity.datamodel.Split('/'); @@ -449,14 +453,14 @@ namespace HeavenStudio var inf = GetGameInfo(gameName); if (inf != null && inf.usesAssetBundle && inf.AssetsLoaded && !inf.SequencesPreloaded) { - Debug.Log($"Preloading game {gameName}"); + Debug.Log($"Preparing game {gameName}"); PreloadGameSequences(gameName); } eventCaller.CallPreEvent(entity); currentPreSequence++; } - ListPool.Release(entitiesInRange); } + ListPool.Release(entitiesInRange); } } @@ -533,7 +537,7 @@ namespace HeavenStudio if (cond.songPositionInBeatsAsDouble >= Math.Ceiling(_playStartBeat) + _pulseTally) { - if (_currentMinigame != null) _currentMinigame.OnBeatPulse(Math.Ceiling(_playStartBeat) + _pulseTally); + if (minigame != null) minigame.OnBeatPulse(Math.Ceiling(_playStartBeat) + _pulseTally); onBeatPulse?.Invoke(Math.Ceiling(_playStartBeat) + _pulseTally); _pulseTally++; } @@ -545,12 +549,13 @@ namespace HeavenStudio if (currentEvent < Beatmap.Entities.Count && currentEvent >= 0) { - if (clampedBeat >= eventBeats[currentEvent]) + List entitiesInRange = ListPool.Get(); + List fxEntities = ListPool.Get(); + // allows for multiple events on the same beat to be executed on the same frame, so no more 1-frame delay + while (currentEvent < eventBeats.Count && clampedBeat >= eventBeats[currentEvent] && Conductor.instance.isPlaying) { - List entitiesInRange = ListPool.Get(); - List fxEntities = ListPool.Get(); - - // allows for multiple events on the same beat to be executed on the same frame, so no more 1-frame delay + fxEntities.Clear(); + entitiesInRange.Clear(); using (PooledObject> pool = ListPool.Get(out List currentBeatEntities)) { currentBeatEntities = Beatmap.Entities.FindAll(c => c.beat == eventBeats[currentEvent]); @@ -592,10 +597,9 @@ namespace HeavenStudio // Thank you to @shshwdr for bring this to my attention currentEvent++; } - - ListPool.Release(entitiesInRange); - ListPool.Release(fxEntities); } + ListPool.Release(entitiesInRange); + ListPool.Release(fxEntities); } if (currentSection == null) @@ -619,7 +623,7 @@ namespace HeavenStudio if (Conductor.instance.songPositionInBeatsAsDouble >= Math.Ceiling(_playStartBeat) + _latePulseTally) { - if (_currentMinigame != null) _currentMinigame.OnLateBeatPulse(Math.Ceiling(_playStartBeat) + _latePulseTally); + if (minigame != null) minigame.OnLateBeatPulse(Math.Ceiling(_playStartBeat) + _latePulseTally); onBeatPulse?.Invoke(Math.Ceiling(_playStartBeat) + _latePulseTally); _latePulseTally++; } @@ -630,6 +634,16 @@ namespace HeavenStudio canInput = inputs; } + public void ToggleAutoplay(bool auto) + { + autoplay = auto; + } + + public void TogglePlayMode(bool mode) + { + playMode = mode; + } + #region Play Events private double _playStartBeat = 0; @@ -701,7 +715,7 @@ namespace HeavenStudio { Conductor.instance.PlaySetup(beat); Minigame miniGame = null; - if (currentGameO != null && currentGameO.TryGetComponent(out miniGame)) + if (minigameObj != null && minigameObj.TryGetComponent(out miniGame)) { if (miniGame != null) { @@ -761,7 +775,7 @@ namespace HeavenStudio } Minigame miniGame; - if (currentGameO != null && currentGameO.TryGetComponent(out miniGame)) + if (minigameObj != null && minigameObj.TryGetComponent(out miniGame)) { if (miniGame != null) { @@ -1065,7 +1079,7 @@ namespace HeavenStudio SetGame(game, false); Minigame miniGame; - if (currentGameO != null && currentGameO.TryGetComponent(out miniGame)) + if (minigameObj != null && minigameObj.TryGetComponent(out miniGame)) { if (miniGame != null) { @@ -1095,19 +1109,19 @@ namespace HeavenStudio GameObject prefab = GetGame(game); if (prefab == null) return; - Destroy(currentGameO); - currentGameO = Instantiate(prefab); - if (currentGameO.TryGetComponent(out var minigame)) + Destroy(minigameObj); + minigameObj = Instantiate(prefab); + if (minigameObj.TryGetComponent(out var minigame)) { - _currentMinigame = minigame; + this.minigame = minigame; minigame.minigameName = game; minigame.gameManager = this; minigame.conductor = Conductor.instance; } - Vector3 originalScale = currentGameO.transform.localScale; - currentGameO.transform.parent = eventCaller.GamesHolder.transform; - currentGameO.transform.localScale = originalScale; - currentGameO.name = game; + Vector3 originalScale = minigameObj.transform.localScale; + minigameObj.transform.parent = eventCaller.GamesHolder.transform; + minigameObj.transform.localScale = originalScale; + minigameObj.name = game; SetCurrentGame(game, useMinigameColor); } diff --git a/Assets/Scripts/Games/TrickClass/TrickClass.cs b/Assets/Scripts/Games/TrickClass/TrickClass.cs index d05d7ad37..ef319e7a7 100644 --- a/Assets/Scripts/Games/TrickClass/TrickClass.cs +++ b/Assets/Scripts/Games/TrickClass/TrickClass.cs @@ -29,8 +29,9 @@ namespace HeavenStudio.Games.Loaders { preFunction = delegate { - var e = eventCaller.currentEntity; - TrickClass.PreTossObject(e.beat, (int)e["obj"], e["nx"]); + EventCaller ec = eventCaller; + var e = ec.currentEntity; + TrickClass.PreTossObject(ec.gameManager, e.beat, (int)e["obj"], e["nx"]); }, defaultLength = 2, parameters = new List() @@ -46,7 +47,9 @@ namespace HeavenStudio.Games.Loaders { preFunction = delegate { - TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Plane); + EventCaller ec = eventCaller; + var e = ec.currentEntity; + TrickClass.PreTossObject(ec.gameManager, e.beat, (int)TrickClass.TrickObjType.Plane); }, defaultLength = 3, }, @@ -62,7 +65,9 @@ namespace HeavenStudio.Games.Loaders { preFunction = delegate { - TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Chair); + EventCaller ec = eventCaller; + var e = ec.currentEntity; + TrickClass.PreTossObject(ec.gameManager, e.beat, (int)TrickClass.TrickObjType.Chair); }, defaultLength = 2, hidden = true, @@ -71,7 +76,9 @@ namespace HeavenStudio.Games.Loaders { preFunction = delegate { - TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Phone, eventCaller.currentEntity["nx"]); + EventCaller ec = eventCaller; + var e = ec.currentEntity; + TrickClass.PreTossObject(ec.gameManager, e.beat, (int)TrickClass.TrickObjType.Phone, eventCaller.currentEntity["nx"]); }, defaultLength = 2, hidden = true, @@ -84,7 +91,9 @@ namespace HeavenStudio.Games.Loaders { preFunction = delegate { - TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Shock); + EventCaller ec = eventCaller; + var e = ec.currentEntity; + TrickClass.PreTossObject(ec.gameManager, e.beat, (int)TrickClass.TrickObjType.Shock); }, defaultLength = 2, hidden = true, @@ -283,23 +292,23 @@ namespace HeavenStudio.Games instance.showBubble = !instance.showBubble; } - public static void PreTossObject(double beat, int type, bool variant = false) + public static void PreTossObject(GameManager gm, double beat, int type, bool variant = false) { - if (GameManager.instance.currentGame == "trickClass") + if (gm.currentGame == "trickClass" && gm.minigameObj.TryGetComponent(out TrickClass tc)) { - BeatAction.New(instance, new List() + BeatAction.New(tc, new List() { new BeatAction.Action(beat - 1, delegate { - if (instance.showBubble == true) + if (tc.showBubble == true) { - instance.warnAnim.Play(variant ? instance.objWarnAnimVariant[type] : instance.objWarnAnim[type], 0, 0); + tc.warnAnim.Play(variant ? tc.objWarnAnimVariant[type] : tc.objWarnAnim[type], 0, 0); } }), new BeatAction.Action(beat, delegate { - instance.warnAnim.Play("NoPose", 0, 0); - instance.TossObject(beat, type, variant); + tc.warnAnim.Play("NoPose", 0, 0); + tc.TossObject(beat, type, variant); }) }); } diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index 30fca09f0..48a9d2453 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -522,7 +522,7 @@ namespace HeavenStudio.Editor public void ToggleDebugCam() { - var game = GameManager.instance.currentGameO; + var game = GameManager.instance.minigameObj; if (game != null) { diff --git a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs index 602e1f825..a3ca88899 100644 --- a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs +++ b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs @@ -353,12 +353,12 @@ namespace HeavenStudio.Editor.Track if (!GameManager.instance.autoplay) { AutoplayBTN.GetComponent().Play("Idle", 0, 0); - GameManager.instance.autoplay = true; + GameManager.instance.ToggleAutoplay(true); } else { AutoplayBTN.GetComponent().Play("Disabled", 0, 0); - GameManager.instance.autoplay = false; + GameManager.instance.ToggleAutoplay(false); } } diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 98542264b..969e36c51 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -497,7 +497,7 @@ namespace HeavenStudio if (!usesAssetBundle) return; if (bundleCommon != null) return; - AssetBundle bundle = await AssetBundle.LoadFromFileAsync(Path.Combine(Application.streamingAssetsPath, wantAssetBundle + "/common")).ToUniTask(); + AssetBundle bundle = await AssetBundle.LoadFromFileAsync(Path.Combine(Application.streamingAssetsPath, wantAssetBundle + "/common")).ToUniTask(timing: PlayerLoopTiming.PreLateUpdate); bundleCommon = bundle; commonLoaded = true; @@ -519,7 +519,7 @@ namespace HeavenStudio if (!usesAssetBundle) return; if (localeLoaded && bundleLocalized != null && currentLoadedLocale == defaultLocale) return; - AssetBundle bundle = await AssetBundle.LoadFromFileAsync(Path.Combine(Application.streamingAssetsPath, wantAssetBundle + "/locale." + defaultLocale)).ToUniTask(); + AssetBundle bundle = await AssetBundle.LoadFromFileAsync(Path.Combine(Application.streamingAssetsPath, wantAssetBundle + "/locale." + defaultLocale)).ToUniTask(timing: PlayerLoopTiming.PreLateUpdate); if (localeLoaded && bundleLocalized != null && currentLoadedLocale == defaultLocale) return; bundleLocalized = bundle; @@ -533,7 +533,7 @@ namespace HeavenStudio if (!commonLoaded) return; if (bundleCommon == null) return; - UnityEngine.Object asset = await bundleCommon.LoadAssetAsync(name).ToUniTask(); + UnityEngine.Object asset = await bundleCommon.LoadAssetAsync(name).ToUniTask(timing: PlayerLoopTiming.PreLateUpdate); loadedPrefab = asset as GameObject; // load sound sequences here for now diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index a7875bb46..77a2c2032 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -51,5 +51,9 @@ MonoBehaviour: - Assets/Scripts/UI/PauseMenu.cs - Assets/Scripts/Util/Sound.cs - Assets/Scripts/Conductor.cs + - Assets/Scripts/EventCaller.cs + - Assets/Scripts/Games/TrickClass/TrickClass.cs + - Assets/Scripts/GameInitializer.cs + - Assets/Scripts/LevelEditor/Timeline/Timeline.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: [] From 9be16564a0b4f7a62854bd7181a8ee7938536476 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Thu, 25 Jan 2024 15:11:43 -0500 Subject: [PATCH 4/6] change operation order for input checks --- Assets/Scripts/Conductor.cs | 16 ++-- Assets/Scripts/Games/DJSchool/DJSchool.cs | 27 ++----- Assets/Scripts/Games/DJSchool/Student.cs | 14 +--- .../Scripts/Games/KarateMan/KarateManJoe.cs | 35 +++++---- .../Scripts/Games/KarateMan/KarateManPot.cs | 6 ++ Assets/Scripts/Games/Minigame.cs | 76 +++---------------- Assets/Scripts/Games/PlayerActionEvent.cs | 7 -- .../Scripts/Games/PlayerActionEvent.cs.meta | 2 +- Assets/Scripts/Games/TossBoys/TossBoys.cs | 24 +++--- Assets/Scripts/Util/BeatAction.cs | 18 +++-- Assets/Scripts/Util/Sound.cs | 2 +- ...Generator.Editor.ProjectSettingsData.asset | 3 + 12 files changed, 81 insertions(+), 149 deletions(-) diff --git a/Assets/Scripts/Conductor.cs b/Assets/Scripts/Conductor.cs index 1acff611c..ece56c33d 100644 --- a/Assets/Scripts/Conductor.cs +++ b/Assets/Scripts/Conductor.cs @@ -46,7 +46,7 @@ namespace HeavenStudio // Current time of the song private double time; double dspTime; - double absTime, absTimeAdjust, lastAbsTime; + double absTime, absTimeAdjust; double dspSizeSeconds; double dspMargin = 128 / 44100.0; bool deferTimeKeeping = false; @@ -56,7 +56,7 @@ namespace HeavenStudio private double dspStart; private float dspStartTime => (float)dspStart; public double dspStartTimeAsDouble => dspStart; - DateTime startTime, lastMixTime; + DateTime startTime; //the beat we started at private double startPos; @@ -88,7 +88,6 @@ namespace HeavenStudio private float minigamePitch = 1f; public float SongPitch { get => isPaused ? 0f : (timelinePitch * minigamePitch); } public float TimelinePitch { get => timelinePitch; } - private float musicScheduledPitch = 1f; private double musicScheduledTime = 0; // volume modifier @@ -201,16 +200,15 @@ namespace HeavenStudio double musicStartDelay = -offset - startPos; if (musicStartDelay > 0) { - musicScheduledTime = dspTime + (musicStartDelay / timelinePitch) + 2*dspSizeSeconds; - dspStart = dspTime + 2*dspSizeSeconds; + musicScheduledTime = dspTime + (musicStartDelay / timelinePitch) + 2 * dspSizeSeconds; + dspStart = dspTime + 2 * dspSizeSeconds; } else { - musicScheduledTime = dspTime + 2*dspSizeSeconds; - dspStart = dspTime + 2*dspSizeSeconds; + musicScheduledTime = dspTime + 2 * dspSizeSeconds; + dspStart = dspTime + 2 * dspSizeSeconds; } musicSource.PlayScheduled(musicScheduledTime); - musicScheduledPitch = timelinePitch; musicSource.pitch = timelinePitch; Debug.Log($"playback scheduled for dsptime {dspStart}"); } @@ -221,7 +219,6 @@ namespace HeavenStudio startTime = DateTime.Now; absTimeAdjust = 0; - lastAbsTime = 0; deferTimeKeeping = musicSource.clip != null; isPlaying = true; @@ -242,7 +239,6 @@ namespace HeavenStudio absTimeAdjust = 0; dspStart = dsp; } - lastMixTime = DateTime.Now; } public void Pause() diff --git a/Assets/Scripts/Games/DJSchool/DJSchool.cs b/Assets/Scripts/Games/DJSchool/DJSchool.cs index bb42062cf..a860f0258 100644 --- a/Assets/Scripts/Games/DJSchool/DJSchool.cs +++ b/Assets/Scripts/Games/DJSchool/DJSchool.cs @@ -166,11 +166,11 @@ namespace HeavenStudio.Games public override void OnBeatPulse(double beat) { if (!BeatIsInBopRegion(beat)) return; - if (student.isHolding) + if (student.isHolding && !student.swiping) { student.anim.DoScaledAnimationAsync("HoldBop", 0.5f); } - else if (!student.swiping && student.anim.IsAnimationNotPlaying()) + else if (student.anim.IsAnimationNotPlaying() && !student.swiping) { student.anim.DoScaledAnimationAsync("IdleBop", 0.5f); } @@ -217,16 +217,19 @@ namespace HeavenStudio.Games { student.UnHold(); shouldBeHolding = false; + ScoreMiss(); } else if(PlayerInput.GetIsAction(InputAction_FlickRelease) && !IsExpectingInputNow(InputAction_FlickRelease) && student.isHolding) //Flick during hold { student.OnFlickSwipe(); shouldBeHolding = false; + ScoreMiss(); } else if (!GameManager.instance.autoplay && shouldBeHolding && !PlayerInput.GetIsAction(InputAction_BasicPressing) && !IsExpectingInputNow(InputAction_FlickRelease)) { student.UnHold(); shouldBeHolding = false; + ScoreMiss(); } } @@ -249,11 +252,11 @@ namespace HeavenStudio.Games { new BeatAction.Action(beat + i, delegate { - if (student.isHolding) + if (student.isHolding && !student.swiping) { student.anim.DoScaledAnimationAsync("HoldBop", 0.5f); } - else if (!student.swiping && student.anim.IsAnimationNotPlaying()) + else if (student.anim.IsAnimationNotPlaying() && !student.swiping) { student.anim.DoScaledAnimationAsync("IdleBop", 0.5f); } @@ -469,27 +472,13 @@ namespace HeavenStudio.Games ScheduleInput(beat, timing, InputAction_FlickRelease, student.OnHitSwipe, student.OnMissSwipe, student.OnEmpty); } andStop = false; - - - - } - //void SetupCue(float beat, bool swipe) - //{ - // if (swipe) - // student.swipeBeat = beat; - // else - // student.holdBeat = beat; - - // student.eligible = true; - // student.ResetState(); - //} - public static void SoundFX(bool toggle) { Student.soundFX = toggle; } + public static void VoiceLines(double beat, int type) { string[] sounds; diff --git a/Assets/Scripts/Games/DJSchool/Student.cs b/Assets/Scripts/Games/DJSchool/Student.cs index ee1c0021a..ef40ca06f 100644 --- a/Assets/Scripts/Games/DJSchool/Student.cs +++ b/Assets/Scripts/Games/DJSchool/Student.cs @@ -169,23 +169,21 @@ namespace HeavenStudio.Games.Scripts_DJSchool public void OnHitSwipe(PlayerActionEvent caller, float beat) { game.shouldBeHolding = false; + isHolding = false; + swiping = true; + SoundByte.PlayOneShotGame("djSchool/recordSwipe"); + anim.Play("Swipe", 0, 0); if (beat >= 1f || beat <= -1f) missed = true; if (!missed) { - isHolding = false; - missed = false; shouldBeHolding = false; - SoundByte.PlayOneShotGame("djSchool/recordSwipe"); FlashFX(false); - swiping = true; BeatAction.New(this, new List() { - new BeatAction.Action(beat, delegate { anim.Play("Swipe", 0, 0); }), new BeatAction.Action(beat + 4f, delegate { swiping = false; }), }); - //anim.Play("Swipe", 0, 0); game.djYellowScript.ChangeHeadSprite(DJYellow.DJExpression.UpSecond); game.djYellowScript.Reverse(); game.smileBeat = caller.timer + caller.startBeat + 1f; @@ -199,13 +197,10 @@ namespace HeavenStudio.Games.Scripts_DJSchool else { OnMissSwipeForPlayerInput(caller.timer + caller.startBeat + 1); - SoundByte.PlayOneShotGame("djSchool/recordSwipe"); BeatAction.New(this, new List() { - new BeatAction.Action(beat, delegate { anim.Play("Swipe", 0, 0); }), new BeatAction.Action(beat + 4f, delegate { swiping = false; }), }); - //anim.Play("Swipe", 0, 0); tableAnim.speed = 1; tableAnim.DoScaledAnimationAsync("Student_Turntable_Swipe", 0.5f); @@ -304,7 +299,6 @@ namespace HeavenStudio.Games.Scripts_DJSchool } } - //Not sure but will do? private void OnDestroy() { diff --git a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs index e05f87070..f19adda1e 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs @@ -39,7 +39,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan double lastChargeTime = double.MinValue; double unPrepareTime = double.MinValue; double noNuriJabTime = double.MinValue; - bool canEmote = false; + bool canEmote = false, justPunched = false; public int wantFace = 0; public bool inSpecial @@ -137,7 +137,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan } } - if (PlayerInput.GetIsAction(KarateMan.InputAction_Press) && !inSpecial) + if (PlayerInput.GetIsAction(KarateMan.InputAction_Press) && !(inSpecial || justPunched)) { if (!KarateMan.instance.IsExpectingInputNow(KarateMan.InputAction_Press)) { @@ -204,7 +204,11 @@ namespace HeavenStudio.Games.Scripts_KarateMan } } } + } + void LateUpdate() + { + justPunched = false; } public void Bop() @@ -230,19 +234,6 @@ namespace HeavenStudio.Games.Scripts_KarateMan switch (forceHand) { - case 0: - if (cond.songPositionInBeatsAsDouble - lastPunchTime < 0.25f + (Minigame.JustLateTime() - 1f)) - { - lastPunchTime = double.MinValue; - anim.DoScaledAnimationAsync("Straight", 0.5f); - straight = true; - } - else - { - lastPunchTime = cond.songPositionInBeatsAsDouble; - anim.DoScaledAnimationAsync("Jab", 0.5f); - } - break; case 1: anim.DoScaledAnimationAsync("Jab", 0.5f); break; @@ -255,6 +246,19 @@ namespace HeavenStudio.Games.Scripts_KarateMan anim.DoNormalizedAnimation("JabNoNuri"); noNuriJabTime = cond.songPositionInBeatsAsDouble; break; + default: + if (cond.songPositionInBeatsAsDouble <= cond.GetBeatFromSongPos(lastPunchTime + Minigame.NgLateTime() - 1) + 0.25) + { + lastPunchTime = double.MinValue; + anim.DoScaledAnimationAsync("Straight", 0.5f); + straight = true; + } + else + { + lastPunchTime = cond.songPositionAsDouble; + anim.DoScaledAnimationAsync("Jab", 0.5f); + } + break; } if (touchCharge) { @@ -265,6 +269,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan { bop.startBeat = cond.songPositionInBeatsAsDouble + 0.5f; } + justPunched = true; return straight; //returns what hand was used to punch the object } diff --git a/Assets/Scripts/Games/KarateMan/KarateManPot.cs b/Assets/Scripts/Games/KarateMan/KarateManPot.cs index cf33afc9a..5768680a4 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManPot.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManPot.cs @@ -190,6 +190,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan case ItemType.ComboPot1: OnHit = KarateMan.instance.ScheduleInput(startBeat, 1f, KarateMan.InputAction_AltDown, ComboStartJustOrNg, ComboStartThrough, ComboStartOut, CanCombo); OnHitWrongAction = KarateMan.instance.ScheduleUserInput(startBeat, 1f, KarateMan.InputAction_Press, ComboStartWrongAction, ComboStartOut, ComboStartOut, CanHitWrong); + OnHitWrongAction.weight = 0; path = 1; break; case ItemType.ComboPot2: @@ -216,6 +217,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan case ItemType.KickBarrel: OnHit = KarateMan.instance.ScheduleInput(startBeat, 1f, KarateMan.InputAction_Press, KickChargeJustOrNg, ItemThrough, ItemOut, CanCombo); OnHitWrongAction = KarateMan.instance.ScheduleUserInput(startBeat, 1f, KarateMan.InputAction_AltDown, ItemWrongAction, ItemOut, ItemOut, CanComboWrong); + OnHitWrongAction.weight = 0; path = 1; comboId = -1; break; @@ -243,12 +245,14 @@ namespace HeavenStudio.Games.Scripts_KarateMan case ItemType.Bomb: OnHit = KarateMan.instance.ScheduleInput(startBeat, 1f, KarateMan.InputAction_Press, ItemJustOrNg, ItemThrough, ItemOut, CanHit); OnHitWrongAction = KarateMan.instance.ScheduleUserInput(startBeat, 1f, KarateMan.InputAction_AltDown, ItemWrongAction, ItemOut, ItemOut, CanHitWrong); + OnHitWrongAction.weight = 0; path = 1; comboId = -1; break; default: OnHit = KarateMan.instance.ScheduleInput(startBeat, 1f, KarateMan.InputAction_Press, ItemJustOrNg, ItemThrough, ItemOut, CanHit); OnHitWrongAction = KarateMan.instance.ScheduleUserInput(startBeat, 1f, KarateMan.InputAction_AltDown, ItemWrongAction, ItemOut, ItemOut, CanHitWrong); + OnHitWrongAction.weight = 0; path = 1; comboId = -1; break; @@ -832,6 +836,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan }), }); KarateMan.instance.Nori.DoThrough(); + KarateMan.instance.ScoreMiss(); } public void ItemOut(PlayerActionEvent caller) { } @@ -937,6 +942,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan { ItemHitEffect(straight); } + KarateMan.instance.ScoreMiss(); KarateMan.instance.Nori.DoThrough(); } diff --git a/Assets/Scripts/Games/Minigame.cs b/Assets/Scripts/Games/Minigame.cs index 5396b7775..eafdc64ba 100644 --- a/Assets/Scripts/Games/Minigame.cs +++ b/Assets/Scripts/Games/Minigame.cs @@ -198,42 +198,6 @@ namespace HeavenStudio.Games scheduledInputs.Remove(evt); } - //Get the scheduled input that should happen the **Soonest** - //Can return null if there's no scheduled inputs - // remark: need a check for specific button(s) - [Obsolete("Use GetClosestScheduledInput InputAction or InputAction category instead")] - public PlayerActionEvent GetClosestScheduledInput(InputType input = InputType.ANY) - { - PlayerActionEvent closest = null; - - foreach (PlayerActionEvent toCompare in scheduledInputs) - { - // ignore inputs that are for sequencing in autoplay - if (toCompare.autoplayOnly) continue; - - if (closest == null) - { - if (input == InputType.ANY || (toCompare.inputType & input) != 0) - closest = toCompare; - } - else - { - double t1 = closest.startBeat + closest.timer; - double t2 = toCompare.startBeat + toCompare.timer; - - // Debug.Log("t1=" + t1 + " -- t2=" + t2); - - if (t2 < t1) - { - if (input == InputType.ANY || (toCompare.inputType & input) != 0) - closest = toCompare; - } - } - } - - return closest; - } - public PlayerActionEvent GetClosestScheduledInput(int[] actionCats) { int catIdx = (int)PlayerInput.CurrentControlStyle; @@ -267,22 +231,6 @@ namespace HeavenStudio.Games return closest; } - public PlayerActionEvent GetClosestScheduledInput(PlayerInput.InputAction action) - { - return GetClosestScheduledInput(action.inputLockCategory); - } - - //Hasn't been tested yet. *Should* work. - //Can be used to detect if the user is expected to input something now or not - //Useful for strict call and responses games like Tambourine - [Obsolete("Use IsExpectingInputNow InputAction or InputAction category instead")] - public bool IsExpectingInputNow(InputType wantInput = InputType.ANY) - { - PlayerActionEvent input = GetClosestScheduledInput(wantInput); - if (input == null) return false; - return input.IsExpectingInputNow(); - } - public bool IsExpectingInputNow(int[] wantActionCategory) { PlayerActionEvent input = GetClosestScheduledInput(wantActionCategory); @@ -299,43 +247,43 @@ namespace HeavenStudio.Games public static double NgEarlyTime(float pitch = -1) { if (pitch < 0) - return 1f - ngEarlyTime; - return 1f - (ngEarlyTimeBase * pitch); + return 1 - ngEarlyTime; + return 1 - (ngEarlyTimeBase * pitch); } public static double JustEarlyTime(float pitch = -1) { if (pitch < 0) - return 1f - justEarlyTime; - return 1f - (justEarlyTimeBase * pitch); + return 1 - justEarlyTime; + return 1 - (justEarlyTimeBase * pitch); } public static double JustLateTime(float pitch = -1) { if (pitch < 0) - return 1f + justLateTime; - return 1f + (justLateTimeBase * pitch); + return 1 + justLateTime; + return 1 + (justLateTimeBase * pitch); } public static double NgLateTime(float pitch = -1) { if (pitch < 0) - return 1f + ngLateTime; - return 1f + (ngLateTimeBase * pitch); + return 1 + ngLateTime; + return 1 + (ngLateTimeBase * pitch); } public static double AceEarlyTime(float pitch = -1) { if (pitch < 0) - return 1f - aceEarlyTime; - return 1f - (aceEarlyTimeBase * pitch); + return 1 - aceEarlyTime; + return 1 - (aceEarlyTimeBase * pitch); } public static double AceLateTime(float pitch = -1) { if (pitch < 0) - return 1f + aceLateTime; - return 1f + (aceLateTimeBase * pitch); + return 1 + aceLateTime; + return 1 + (aceLateTimeBase * pitch); } public virtual void OnGameSwitch(double beat) diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs b/Assets/Scripts/Games/PlayerActionEvent.cs index 8ea9eaba8..d2fdbe569 100644 --- a/Assets/Scripts/Games/PlayerActionEvent.cs +++ b/Assets/Scripts/Games/PlayerActionEvent.cs @@ -42,8 +42,6 @@ namespace HeavenStudio.Games public bool noAutoplay = false; //Indicates if this PlayerActionEvent is recognized by the autoplay. /!\ Overrides autoPlayOnly /!\ - public InputType inputType; //The type of input. Check the InputType class to see a list of all of them - public bool perfectOnly = false; //Indicates that the input only recognize perfect inputs. public bool countsForAccuracy = true; //Indicates if the input counts for the accuracy or not. If set to false, it'll not be counted in the accuracy calculation @@ -160,11 +158,6 @@ namespace HeavenStudio.Games if (toCompare.InputAction != null && toCompare.InputAction.inputLockCategory[catIdx] != InputAction.inputLockCategory[catIdx]) continue; } - else - { - if ((toCompare.inputType & this.inputType) == 0) continue; - if (!toCompare.IsExpectingInputNow()) continue; - } double t1 = this.startBeat + this.timer; double t2 = toCompare.startBeat + toCompare.timer; diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs.meta b/Assets/Scripts/Games/PlayerActionEvent.cs.meta index 62a527341..85e97d8c2 100644 --- a/Assets/Scripts/Games/PlayerActionEvent.cs.meta +++ b/Assets/Scripts/Games/PlayerActionEvent.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 5 + executionOrder: -30 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Games/TossBoys/TossBoys.cs b/Assets/Scripts/Games/TossBoys/TossBoys.cs index fe5c003a0..f85d28cca 100644 --- a/Assets/Scripts/Games/TossBoys/TossBoys.cs +++ b/Assets/Scripts/Games/TossBoys/TossBoys.cs @@ -177,29 +177,23 @@ namespace HeavenStudio.Games protected static bool IA_TouchNrm(out double dt) { return PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt) - && (instance.currentReceiver is WhichTossKid.Akachan - || (instance.lastReceiver is WhichTossKid.Akachan or WhichTossKid.None - && instance.currentReceiver is WhichTossKid.None) - || (instance.IsExpectingInputNow(InputAction_Aka) - && !(instance.IsExpectingInputNow(InputAction_Ao) || instance.IsExpectingInputNow(InputAction_Kii)))); + && ((instance.currentReceiver is WhichTossKid.Akachan or WhichTossKid.None) + || instance.IsExpectingInputNow(InputAction_Aka)) + && !(instance.IsExpectingInputNow(InputAction_Ao) || instance.IsExpectingInputNow(InputAction_Kii)); } protected static bool IA_TouchDir(out double dt) { return PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt) - && (instance.currentReceiver is WhichTossKid.Kiiyan - || (instance.lastReceiver is WhichTossKid.Kiiyan - && instance.currentReceiver is WhichTossKid.None) - || (instance.IsExpectingInputNow(InputAction_Kii) - && !(instance.IsExpectingInputNow(InputAction_Ao) || instance.IsExpectingInputNow(InputAction_Aka)))); + && ((instance.currentReceiver is WhichTossKid.Kiiyan) + || instance.IsExpectingInputNow(InputAction_Kii)) + && !(instance.IsExpectingInputNow(InputAction_Ao) || instance.IsExpectingInputNow(InputAction_Aka)); } protected static bool IA_TouchAlt(out double dt) { return PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt) - && (instance.currentReceiver is WhichTossKid.Aokun - || (instance.lastReceiver is WhichTossKid.Aokun - && instance.currentReceiver is WhichTossKid.None) - || (instance.IsExpectingInputNow(InputAction_Ao) - && !(instance.IsExpectingInputNow(InputAction_Aka) || instance.IsExpectingInputNow(InputAction_Kii)))); + && ((instance.currentReceiver is WhichTossKid.Aokun) + || instance.IsExpectingInputNow(InputAction_Ao)) + && !(instance.IsExpectingInputNow(InputAction_Aka) || instance.IsExpectingInputNow(InputAction_Kii)); } protected static bool IA_BatonNrm(out double dt) diff --git a/Assets/Scripts/Util/BeatAction.cs b/Assets/Scripts/Util/BeatAction.cs index 2c6ef0346..7ed802732 100644 --- a/Assets/Scripts/Util/BeatAction.cs +++ b/Assets/Scripts/Util/BeatAction.cs @@ -58,15 +58,19 @@ namespace HeavenStudio.Util if (behaviour == null || !(conductor.isPlaying || conductor.isPaused)) return; - try + while (conductor.songPositionInBeatsAsDouble >= actions[idx].beat) { - actions[idx].function.Invoke(); + try + { + actions[idx].function.Invoke(); + } + catch (System.Exception e) + { + Debug.LogError($"Exception thrown while executing BeatAction: {e}"); + } + idx++; + if (idx >= actions.Count) return; } - catch (System.Exception e) - { - Debug.LogError($"Exception thrown while executing BeatAction: {e}"); - } - idx++; } } } diff --git a/Assets/Scripts/Util/Sound.cs b/Assets/Scripts/Util/Sound.cs index 5084bdbad..3ac3c44ad 100644 --- a/Assets/Scripts/Util/Sound.cs +++ b/Assets/Scripts/Util/Sound.cs @@ -37,7 +37,7 @@ namespace HeavenStudio.Util bool queued = false; public bool available = true; - const double PREBAKE_TIME = 0.5; + const double PREBAKE_TIME = 0.25; private void Start() { diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 77a2c2032..9bd4b8b72 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -55,5 +55,8 @@ MonoBehaviour: - Assets/Scripts/Games/TrickClass/TrickClass.cs - Assets/Scripts/GameInitializer.cs - Assets/Scripts/LevelEditor/Timeline/Timeline.cs + - Assets/Scripts/Games/PlayerActionEvent.cs + - Assets/Scripts/Games/KarateMan/KarateManPot.cs + - Assets/Scripts/Games/DJSchool/DJSchool.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: [] From 7384dd909274542a10a9fc478288887a3b7be35b Mon Sep 17 00:00:00 2001 From: minenice55 Date: Thu, 25 Jan 2024 15:27:26 -0500 Subject: [PATCH 5/6] remove unused class --- Assets/Scripts/InputSystem/InputType.cs | 37 -------------------- Assets/Scripts/InputSystem/InputType.cs.meta | 11 ------ 2 files changed, 48 deletions(-) delete mode 100644 Assets/Scripts/InputSystem/InputType.cs delete mode 100644 Assets/Scripts/InputSystem/InputType.cs.meta diff --git a/Assets/Scripts/InputSystem/InputType.cs b/Assets/Scripts/InputSystem/InputType.cs deleted file mode 100644 index 3861636e5..000000000 --- a/Assets/Scripts/InputSystem/InputType.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - - -namespace HeavenStudio -{ - [System.Flags] - public enum InputType : int { - // Shouldn't be used by minigame scripts - ANY = -1, - - //General - //------- - //Down - STANDARD_DOWN = 1<<0, - STANDARD_ALT_DOWN = 1<<1, - DIRECTION_DOWN = 1<<2, - //Up - STANDARD_UP = 1<<3, - STANDARD_ALT_UP = 1<<4, - DIRECTION_UP = 1<<5, - - //Specific - //-------- - //Down - DIRECTION_DOWN_DOWN = 1<<6, - DIRECTION_UP_DOWN = 1<<7, - DIRECTION_LEFT_DOWN = 1<<8, - DIRECTION_RIGHT_DOWN = 1<<9, - //Up - DIRECTION_DOWN_UP = 1<<10, - DIRECTION_UP_UP = 1<<11, - DIRECTION_LEFT_UP = 1<<12, - DIRECTION_RIGHT_UP = 1<<13 - } -} \ No newline at end of file diff --git a/Assets/Scripts/InputSystem/InputType.cs.meta b/Assets/Scripts/InputSystem/InputType.cs.meta deleted file mode 100644 index cf32f3aa3..000000000 --- a/Assets/Scripts/InputSystem/InputType.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 25e3511c55cd2f540abe014bf39e626b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From ac3059e00817df1f0cf7014ab4f7756b31eec0e3 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Thu, 25 Jan 2024 16:15:45 -0500 Subject: [PATCH 6/6] update workflows --- .github/workflows/activation.yml | 2 +- .github/workflows/build.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/activation.yml b/.github/workflows/activation.yml index 232e47faa..228042ae2 100644 --- a/.github/workflows/activation.yml +++ b/.github/workflows/activation.yml @@ -15,7 +15,7 @@ jobs: # Upload artifact (Unity_v20XX.X.XXXX.alf) - name: Expose as artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.getManualLicenseFile.outputs.filePath }} path: ${{ steps.getManualLicenseFile.outputs.filePath }} \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33508489e..6503fe2af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,12 +35,12 @@ jobs: swap-storage: false - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # with: # lfs: true # Cache reused Library files to speed up compilation - - uses: actions/cache@v3 + - uses: actions/cache@v4.0.0 with: path: Library key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} @@ -56,7 +56,7 @@ jobs: # githubToken: ${{ secrets.GITHUB_TOKEN }} - name: Build project - uses: game-ci/unity-builder@v2 + uses: game-ci/unity-builder@v4 env: UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}