Merge remote-tracking branch 'tech-mkt/main' into main

Author: ciro-unity

UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset

@@ -89,6 +89,12 @@ MonoBehaviour:
     m_SerializedLabels: []
     m_MainAsset: {fileID: 0}
     m_TargetAsset: {fileID: 0}
+  - m_GUID: 753c1cc38ecdc5a4b93227e74555c8d7
+    m_Address: Critters Shared Data
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
   m_SchemaSet:

UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-StringTables.asset

@@ -171,6 +171,20 @@ MonoBehaviour:
     - Locale-fr
     m_MainAsset: {fileID: 0}
     m_TargetAsset: {fileID: 0}
+  - m_GUID: 8d4813fc8788c4949b7fda8395a3840b
+    m_Address: Critters_en
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
+  - m_GUID: 379b9ca9db427c74bb0cd504865dea33
+    m_Address: Critters_fr
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-fr
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
   m_SchemaSet:

UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/PlantCritter.controller

@@ -356,6 +356,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
+  - m_Name: IsMoving
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

UOP1_Project/Assets/Scenes/TestingGround/Materials.meta renamed to UOP1_Project/Assets/Localization Files/Asset Tables/Critters.meta

@@ -0,0 +1,40 @@
+%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: 5b11a58205ec3474ca216360e9fa74a8, type: 3}
+  m_Name: Critters Shared Data
+  m_EditorClassIdentifier: 
+  m_TableCollectionName: Critters
+  m_TableCollectionNameGuidString: 753c1cc38ecdc5a4b93227e74555c8d7
+  m_Entries:
+  - m_Id: 8129245184
+    m_Key: PlantCritter
+    m_Metadata:
+      m_Items: []
+  - m_Id: 173183496192
+    m_Key: SlimeCritter
+    m_Metadata:
+      m_Items: []
+  - m_Id: 289701261312
+    m_Key: RockCritter
+    m_Metadata:
+      m_Items: []
+  m_Metadata:
+    m_Items: []
+  m_KeyGenerator:
+    id: 0
+  references:
+    version: 1
+    00000000:
+      type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables,
+        asm: Unity.Localization}
+      data:
+        m_CustomEpoch: 1610381038103

UOP1_Project/Assets/Localization Files/Asset Tables/Critters/Critters Shared Data.asset

@@ -0,0 +1,22 @@
+%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: 5be51871efa6c3e4eae1703925c8f5ac, type: 3}
+  m_Name: Critters
+  m_EditorClassIdentifier: 
+  m_SharedTableData: {fileID: 11400000, guid: 753c1cc38ecdc5a4b93227e74555c8d7, type: 2}
+  m_Tables:
+  - {fileID: 11400000, guid: 8d4813fc8788c4949b7fda8395a3840b, type: 2}
+  - {fileID: 11400000, guid: 379b9ca9db427c74bb0cd504865dea33, type: 2}
+  m_Extensions: []
+  m_Group: String Table
+  references:
+    version: 1

UOP1_Project/Assets/Localization Files/Asset Tables/Critters/Critters Shared Data.asset.meta

@@ -0,0 +1,34 @@
+%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: e9620f8c34305754d8cc9a7e49e852d9, type: 3}
+  m_Name: Critters_en
+  m_EditorClassIdentifier: 
+  m_LocaleId:
+    m_Code: en
+  m_SharedData: {fileID: 11400000, guid: 753c1cc38ecdc5a4b93227e74555c8d7, type: 2}
+  m_Metadata:
+    m_Items: []
+  m_TableData:
+  - m_Id: 8129245184
+    m_Localized: Plant Critter
+    m_Metadata:
+      m_Items: []
+  - m_Id: 173183496192
+    m_Localized: Slime Critter
+    m_Metadata:
+      m_Items: []
+  - m_Id: 289701261312
+    m_Localized: Rock Critter
+    m_Metadata:
+      m_Items: []
+  references:
+    version: 1