Merge branch 'dev'

Caeden117 · Sep 25, 2022 · 4683a77 · 4683a77
2 parents 98ce36c + 9555b57
commit 4683a77
Show file tree

Hide file tree

Showing 354 changed files with 783,925 additions and 17,107 deletions.
diff --git a/.gitignore b/.gitignore
@@ -328,4 +328,6 @@ UserSettings/
 
 # Unity autogenerated lighting files (ChroMapper does not utilize baked lighting)
 *.lighting.meta
-*.lighting
+*.lighting
+
+./quest-utils
diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -55,14 +55,19 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 89885db7f04344d46ad3175d1aa8ed08, type: 2}
   - {fileID: 11400000, guid: 242106b41a72fd54f964492b5126216b, type: 2}
   - {fileID: 11400000, guid: 08f4d039278572d4884a12eecd542c00, type: 2}
-  - {fileID: 11400000, guid: 222441cc57128f74a95cc543fc7d1102, type: 2}
-  - {fileID: 11400000, guid: 3c1ac01216b1517408336aacd481ae76, type: 2}
-  - {fileID: 11400000, guid: 6d0dc327a8510d74fa39d7ec8bbec5e8, type: 2}
-  - {fileID: 11400000, guid: 0074cb7f8e162514e9dc16795152a39d, type: 2}
-  - {fileID: 11400000, guid: 4fac31b6fddf13c42bf853fa8f9c9a4b, type: 2}
-  - {fileID: 11400000, guid: 839a0188f394b214f9e9b39d46dca278, type: 2}
-  - {fileID: 11400000, guid: 973c0ca82326ee74e945fd3827f403cf, type: 2}
-  - {fileID: 11400000, guid: 2ecf16f28d4a868439b3de1a9ebecc96, type: 2}
+  - {fileID: 11400000, guid: 393165d6e57947b468f09debea568b3a, type: 2}
+  - {fileID: 11400000, guid: e95cbf4067bdb7b41be02f9da61e10f1, type: 2}
+  - {fileID: 11400000, guid: c0e0863c1c6e57349be4055f80c3c34d, type: 2}
+  - {fileID: 11400000, guid: ac3231f31671ae54a9cc4114cbdea89e, type: 2}
+  - {fileID: 11400000, guid: 684bd3f8d4e04cf42beb4a44db396bf9, type: 2}
+  - {fileID: 11400000, guid: ac06d931c6080944abb8f6b890acbde6, type: 2}
+  - {fileID: 11400000, guid: c0e8ea91202fc564cbccb29b9e3551ce, type: 2}
+  - {fileID: 11400000, guid: d7cea6391e2a8ef47aec38315d5e840d, type: 2}
+  - {fileID: 11400000, guid: d4f36b942c783ad4bb27f7e250e25070, type: 2}
+  - {fileID: 11400000, guid: 9625a4947b7830d4f8bd1c62f5ec98b3, type: 2}
+  - {fileID: 11400000, guid: d3050478cecee1e4d9cf16895345ae9c, type: 2}
+  - {fileID: 11400000, guid: 0f99fb9f07a68c045a40f4e60b689b6d, type: 2}
+  - {fileID: 11400000, guid: a4fd4bbc8cf2223448bb1b3c032420d2, type: 2}
   m_BuildSettings:
     m_CompileScriptsInVirtualMode: 0
     m_CleanupStreamingAssetsAfterBuilds: 1
@@ -118,6 +123,8 @@ MonoBehaviour:
     - Locale-en-PT
     - Locale-es-ES
     - Locale-sv-SE
+    - Locale-ko
+    - Locale-zh-CN
   m_SchemaTemplates: []
   m_GroupTemplateObjects:
   - {fileID: 11400000, guid: 3d15de3f04647aa4d8a8dbdfb4685e52, type: 2}

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset
@@ -23,7 +23,7 @@ MonoBehaviour:
     m_SerializedLabels:
     - Locale
   - m_GUID: 5a8a5bd10c31a5f49a24b9e8f261aecf
-    m_Address: New Locale
+    m_Address: owospeak (en-OWO)
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale
@@ -82,6 +82,16 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale
+  - m_GUID: bbfbdebec15a4ae4e9c4484725124374
+    m_Address: Korean (ko)
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale
+  - m_GUID: 74ed30667b69fcc47a5ccfef2133f474
+    m_Address: Chinese (Simplified) (zh-CN)
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/...sableAssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-CN).asset b/...sableAssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-CN).asset
@@ -0,0 +1,60 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Localization-String-Tables-Chinese (Simplified) (zh-CN)
+  m_EditorClassIdentifier: 
+  m_GroupName: Localization-String-Tables-Chinese (Simplified) (zh-CN)
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 07be4aa11b567b54294a414f97084066
+  m_SerializeEntries:
+  - m_GUID: d2bc9a0bce4cc054db8b15d244aa97a0
+    m_Address: Contributors_zh-CN
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-zh-CN
+  - m_GUID: c776d20ed6b65e14fbc3252781e3ae17
+    m_Address: FirstBoot_zh-CN
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-zh-CN
+  - m_GUID: bf029b9bc0fa72d46b28cc2d30656153
+    m_Address: Mapper_zh-CN
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-zh-CN
+  - m_GUID: a7194ddefd6707d49b498942f3564daf
+    m_Address: Options_zh-CN
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-zh-CN
+  - m_GUID: e4fc4ce3d5f7f704c9f639aa56dfe5aa
+    m_Address: PersistentUI_zh-CN
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-zh-CN
+  - m_GUID: faffb37d790206f44b4a6543cc08ed46
+    m_Address: SongEditMenu_zh-CN
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-zh-CN
+  - m_GUID: b0d5da8bfc6a8c04e89a1318d525acf3
+    m_Address: SongSelectMenu_zh-CN
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-zh-CN
+  m_ReadOnly: 1
+  m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 0cd03c2ed04024748a9e05b720cb2a9e, type: 2}
+    - {fileID: 11400000, guid: 5709920e857cfa945960fa699f6cb442, type: 2}
diff --git a/...AssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-CN).asset.meta b/...AssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-CN).asset.meta
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Danish (da).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Danish (da).asset
@@ -27,13 +27,18 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-da
-  - m_GUID: 073d070e3bcac9d4396b082b94a7b4ec
-    m_Address: Contributors_da
+  - m_GUID: 2714755359cffe74ea01f6a87771bf25
+    m_Address: PersistentUI_da
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-da
-  - m_GUID: 831513a1beae93348a0fd9afa3f9d3d7
-    m_Address: Mapper_da
+  - m_GUID: 1c0e94dc5310b8f47b921fd03dba3b22
+    m_Address: FirstBoot_da
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-da
+  - m_GUID: 073d070e3bcac9d4396b082b94a7b4ec
+    m_Address: Contributors_da
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-da
@@ -42,8 +47,8 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-da
-  - m_GUID: 1c0e94dc5310b8f47b921fd03dba3b22
-    m_Address: FirstBoot_da
+  - m_GUID: 831513a1beae93348a0fd9afa3f9d3d7
+    m_Address: Mapper_da
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-da

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Danish.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Danish.asset
@@ -15,16 +15,11 @@ MonoBehaviour:
   m_GroupName: Localization-String-Tables-Danish
   m_Data:
     m_SerializedData: []
-  m_GUID: 84739dc0cad1f4f469aaac5ed5efeb6f
-  m_SerializeEntries:
-  - m_GUID: 2714755359cffe74ea01f6a87771bf25
-    m_Address: PersistentUI_da
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-da
+  m_GUID: e23e8b2f902e0bb44ac91bbfe747321d
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:
     m_Schemas:
-    - {fileID: 11400000, guid: 16ccedb9bec29524fb110d71474dedf9, type: 2}
-    - {fileID: 11400000, guid: f793ac4769a8444468e81d2c2645d745, type: 2}
+    - {fileID: 11400000, guid: 2e5bcec27f6e98342baa16c1053f6aab, type: 2}
+    - {fileID: 11400000, guid: 07e00f59d18357d409afc80337583a63, type: 2}
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Danish.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Danish.asset.meta
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Dutch (nl).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Dutch (nl).asset
@@ -27,13 +27,18 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-nl
-  - m_GUID: 629d8a24657e936408405d0528afe267
-    m_Address: Contributors_nl
+  - m_GUID: 5282ae513b6e95c439517a14b44cb1f2
+    m_Address: PersistentUI_nl
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-nl
-  - m_GUID: 93e4496d786ba6b48b7d4549a1d292e6
-    m_Address: Mapper_nl
+  - m_GUID: b285253f8003b1640b8be8066d53f0a5
+    m_Address: FirstBoot_nl
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-nl
+  - m_GUID: 629d8a24657e936408405d0528afe267
+    m_Address: Contributors_nl
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-nl
@@ -42,8 +47,8 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-nl
-  - m_GUID: b285253f8003b1640b8be8066d53f0a5
-    m_Address: FirstBoot_nl
+  - m_GUID: 93e4496d786ba6b48b7d4549a1d292e6
+    m_Address: Mapper_nl
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-nl

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Dutch.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Dutch.asset
@@ -15,16 +15,11 @@ MonoBehaviour:
   m_GroupName: Localization-String-Tables-Dutch
   m_Data:
     m_SerializedData: []
-  m_GUID: e62f659b1f527b044a635d927238be20
-  m_SerializeEntries:
-  - m_GUID: 5282ae513b6e95c439517a14b44cb1f2
-    m_Address: PersistentUI_nl
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-nl
+  m_GUID: e5277bae54c1ce04bbe6c4841e4353e8
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:
     m_Schemas:
-    - {fileID: 11400000, guid: 8e6a8558ec44c5b4d87c179a2a650dd2, type: 2}
-    - {fileID: 11400000, guid: 3998ba05529fad142b62f43e0b094a74, type: 2}
+    - {fileID: 11400000, guid: ca2b8ac3238376b4f80bf2b865cf80c9, type: 2}
+    - {fileID: 11400000, guid: 4eee3e0863989a84e8ea0597f04bc829, type: 2}
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Dutch.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Dutch.asset.meta
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset
@@ -27,13 +27,18 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-en
-  - m_GUID: 1411c398524482f409501269230bab2b
-    m_Address: Contributors_en
+  - m_GUID: 5b795ca38bfbbdd428d68e063bfd443e
+    m_Address: PersistentUI_en
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-en
-  - m_GUID: 7d243bcc9348bd34ab47236f8648b568
-    m_Address: Mapper_en
+  - m_GUID: 3ef08bb38c24ba24e8c4c1494c17d68a
+    m_Address: FirstBoot_en
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en
+  - m_GUID: 1411c398524482f409501269230bab2b
+    m_Address: Contributors_en
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-en
@@ -42,8 +47,8 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-en
-  - m_GUID: 3ef08bb38c24ba24e8c4c1494c17d68a
-    m_Address: FirstBoot_en
+  - m_GUID: 7d243bcc9348bd34ab47236f8648b568
+    m_Address: Mapper_en
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-en

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English.asset
@@ -15,16 +15,11 @@ MonoBehaviour:
   m_GroupName: Localization-String-Tables-English
   m_Data:
     m_SerializedData: []
-  m_GUID: eb2fa31c37a2aec49b1cfb9e994c6ff9
-  m_SerializeEntries:
-  - m_GUID: 5b795ca38bfbbdd428d68e063bfd443e
-    m_Address: PersistentUI_en
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-en
+  m_GUID: 8c01df2a9e2e9254099a9aabd160e28d
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:
     m_Schemas:
-    - {fileID: 11400000, guid: 2ab301ce2f66d624484c6408e684ca19, type: 2}
-    - {fileID: 11400000, guid: 5cc3618d04bc43c4887f014261c5e775, type: 2}
+    - {fileID: 11400000, guid: 3bd7409174d77d1408c6fa329a066500, type: 2}
+    - {fileID: 11400000, guid: 66e81696d3551764d923430a5a93be8b, type: 2}
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English.asset.meta
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Estonian (et).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Estonian (et).asset
@@ -27,13 +27,18 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-et
-  - m_GUID: b3ec86905fffa1d428a29becc38f9446
-    m_Address: Contributors_et
+  - m_GUID: 5821b4d1a0fe58d4ba6d85e9e1e6481a
+    m_Address: PersistentUI_et
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-et
-  - m_GUID: 11e7f3a057b90bd47aeef52511b23090
-    m_Address: Mapper_et
+  - m_GUID: 88a93aa9078b982408ef06c939101b08
+    m_Address: FirstBoot_et
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-et
+  - m_GUID: b3ec86905fffa1d428a29becc38f9446
+    m_Address: Contributors_et
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-et
@@ -42,8 +47,8 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-et
-  - m_GUID: 88a93aa9078b982408ef06c939101b08
-    m_Address: FirstBoot_et
+  - m_GUID: 11e7f3a057b90bd47aeef52511b23090
+    m_Address: Mapper_et
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-et

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Estonian.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Estonian.asset
@@ -15,16 +15,11 @@ MonoBehaviour:
   m_GroupName: Localization-String-Tables-Estonian
   m_Data:
     m_SerializedData: []
-  m_GUID: 36d61a25332e13d4ebe45cce9d8bb0b0
-  m_SerializeEntries:
-  - m_GUID: 5821b4d1a0fe58d4ba6d85e9e1e6481a
-    m_Address: PersistentUI_et
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-et
+  m_GUID: 32d2181c2354f8449b708994cc1ccf06
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:
     m_Schemas:
-    - {fileID: 11400000, guid: 1d4cba40167765d4cbbd22cf2b561056, type: 2}
-    - {fileID: 11400000, guid: ab6b8ebd57ec08c4a9972161f8ac8254, type: 2}
+    - {fileID: 11400000, guid: a7fff970297d4f54da1a3f7207aa1ab5, type: 2}
+    - {fileID: 11400000, guid: cc9f38982ee15b94bb7223b6a29c32b2, type: 2}
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Estonian.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Estonian.asset.meta