Merge branch 'release_1' into pr/615

Assets/Editor/bread2unity.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 375dce47d61a68447a1b4813869b10b2
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Editor/bread2unity/BCCAD.cs

@@ -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
-    }
-}

Assets/Editor/bread2unity/BCCAD.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3b4f0c7c12cfcc74bbfdc8c1be61d4b0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Editor/bread2unity/Bread2Unity.cs

@@ -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>("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();
-        }
-    }
-}

Assets/Editor/bread2unity/Bread2Unity.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 0967d3b57ef5e5d46965e261ead79e15
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Editor/bread2unity/LICENSE

@@ -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.

Assets/Editor/bread2unity/Model/IAnimation.cs

@@ -1,24 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Bread2Unity
-{
-    public class IAnimation
-    {
-        public List<IAnimationStep> steps;
-    }
-
-    public class IAnimationStep
-    {
-        public ushort spriteIndex;
-        public ushort delay;
-
-        public float stretchX;
-        public float stretchY;
-
-        public float rotation;
-
-        public byte opacity;
-    }
-}

Assets/Editor/bread2unity/Model/IAnimation.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c33bcfd692627dd4a97ac1cd1d930420
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Editor/bread2unity/Model/IDataModel.cs

@@ -1,13 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Bread2Unity
-{
-    public class IDataModel
-    {
-        public List<ISprite> sprites = new List<ISprite>();
-        public List<IAnimation> animations = new List<IAnimation>();
-        public int sheetW;
-        public int sheetH;
-    }
-}

Assets/Editor/bread2unity/Model/IDataModel.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ddf1fd563dabc6040a863537a081843a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Editor/bread2unity/Model/ISprite.cs

@@ -1,31 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Bread2Unity
-{
-    public class ISprite
-    {
-        public List<ISpritePart> parts = new List<ISpritePart>();
-    }
-
-    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;
-    }
-}

Assets/Editor/bread2unity/Model/ISprite.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d4aae79bea7b7234f9ce059ade5fce08
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Editor/bread2unity/README.md

@@ -1,2 +0,0 @@
-# bread2unity
-Rhythm Heaven animation to Unity animation converter

Assets/Resources/Games/boardMeeting.prefab

@@ -1229,9 +1229,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   SoundSequences: []
-  EligibleHits: []
   scheduledInputs: []
-  firstEnable: 0
   farLeft: {fileID: 7518443851165344965}
   farRight: {fileID: 6713782291520362818}
   assistantAnim: {fileID: 1521746322850907348}
@@ -1240,7 +1238,6 @@ MonoBehaviour:
   - {fileID: 6299728505360095184}
   firstSpinner: {fileID: 0}
   shakeIntensity: 0.5
-  shouldBop: 1
 --- !u!1 &4694930924533062141
 GameObject:
   m_ObjectHideFlags: 0
@@ -2448,6 +2445,90 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &7692319912555466056
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2327120719424392110}
+  - component: {fileID: 1761198211587892282}
+  m_Layer: 0
+  m_Name: BG BM_2 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2327120719424392110
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7692319912555466056}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -5.46, y: -2.646, z: 0}
+  m_LocalScale: {x: 0.37, y: 0.37, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5396135612834373355}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1761198211587892282
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7692319912555466056}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: b0a1d7d7f9ff2cd429ca4a190e43f870, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: -100
+  m_Sprite: {fileID: 1828705492, guid: 993d3ee06decd3b4aa65852d66a3180d, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 2
+  m_Size: {x: 100, y: 13.44}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &7693505318456935900
 GameObject:
   m_ObjectHideFlags: 0
@@ -2796,6 +2877,7 @@ Transform:
   - {fileID: 2446071777684279398}
   - {fileID: 8567651959911606324}
   - {fileID: 5237250537066865816}
+  - {fileID: 2327120719424392110}
   m_Father: {fileID: 8702929335642151782}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resources/Games/coinToss.prefab

@@ -27,6 +27,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -4.3, y: 9.92, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2083908003750235240}
   m_RootOrder: 0
@@ -42,6 +43,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -109,6 +111,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.5, y: 0.5, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3170172331476655201}
   m_RootOrder: 0
@@ -124,6 +127,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -191,6 +195,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -4.24, y: 1.8, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2083908003750235240}
   m_RootOrder: 2
@@ -206,6 +211,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -273,6 +279,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -4.520001, y: 0.78000045, z: 0}
   m_LocalScale: {x: 0.5, y: 0.5, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1615845594994777750}
   - {fileID: 7476450758015735169}
@@ -291,6 +298,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -358,6 +366,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 49.213802, y: 29.528282, z: 2.7341}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8906338938816874952}
   m_RootOrder: 0
@@ -373,6 +382,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -440,6 +450,7 @@ Transform:
   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: 8906338938816874952}
   m_RootOrder: 1
@@ -455,6 +466,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -522,6 +534,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -5.44, y: 3.66, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2083908003750235240}
   m_RootOrder: 1
@@ -537,6 +550,7 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -565,7 +579,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_Sprite: {fileID: -8904420264161679176, guid: eab6bdf53b08c644db9afb05df441329, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -604,6 +618,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5417053695332528972}
   - {fileID: 7982481497042899067}
@@ -624,9 +639,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   SoundSequences: []
-  EligibleHits: []
   scheduledInputs: []
-  firstEnable: 0
   fg: {fileID: 4608248523716601930}
   bg: {fileID: 3722363597051273302}
   handAnimator: {fileID: 6887173419118620922}
@@ -660,6 +673,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 6.66, y: -3.4, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 531613198458803261}
   - {fileID: 2083908003750235240}
@@ -668,7 +682,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &6887173419118620922
 Animator:
-  serializedVersion: 3
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -681,7 +695,9 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0

Assets/Resources/Games/doubleDate.prefab

@@ -486,7 +486,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5057601987836241533
 Transform:
   m_ObjectHideFlags: 0
@@ -880,7 +880,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 3
+  m_SortingOrder: 5
   m_Sprite: {fileID: -8241388437142500833, guid: e69d8631bbd6b4047b0cd9d9d78be671, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -13502,7 +13502,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 4
+  m_SortingOrder: 6
   m_Sprite: {fileID: -2886052291205970805, guid: e69d8631bbd6b4047b0cd9d9d78be671, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -17588,8 +17588,8 @@ Transform:
   m_LocalScale: {x: 0.92045, y: 0.92045, z: 0.92045}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4287718705053222288}
   - {fileID: 2602257268473603279}
+  - {fileID: 4287718705053222288}
   - {fileID: 2886270264316386320}
   - {fileID: 7529215513594783899}
   - {fileID: 5057601987836241533}
@@ -18129,7 +18129,7 @@ Transform:
   - {fileID: 8284843346833121454}
   - {fileID: 3196070111010031696}
   m_Father: {fileID: 3114857684828203505}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!210 &6268125902584026029
 SortingGroup:
@@ -18176,7 +18176,7 @@ Transform:
   - {fileID: 4165868219261623941}
   - {fileID: 8615252329958160817}
   m_Father: {fileID: 3114857684828203505}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!210 &3469472890315857684
 SortingGroup:

Assets/Resources/Games/munchyMonk.prefab

@@ -3258,7 +3258,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 150
+  m_SortingOrder: 152
   m_Sprite: {fileID: 7953426270202603213, guid: de37f25efaa713347b9cfe924e2e3680, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -3616,9 +3616,7 @@ MonoBehaviour:
         looping: 0
         offset: 0
         parameters: []
-  EligibleHits: []
   scheduledInputs: []
-  firstEnable: 0
   dumplings: []
   Baby: {fileID: 9030838172503822172}
   BrowHolder: {fileID: 5330488048195279595}
@@ -6899,7 +6897,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 100
+  m_SortingOrder: 151
   m_Sprite: {fileID: 1030990730640347943, guid: de37f25efaa713347b9cfe924e2e3680, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

Assets/Resources/Games/rockers.prefab.meta

@@ -3,5 +3,5 @@ guid: 8f7c4cce90cc7444d9f6eb749af8511c
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Games/splashdown.prefab.meta

@@ -3,5 +3,5 @@ guid: aea3428178ba96e4a859677fa4c68548
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Games/tramAndPauline.prefab

@@ -562,7 +562,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   SoundSequences: []
-  EligibleHits: []
   scheduledInputs: []
   tram: {fileID: 6436903307986279996}
   pauline: {fileID: 2176275447357796304}

Assets/Resources/Games/tramAndPauline.prefab.meta

@@ -3,5 +3,5 @@ guid: dded4c2e961a9384fab1439fd19ac785
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: agbtrampoline/common
   assetBundleVariant: 

Assets/Resources/Prefabs/Games/Splashdown.meta

@@ -4,5 +4,5 @@ folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Prefabs/Games/Splashdown/Splashes.prefab.meta

@@ -3,5 +3,5 @@ guid: 80e3559b5f8c6ce47b95ebd5926d1a52
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Prefabs/Games/Splashdown/Synchrette.prefab.meta

@@ -3,5 +3,5 @@ guid: f25ca3f01901f3f4992757dd62e08933
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Prefabs/Games/Splashdown/SynchretteHolder.prefab.meta

@@ -3,5 +3,5 @@ guid: 42adbe7efa2480240ae54ddaaeff2ce1
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/Applause.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/BendC6.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/BendG5.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/Cheer.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/Clap.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/Cmon.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/locale
-  assetBundleVariant: 
+  assetBundleVariant: en

Assets/Resources/Sfx/games/rockers/LastOne.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/locale
-  assetBundleVariant: 
+  assetBundleVariant: en

Assets/Resources/Sfx/games/rockers/Whistle.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/bendDown.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/bendUp.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/count.meta

@@ -4,5 +4,5 @@ folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/locale
-  assetBundleVariant: 
+  assetBundleVariant: en

Assets/Resources/Sfx/games/rockers/doremi.meta

@@ -4,5 +4,5 @@ folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/mute.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/noise.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/rocker.meta

@@ -4,5 +4,5 @@ folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/rockers/strings.meta

@@ -4,5 +4,5 @@ folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrrockers/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/samuraiSliceNtr/faster_normal.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: a59745c8c2d116641ac71fa2e156bd07
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/samuraiSliceNtr/faster_question.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 04074d7b1e67c4149adc197b3d97b868
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/samuraiSliceNtr/faster_weird.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3c9a65b255ce4124793d9be322b9cfe1
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/samuraiSliceNtr/fire_gain.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 6eea6b9d4e8ea6a43a6931338ba21186
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/samuraiSliceNtr/fire_loss.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 325da26f30e383840858edc377d3c1f3
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/samuraiSliceNtr/item_splat.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 78b9d6db4dbad2645903bebe6ea9df62
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/alleyOop1.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/locale
-  assetBundleVariant: 
+  assetBundleVariant: en

Assets/Resources/Sfx/games/splashdown/alleyOop2.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/locale
-  assetBundleVariant: 
+  assetBundleVariant: en

Assets/Resources/Sfx/games/splashdown/alleyOop3.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/locale
-  assetBundleVariant: 
+  assetBundleVariant: en

Assets/Resources/Sfx/games/splashdown/downOthers.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/downPlayer.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/jumpOthers.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/jumpPlayer.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/rollOthers.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/rollPlayer.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/splashOthers.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/splashPlayer.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/start.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/together.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/togetherRemix9.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/upOthers.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/upPlayer.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/whistle.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/splashdown/yeah.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ntrdiving/locale
-  assetBundleVariant: 
+  assetBundleVariant: en

Assets/Resources/Sfx/games/tramAndPauline/jump1.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: agbtrampoline/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/tramAndPauline/jump2.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: agbtrampoline/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/tramAndPauline/transformPauline.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: agbtrampoline/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/tramAndPauline/transformTram.ogg.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: agbtrampoline/common
   assetBundleVariant: 

Assets/Resources/Sfx/games/trickClass/blast_dodge.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3a773d9c50de0924b912c1a3eeef7d5c
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/trickClass/blast_dodge_return.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 8b22ce86120aa314ebcfe5696e0fe490
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/trickClass/blast_miss.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 815d8b83691257949b66fae211731784
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/trickClass/girl_charge_0.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 49ecbcd4f7cb82d48a615ec2416b2ba5
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/trickClass/girl_charge_1.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 770734d13a4d8fa4e904aa6616e6591c
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/trickClass/girl_charge_2.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 04530f49b3ebcec4dbce11c998af7d75
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/trickClass/player_dodge_success_alt.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: db184e49b54841747828dd71e8a2db04
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/CheerReaders/tex1_1024x1024_e5fe04bdb6c79e4d_5.png.meta

@@ -134,7 +134,7 @@ TextureImporter:
         width: 2865
         height: 3847
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -155,7 +155,7 @@ TextureImporter:
         width: 232
         height: 1302
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -176,7 +176,7 @@ TextureImporter:
         width: 259
         height: 1302
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -188,6 +188,27 @@ TextureImporter:
       indices: 
       edges: []
       weights: []
+    - serializedVersion: 2
+      name: tex1_1024x1024_e5fe04bdb6c79e4d_5_2
+      rect:
+        serializedVersion: 2
+        x: 74
+        y: 82
+        width: 2841
+        height: 46
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 142638d2b5d980d42a221b7eab4fa6e1
+      internalID: 479367862
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
     outline: []
     physicsShape: []
     bones: []
@@ -201,6 +222,7 @@ TextureImporter:
     nameFileIdTable:
       tex1_1024x1024_e5fe04bdb6c79e4d_5_0: 3474984633670427006
       tex1_1024x1024_e5fe04bdb6c79e4d_5_1: -3345518207574268676
+      tex1_1024x1024_e5fe04bdb6c79e4d_5_2: 703625535
       tex1_1024x1024_e5fe04bdb6c79e4d_5_7: -292174439971434857
   spritePackingTag: 
   pSDRemoveMatte: 0

Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim

@@ -399,6 +399,25 @@ AnimationClip:
     path: WeaselGirl/WeaselGirlArm
     classID: 212
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: WeaselGirl/WeaselGirlArm
+    classID: 1
+    script: {fileID: 0}
   m_PPtrCurves:
   - curve:
     - time: 0
@@ -539,6 +558,13 @@ AnimationClip:
       typeID: 212
       customType: 26
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2314837333
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 3018599444
       attribute: 0
@@ -1707,6 +1733,25 @@ AnimationClip:
     path: WeaselGirl/WeaselGirlBody
     classID: 4
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: WeaselGirl/WeaselGirlArm
+    classID: 1
+    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2

Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim

@@ -498,6 +498,52 @@ AnimationClip:
     path: WeaselBoy
     classID: 1
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.033333335
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.2
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.3
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Shock2
+    classID: 1
+    script: {fileID: 0}
   m_PPtrCurves:
   - curve:
     - time: 0
@@ -672,6 +718,13 @@ AnimationClip:
       typeID: 1
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 4119893686
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 3484930362
       attribute: 0
@@ -1991,6 +2044,52 @@ AnimationClip:
     path: WeaselGirl
     classID: 4
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.033333335
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.2
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.3
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Shock2
+    classID: 1
+    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2

Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat

@@ -84,8 +84,8 @@ Material:
     m_Colors:
     - _AddColor: {r: 0, g: 0, b: 0, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _ColorAlpha: {r: 0.42745098, g: 0.6666668, b: 0.8784314, a: 1}
+    - _ColorAlpha: {r: 1, g: 1, b: 1, a: 1}
     - _ColorBravo: {r: 1, g: 0, b: 0, a: 1}
-    - _ColorDelta: {r: 0.72156864, g: 0.972549, b: 1, a: 1}
+    - _ColorDelta: {r: 0.8117648, g: 0.8235295, b: 0.8117648, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/Resources/Sprites/Games/LaunchParty/Background Elements.png.meta

@@ -85,7 +85,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -138,10 +138,10 @@ TextureImporter:
       name: Background Elements_0
       rect:
         serializedVersion: 2
-        x: 12
+        x: 0
-        y: 6
+        y: 0
-        width: 3374
+        width: 3875
-        height: 1568
+        height: 1611
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -248,7 +248,7 @@ TextureImporter:
         width: 1555
         height: 1594
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -260,6 +260,48 @@ TextureImporter:
       indices: 
       edges: []
       weights: []
+    - serializedVersion: 2
+      name: Background Elements_6
+      rect:
+        serializedVersion: 2
+        x: 2227
+        y: 3857
+        width: 187
+        height: 233
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: de9cc5d0d3a97ca45b7b5616c90d8448
+      internalID: -695422399
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Background Elements_7
+      rect:
+        serializedVersion: 2
+        x: 2432
+        y: 3752
+        width: 223
+        height: 296
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 049567212cb2e7a48adf4d1be630af99
+      internalID: 519812580
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
     outline: []
     physicsShape: []
     bones: []
@@ -277,6 +319,8 @@ TextureImporter:
       Background Elements_3: 2356066476548809487
       Background Elements_4: -3829839989203116485
       Background Elements_5: 286201189424744302
+      Background Elements_6: -695422399
+      Background Elements_7: 519812580
   spritePackingTag: 
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0