Browse Source

添加预制体脚本,ShowChoose界面当前机房显示

蓝色星空 1 year ago
parent
commit
44a312d37f

+ 8 - 0
Assets/Game/Blue/Prefabs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 21787087ba1d0a64cba9b06fe2ffc3cc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 377 - 0
Assets/Game/Blue/Prefabs/RoomName_Item.prefab

@@ -0,0 +1,377 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1438335765942971029
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 83985762761412844}
+  - component: {fileID: 6855198392126583077}
+  - component: {fileID: 143220577649231664}
+  m_Layer: 5
+  m_Name: RoomName_Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &83985762761412844
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1438335765942971029}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4564123340113973250}
+  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: 441.7, y: -75}
+  m_SizeDelta: {x: 827, y: 150}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6855198392126583077
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1438335765942971029}
+  m_CullTransparentMesh: 1
+--- !u!114 &143220577649231664
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1438335765942971029}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.7924528, g: 0.7924528, b: 0.7924528, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 60
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 6
+    m_MaxSize: 60
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "4A-23\u673A\u623F"
+--- !u!1 &6654862390303356522
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8368531927301695240}
+  - component: {fileID: 5232443900725815318}
+  - component: {fileID: 8816264744549849215}
+  m_Layer: 5
+  m_Name: XunJian
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8368531927301695240
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6654862390303356522}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4878111805784372726}
+  m_Father: {fileID: 4564123340113973250}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 374, y: 0}
+  m_SizeDelta: {x: 200, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5232443900725815318
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6654862390303356522}
+  m_CullTransparentMesh: 1
+--- !u!114 &8816264744549849215
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6654862390303356522}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.56078434, g: 0.7686275, b: 0.83921576, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6861891413660314999
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4564123340113973250}
+  - component: {fileID: 2558091159916306689}
+  - component: {fileID: 2168360187906729106}
+  - component: {fileID: 5422182490886855160}
+  - component: {fileID: 3358119731071747367}
+  m_Layer: 5
+  m_Name: RoomName_Item
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4564123340113973250
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6861891413660314999}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 83985762761412844}
+  - {fileID: 8368531927301695240}
+  m_Father: {fileID: 0}
+  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: -150}
+  m_SizeDelta: {x: 1096, y: 150}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &2558091159916306689
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6861891413660314999}
+  m_CullTransparentMesh: 1
+--- !u!114 &2168360187906729106
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6861891413660314999}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 156a5f68c69bfc4408ed80ec79837e4c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5422182490886855160
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6861891413660314999}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2168360187906729106}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &3358119731071747367
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6861891413660314999}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2bc10047abdc7f74f9ef03c39a269dd6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  RoomName_Text: {fileID: 143220577649231664}
+  XunJian_Text: {fileID: 5903777102771945592}
+--- !u!1 &7712303502936265290
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4878111805784372726}
+  - component: {fileID: 678764538287707885}
+  - component: {fileID: 5903777102771945592}
+  m_Layer: 5
+  m_Name: XunJian_Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4878111805784372726
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7712303502936265290}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8368531927301695240}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &678764538287707885
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7712303502936265290}
+  m_CullTransparentMesh: 1
+--- !u!114 &5903777102771945592
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7712303502936265290}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 60
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 6
+    m_MaxSize: 60
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5DF2\u5DE1\u68C0"

+ 7 - 0
Assets/Game/Blue/Prefabs/RoomName_Item.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c094e2ac4157cdb40b236ada28d075d6
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Game/Blue/ScriptableObject/BlueObject.cs

@@ -0,0 +1,8 @@
+using UnityEngine;
+
+[CreateAssetMenu(fileName ="PrefabsAsset",menuName ="ScriptableObject/BluePrefabs",order = 1 )]
+public class BlueObject : ScriptableObject
+{
+    //可以包含更多的数据,信息
+    public GameObject RoomName_Item; // ShowChoose 面板 -- 所在机房面板 ---子物体
+}

+ 11 - 0
Assets/Game/Blue/ScriptableObject/BlueObject.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 42bd45210da6ebd4eb8f07aaf741ea5f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
Assets/Game/Blue/ScriptableObject/PrefabsAsset.asset

@@ -0,0 +1,15 @@
+%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: 42bd45210da6ebd4eb8f07aaf741ea5f, type: 3}
+  m_Name: PrefabsAsset
+  m_EditorClassIdentifier: 
+  RoomName_Item: {fileID: 6861891413660314999, guid: c094e2ac4157cdb40b236ada28d075d6, type: 3}

+ 8 - 0
Assets/Game/Blue/ScriptableObject/PrefabsAsset.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d2576af9f7ec3f744825e84161cd125b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 4
Assets/Game/Blue/System/InstantiateSystem.cs

@@ -5,12 +5,16 @@ namespace GHZLangChao
 {
     public class InstantiateSystem : SingletonMonobehaviour<InstantiateSystem>
     {
-        //[SerializeField] private BlueObject blueObject;
-        //public BlueObject BlueObject => blueObject;
+        [SerializeField] private BlueObject blueObject;
+        public BlueObject BlueObject => blueObject;
 
-        public void InstantiatePrefab(GameObject prefab, GameObject parent = null)
+        public GameObject InstantiatePrefab(GameObject prefab, GameObject parent = null)
         {
-            Instantiate(prefab, parent.transform);
+            return Instantiate(prefab, parent.transform);
+        }
+        public GameObject InstantiatePrefab(GameObject prefab, Transform parent = null)
+        {
+            return Instantiate(prefab, parent);
         }
     }
 }

+ 8 - 8
Assets/Game/PrefabTemplate/DeviceInfo.prefab

@@ -157,7 +157,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 22.1, y: -27.7}
+  m_AnchoredPosition: {x: 3.9, y: -27.7}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3966841855204128104
@@ -554,7 +554,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -17.9, y: -27.7}
+  m_AnchoredPosition: {x: -94.9, y: -27.7}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5567018181965512716
@@ -631,7 +631,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 55.6, y: -1.7}
+  m_AnchoredPosition: {x: 127, y: -1.7}
   m_SizeDelta: {x: 31.1243, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9207843894968701855
@@ -712,7 +712,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -58.4, y: -27.7}
+  m_AnchoredPosition: {x: -189.3, y: -27.7}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9108376296709819145
@@ -789,7 +789,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -101.2, y: -27.7}
+  m_AnchoredPosition: {x: -257.8, y: -27.7}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8558787629604214587
@@ -865,7 +865,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -59.2, y: 19.2}
+  m_AnchoredPosition: {x: -215, y: 19.2}
   m_SizeDelta: {x: 101.1, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &835009461542761230
@@ -946,7 +946,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -95.48787, y: -1.7}
+  m_AnchoredPosition: {x: -248.8, y: -1.7}
   m_SizeDelta: {x: 31.1243, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2044278242464778515
@@ -1107,7 +1107,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -18.100052, y: -1.7}
+  m_AnchoredPosition: {x: -49, y: -1.7}
   m_SizeDelta: {x: 31.1243, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5019178714115637395

File diff suppressed because it is too large
+ 320 - 409
Assets/Game/ShowChoose/ShowChoose.prefab


+ 14 - 6
Assets/Game/ShowChoose/ShowChoosePanelSelect.cs

@@ -1,18 +1,26 @@
-using System.Net.Mime;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
-using Blue;
 using UnityEngine.UI;
 
 namespace GHZLangChao
 {
     public class ShowChoosePanelSelect : AbstractController
     {
-        public Text currentRoom_Text;
+        [SerializeField] private Text currentRoom_Text;  // 当前房间名
+        [SerializeField] private Transform Content;
+
+        private SelectListRoomName_Item roomName_Item; // item
         void Start()
         {
-            //MachineRoomManager.Instance.data;
+            currentRoom_Text.text = UICallManager.Instance.GetMachineRoomList()[0];
+
+            // 实例化 item
+            for (int i = 0;i< UICallManager.Instance.GetMachineRoomList().Count;i++)
+            {
+                GameObject item = Instantiate(InstantiateSystem.Instance.BlueObject.RoomName_Item, Content);
+                roomName_Item = item .GetComponent<SelectListRoomName_Item>();
+                roomName_Item.RoomName_Text.text = MachineRoomManager.Instance.listRoomName[i];
+                item.name = UICallManager.Instance.GetMachineRoomList()[i];
+            }
         }
     }
 }

+ 1 - 1
Assets/Game/ShowLogin/LangChaoLogin.cs

@@ -18,7 +18,7 @@ namespace GHZLangChao
 
         private void LoginSuccess(LoginSuccessEvent e)
         {
-            //MachineRoomManager.Instance.Init();
+            MachineRoomManager.Instance.Init();
 
             ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
         }

+ 119 - 118
Assets/Resources/DataItem.prefab

@@ -418,7 +418,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &7206794767239322300
 Transform:
   m_ObjectHideFlags: 0
@@ -498,6 +498,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ID: 0
+  tagId: 0
   offsetPos: {x: 0, y: 0, z: 0}
   eulerAxle: 0
   idText: {fileID: 7206794765974243573}
@@ -637,22 +638,22 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 638018108086236768}
-  - {fileID: 638018108537498916}
-  - {fileID: 638018108904363029}
-  - {fileID: 638018107599893055}
-  - {fileID: 638018108750441236}
-  - {fileID: 638018108953112647}
-  - {fileID: 638018108012001193}
-  - {fileID: 638018108725057432}
-  - {fileID: 638018107872973570}
-  - {fileID: 638018109067137140}
+  - {fileID: 6124971086886603319}
+  - {fileID: 4551009965501842212}
+  - {fileID: 1172600622735557827}
+  - {fileID: 5079335866014139293}
+  - {fileID: 2246719232629480205}
+  - {fileID: 3531786218059849729}
+  - {fileID: 3214806319551218889}
+  - {fileID: 7049990998659694264}
+  - {fileID: 3459951591940662328}
   m_Father: {fileID: 8961025229376520074}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.0008605695, y: 0}
-  m_SizeDelta: {x: 0, y: 1305}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &8961025228171187535
 MonoBehaviour:
@@ -667,12 +668,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: -28
-    m_Right: 13
-    m_Top: 35
+    m_Left: 0
+    m_Right: 0
+    m_Top: 70
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 30
+  m_Spacing: 230
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -840,7 +841,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -17}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8961025229376520079
 CanvasRenderer:
@@ -893,7 +894,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
---- !u!1001 &8961025227604113261
+--- !u!1001 &1537943627586142133
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -902,7 +903,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1475626945930305025, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Name
-      value: DeviceInfo
+      value: DeviceInfo (8)
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Pivot.x
@@ -914,7 +915,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_RootOrder
-      value: 0
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.x
@@ -922,7 +923,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -930,11 +931,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 262.1949
+      value: 625.39
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.y
@@ -970,11 +971,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 293.22714
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -990,12 +991,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
---- !u!224 &638018108086236768 stripped
+--- !u!224 &7049990998659694264 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
-  m_PrefabInstance: {fileID: 8961025227604113261}
+  m_PrefabInstance: {fileID: 1537943627586142133}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8961025227664750244
+--- !u!1001 &2414213219418442554
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1004,7 +1005,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1475626945930305025, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Name
-      value: DeviceInfo (6)
+      value: DeviceInfo (1)
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Pivot.x
@@ -1016,7 +1017,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.x
@@ -1024,7 +1025,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1032,11 +1033,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 262.1949
+      value: 625.39
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1072,11 +1073,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 293.22714
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -865
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1092,12 +1093,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
---- !u!224 &638018108012001193 stripped
+--- !u!224 &6124971086886603319 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
-  m_PrefabInstance: {fileID: 8961025227664750244}
+  m_PrefabInstance: {fileID: 2414213219418442554}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8961025227722320937
+--- !u!1001 &3673859698483495568
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1106,7 +1107,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1475626945930305025, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Name
-      value: DeviceInfo (1)
+      value: DeviceInfo (4)
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Pivot.x
@@ -1118,7 +1119,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.x
@@ -1126,7 +1127,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1134,11 +1135,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 262.1949
+      value: 625.39
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1174,11 +1175,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 293.22714
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -215
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1194,12 +1195,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
---- !u!224 &638018108537498916 stripped
+--- !u!224 &5079335866014139293 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
-  m_PrefabInstance: {fileID: 8961025227722320937}
+  m_PrefabInstance: {fileID: 3673859698483495568}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8961025228000012825
+--- !u!1001 &4937477109388715317
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1208,7 +1209,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1475626945930305025, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Name
-      value: DeviceInfo (4)
+      value: DeviceInfo (9)
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Pivot.x
@@ -1220,7 +1221,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.x
@@ -1228,7 +1229,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1236,11 +1237,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 262.1949
+      value: 625.39
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1276,11 +1277,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 293.22714
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -605
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1296,12 +1297,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
---- !u!224 &638018108750441236 stripped
+--- !u!224 &3459951591940662328 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
-  m_PrefabInstance: {fileID: 8961025228000012825}
+  m_PrefabInstance: {fileID: 4937477109388715317}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8961025228042262165
+--- !u!1001 &5008612169152258316
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1310,7 +1311,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1475626945930305025, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Name
-      value: DeviceInfo (7)
+      value: DeviceInfo (6)
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Pivot.x
@@ -1322,7 +1323,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.x
@@ -1330,7 +1331,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1338,11 +1339,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 262.1949
+      value: 625.39
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1378,11 +1379,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 293.22714
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -995
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1398,12 +1399,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
---- !u!224 &638018108725057432 stripped
+--- !u!224 &3531786218059849729 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
-  m_PrefabInstance: {fileID: 8961025228042262165}
+  m_PrefabInstance: {fileID: 5008612169152258316}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8961025228249600377
+--- !u!1001 &5451934534257279529
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1412,7 +1413,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1475626945930305025, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Name
-      value: DeviceInfo (9)
+      value: DeviceInfo (2)
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Pivot.x
@@ -1424,7 +1425,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.x
@@ -1432,7 +1433,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1440,11 +1441,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 262.1949
+      value: 625.39
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1480,11 +1481,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 293.22714
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -1255
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1500,12 +1501,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
---- !u!224 &638018109067137140 stripped
+--- !u!224 &4551009965501842212 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
-  m_PrefabInstance: {fileID: 8961025228249600377}
+  m_PrefabInstance: {fileID: 5451934534257279529}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8961025228339523914
+--- !u!1001 &6348966831136376260
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1514,7 +1515,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1475626945930305025, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Name
-      value: DeviceInfo (5)
+      value: DeviceInfo (7)
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Pivot.x
@@ -1526,7 +1527,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.x
@@ -1534,7 +1535,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1542,11 +1543,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 262.1949
+      value: 625.39
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1582,11 +1583,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 293.22714
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -735
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1602,12 +1603,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
---- !u!224 &638018108953112647 stripped
+--- !u!224 &3214806319551218889 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
-  m_PrefabInstance: {fileID: 8961025228339523914}
+  m_PrefabInstance: {fileID: 6348966831136376260}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8961025228424992024
+--- !u!1001 &7261118632927233486
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1616,7 +1617,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1475626945930305025, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Name
-      value: DeviceInfo (2)
+      value: DeviceInfo (3)
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Pivot.x
@@ -1628,7 +1629,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.x
@@ -1636,7 +1637,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1644,11 +1645,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 262.1949
+      value: 625.39
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1684,11 +1685,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 293.22714
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -345
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1704,12 +1705,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
---- !u!224 &638018108904363029 stripped
+--- !u!224 &1172600622735557827 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
-  m_PrefabInstance: {fileID: 8961025228424992024}
+  m_PrefabInstance: {fileID: 7261118632927233486}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8961025229200896818
+--- !u!1001 &7758776215707326976
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1718,7 +1719,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1475626945930305025, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Name
-      value: DeviceInfo (3)
+      value: DeviceInfo (5)
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Pivot.x
@@ -1730,7 +1731,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.x
@@ -1738,7 +1739,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1746,11 +1747,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 262.1949
+      value: 625.39
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1786,11 +1787,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 293.22714
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -475
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1806,12 +1807,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
---- !u!224 &638018107599893055 stripped
+--- !u!224 &2246719232629480205 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
-  m_PrefabInstance: {fileID: 8961025229200896818}
+  m_PrefabInstance: {fileID: 7758776215707326976}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8961025229406999055
+--- !u!1001 &8961025227604113261
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1820,7 +1821,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1475626945930305025, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Name
-      value: DeviceInfo (8)
+      value: DeviceInfo
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_Pivot.x
@@ -1832,7 +1833,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.x
@@ -1840,7 +1841,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1848,11 +1849,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 262.1949
+      value: 625.39
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1888,11 +1889,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 293.22714
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -1125
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1908,8 +1909,8 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
---- !u!224 &638018107872973570 stripped
+--- !u!224 &638018108086236768 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
-  m_PrefabInstance: {fileID: 8961025229406999055}
+  m_PrefabInstance: {fileID: 8961025227604113261}
   m_PrefabAsset: {fileID: 0}

Some files were not shown because too many files changed in this diff