Browse Source

远程协助可拖拽

蓝色星空 1 year ago
parent
commit
89a6c1e86f

+ 1 - 1
Assets/Game/Blue/ScriptableObject/PrefabsAsset.asset

@@ -19,4 +19,4 @@ MonoBehaviour:
   ShowDeviceControle: {fileID: 6107917270000557272, guid: c61a8008bf2355c42ad9c16cde9bc3eb, type: 3}
   ZeroDofPosX: 50
   ZeroDofPosY: 0
-  ZeroDofPosZ: 180
+  ZeroDofPosZ: 160

+ 148 - 0
Assets/Game/PrefabTemplate/DragBtn.prefab

@@ -0,0 +1,148 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4978441817649897854
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 170424872627209487}
+  - component: {fileID: 5530229627558832529}
+  - component: {fileID: 2509118806218586504}
+  - component: {fileID: 7397968760683577443}
+  - component: {fileID: 231380608763415301}
+  - component: {fileID: 6228095810160533040}
+  m_Layer: 0
+  m_Name: DragBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &170424872627209487
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4978441817649897854}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 250, y: 500, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  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: 0, y: 410}
+  m_SizeDelta: {x: 6, y: 0.2}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5530229627558832529
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4978441817649897854}
+  m_CullTransparentMesh: 0
+--- !u!114 &2509118806218586504
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4978441817649897854}
+  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: 0}
+  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!65 &7397968760683577443
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4978441817649897854}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 6.000007, y: 0.2, z: 44.090378}
+  m_Center: {x: 0, y: 0, z: -21.94519}
+--- !u!114 &231380608763415301
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4978441817649897854}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8f8ba16b6be60154694163e1357f21ab, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GrabbaleTransform: {fileID: 0}
+--- !u!114 &6228095810160533040
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4978441817649897854}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbccc4d71ae5b447bab3997600fbdce, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PointerEnter:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerDown:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerClick:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerUp:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerExit:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerDrag:
+    m_PersistentCalls:
+      m_Calls: []
+  Target: {fileID: 0}
+  StartAudio: 6
+  EndAudio: 5
+  headRotate: 1
+  oneGameControllerRotate: 1
+  canOneHandRotate: 0
+  canTwoHandRotate: 0
+  canTwoHandScale: 0
+  minScaleRatio: 0.8
+  maxScaleRatio: 3
+  isParentDrag: 0

+ 7 - 0
Assets/Game/PrefabTemplate/DragBtn.prefab.meta

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

+ 114 - 146
Assets/Game/ShowSupport/ShowRtc.prefab

@@ -364,152 +364,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &5171306778118596031
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 40443257493832142}
-  - component: {fileID: 5651319217263275344}
-  - component: {fileID: 2306115876040342857}
-  - component: {fileID: 7239548552036713634}
-  - component: {fileID: 136463795994038212}
-  - component: {fileID: 6105880871223122673}
-  m_Layer: 0
-  m_Name: DragBtn
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &40443257493832142
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5171306778118596031}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 250, y: 500, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5466424356445212017}
-  m_RootOrder: 4
-  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: 0, y: 410}
-  m_SizeDelta: {x: 6, y: 0.2}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5651319217263275344
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5171306778118596031}
-  m_CullTransparentMesh: 0
---- !u!114 &2306115876040342857
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5171306778118596031}
-  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: 0}
-  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!65 &7239548552036713634
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5171306778118596031}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 6.000007, y: 0.2, z: 44.090378}
-  m_Center: {x: 0, y: 0, z: -21.94519}
---- !u!114 &136463795994038212
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5171306778118596031}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8f8ba16b6be60154694163e1357f21ab, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  GrabbaleTransform: {fileID: 0}
---- !u!114 &6105880871223122673
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5171306778118596031}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0dbccc4d71ae5b447bab3997600fbdce, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  PointerEnter:
-    m_PersistentCalls:
-      m_Calls: []
-  PointerDown:
-    m_PersistentCalls:
-      m_Calls: []
-  PointerClick:
-    m_PersistentCalls:
-      m_Calls: []
-  PointerUp:
-    m_PersistentCalls:
-      m_Calls: []
-  PointerExit:
-    m_PersistentCalls:
-      m_Calls: []
-  PointerDrag:
-    m_PersistentCalls:
-      m_Calls: []
-  Target: {fileID: 5466424356445212017}
-  StartAudio: 6
-  EndAudio: 5
-  headRotate: 1
-  oneGameControllerRotate: 1
-  canOneHandRotate: 0
-  canTwoHandRotate: 0
-  canTwoHandScale: 0
-  minScaleRatio: 0.8
-  maxScaleRatio: 3
-  isParentDrag: 0
 --- !u!1 &5466424356445212314
 GameObject:
   m_ObjectHideFlags: 0
@@ -1434,6 +1288,112 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1001 &203460681350825153
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5466424356445212017}
+    m_Modifications:
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 410
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4978441817649897854, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: m_Name
+      value: DragBtn
+      objectReference: {fileID: 0}
+    - target: {fileID: 6228095810160533040, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+      propertyPath: Target
+      value: 
+      objectReference: {fileID: 5466424356445212017}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+--- !u!224 &40443257493832142 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 170424872627209487, guid: 4c51d05eb4e34a348bc27e9fdfcfdd9d, type: 3}
+  m_PrefabInstance: {fileID: 203460681350825153}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3209621791322341753
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1529,6 +1489,14 @@ PrefabInstance:
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
       objectReference: {fileID: 3651108695874027832}
+    - target: {fileID: 2658063448281961146, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: a43b8a9800829334c9c189d88cd35465, type: 3}
+    - target: {fileID: 2658063448281961146, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
+      propertyPath: m_Color.a
+      value: 0.60784316
+      objectReference: {fileID: 0}
     - target: {fileID: 6280916023673956047, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
       value: 4

+ 18 - 16
Assets/LangChaoRTC/Remote/ShowRoom/RoomMain.prefab

@@ -195,14 +195,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.60784316}
   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: 5e7ddc4b3a59d9d489b42af05a9639cb, type: 3}
+  m_Sprite: {fileID: 21300000, guid: baffd67ff587f504e8639636e0ff8885, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -669,7 +669,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: 25.2, y: -45.4}
+  m_AnchoredPosition: {x: 26.9, y: -45.4}
   m_SizeDelta: {x: 7.2, y: 7.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2241088650822641919
@@ -1920,7 +1920,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2241088651684221945}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -19.8, y: -45.399998, z: 0}
+  m_LocalPosition: {x: -18.1, y: -45.399998, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1954,7 +1954,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2241088651695864273}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -32.8, y: -45.399998, z: 0}
+  m_LocalPosition: {x: -31.1, y: -45.399998, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2892,7 +2892,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: -4.799999, y: -45.399998}
+  m_AnchoredPosition: {x: -3.1000004, y: -45.399998}
   m_SizeDelta: {x: 7.2, y: 7.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7735424442414073698
@@ -3049,14 +3049,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.627451}
+  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: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c34812c992ede944c9913fad203a4aa8, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3515,7 +3515,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8267190211904699470
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3533,8 +3533,8 @@ 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: -5.397555, y: 71.00154}
-  m_SizeDelta: {x: 0.40543675, y: 0.03}
+  m_AnchoredPosition: {x: 0.31, y: 49.77}
+  m_SizeDelta: {x: 0.62, y: 0.03}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5281888834527427313
 CanvasRenderer:
@@ -3585,7 +3585,7 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.412, y: 0.03, z: 0.008}
+  m_Size: {x: 0.62, y: 0.03, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &5451261645622976230
 MonoBehaviour:
@@ -3630,7 +3630,7 @@ MonoBehaviour:
   PointerDrag:
     m_PersistentCalls:
       m_Calls: []
-  Target: {fileID: 0}
+  Target: {fileID: 2241088652506551529}
   StartAudio: 6
   EndAudio: 5
   headRotate: 1
@@ -3929,9 +3929,9 @@ MonoBehaviour:
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
+    m_HighlightedSprite: {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
     m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
@@ -3961,6 +3961,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   SpriteList:
+  - {fileID: 21300000, guid: c34812c992ede944c9913fad203a4aa8, type: 3}
+  - {fileID: 21300000, guid: 29ab1df7e57804348be2b05c75c3fcf5, type: 3}
   - {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
   - {fileID: 21300000, guid: 7416d0026c4d26248a5fd85a85becef5, type: 3}
   mImage: {fileID: 8041133824467914880}
@@ -4195,7 +4197,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: 10.200001, y: -45.399998}
+  m_AnchoredPosition: {x: 11.9, y: -45.399998}
   m_SizeDelta: {x: 7.2, y: 7.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7347669372850126379

+ 2 - 2
Assets/UI/1027/2/Panel@2x(1).png.meta

@@ -42,7 +42,7 @@ TextureImporter:
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -119,7 +119,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: