From 60b66e3ae2ab9be06a6348b54a2f5dae11d9c70b Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sun, 14 Jan 2024 02:18:46 -0500 Subject: [PATCH] last of the assetbundle definitions fix input scheduling not taking into account what minigame is actually active at the target time fix input disable and autoplay jank prep "friendly program name" define title screen adjustments remove bread2unity --- Assets/Editor/bread2unity.meta | 8 - Assets/Editor/bread2unity/BCCAD.cs | 65 ------ Assets/Editor/bread2unity/BCCAD.cs.meta | 11 - Assets/Editor/bread2unity/Bread2Unity.cs | 55 ----- Assets/Editor/bread2unity/Bread2Unity.cs.meta | 11 - Assets/Editor/bread2unity/LICENSE | 201 ---------------- Assets/Editor/bread2unity/LICENSE.meta | 7 - Assets/Editor/bread2unity/Model.meta | 8 - Assets/Editor/bread2unity/Model/IAnimation.cs | 24 -- .../bread2unity/Model/IAnimation.cs.meta | 11 - Assets/Editor/bread2unity/Model/IDataModel.cs | 13 -- .../bread2unity/Model/IDataModel.cs.meta | 11 - Assets/Editor/bread2unity/Model/ISprite.cs | 31 --- .../Editor/bread2unity/Model/ISprite.cs.meta | 11 - Assets/Editor/bread2unity/README.md | 2 - Assets/Editor/bread2unity/README.md.meta | 7 - Assets/Editor/bread2unity/logo.png | Bin 34022 -> 0 bytes Assets/Editor/bread2unity/logo.png.meta | 120 ---------- Assets/Resources/Games/rockers.prefab.meta | 2 +- Assets/Resources/Games/splashdown.prefab.meta | 2 +- .../Games/tramAndPauline.prefab.meta | 2 +- .../Resources/Prefabs/Games/Splashdown.meta | 2 +- .../Games/Splashdown/Splashes.prefab.meta | 2 +- .../Games/Splashdown/Synchrette.prefab.meta | 2 +- .../Splashdown/SynchretteHolder.prefab.meta | 2 +- .../Sfx/games/rockers/Applause.wav.meta | 2 +- .../Sfx/games/rockers/BendC6.wav.meta | 2 +- .../Sfx/games/rockers/BendG5.wav.meta | 2 +- .../Sfx/games/rockers/Cheer.wav.meta | 2 +- .../Resources/Sfx/games/rockers/Clap.wav.meta | 2 +- .../Resources/Sfx/games/rockers/Cmon.wav.meta | 4 +- .../Sfx/games/rockers/LastOne.wav.meta | 4 +- .../Sfx/games/rockers/Whistle.wav.meta | 2 +- .../Sfx/games/rockers/bendDown.wav.meta | 2 +- .../Sfx/games/rockers/bendUp.wav.meta | 2 +- Assets/Resources/Sfx/games/rockers/count.meta | 4 +- .../Resources/Sfx/games/rockers/doremi.meta | 2 +- .../Resources/Sfx/games/rockers/mute.wav.meta | 2 +- .../Sfx/games/rockers/noise.wav.meta | 2 +- .../Resources/Sfx/games/rockers/rocker.meta | 2 +- .../Resources/Sfx/games/rockers/strings.meta | 2 +- .../Sfx/games/splashdown/alleyOop1.ogg.meta | 4 +- .../Sfx/games/splashdown/alleyOop2.ogg.meta | 4 +- .../Sfx/games/splashdown/alleyOop3.ogg.meta | 4 +- .../Sfx/games/splashdown/downOthers.ogg.meta | 2 +- .../Sfx/games/splashdown/downPlayer.ogg.meta | 2 +- .../Sfx/games/splashdown/jumpOthers.ogg.meta | 2 +- .../Sfx/games/splashdown/jumpPlayer.ogg.meta | 2 +- .../Sfx/games/splashdown/rollOthers.ogg.meta | 2 +- .../Sfx/games/splashdown/rollPlayer.ogg.meta | 2 +- .../games/splashdown/splashOthers.ogg.meta | 2 +- .../games/splashdown/splashPlayer.ogg.meta | 2 +- .../Sfx/games/splashdown/start.ogg.meta | 2 +- .../Sfx/games/splashdown/together.ogg.meta | 2 +- .../games/splashdown/togetherRemix9.ogg.meta | 2 +- .../Sfx/games/splashdown/upOthers.ogg.meta | 2 +- .../Sfx/games/splashdown/upPlayer.ogg.meta | 2 +- .../Sfx/games/splashdown/whistle.ogg.meta | 2 +- .../Sfx/games/splashdown/yeah.ogg.meta | 4 +- .../Sfx/games/tramAndPauline/jump1.ogg.meta | 2 +- .../Sfx/games/tramAndPauline/jump2.ogg.meta | 2 +- .../tramAndPauline/transformPauline.ogg.meta | 2 +- .../tramAndPauline/transformTram.ogg.meta | 2 +- .../Sprites/Games/Rockers/Animations.meta | 2 +- .../Sprites/Games/Rockers/JJBodyMap.mat.meta | 2 +- .../Games/Rockers/JJGuitarMap.mat.meta | 2 +- .../Games/Rockers/SoshiBodyMap.mat.meta | 2 +- .../Games/Rockers/SoshiGuitarMap.mat.meta | 2 +- .../Sprites/Games/Rockers/rockersbg.png.meta | 2 +- .../Games/Rockers/rockerslayout.png.meta | 2 +- .../Games/Rockers/rockersmain.png.meta | 2 +- .../Sprites/Games/Splashdown/Animations.meta | 2 +- .../Games/Splashdown/splashdown.png.meta | 2 +- .../Games/Splashdown/splashdownbg.png.meta | 2 +- .../Games/TramAndPauline/Animations.meta | 2 +- .../Games/TramAndPauline/FixLinesTP.mat.meta | 2 +- .../Games/TramAndPauline/Tram_Poline.png.meta | 2 +- .../Games/TramAndPauline/smoke.png.meta | 2 +- .../TramAndPauline/splashdownbg (1).png.meta | 2 +- Assets/Scenes/Title.unity | 221 ++++++++++++++---- Assets/Scripts/GameManager.cs | 9 +- Assets/Scripts/Games/Minigame.cs | 100 +------- Assets/Scripts/Games/PlayerActionEvent.cs | 28 ++- Assets/Scripts/Games/Rockers/Rockers.cs | 6 +- Assets/Scripts/Games/Splashdown/Splashdown.cs | 6 +- Assets/Scripts/Games/TossBoys/TossBoys.cs | 2 +- .../Games/TramAndPauline/TramAndPauline.cs | 5 +- Assets/Scripts/GlobalGameManager.cs | 10 +- Assets/Scripts/LevelEditor/Editor.cs | 5 +- .../Scripts/LevelEditor/Timeline/Timeline.cs | 1 + Assets/Scripts/TitleManager.cs | 46 +++- README.md | 2 - 92 files changed, 354 insertions(+), 819 deletions(-) delete mode 100644 Assets/Editor/bread2unity.meta delete mode 100644 Assets/Editor/bread2unity/BCCAD.cs delete mode 100644 Assets/Editor/bread2unity/BCCAD.cs.meta delete mode 100644 Assets/Editor/bread2unity/Bread2Unity.cs delete mode 100644 Assets/Editor/bread2unity/Bread2Unity.cs.meta delete mode 100644 Assets/Editor/bread2unity/LICENSE delete mode 100644 Assets/Editor/bread2unity/LICENSE.meta delete mode 100644 Assets/Editor/bread2unity/Model.meta delete mode 100644 Assets/Editor/bread2unity/Model/IAnimation.cs delete mode 100644 Assets/Editor/bread2unity/Model/IAnimation.cs.meta delete mode 100644 Assets/Editor/bread2unity/Model/IDataModel.cs delete mode 100644 Assets/Editor/bread2unity/Model/IDataModel.cs.meta delete mode 100644 Assets/Editor/bread2unity/Model/ISprite.cs delete mode 100644 Assets/Editor/bread2unity/Model/ISprite.cs.meta delete mode 100644 Assets/Editor/bread2unity/README.md delete mode 100644 Assets/Editor/bread2unity/README.md.meta delete mode 100644 Assets/Editor/bread2unity/logo.png delete mode 100644 Assets/Editor/bread2unity/logo.png.meta diff --git a/Assets/Editor/bread2unity.meta b/Assets/Editor/bread2unity.meta deleted file mode 100644 index 2ced3e07..00000000 --- a/Assets/Editor/bread2unity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 375dce47d61a68447a1b4813869b10b2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/bread2unity/BCCAD.cs b/Assets/Editor/bread2unity/BCCAD.cs deleted file mode 100644 index ff9efdc4..00000000 --- a/Assets/Editor/bread2unity/BCCAD.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; - -using UnityEngine; -namespace Bread2Unity -{ - public class BCCAD : IDataModel - { - - public BCCAD Read(byte[] bytes) - { - sheetW = BitConverter.ToUInt16(bytes, 4); - sheetH = BitConverter.ToUInt16(bytes, 6); - - - // int max = (bytes[8] * 2) + 12; - int max = 64 * bytes[8] + 12; - - // note this doesn't account for empty sprites, but I'll get there when i get there - for (int i = 12; i < max; i += 2) // 16 bit bytes, skip every 2nd byte - { - ISprite spriteParts_ = new ISprite(); - int compare = 0; - for (int j = 0; j < bytes[i]; j++) - { - int ind = i + 4 + (64 * j); - - ISpritePart part = new ISpritePart(); - part.regionX = BitConverter.ToUInt16(bytes, ind + 0); - part.regionY = BitConverter.ToUInt16(bytes, ind + 2); - part.regionW = BitConverter.ToUInt16(bytes, ind + 4); - part.regionH = BitConverter.ToUInt16(bytes, ind + 6); - part.posX = BitConverter.ToInt16(bytes, ind + 8); - part.posY = BitConverter.ToInt16(bytes, ind + 10); - part.stretchX = BitConverter.ToSingle(bytes, ind + 12); - part.stretchY = BitConverter.ToSingle(bytes, ind + 14); - part.rotation = BitConverter.ToSingle(bytes, ind + 16); - part.flipX = bytes[ind + 18] != (byte)0; - part.flipY = bytes[ind + 20] != (byte)0; - // im sure the values between 20 and 28 are important so remind me to come back to these - part.opacity = bytes[ind + 28]; - - Debug.Log("offset: " + ind + ", val: " + part.regionX); - - spriteParts_.parts.Add(part); - - compare += 64; - } - - sprites.Add(spriteParts_); - - i += compare; - - } - - return new BCCAD() - { - }; - } - - - /// sprites length bytes start = 12 - } -} \ No newline at end of file diff --git a/Assets/Editor/bread2unity/BCCAD.cs.meta b/Assets/Editor/bread2unity/BCCAD.cs.meta deleted file mode 100644 index aa2f0d84..00000000 --- a/Assets/Editor/bread2unity/BCCAD.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3b4f0c7c12cfcc74bbfdc8c1be61d4b0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/bread2unity/Bread2Unity.cs b/Assets/Editor/bread2unity/Bread2Unity.cs deleted file mode 100644 index 6cba9f92..00000000 --- a/Assets/Editor/bread2unity/Bread2Unity.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using System.IO; - -using UnityEngine; -using UnityEditor; - -using Starpelly; - -namespace Bread2Unity -{ - public class Bread2Unity : EditorWindow - { - public const string editorFolderName = "bread2unity"; - - [MenuItem("Tools/bread2unity")] - public static void ShowWindow() - { - EditorWindow.GetWindow("bread2unity"); - } - - public void OnGUI() - { - Texture logo = (Texture)AssetDatabase.LoadAssetAtPath($"Assets/Editor/{editorFolderName}/logo.png", typeof(Texture)); - GUILayout.Box(logo, new GUILayoutOption[] { GUILayout.ExpandWidth(true), GUILayout.Height(60) }); - GUILayout.Space(30); - - GUIStyle desc = EditorStyles.label; - desc.wordWrap = true; - desc.fontStyle = FontStyle.BoldAndItalic; - - GUILayout.Box("bread2unity is a tool built with the purpose of converting RH Megamix and Fever animations to unity. And to generally speed up development by a lot." + - "\nCreated by Starpelly.", desc); - - GUILayout.Space(120); - - if (GUILayout.Button("Test")) - { - string path = EditorUtility.OpenFilePanel("Open BCCAD File", null, "bccad"); - if (path.Length != 0) - { - var fileContent = File.ReadAllBytes(path); - new BCCAD().Read(fileContent); - } - } - - GUILayout.BeginHorizontal(); - if (GUILayout.Button("Bread Download", GUILayout.Height(40))) - { - Application.OpenURL("https://github.com/rhmodding/bread"); - } - GUILayout.EndHorizontal(); - } - } -} \ No newline at end of file diff --git a/Assets/Editor/bread2unity/Bread2Unity.cs.meta b/Assets/Editor/bread2unity/Bread2Unity.cs.meta deleted file mode 100644 index 9726922c..00000000 --- a/Assets/Editor/bread2unity/Bread2Unity.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0967d3b57ef5e5d46965e261ead79e15 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/bread2unity/LICENSE b/Assets/Editor/bread2unity/LICENSE deleted file mode 100644 index 261eeb9e..00000000 --- a/Assets/Editor/bread2unity/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/Assets/Editor/bread2unity/LICENSE.meta b/Assets/Editor/bread2unity/LICENSE.meta deleted file mode 100644 index 9217ef3d..00000000 --- a/Assets/Editor/bread2unity/LICENSE.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5149fd98229eaac4fb4d8a83f8c9b52f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/bread2unity/Model.meta b/Assets/Editor/bread2unity/Model.meta deleted file mode 100644 index 818af05f..00000000 --- a/Assets/Editor/bread2unity/Model.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4801a6826549d7d4a978c7387a1aa26a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/bread2unity/Model/IAnimation.cs b/Assets/Editor/bread2unity/Model/IAnimation.cs deleted file mode 100644 index cdde15c0..00000000 --- a/Assets/Editor/bread2unity/Model/IAnimation.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace Bread2Unity -{ - public class IAnimation - { - public List steps; - } - - public class IAnimationStep - { - public ushort spriteIndex; - public ushort delay; - - public float stretchX; - public float stretchY; - - public float rotation; - - public byte opacity; - } -} \ No newline at end of file diff --git a/Assets/Editor/bread2unity/Model/IAnimation.cs.meta b/Assets/Editor/bread2unity/Model/IAnimation.cs.meta deleted file mode 100644 index c022dfd3..00000000 --- a/Assets/Editor/bread2unity/Model/IAnimation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c33bcfd692627dd4a97ac1cd1d930420 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/bread2unity/Model/IDataModel.cs b/Assets/Editor/bread2unity/Model/IDataModel.cs deleted file mode 100644 index 0c9634ed..00000000 --- a/Assets/Editor/bread2unity/Model/IDataModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections; -using System.Collections.Generic; - -namespace Bread2Unity -{ - public class IDataModel - { - public List sprites = new List(); - public List animations = new List(); - public int sheetW; - public int sheetH; - } -} \ No newline at end of file diff --git a/Assets/Editor/bread2unity/Model/IDataModel.cs.meta b/Assets/Editor/bread2unity/Model/IDataModel.cs.meta deleted file mode 100644 index ff789390..00000000 --- a/Assets/Editor/bread2unity/Model/IDataModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ddf1fd563dabc6040a863537a081843a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/bread2unity/Model/ISprite.cs b/Assets/Editor/bread2unity/Model/ISprite.cs deleted file mode 100644 index 9b0ca7e2..00000000 --- a/Assets/Editor/bread2unity/Model/ISprite.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections; -using System.Collections.Generic; - -namespace Bread2Unity -{ - public class ISprite - { - public List parts = new List(); - } - - public class ISpritePart - { - public ushort regionX; - public ushort regionY; - public ushort regionW; - public ushort regionH; - - public short posX; - public short posY; - - public float stretchX; - public float stretchY; - - public float rotation; - - public bool flipX; - public bool flipY; - - public byte opacity; - } -} \ No newline at end of file diff --git a/Assets/Editor/bread2unity/Model/ISprite.cs.meta b/Assets/Editor/bread2unity/Model/ISprite.cs.meta deleted file mode 100644 index c70703e1..00000000 --- a/Assets/Editor/bread2unity/Model/ISprite.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d4aae79bea7b7234f9ce059ade5fce08 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/bread2unity/README.md b/Assets/Editor/bread2unity/README.md deleted file mode 100644 index d5cb8548..00000000 --- a/Assets/Editor/bread2unity/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# bread2unity -Rhythm Heaven animation to Unity animation converter diff --git a/Assets/Editor/bread2unity/README.md.meta b/Assets/Editor/bread2unity/README.md.meta deleted file mode 100644 index 28d1d300..00000000 --- a/Assets/Editor/bread2unity/README.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: dcb89f55ef62d184d886dfce1fca7bd6 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Editor/bread2unity/logo.png b/Assets/Editor/bread2unity/logo.png deleted file mode 100644 index 06570852bd93822f60d1c02128856df6437bb3e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34022 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Π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 diff --git a/Assets/Editor/bread2unity/logo.png.meta b/Assets/Editor/bread2unity/logo.png.meta deleted file mode 100644 index 00187f00..00000000 --- a/Assets/Editor/bread2unity/logo.png.meta +++ /dev/null @@ -1,120 +0,0 @@ -fileFormatVersion: 2 -guid: bca6955e61a73c44caba7d24d46c78f5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 0 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - 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: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Games/rockers.prefab.meta b/Assets/Resources/Games/rockers.prefab.meta index 2397dc03..ed7d7518 100644 --- a/Assets/Resources/Games/rockers.prefab.meta +++ b/Assets/Resources/Games/rockers.prefab.meta @@ -3,5 +3,5 @@ guid: 8f7c4cce90cc7444d9f6eb749af8511c PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Games/splashdown.prefab.meta b/Assets/Resources/Games/splashdown.prefab.meta index 714c30cf..88e1c9ec 100644 --- a/Assets/Resources/Games/splashdown.prefab.meta +++ b/Assets/Resources/Games/splashdown.prefab.meta @@ -3,5 +3,5 @@ guid: aea3428178ba96e4a859677fa4c68548 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Games/tramAndPauline.prefab.meta b/Assets/Resources/Games/tramAndPauline.prefab.meta index ffefee67..cf07857c 100644 --- a/Assets/Resources/Games/tramAndPauline.prefab.meta +++ b/Assets/Resources/Games/tramAndPauline.prefab.meta @@ -3,5 +3,5 @@ guid: dded4c2e961a9384fab1439fd19ac785 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: agbtrampoline/common assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Games/Splashdown.meta b/Assets/Resources/Prefabs/Games/Splashdown.meta index d0c9be80..1f6bb4b6 100644 --- a/Assets/Resources/Prefabs/Games/Splashdown.meta +++ b/Assets/Resources/Prefabs/Games/Splashdown.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Games/Splashdown/Splashes.prefab.meta b/Assets/Resources/Prefabs/Games/Splashdown/Splashes.prefab.meta index ff92f222..ab855dfe 100644 --- a/Assets/Resources/Prefabs/Games/Splashdown/Splashes.prefab.meta +++ b/Assets/Resources/Prefabs/Games/Splashdown/Splashes.prefab.meta @@ -3,5 +3,5 @@ guid: 80e3559b5f8c6ce47b95ebd5926d1a52 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Games/Splashdown/Synchrette.prefab.meta b/Assets/Resources/Prefabs/Games/Splashdown/Synchrette.prefab.meta index feee3748..ab99624c 100644 --- a/Assets/Resources/Prefabs/Games/Splashdown/Synchrette.prefab.meta +++ b/Assets/Resources/Prefabs/Games/Splashdown/Synchrette.prefab.meta @@ -3,5 +3,5 @@ guid: f25ca3f01901f3f4992757dd62e08933 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Games/Splashdown/SynchretteHolder.prefab.meta b/Assets/Resources/Prefabs/Games/Splashdown/SynchretteHolder.prefab.meta index 3ab39b82..802f2cdd 100644 --- a/Assets/Resources/Prefabs/Games/Splashdown/SynchretteHolder.prefab.meta +++ b/Assets/Resources/Prefabs/Games/Splashdown/SynchretteHolder.prefab.meta @@ -3,5 +3,5 @@ guid: 42adbe7efa2480240ae54ddaaeff2ce1 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/Applause.wav.meta b/Assets/Resources/Sfx/games/rockers/Applause.wav.meta index 6919e22c..ba50b5e9 100644 --- a/Assets/Resources/Sfx/games/rockers/Applause.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/Applause.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/BendC6.wav.meta b/Assets/Resources/Sfx/games/rockers/BendC6.wav.meta index dc36a4b0..4b7b4e6b 100644 --- a/Assets/Resources/Sfx/games/rockers/BendC6.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/BendC6.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/BendG5.wav.meta b/Assets/Resources/Sfx/games/rockers/BendG5.wav.meta index 7094f48e..e2dbb4da 100644 --- a/Assets/Resources/Sfx/games/rockers/BendG5.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/BendG5.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/Cheer.wav.meta b/Assets/Resources/Sfx/games/rockers/Cheer.wav.meta index cecfb83c..fe2870f8 100644 --- a/Assets/Resources/Sfx/games/rockers/Cheer.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/Cheer.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/Clap.wav.meta b/Assets/Resources/Sfx/games/rockers/Clap.wav.meta index aecdd62f..a903cf3a 100644 --- a/Assets/Resources/Sfx/games/rockers/Clap.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/Clap.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/Cmon.wav.meta b/Assets/Resources/Sfx/games/rockers/Cmon.wav.meta index d10d7691..88159dc7 100644 --- a/Assets/Resources/Sfx/games/rockers/Cmon.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/Cmon.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: ntrrockers/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/rockers/LastOne.wav.meta b/Assets/Resources/Sfx/games/rockers/LastOne.wav.meta index e74877a0..d500b372 100644 --- a/Assets/Resources/Sfx/games/rockers/LastOne.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/LastOne.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: ntrrockers/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/rockers/Whistle.wav.meta b/Assets/Resources/Sfx/games/rockers/Whistle.wav.meta index 794dd9a3..f2fc8ed5 100644 --- a/Assets/Resources/Sfx/games/rockers/Whistle.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/Whistle.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/bendDown.wav.meta b/Assets/Resources/Sfx/games/rockers/bendDown.wav.meta index 97697592..30b29574 100644 --- a/Assets/Resources/Sfx/games/rockers/bendDown.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/bendDown.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/bendUp.wav.meta b/Assets/Resources/Sfx/games/rockers/bendUp.wav.meta index b75cc863..21ac282c 100644 --- a/Assets/Resources/Sfx/games/rockers/bendUp.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/bendUp.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/count.meta b/Assets/Resources/Sfx/games/rockers/count.meta index 9cf69723..c6afcee2 100644 --- a/Assets/Resources/Sfx/games/rockers/count.meta +++ b/Assets/Resources/Sfx/games/rockers/count.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: ntrrockers/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/rockers/doremi.meta b/Assets/Resources/Sfx/games/rockers/doremi.meta index a88e1154..e8d3a5db 100644 --- a/Assets/Resources/Sfx/games/rockers/doremi.meta +++ b/Assets/Resources/Sfx/games/rockers/doremi.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/mute.wav.meta b/Assets/Resources/Sfx/games/rockers/mute.wav.meta index 9b2db083..f1c848cf 100644 --- a/Assets/Resources/Sfx/games/rockers/mute.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/mute.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/noise.wav.meta b/Assets/Resources/Sfx/games/rockers/noise.wav.meta index 821cbb6c..ee8d6057 100644 --- a/Assets/Resources/Sfx/games/rockers/noise.wav.meta +++ b/Assets/Resources/Sfx/games/rockers/noise.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/rocker.meta b/Assets/Resources/Sfx/games/rockers/rocker.meta index ecd34472..98782f9e 100644 --- a/Assets/Resources/Sfx/games/rockers/rocker.meta +++ b/Assets/Resources/Sfx/games/rockers/rocker.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rockers/strings.meta b/Assets/Resources/Sfx/games/rockers/strings.meta index a51167c1..600c3cd6 100644 --- a/Assets/Resources/Sfx/games/rockers/strings.meta +++ b/Assets/Resources/Sfx/games/rockers/strings.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/alleyOop1.ogg.meta b/Assets/Resources/Sfx/games/splashdown/alleyOop1.ogg.meta index 9bf983b1..050f4828 100644 --- a/Assets/Resources/Sfx/games/splashdown/alleyOop1.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/alleyOop1.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: ntrdiving/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/splashdown/alleyOop2.ogg.meta b/Assets/Resources/Sfx/games/splashdown/alleyOop2.ogg.meta index 8ca9e2ed..b1443efd 100644 --- a/Assets/Resources/Sfx/games/splashdown/alleyOop2.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/alleyOop2.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: ntrdiving/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/splashdown/alleyOop3.ogg.meta b/Assets/Resources/Sfx/games/splashdown/alleyOop3.ogg.meta index dde4c1a8..d18182cb 100644 --- a/Assets/Resources/Sfx/games/splashdown/alleyOop3.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/alleyOop3.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: ntrdiving/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/splashdown/downOthers.ogg.meta b/Assets/Resources/Sfx/games/splashdown/downOthers.ogg.meta index bb824b0e..c3d64937 100644 --- a/Assets/Resources/Sfx/games/splashdown/downOthers.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/downOthers.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/downPlayer.ogg.meta b/Assets/Resources/Sfx/games/splashdown/downPlayer.ogg.meta index fa805d33..82afeb28 100644 --- a/Assets/Resources/Sfx/games/splashdown/downPlayer.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/downPlayer.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/jumpOthers.ogg.meta b/Assets/Resources/Sfx/games/splashdown/jumpOthers.ogg.meta index 64d30f60..52a5a5aa 100644 --- a/Assets/Resources/Sfx/games/splashdown/jumpOthers.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/jumpOthers.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/jumpPlayer.ogg.meta b/Assets/Resources/Sfx/games/splashdown/jumpPlayer.ogg.meta index ff2e6322..a8e44b07 100644 --- a/Assets/Resources/Sfx/games/splashdown/jumpPlayer.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/jumpPlayer.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/rollOthers.ogg.meta b/Assets/Resources/Sfx/games/splashdown/rollOthers.ogg.meta index 336decec..76dd0415 100644 --- a/Assets/Resources/Sfx/games/splashdown/rollOthers.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/rollOthers.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/rollPlayer.ogg.meta b/Assets/Resources/Sfx/games/splashdown/rollPlayer.ogg.meta index 7ce98a1a..14e765a4 100644 --- a/Assets/Resources/Sfx/games/splashdown/rollPlayer.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/rollPlayer.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/splashOthers.ogg.meta b/Assets/Resources/Sfx/games/splashdown/splashOthers.ogg.meta index 598f053b..0eb07315 100644 --- a/Assets/Resources/Sfx/games/splashdown/splashOthers.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/splashOthers.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/splashPlayer.ogg.meta b/Assets/Resources/Sfx/games/splashdown/splashPlayer.ogg.meta index 17bbdb88..624c54bb 100644 --- a/Assets/Resources/Sfx/games/splashdown/splashPlayer.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/splashPlayer.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/start.ogg.meta b/Assets/Resources/Sfx/games/splashdown/start.ogg.meta index e20044e3..68d0e4f7 100644 --- a/Assets/Resources/Sfx/games/splashdown/start.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/start.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/together.ogg.meta b/Assets/Resources/Sfx/games/splashdown/together.ogg.meta index 826ea6da..abd3fa68 100644 --- a/Assets/Resources/Sfx/games/splashdown/together.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/together.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/togetherRemix9.ogg.meta b/Assets/Resources/Sfx/games/splashdown/togetherRemix9.ogg.meta index f2eeaf79..7f5e4745 100644 --- a/Assets/Resources/Sfx/games/splashdown/togetherRemix9.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/togetherRemix9.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/upOthers.ogg.meta b/Assets/Resources/Sfx/games/splashdown/upOthers.ogg.meta index b4ae381e..aeb52219 100644 --- a/Assets/Resources/Sfx/games/splashdown/upOthers.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/upOthers.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/upPlayer.ogg.meta b/Assets/Resources/Sfx/games/splashdown/upPlayer.ogg.meta index 62bbcb3f..462712e2 100644 --- a/Assets/Resources/Sfx/games/splashdown/upPlayer.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/upPlayer.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/whistle.ogg.meta b/Assets/Resources/Sfx/games/splashdown/whistle.ogg.meta index 7fb57740..9c6b42c3 100644 --- a/Assets/Resources/Sfx/games/splashdown/whistle.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/whistle.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/splashdown/yeah.ogg.meta b/Assets/Resources/Sfx/games/splashdown/yeah.ogg.meta index fe3f000d..4ed76db2 100644 --- a/Assets/Resources/Sfx/games/splashdown/yeah.ogg.meta +++ b/Assets/Resources/Sfx/games/splashdown/yeah.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: ntrdiving/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/tramAndPauline/jump1.ogg.meta b/Assets/Resources/Sfx/games/tramAndPauline/jump1.ogg.meta index e915a23b..685b0ac7 100644 --- a/Assets/Resources/Sfx/games/tramAndPauline/jump1.ogg.meta +++ b/Assets/Resources/Sfx/games/tramAndPauline/jump1.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: agbtrampoline/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/tramAndPauline/jump2.ogg.meta b/Assets/Resources/Sfx/games/tramAndPauline/jump2.ogg.meta index 43841959..7da04112 100644 --- a/Assets/Resources/Sfx/games/tramAndPauline/jump2.ogg.meta +++ b/Assets/Resources/Sfx/games/tramAndPauline/jump2.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: agbtrampoline/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/tramAndPauline/transformPauline.ogg.meta b/Assets/Resources/Sfx/games/tramAndPauline/transformPauline.ogg.meta index c726df8d..80ee6efc 100644 --- a/Assets/Resources/Sfx/games/tramAndPauline/transformPauline.ogg.meta +++ b/Assets/Resources/Sfx/games/tramAndPauline/transformPauline.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: agbtrampoline/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/tramAndPauline/transformTram.ogg.meta b/Assets/Resources/Sfx/games/tramAndPauline/transformTram.ogg.meta index 62244e4c..03d6a81f 100644 --- a/Assets/Resources/Sfx/games/tramAndPauline/transformTram.ogg.meta +++ b/Assets/Resources/Sfx/games/tramAndPauline/transformTram.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: agbtrampoline/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Rockers/Animations.meta b/Assets/Resources/Sprites/Games/Rockers/Animations.meta index a64c775a..eb285f63 100644 --- a/Assets/Resources/Sprites/Games/Rockers/Animations.meta +++ b/Assets/Resources/Sprites/Games/Rockers/Animations.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Rockers/JJBodyMap.mat.meta b/Assets/Resources/Sprites/Games/Rockers/JJBodyMap.mat.meta index 8d07ca6d..77801f78 100644 --- a/Assets/Resources/Sprites/Games/Rockers/JJBodyMap.mat.meta +++ b/Assets/Resources/Sprites/Games/Rockers/JJBodyMap.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Rockers/JJGuitarMap.mat.meta b/Assets/Resources/Sprites/Games/Rockers/JJGuitarMap.mat.meta index 8fb9d8b9..5337eebd 100644 --- a/Assets/Resources/Sprites/Games/Rockers/JJGuitarMap.mat.meta +++ b/Assets/Resources/Sprites/Games/Rockers/JJGuitarMap.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Rockers/SoshiBodyMap.mat.meta b/Assets/Resources/Sprites/Games/Rockers/SoshiBodyMap.mat.meta index 54ec36ba..6a1676fb 100644 --- a/Assets/Resources/Sprites/Games/Rockers/SoshiBodyMap.mat.meta +++ b/Assets/Resources/Sprites/Games/Rockers/SoshiBodyMap.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Rockers/SoshiGuitarMap.mat.meta b/Assets/Resources/Sprites/Games/Rockers/SoshiGuitarMap.mat.meta index cba0a7e9..995ad590 100644 --- a/Assets/Resources/Sprites/Games/Rockers/SoshiGuitarMap.mat.meta +++ b/Assets/Resources/Sprites/Games/Rockers/SoshiGuitarMap.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Rockers/rockersbg.png.meta b/Assets/Resources/Sprites/Games/Rockers/rockersbg.png.meta index 9b208350..22a6a78c 100644 --- a/Assets/Resources/Sprites/Games/Rockers/rockersbg.png.meta +++ b/Assets/Resources/Sprites/Games/Rockers/rockersbg.png.meta @@ -339,5 +339,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Rockers/rockerslayout.png.meta b/Assets/Resources/Sprites/Games/Rockers/rockerslayout.png.meta index e8e008f5..48f74e64 100644 --- a/Assets/Resources/Sprites/Games/Rockers/rockerslayout.png.meta +++ b/Assets/Resources/Sprites/Games/Rockers/rockerslayout.png.meta @@ -119,5 +119,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Rockers/rockersmain.png.meta b/Assets/Resources/Sprites/Games/Rockers/rockersmain.png.meta index 27247a37..e511ad10 100644 --- a/Assets/Resources/Sprites/Games/Rockers/rockersmain.png.meta +++ b/Assets/Resources/Sprites/Games/Rockers/rockersmain.png.meta @@ -1285,5 +1285,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrrockers/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Splashdown/Animations.meta b/Assets/Resources/Sprites/Games/Splashdown/Animations.meta index 5a7faa3d..64c837fa 100644 --- a/Assets/Resources/Sprites/Games/Splashdown/Animations.meta +++ b/Assets/Resources/Sprites/Games/Splashdown/Animations.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Splashdown/splashdown.png.meta b/Assets/Resources/Sprites/Games/Splashdown/splashdown.png.meta index 6b1f8f6a..1c9a237e 100644 --- a/Assets/Resources/Sprites/Games/Splashdown/splashdown.png.meta +++ b/Assets/Resources/Sprites/Games/Splashdown/splashdown.png.meta @@ -810,5 +810,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Splashdown/splashdownbg.png.meta b/Assets/Resources/Sprites/Games/Splashdown/splashdownbg.png.meta index e564ad4b..248df1a9 100644 --- a/Assets/Resources/Sprites/Games/Splashdown/splashdownbg.png.meta +++ b/Assets/Resources/Sprites/Games/Splashdown/splashdownbg.png.meta @@ -356,5 +356,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrdiving/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TramAndPauline/Animations.meta b/Assets/Resources/Sprites/Games/TramAndPauline/Animations.meta index 05bb8aa1..7a7bb66f 100644 --- a/Assets/Resources/Sprites/Games/TramAndPauline/Animations.meta +++ b/Assets/Resources/Sprites/Games/TramAndPauline/Animations.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: agbtrampoline/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TramAndPauline/FixLinesTP.mat.meta b/Assets/Resources/Sprites/Games/TramAndPauline/FixLinesTP.mat.meta index 927be37a..be9b8994 100644 --- a/Assets/Resources/Sprites/Games/TramAndPauline/FixLinesTP.mat.meta +++ b/Assets/Resources/Sprites/Games/TramAndPauline/FixLinesTP.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: + assetBundleName: agbtrampoline/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TramAndPauline/Tram_Poline.png.meta b/Assets/Resources/Sprites/Games/TramAndPauline/Tram_Poline.png.meta index f2f3ef36..8740aa72 100644 --- a/Assets/Resources/Sprites/Games/TramAndPauline/Tram_Poline.png.meta +++ b/Assets/Resources/Sprites/Games/TramAndPauline/Tram_Poline.png.meta @@ -1616,5 +1616,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: agbtrampoline/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TramAndPauline/smoke.png.meta b/Assets/Resources/Sprites/Games/TramAndPauline/smoke.png.meta index 43c80e4e..1b19fab0 100644 --- a/Assets/Resources/Sprites/Games/TramAndPauline/smoke.png.meta +++ b/Assets/Resources/Sprites/Games/TramAndPauline/smoke.png.meta @@ -319,5 +319,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: agbtrampoline/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TramAndPauline/splashdownbg (1).png.meta b/Assets/Resources/Sprites/Games/TramAndPauline/splashdownbg (1).png.meta index 21847f84..b9d18c19 100644 --- a/Assets/Resources/Sprites/Games/TramAndPauline/splashdownbg (1).png.meta +++ b/Assets/Resources/Sprites/Games/TramAndPauline/splashdownbg (1).png.meta @@ -163,5 +163,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: agbtrampoline/common assetBundleVariant: diff --git a/Assets/Scenes/Title.unity b/Assets/Scenes/Title.unity index a88a89ea..b59a60d0 100644 --- a/Assets/Scenes/Title.unity +++ b/Assets/Scenes/Title.unity @@ -482,7 +482,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 551, y: -14.409576} + m_AnchoredPosition: {x: 444.5, y: -0} m_SizeDelta: {x: 1149.1, y: 139.9575} m_Pivot: {x: 0.5, y: 1} --- !u!114 &75677143 @@ -706,11 +706,11 @@ RectTransform: m_Father: {fileID: 1592423196} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 196, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -32, y: 0} m_SizeDelta: {x: 56, y: 56} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &124423117 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1025,8 +1025,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -256, y: -256} + m_AnchoredPosition: {x: 0, y: -18} + m_SizeDelta: {x: -256, y: -292} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &205376984 GameObject: @@ -1741,11 +1741,11 @@ RectTransform: m_Father: {fileID: 1923523151} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 196, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -32, y: 0} m_SizeDelta: {x: 56, y: 56} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &462262275 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2103,8 +2103,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1222.5, y: 0} - m_SizeDelta: {x: 815, y: 456.49997} + m_AnchoredPosition: {x: 1062.75, y: 0} + m_SizeDelta: {x: 708.5, y: 396.5} m_Pivot: {x: 0.5, y: 1} --- !u!114 &594751226 MonoBehaviour: @@ -2453,7 +2453,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 551, y: -183.18622} + m_AnchoredPosition: {x: 444.5, y: -139.9575} m_SizeDelta: {x: 1136, y: 372.6375} m_Pivot: {x: 0.5, y: 1} --- !u!114 &684958158 @@ -2476,12 +2476,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: '- https://github.com/RHeavenStudio/HeavenStudio - - - https://rheavenstudio.itch.io/heaven-studio - - - - https://www.youtube.com/@rheavenstudio' + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 35949c950a936b744936efd75ae436ea, type: 2} m_sharedMaterial: {fileID: -212896991529246517, guid: 35949c950a936b744936efd75ae436ea, type: 2} @@ -4579,8 +4574,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 815, y: -684.74994} - m_SizeDelta: {x: 1630, y: 456.49997} + m_AnchoredPosition: {x: 708.5, y: -594.75} + m_SizeDelta: {x: 1417, y: 396.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1101280658 MonoBehaviour: @@ -5086,7 +5081,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 815, y: 456.49997} + m_SizeDelta: {x: 708.5, y: 396.5} m_Pivot: {x: 0, y: 1} --- !u!114 &1285225122 MonoBehaviour: @@ -5237,8 +5232,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 11, y: 0} - m_SizeDelta: {x: -22, y: 72} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1328299795 MonoBehaviour: @@ -5287,8 +5282,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 38 - m_fontSizeBase: 38 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -5648,8 +5643,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -456.49997} - m_SizeDelta: {x: 815, y: 456.49997} + m_AnchoredPosition: {x: 0, y: -396.5} + m_SizeDelta: {x: 708.5, y: 396.5} m_Pivot: {x: 0, y: 0} --- !u!114 &1348032093 MonoBehaviour: @@ -6431,8 +6426,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 815, y: -228.25} - m_SizeDelta: {x: 1630, y: 456.49997} + m_AnchoredPosition: {x: 708.5, y: -198.25} + m_SizeDelta: {x: 1417, y: 396.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1449891560 MonoBehaviour: @@ -6727,6 +6722,143 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &1570836016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1570836017} + - component: {fileID: 1570836019} + - component: {fileID: 1570836018} + m_Layer: 0 + m_Name: Idol + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1570836017 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570836016} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1657419482} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 20} + m_SizeDelta: {x: 0, y: 72} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1570836018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570836016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: AWWWWWWWW BWWWWWWWW + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e5f3069ff426f2546b8168857ad6e0d4, type: 2} + m_sharedMaterial: {fileID: 1618155055176292627, guid: e5f3069ff426f2546b8168857ad6e0d4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 2701131775 + m_fontColor: {r: 1, g: 1, b: 1, a: 0.627451} + m_enableVertexGradient: 0 + m_colorMode: 0 + m_fontColorGradient: + topLeft: {r: 0, g: 0, b: 0, a: 1} + topRight: {r: 0, g: 0, b: 0, a: 1} + bottomLeft: {r: 0, g: 0, b: 0, a: 1} + bottomRight: {r: 0, g: 0, b: 0, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 38 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 + m_fontSizeMax: 38 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 15 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1570836019 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570836016} + m_CullTransparentMesh: 1 --- !u!1 &1592423195 GameObject: m_ObjectHideFlags: 0 @@ -6766,7 +6898,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 272, y: -64} + m_AnchoredPosition: {x: 272.036, y: -64} m_SizeDelta: {x: 256, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1592423197 @@ -6983,13 +7115,14 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 128923926} + - {fileID: 1570836017} m_Father: {fileID: 720687239} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 24} - m_SizeDelta: {x: 768, y: 128} + m_AnchoredPosition: {x: 0, y: 32} + m_SizeDelta: {x: 768, y: 164} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1657419483 MonoBehaviour: @@ -7216,8 +7349,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1222.5, y: -456.49997} - m_SizeDelta: {x: 815, y: 456.49997} + m_AnchoredPosition: {x: 1062.75, y: -396.5} + m_SizeDelta: {x: 708.5, y: 396.5} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1697728242 MonoBehaviour: @@ -7293,7 +7426,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 551, y: -623.6166} + m_AnchoredPosition: {x: 444.5, y: -551.5688} m_SizeDelta: {x: 1140.8, y: 77.9475} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1756042649 @@ -7577,6 +7710,7 @@ MonoBehaviour: playPanel: {fileID: 1925566736} chartTitleText: {fileID: 2077947577} chartMapperText: {fileID: 128923927} + chartIdolText: {fileID: 1570836018} chartDescText: {fileID: 177207008} chartStyleText: {fileID: 1959183877} mainSelectables: @@ -7588,6 +7722,9 @@ MonoBehaviour: defaultSelectable: {fileID: 2079077664} selectedDisplayRect: {fileID: 1437246958} selectedDisplayIcon: {fileID: 896543860} + otherHiddenOnMouse: + - {fileID: 1284552964} + - {fileID: 1305960736} --- !u!82 &1811344143 AudioSource: m_ObjectHideFlags: 0 @@ -7875,8 +8012,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 11, y: 0} - m_SizeDelta: {x: -22, y: 72} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1880104641 MonoBehaviour: @@ -7925,8 +8062,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 38 - m_fontSizeBase: 38 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -8127,7 +8264,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 816, y: -64} + m_AnchoredPosition: {x: 816.10803, y: -64} m_SizeDelta: {x: 256, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1923523152 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 44eb5454..fba796ae 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -336,6 +336,10 @@ namespace HeavenStudio public void ScoreInputAccuracy(double beat, double accuracy, bool late, double time, float weight = 1, bool doDisplay = true) { + // push the hit event to the timing display + if (doDisplay) + TimingAccuracyDisplay.instance.MakeAccuracyVfx(time, late); + if (weight > 0 && MarkerWeight > 0) { totalInputs += weight * MarkerWeight; @@ -361,10 +365,6 @@ namespace HeavenStudio if (SkillStarManager.instance.DoStarJust()) skillStarCollected = true; } - - // push the hit event to the timing display - if (doDisplay) - TimingAccuracyDisplay.instance.MakeAccuracyVfx(time, late); } public void DoSectionCompletion(double beat, bool clear, string name, double score) @@ -1121,6 +1121,7 @@ namespace HeavenStudio if (currentGameO.TryGetComponent(out var minigame)) { _currentMinigame = minigame; + minigame.minigameName = game; } Vector3 originalScale = currentGameO.transform.localScale; currentGameO.transform.parent = eventCaller.GamesHolder.transform; diff --git a/Assets/Scripts/Games/Minigame.cs b/Assets/Scripts/Games/Minigame.cs index e504e29e..51c573b4 100644 --- a/Assets/Scripts/Games/Minigame.cs +++ b/Assets/Scripts/Games/Minigame.cs @@ -7,6 +7,7 @@ using HeavenStudio.Common; using HeavenStudio.InputSystem; using System; using System.Linq; +using Jukebox; namespace HeavenStudio.Games { @@ -24,6 +25,8 @@ namespace HeavenStudio.Games [SerializeField] public SoundSequence.SequenceKeyValue[] SoundSequences; + [NonSerialized] public string minigameName; + #region Premade Input Actions protected const int IAEmptyCat = -1; protected const int IAPressCat = 0; @@ -125,6 +128,11 @@ namespace HeavenStudio.Games PlayerActionEvent.ActionEventHittableQuery HittableQuery = null ) { + // List gameSwitches = GameManager.instance.Beatmap.Entities.FindAll(c => c.beat <= startBeat + timer && c.datamodel.Split("/")[0] == "switchGame"); + // if (gameSwitches != null && gameSwitches[^1].datamodel.Split("/")[1] != gameObject.name) + // { + // return null; + // } GameObject evtObj = new("ActionEvent" + (startBeat + timer)); @@ -145,6 +153,8 @@ namespace HeavenStudio.Games evt.transform.parent = this.transform.parent; + evt.minigame = minigameName; + evtObj.SetActive(true); scheduledInputs.Add(evt); @@ -161,6 +171,7 @@ namespace HeavenStudio.Games { PlayerActionEvent evt = ScheduleInput(startBeat, timer, inputAction, OnHit, OnMiss, OnBlank); evt.autoplayOnly = true; + evt.minigame = minigameName; return evt; } @@ -174,82 +185,7 @@ namespace HeavenStudio.Games { PlayerActionEvent evt = ScheduleInput(startBeat, timer, inputAction, OnHit, OnMiss, OnBlank, HittableQuery); evt.noAutoplay = true; - return evt; - } - - /// - /// Schedule an Input for a later time in the minigame. Executes the methods put in parameters - /// - /// When the scheduling started (in beats) - /// How many beats later should the input be expected - /// The type of the input that's expected (Press, Release, A, B, Directions>) - /// Method to run if the Input has been Hit - /// Method to run if the Input has been Missed - /// Method to run whenever there's an Input while this is Scheduled (Shouldn't be used too much) - /// - [Obsolete("Use Input Action ScheduleInput instead")] - public PlayerActionEvent ScheduleInput( - double startBeat, - double timer, - InputType inputType, - PlayerActionEvent.ActionEventCallbackState OnHit, - PlayerActionEvent.ActionEventCallback OnMiss, - PlayerActionEvent.ActionEventCallback OnBlank, - PlayerActionEvent.ActionEventHittableQuery HittableQuery = null - ) - { - - GameObject evtObj = new GameObject("ActionEvent" + (startBeat + timer)); - evtObj.AddComponent(); - - PlayerActionEvent evt = evtObj.GetComponent(); - - evt.startBeat = startBeat; - evt.timer = timer; - evt.inputType = inputType; - evt.OnHit = OnHit; - evt.OnMiss = OnMiss; - evt.OnBlank = OnBlank; - evt.IsHittable = HittableQuery; - - evt.OnDestroy = RemoveScheduledInput; - - evt.canHit = true; - evt.enabled = true; - - evt.transform.parent = this.transform.parent; - - evtObj.SetActive(true); - - scheduledInputs.Add(evt); - - return evt; - } - - [Obsolete("Use Input Action ScheduleInput instead")] - public PlayerActionEvent ScheduleAutoplayInput(double startBeat, - double timer, - InputType inputType, - PlayerActionEvent.ActionEventCallbackState OnHit, - PlayerActionEvent.ActionEventCallback OnMiss, - PlayerActionEvent.ActionEventCallback OnBlank) - { - PlayerActionEvent evt = ScheduleInput(startBeat, timer, inputType, OnHit, OnMiss, OnBlank); - evt.autoplayOnly = true; - return evt; - } - - [Obsolete("Use Input Action ScheduleInput instead")] - public PlayerActionEvent ScheduleUserInput(double startBeat, - double timer, - InputType inputType, - PlayerActionEvent.ActionEventCallbackState OnHit, - PlayerActionEvent.ActionEventCallback OnMiss, - PlayerActionEvent.ActionEventCallback OnBlank, - PlayerActionEvent.ActionEventHittableQuery HittableQuery = null) - { - PlayerActionEvent evt = ScheduleInput(startBeat, timer, inputType, OnHit, OnMiss, OnBlank, HittableQuery); - evt.noAutoplay = true; + evt.minigame = minigameName; return evt; } @@ -401,18 +337,6 @@ namespace HeavenStudio.Games public virtual void OnGameSwitch(double beat) { - //Below is a template that can be used for handling previous entities. - //section below is if you only want to look at entities that overlap the game switch - /* - List prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.beat <= beat && c.datamodel.Split(0) == [insert game name]); - foreach(RiqEntity entity in prevEntities) - { - if(entity.beat + entity.length >= beat) - { - EventCaller.instance.CallEvent(entity, true); - } - } - */ } public virtual void OnTimeChange() diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs b/Assets/Scripts/Games/PlayerActionEvent.cs index cbbf354f..8ea9eaba 100644 --- a/Assets/Scripts/Games/PlayerActionEvent.cs +++ b/Assets/Scripts/Games/PlayerActionEvent.cs @@ -32,6 +32,7 @@ namespace HeavenStudio.Games public bool canHit = true; //Indicates if you can still hit the cue or not. If set to false, it'll guarantee a miss public bool enabled = true; //Indicates if the PlayerActionEvent is enabled. If set to false, it'll not trigger any events and destroy itself AFTER it's not relevant anymore public bool triggersAutoplay = true; + public string minigame; bool lockedByEvent = false; bool markForDeletion = false; @@ -89,15 +90,17 @@ namespace HeavenStudio.Games public void Update() { Conductor cond = Conductor.instance; + GameManager gm = GameManager.instance; if (markForDeletion) CleanUp(); if (!cond.NotStopped()) CleanUp(); // If the song is stopped entirely in the editor, destroy itself as we don't want duplicates if (noAutoplay && autoplayOnly) autoplayOnly = false; if (noAutoplay && triggersAutoplay) triggersAutoplay = false; if (!enabled) return; + if (minigame != GameManager.instance.currentGame) return; double normalizedTime = GetNormalizedTime(); - if (GameManager.instance.autoplay) + if (gm.autoplay && gm.canInput) { AutoplayInput(normalizedTime); return; @@ -179,7 +182,7 @@ namespace HeavenStudio.Games private void AutoplayInput(double normalizedTime, bool autoPlay = false) { - if (triggersAutoplay && (GameManager.instance.autoplay || autoPlay) && GameManager.instance.canInput && normalizedTime >= 1f - (Time.deltaTime * 0.5f)) + if (triggersAutoplay && (GameManager.instance.autoplay || autoPlay) && normalizedTime >= 1f - (Time.deltaTime * 0.5f)) { AutoplayEvent(); if (!autoPlay) @@ -191,6 +194,7 @@ namespace HeavenStudio.Games private void TimelineAutoplay() { if (Editor.Editor.instance == null) return; + if (!GameManager.instance.canInput) return; if (Editor.Track.Timeline.instance != null && !Editor.Editor.instance.fullscreen) { Editor.Track.Timeline.instance.AutoplayBTN.GetComponent().Play("Ace", 0, 0); @@ -223,6 +227,11 @@ namespace HeavenStudio.Games //For the Autoplay public void AutoplayEvent() { + if (!GameManager.instance.canInput) + { + CleanUp(); + return; + } if (EnableAutoplayCheat) { Hit(0f, 1f); @@ -238,6 +247,7 @@ namespace HeavenStudio.Games //The state parameter is either -1 -> Early, 0 -> Perfect, 1 -> Late public void Hit(double state, double time) { + GameManager gm = GameManager.instance; if (OnHit != null && enabled) { if (canHit) @@ -246,12 +256,15 @@ namespace HeavenStudio.Games pitchWhenHit = Conductor.instance.SongPitch; double normalized = time - 1f; int offset = Mathf.CeilToInt((float)normalized * 1000); - GameManager.instance.AvgInputOffset = offset; + if (gm.canInput) + { + gm.AvgInputOffset = offset; + } state = System.Math.Max(-1.0, System.Math.Min(1.0, state)); - if (countsForAccuracy && !(noAutoplay || autoplayOnly) && isEligible) + if (countsForAccuracy && gm.canInput && !(noAutoplay || autoplayOnly) && isEligible) { - GameManager.instance.ScoreInputAccuracy(startBeat + timer, TimeToAccuracy(time, pitchWhenHit), time > 1.0, time, weight, true); + gm.ScoreInputAccuracy(startBeat + timer, TimeToAccuracy(time, pitchWhenHit), time > 1.0, time, weight, true); if (state >= 1f || state <= -1f) { GoForAPerfect.instance.Miss(); @@ -319,15 +332,16 @@ namespace HeavenStudio.Games public void Miss() { + GameManager gm = GameManager.instance; CleanUp(); if (OnMiss != null && enabled && !autoplayOnly) { OnMiss(this); } - if (countsForAccuracy && !(noAutoplay || autoplayOnly)) + if (countsForAccuracy && gm.canInput && !(noAutoplay || autoplayOnly)) { - GameManager.instance.ScoreInputAccuracy(startBeat + timer, 0, true, 2.0, weight, false); + gm.ScoreInputAccuracy(startBeat + timer, 0, true, 2.0, weight, false); GoForAPerfect.instance.Miss(); SectionMedalsManager.instance.MakeIneligible(); } diff --git a/Assets/Scripts/Games/Rockers/Rockers.cs b/Assets/Scripts/Games/Rockers/Rockers.cs index 555f85d8..13b00a2a 100644 --- a/Assets/Scripts/Games/Rockers/Rockers.cs +++ b/Assets/Scripts/Games/Rockers/Rockers.cs @@ -285,7 +285,11 @@ namespace HeavenStudio.Games.Loaders new Param("gcS", false, "Glee Club Guitar (Soshi)", "Will Soshi use the same guitar as in the glee club lessons?") } }, - }); + }, + new List() { "ntr", "repeat" }, + "ntrrockers", "en", + new List() { "en" } + ); } } } diff --git a/Assets/Scripts/Games/Splashdown/Splashdown.cs b/Assets/Scripts/Games/Splashdown/Splashdown.cs index 558c46f9..8f5f5b05 100644 --- a/Assets/Scripts/Games/Splashdown/Splashdown.cs +++ b/Assets/Scripts/Games/Splashdown/Splashdown.cs @@ -72,7 +72,11 @@ namespace HeavenStudio.Games.Loaders new Param("amount", new EntityTypes.Integer(3, 5, 3), "Amount") } } - }); + }, + new List() { "ntr", "normal" }, + "ntrdiving", "en", + new List() { "en" } + ); } } } diff --git a/Assets/Scripts/Games/TossBoys/TossBoys.cs b/Assets/Scripts/Games/TossBoys/TossBoys.cs index 1da9fd7a..20e77266 100644 --- a/Assets/Scripts/Games/TossBoys/TossBoys.cs +++ b/Assets/Scripts/Games/TossBoys/TossBoys.cs @@ -103,7 +103,7 @@ namespace HeavenStudio.Games.Loaders }, }, new List() {"agb", "normal"}, - "agbtoss", "en", + "agbtoss", "jp", new List() {} ); } diff --git a/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs b/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs index 907483cf..15a0dfe3 100644 --- a/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs +++ b/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs @@ -68,7 +68,10 @@ namespace HeavenStudio.Games.Loaders new Param("ease", EasingFunction.Ease.Linear, "Ease") } } - } + }, + new List() {"agb", "normal"}, + "agbtrampoline", "jp", + new List() {} ); } } diff --git a/Assets/Scripts/GlobalGameManager.cs b/Assets/Scripts/GlobalGameManager.cs index 8db4ed1f..9e7f4d92 100644 --- a/Assets/Scripts/GlobalGameManager.cs +++ b/Assets/Scripts/GlobalGameManager.cs @@ -37,6 +37,7 @@ namespace HeavenStudio public static string PlayOpenFile = null; public static string buildTime = "00/00/0000 00:00:00"; + public static string friendlyReleaseName = "Heaven Studio (1.0 Lush)"; public static bool HasShutDown = false; public static bool discordDuringTesting = false; @@ -127,12 +128,15 @@ namespace HeavenStudio } ChangeMasterVolume(PersistentDataManager.gameSettings.masterVolume); PlayerInput.InitInputControllers(); -#if UNITY_EDITOR +#if HEAVENSTUDIO_PROD + Starpelly.OS.ChangeWindowTitle("Heaven Studio"); + buildTime = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss"); +#elif UNITY_EDITOR Starpelly.OS.ChangeWindowTitle("Heaven Studio UNITYEDITOR "); buildTime = "(EDITOR) " + System.DateTime.UtcNow.ToString("dd/MM/yyyy hh:mm:ss"); #else - Starpelly.OS.ChangeWindowTitle("Heaven Studio (INDEV) " + Application.buildGUID.Substring(0, 8)); - buildTime = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss"); + Starpelly.OS.ChangeWindowTitle("Heaven Studio (INDEV) " + Application.buildGUID.Substring(0, 8)); + buildTime = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss"); #endif } diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index 0f2de366..c8493f38 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -108,8 +108,11 @@ namespace HeavenStudio.Editor AddIcon(minigame); UpdateEditorStatus(true); - +#if HEAVENSTUDIO_PROD + BuildDateDisplay.text = GlobalGameManager.friendlyReleaseName; +#else BuildDateDisplay.text = GlobalGameManager.buildTime; +#endif isCursorEnabled = PersistentDataManager.gameSettings.editorCursorEnable; isDiscordEnabled = PersistentDataManager.gameSettings.discordRPCEnable; GameManager.instance.CursorCam.enabled = isCursorEnabled; diff --git a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs index 96e24d0b..bcf22f07 100644 --- a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs +++ b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs @@ -936,6 +936,7 @@ namespace HeavenStudio.Editor.Track { Selections.instance.ClickSelect(marker); marker.moving = true; + marker.entity.beat = Mathf.Max(MousePos2BeatSnap, 0); } else { diff --git a/Assets/Scripts/TitleManager.cs b/Assets/Scripts/TitleManager.cs index 97513fe4..59b2199f 100644 --- a/Assets/Scripts/TitleManager.cs +++ b/Assets/Scripts/TitleManager.cs @@ -44,6 +44,7 @@ namespace HeavenStudio [SerializeField] private GameObject playPanel; [SerializeField] private TMP_Text chartTitleText; [SerializeField] private TMP_Text chartMapperText; + [SerializeField] private TMP_Text chartIdolText; [SerializeField] private TMP_Text chartDescText; [SerializeField] private TMP_Text chartStyleText; @@ -51,6 +52,7 @@ namespace HeavenStudio [SerializeField] private Selectable defaultSelectable; [SerializeField] private RectTransform selectedDisplayRect; [SerializeField] private GameObject selectedDisplayIcon; + [SerializeField] private GameObject[] otherHiddenOnMouse; private AudioSource musicSource; @@ -91,7 +93,9 @@ namespace HeavenStudio selectedDisplayAnim = anim; } -#if UNITY_EDITOR +#if HEAVENSTUDIO_PROD + versionText.text = GlobalGameManager.friendlyReleaseName; +#elif UNITY_EDITOR versionText.text = "EDITOR"; #else versionText.text = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss"); @@ -163,6 +167,10 @@ namespace HeavenStudio PlayerInput.CurrentControlStyle = nextController.GetDefaultStyle(); usingMouse = PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch; selectedDisplayIcon.SetActive(!usingMouse); + foreach (var obj in otherHiddenOnMouse) + { + obj.SetActive(!usingMouse); + } if ((lastController as InputJoyshock) != null) { @@ -300,6 +308,10 @@ namespace HeavenStudio { usingMouse = false; selectedDisplayIcon.SetActive(true); + foreach (var obj in otherHiddenOnMouse) + { + obj.SetActive(true); + } } currentSelectable.GetComponent