Merge pull request #1999 from WEKIT-ECS/tutorial_refactor

Tutorial refactor
WEKIT-ECS · Jun 3, 2024 · 3f2e0ad · 3f2e0ad
2 parents 2af1b0a + bfda2b8
commit 3f2e0ad
Show file tree

Hide file tree

Showing 81 changed files with 1,189 additions and 1,599 deletions.
diff --git a/Assets/MirageXR/Design/MobileUI/Prefabs/ActivityItemBig_v2.prefab b/Assets/MirageXR/Design/MobileUI/Prefabs/ActivityItemBig_v2.prefab
@@ -33,7 +33,6 @@ RectTransform:
   - {fileID: 2766167982064553123}
   - {fileID: 1198290554684287741}
   m_Father: {fileID: 1646883810741187114}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -97,7 +96,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1198290554684287741}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -232,7 +230,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5089223818312175494}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -349,7 +346,6 @@ GameObject:
   - component: {fileID: 6826817828096098805}
   - component: {fileID: 9132651464677186986}
   - component: {fileID: 238221739091641371}
-  - component: {fileID: -6147915732671329338}
   m_Layer: 5
   m_Name: ActivityItemBig_v2
   m_TagString: Untagged
@@ -371,7 +367,6 @@ RectTransform:
   m_Children:
   - {fileID: 1646883810741187114}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -436,23 +431,6 @@ MonoBehaviour:
   _image: {fileID: 0}
   _defaultThumbnail: {fileID: 0}
   _btnMain: {fileID: 4492601342753435675}
---- !u!114 &-6147915732671329338
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2766167982673837580}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f8c9fc824b4042141a4efb6ec05f2905, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _getIdFromName: 0
-  _id: acitvity_list_item
-  _interactableObject: {fileID: 5261074480873801598}
-  _isPartOfScrollView: 1
-  _delay: 0
 --- !u!1 &3803819752317353182
 GameObject:
   m_ObjectHideFlags: 0
@@ -484,7 +462,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6554077248808070037}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -566,7 +543,6 @@ RectTransform:
   - {fileID: 469462901808462163}
   - {fileID: 5089223818312175494}
   m_Father: {fileID: 2766167982673837581}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.029166667, y: 0}
   m_AnchorMax: {x: 0.9736112, y: 1}
@@ -726,7 +702,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1646883810741187114}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -823,7 +798,6 @@ RectTransform:
   m_Children:
   - {fileID: 3118363280552677966}
   m_Father: {fileID: 1198290554684287741}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -899,7 +873,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1646883810741187114}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -976,7 +949,6 @@ RectTransform:
   - {fileID: 1106432955946395206}
   - {fileID: 6554077248808070037}
   m_Father: {fileID: 5089223818312175494}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1036,6 +1008,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 5089223818312175494}
     m_Modifications:
     - target: {fileID: 1968257828823201204, guid: 23969110428740946ac20c9be9ec26ca,
@@ -1149,6 +1122,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 23969110428740946ac20c9be9ec26ca, type: 3}
 --- !u!224 &3748957240987604526 stripped
 RectTransform:

diff --git a/Assets/MirageXR/Design/MobileUI/Prefabs/ActivityItemSmall_v2.prefab b/Assets/MirageXR/Design/MobileUI/Prefabs/ActivityItemSmall_v2.prefab
@@ -33,7 +33,6 @@ RectTransform:
   - {fileID: 2766167982064553123}
   - {fileID: 1198290554684287741}
   m_Father: {fileID: 1646883810741187114}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -97,7 +96,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1198290554684287741}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -232,7 +230,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5089223818312175494}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -350,7 +347,6 @@ GameObject:
   - component: {fileID: 6826817828096098805}
   - component: {fileID: 9132651464677186986}
   - component: {fileID: 238221739091641371}
-  - component: {fileID: 1130727148990581677}
   m_Layer: 5
   m_Name: ActivityItemSmall_v2
   m_TagString: Untagged
@@ -372,7 +368,6 @@ RectTransform:
   m_Children:
   - {fileID: 1646883810741187114}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -437,23 +432,6 @@ MonoBehaviour:
   _image: {fileID: 0}
   _defaultThumbnail: {fileID: 0}
   _btnMain: {fileID: 4492601342753435675}
---- !u!114 &1130727148990581677
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2766167982673837580}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f8c9fc824b4042141a4efb6ec05f2905, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _getIdFromName: 0
-  _id: acitvity_list_item
-  _interactableObject: {fileID: 5261074480873801598}
-  _isPartOfScrollView: 1
-  _delay: 0
 --- !u!1 &3803819752317353182
 GameObject:
   m_ObjectHideFlags: 0
@@ -485,7 +463,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6554077248808070037}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -562,7 +539,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1646883810741187114}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -664,7 +640,6 @@ RectTransform:
   - {fileID: 469462901808462163}
   - {fileID: 5089223818312175494}
   m_Father: {fileID: 2766167982673837581}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -824,7 +799,6 @@ RectTransform:
   m_Children:
   - {fileID: 3118363280552677966}
   m_Father: {fileID: 1198290554684287741}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -900,7 +874,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1646883810741187114}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -977,7 +950,6 @@ RectTransform:
   - {fileID: 1106432955946395206}
   - {fileID: 6554077248808070037}
   m_Father: {fileID: 5089223818312175494}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1037,6 +1009,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 5089223818312175494}
     m_Modifications:
     - target: {fileID: 1968257828823201204, guid: 23969110428740946ac20c9be9ec26ca,
@@ -1150,6 +1123,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 23969110428740946ac20c9be9ec26ca, type: 3}
 --- !u!224 &1349512067135058830 stripped
 RectTransform: