Merge pull request #443 from Caeden117/dev

0.8.523
Caeden117 · Jan 15, 2023 · fbf5a83 · fbf5a83
2 parents 4683a77 + 8c318fa
commit fbf5a83
Show file tree

Hide file tree

Showing 322 changed files with 23,295 additions and 5,853 deletions.
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset
@@ -45,6 +45,10 @@ MonoBehaviour:
     m_Address: Contributors Shared Data
     m_ReadOnly: 1
     m_SerializedLabels: []
+  - m_GUID: 4bc9586dd75931946bdf2f3334dc9397
+    m_Address: Assets/Locales/MultiMapping Shared Data.asset
+    m_ReadOnly: 1
+    m_SerializedLabels: []
   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
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-zh-CN
+  - m_GUID: c6cae85a8f2967440a80c58b576ed0de
+    m_Address: MultiMapping_zh-CN
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-zh-CN
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Danish (da).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Danish (da).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-da
+  - m_GUID: 2e301c99a49caf349bc2a20a75b3b023
+    m_Address: MultiMapping_da
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-da
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Dutch (nl).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Dutch (nl).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-nl
+  - m_GUID: c744f3c9fb2f76949be858d15be2cf75
+    m_Address: MultiMapping_nl
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-nl
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-en
+  - m_GUID: 28909bd567038004d9e8797b6646a259
+    m_Address: MultiMapping_en
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Estonian (et).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Estonian (et).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-et
+  - m_GUID: d3217ada3aed2f5458605655292739c2
+    m_Address: MultiMapping_et
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-et
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Finnish (fi).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Finnish (fi).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-fi
+  - m_GUID: 134c2954acc8efc4fb70ba056ad09572
+    m_Address: MultiMapping_fi
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-fi
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French (fr).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French (fr).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-fr
+  - m_GUID: 07eddf1b3052ac541a1e362426755f30
+    m_Address: MultiMapping_fr
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-fr
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-German (de).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-German (de).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-de
+  - m_GUID: 24d356e6749d0b543aadd134274f251a
+    m_Address: MultiMapping_de
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-de
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-ja
+  - m_GUID: d891dc5aac8cf334a9c462bcd33a73ee
+    m_Address: MultiMapping_ja
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-ja
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-ko
+  - m_GUID: 71eb52f195faf0641a10418075ea1ec2
+    m_Address: MultiMapping_ko
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-ko
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/...AddressableAssetsData/AssetGroups/Localization-String-Tables-Pirate English (en-PT).asset b/...AddressableAssetsData/AssetGroups/Localization-String-Tables-Pirate English (en-PT).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-en-PT
+  - m_GUID: fcc74104f0c98014a9620db02ab8c217
+    m_Address: MultiMapping_en-PT
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en-PT
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Russian (ru).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Russian (ru).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-ru
+  - m_GUID: 1227e212e98a4f04db1b48ade55ebcb8
+    m_Address: MultiMapping_ru
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-ru
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Spanish (es).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Spanish (es).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-es-ES
+  - m_GUID: f2488030d89bbba498981c627deef26c
+    m_Address: MultiMapping_es-ES
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-es-ES
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Swedish (sv).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Swedish (sv).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-sv-SE
+  - m_GUID: 257515d5c69571f40bf899c20aaa7e60
+    m_Address: MultiMapping_sv-SE
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-sv-SE
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-owospeak (en-OWO).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-owospeak (en-OWO).asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-en-OWO
+  - m_GUID: 6f66ca6c7e33cbb4abfcf0145e436701
+    m_Address: MultiMapping_en-OWO
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en-OWO
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
   m_SchemaSet: