Merge branch 'Testy' of https://github.com/RaffyTaffy14/HS into Testy

Assets/Plugins/JoyShockLibrary/JoyShockLibrary.cs

@@ -29,8 +29,11 @@ public static class JSL
     public const int ButtonMaskPS = 16;
     public const int ButtonMaskCapture = 17;
     public const int ButtonMaskTouchpadClick = 17;
-    public const int ButtonMaskSL = 18;
-    public const int ButtonMaskSR = 19;
+    public const int ButtonMaskMic = 18;
+    public const int ButtonMaskSL = 19;
+    public const int ButtonMaskSR = 20;
+    public const int ButtonMaskFnL = 21;
+    public const int ButtonMaskFnR = 22;
 
     public const int TypeJoyConLeft = 1;
     public const int TypeJoyConRight = 2;

Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.h

@@ -17,31 +17,33 @@
 #define JS_SPLIT_TYPE_RIGHT 2
 #define JS_SPLIT_TYPE_FULL 3
 
-#define JSMASK_UP 0x00001
-#define JSMASK_DOWN 0x00002
-#define JSMASK_LEFT 0x00004
-#define JSMASK_RIGHT 0x00008
-#define JSMASK_PLUS 0x00010
-#define JSMASK_OPTIONS 0x00010
-#define JSMASK_MINUS 0x00020
-#define JSMASK_SHARE 0x00020
-#define JSMASK_LCLICK 0x00040
-#define JSMASK_RCLICK 0x00080
-#define JSMASK_L 0x00100
-#define JSMASK_R 0x00200
-#define JSMASK_ZL 0x00400
-#define JSMASK_ZR 0x00800
-#define JSMASK_S 0x01000
-#define JSMASK_E 0x02000
-#define JSMASK_W 0x04000
-#define JSMASK_N 0x08000
-#define JSMASK_HOME 0x10000
-#define JSMASK_PS 0x10000
-#define JSMASK_CAPTURE 0x20000
-#define JSMASK_TOUCHPAD_CLICK 0x20000
-#define JSMASK_MIC 0x40000
-#define JSMASK_SL 0x40000
-#define JSMASK_SR 0x80000
+#define JSMASK_UP 0x000001
+#define JSMASK_DOWN 0x000002
+#define JSMASK_LEFT 0x000004
+#define JSMASK_RIGHT 0x000008
+#define JSMASK_PLUS 0x000010
+#define JSMASK_OPTIONS 0x000010
+#define JSMASK_MINUS 0x000020
+#define JSMASK_SHARE 0x000020
+#define JSMASK_LCLICK 0x000040
+#define JSMASK_RCLICK 0x000080
+#define JSMASK_L 0x000100
+#define JSMASK_R 0x000200
+#define JSMASK_ZL 0x000400
+#define JSMASK_ZR 0x000800
+#define JSMASK_S 0x001000
+#define JSMASK_E 0x002000
+#define JSMASK_W 0x004000
+#define JSMASK_N 0x008000
+#define JSMASK_HOME 0x010000
+#define JSMASK_PS 0x010000
+#define JSMASK_CAPTURE 0x020000
+#define JSMASK_TOUCHPAD_CLICK 0x020000
+#define JSMASK_MIC 0x040000
+#define JSMASK_SL 0x080000
+#define JSMASK_SR 0x100000
+#define JSMASK_FNL 0x200000
+#define JSMASK_FNR 0x400000
 
 #define JSOFFSET_UP 0
 #define JSOFFSET_DOWN 1
@@ -66,8 +68,10 @@
 #define JSOFFSET_CAPTURE 17
 #define JSOFFSET_TOUCHPAD_CLICK 17
 #define JSOFFSET_MIC 18
-#define JSOFFSET_SL 18
-#define JSOFFSET_SR 19
+#define JSOFFSET_SL 19
+#define JSOFFSET_SR 20
+#define JSOFFSET_FNL 21
+#define JSOFFSET_FNR 22
 
 // PS5 Player maps for the DS Player Lightbar
 #define DS5_PLAYER_1 4

Assets/Resources/Prefabs/Editor/SettingsMenu/ControllerSetup.prefab

@@ -3758,7 +3758,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3918594454393827276
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3771,16 +3771,15 @@ RectTransform:
   m_LocalScale: {x: 0.9998709, y: 0.9998709, z: 0.9998709}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3918594454521024533}
   - {fileID: 3918594455780710548}
   - {fileID: 3918594455337952163}
   m_Father: {fileID: 3918594454598345480}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 754, y: -307.9788}
-  m_SizeDelta: {x: 1468, y: 100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3918594454393827267
 MonoBehaviour:
@@ -3797,10 +3796,10 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 10
-    m_Bottom: 16
-  m_ChildAlignment: 6
-  m_Spacing: 10
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -3945,145 +3944,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &3918594454521024534
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3918594454521024533}
-  - component: {fileID: 3918594454521024523}
-  - component: {fileID: 3918594454521024532}
-  m_Layer: 5
-  m_Name: Text (TMP)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3918594454521024533
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3918594454521024534}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3918594454393827276}
-  m_RootOrder: 0
-  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: -46.5}
-  m_SizeDelta: {x: 320, y: 75}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &3918594454521024523
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3918594454521024534}
-  m_CullTransparentMesh: 1
---- !u!114 &3918594454521024532
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3918594454521024534}
-  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: 'Joy-Con (L/R) Selected
-
-    Pairing Second Joy-Con...'
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2}
-  m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, 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: 24.5
-  m_fontSizeBase: 32
-  m_fontWeight: 400
-  m_enableAutoSizing: 1
-  m_fontSizeMin: 18
-  m_fontSizeMax: 36
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  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: -7.5}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &3918594454531700438
 GameObject:
   m_ObjectHideFlags: 0
@@ -5807,11 +5667,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3918594454393827276}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 476.83002, y: -69}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 688.17, y: 30}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3918594455337952161
@@ -5842,7 +5702,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Press button on second Joy-Con to select...
+  m_text: Press ZL + ZR to pair Joy-Con
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2}
   m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, type: 2}
@@ -5876,7 +5736,7 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 36
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
+  m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
@@ -6010,9 +5870,6 @@ MonoBehaviour:
   controllersDropdown: {fileID: 3918594454563211279}
   pairSearchItem: {fileID: 3918594454393827277}
   autoSearchLabel: {fileID: 3918594454453368363}
-  pairSearchLabel: {fileID: 3918594455337952172}
-  pairSearchCancelBt: {fileID: 3918594455780710549}
-  pairingLabel: {fileID: 3918594454521024532}
   controllerIcons:
   - {fileID: 3918594454983356908}
   - {fileID: 3918594455640061334}
@@ -6975,7 +6832,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3918594455780710548
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6991,11 +6848,11 @@ RectTransform:
   - {fileID: 3918594455818177326}
   - {fileID: 3918594456368854930}
   m_Father: {fileID: 3918594454393827276}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 330, y: -69}
+  m_AnchoredPosition: {x: 272, y: -25}
   m_SizeDelta: {x: 136.83, y: 30}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3918594455780710537
@@ -8052,8 +7909,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 723, y: 0}
-  m_SizeDelta: {x: 1406, y: 0}
+  m_AnchoredPosition: {x: 704.5, y: 0}
+  m_SizeDelta: {x: 1369, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3918594456218978261
 CanvasRenderer:

Assets/Resources/Prefabs/GameView/CamerasGame.prefab

@@ -2198,7 +2198,7 @@ RectTransform:
   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: -0.25, y: 0}
+  m_AnchoredPosition: {x: -0.25, y: 1}
   m_SizeDelta: {x: 1, y: 1}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1479785503205304790

Assets/Resources/Prefabs/GlobalGameManager.prefab

@@ -1459,7 +1459,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1688,7 +1688,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Resources/Sfx/games/airRally/birdieCatch.wav.meta

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

Assets/Resources/Sfx/games/airRally/en.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 465bccd87e65a8e4b9ebc3c2a35d3406
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Close1.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Close2.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Close3.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Close4.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Far1.ogg.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Far2.ogg.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Far3.ogg.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Far4.ogg.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_FarAlt1.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_FarAlt2.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_FarAlt3.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_FarAlt4.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Farther1.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Farther2.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Farther3.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Farther4.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Farthest1.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Farthest2.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Farthest3.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/baBumBumBum_Farthest4.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn1.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn1Far.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn1Farther.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn1Farthest.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn2.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn2Far.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn2Farther.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn2Farthest.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn3.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn3Far.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn3Farther.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn3Farthest.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn4.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn4Far.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn4Farther.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/countIn4Farthest.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/nya_Close.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/nya_Far.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/nya_Farther.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/en/nya_Farthest.wav.meta

@@ -7,7 +7,7 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 0
+    compressionFormat: 2
     quality: 1
     conversionMode: 0
   platformSettingOverrides: {}
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleName: rvlbadminton/locale
+  assetBundleVariant: en

Assets/Resources/Sfx/games/airRally/hitBaxter_Close.wav.meta

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

Assets/Resources/Sfx/games/airRally/hitBaxter_Far.wav.meta

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

Assets/Resources/Sfx/games/airRally/hitBaxter_Far2.wav.meta

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

Assets/Resources/Sfx/games/airRally/hitBaxter_Farther.wav.meta

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

Assets/Resources/Sfx/games/airRally/hitBaxter_Farther2.wav.meta

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

Assets/Resources/Sfx/games/airRally/hitBaxter_Farthest.wav.meta

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

Assets/Resources/Sfx/games/airRally/hitBaxter_Farthest2.wav.meta

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

Assets/Resources/Sfx/games/airRally/hitForth_Close.wav.meta

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