Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Resources/preform/gui/talent_gift.prefab.meta

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

meng_yao/Assets/Resources/preform/gui/talent_gift_input.prefab

@@ -0,0 +1,315 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7312455269240005508
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7312455269240005511}
+  - component: {fileID: 7312455269240005529}
+  - component: {fileID: 7312455269240005510}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7312455269240005511
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455269240005508}
+  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: 7312455270258174029}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 44, y: 44}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7312455269240005529
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455269240005508}
+  m_CullTransparentMesh: 1
+--- !u!114 &7312455269240005510
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455269240005508}
+  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: a43d977d647eb434ab52e744b0b25407, 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!1 &7312455269648156696
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7312455269648156699}
+  m_Layer: 5
+  m_Name: talent_gift_input
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7312455269648156699
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455269648156696}
+  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: 7312455270258174029}
+  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}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7312455269798856153
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7312455269798856152}
+  - component: {fileID: 7312455269798856154}
+  - component: {fileID: 7312455269798856155}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7312455269798856152
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455269798856153}
+  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: 7312455270258174029}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7312455269798856154
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455269798856153}
+  m_CullTransparentMesh: 1
+--- !u!114 &7312455269798856155
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455269798856153}
+  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: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8F93\u5165UID"
+--- !u!1 &7312455270258174026
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7312455270258174029}
+  - component: {fileID: 7312455270258174017}
+  - component: {fileID: 7312455270258174030}
+  - component: {fileID: 7312455270258174031}
+  - component: {fileID: 7312455270258174028}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7312455270258174029
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455270258174026}
+  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: 7312455269798856152}
+  - {fileID: 7312455269240005511}
+  m_Father: {fileID: 7312455269648156699}
+  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 &7312455270258174017
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455270258174026}
+  m_CullTransparentMesh: 1
+--- !u!114 &7312455270258174030
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455270258174026}
+  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: 6bf1af471e918cf43863ca4635a3a021, 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 &7312455270258174031
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455270258174026}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 1
+  m_VerticalFit: 1
+--- !u!114 &7312455270258174028
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455270258174026}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: -21
+    m_Right: 15
+    m_Top: 15
+    m_Bottom: 15
+  m_ChildAlignment: 4
+  m_Spacing: 497.92
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0

meng_yao/Assets/Resources/preform/gui/talent_gift_input.prefab.meta

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

meng_yao/Assets/Scenes/customInput_Scene.unity

@@ -190,6 +190,11 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!224 &422311333 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1125018133084166433, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
+  m_PrefabInstance: {fileID: 1125018133236624516}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1591218325
 GameObject:
   m_ObjectHideFlags: 0
@@ -284,6 +289,212 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1001 &1714897386
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 422311333}
+    m_Modifications:
+    - target: {fileID: 4095573733552839397, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4095573733552839397, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4095573733552839397, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 828
+      objectReference: {fileID: 0}
+    - target: {fileID: 4095573733552839397, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4095573733552839397, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739161407358038000, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739161407358038000, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739161407358038000, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739161407358038000, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739161407358038000, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8739161407358038000, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163023854629, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_Spacing
+      value: 43.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163023854630, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163023854630, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163023854630, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 683.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163023854630, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163023854630, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 414
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163023854630, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -199.99977
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382588, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259163357382589, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_Name
+      value: pop_up_ui
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259164145765606, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259164145765606, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259164316104016, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259164316104016, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259164316104016, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259164316104016, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259164316104016, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9071259164316104016, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+--- !u!224 &1714897387 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 9071259163023854630, guid: adc5dbda07662a241b726e4513e6e802, type: 3}
+  m_PrefabInstance: {fileID: 1714897386}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2105174906
 GameObject:
   m_ObjectHideFlags: 0
@@ -463,5 +674,363 @@ PrefabInstance:
       propertyPath: m_Name
       value: pop
       objectReference: {fileID: 0}
+    - target: {fileID: 1125018133084166437, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
+--- !u!1001 &3988933247048330384
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1714897387}
+    m_Modifications:
+    - target: {fileID: 378018514714711435, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514714711435, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514714711435, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 357.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514714711435, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 336.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514714711435, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -79
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514781356209, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514781356209, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514781356209, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514781356209, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514784053731, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514784053731, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514784053731, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514784053731, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514784053731, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018514784053731, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018515007944475, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018515007944475, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018515007944475, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 135
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018515007944475, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 72.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018515007944475, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -79
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516203360792, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516203360792, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516203360792, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 139
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516203360792, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516203360792, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 602
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516203360792, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -79
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516398197238, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516398197238, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516398197238, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516398197238, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 683.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 341.75
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -147.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429624, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 378018516400429625, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+      propertyPath: m_Name
+      value: talent_gift
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 60a15dac70dd2dc43b7636e8d3628997, type: 3}
+--- !u!1001 &7312455269372555657
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1714897387}
+    m_Modifications:
+    - target: {fileID: 7312455269240005511, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269240005511, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269240005511, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269240005511, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156696, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_Name
+      value: talent_gift_input
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269648156699, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269798856152, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269798856152, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269798856152, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455269798856152, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455270258174029, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7312455270258174029, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0960f2823ee98ab48b8a9545b58f63d0, type: 3}

meng_yao/Assets/Scenes/develop_the_main_interface_slices.unity

@@ -230,6 +230,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 65205169}
+  - component: {fileID: 65205171}
+  - component: {fileID: 65205170}
   m_Layer: 0
   m_Name: deisland02
   m_TagString: Untagged
@@ -254,6 +256,44 @@ Transform:
   m_Father: {fileID: 1077006413}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &65205170
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 65205168}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4828810cd0a388e438708b3693fe42b5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!61 &65205171
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 65205168}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.123535156, y: -0.13806939}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 3.3689752, y: 2.70043}
+  m_EdgeRadius: 0
 --- !u!1 &84930141
 GameObject:
   m_ObjectHideFlags: 0
@@ -2351,6 +2391,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1086280132}
+  - component: {fileID: 1086280134}
+  - component: {fileID: 1086280133}
   m_Layer: 0
   m_Name: deisland01
   m_TagString: Untagged
@@ -2375,6 +2417,44 @@ Transform:
   m_Father: {fileID: 1077006413}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1086280133
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1086280131}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8f20a8b8005e5ce46b9a3b97c4792820, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!61 &1086280134
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1086280131}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.14308095, y: -0.25754526}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 2.6025047, y: 1.6581719}
+  m_EdgeRadius: 0
 --- !u!1 &1095284821
 GameObject:
   m_ObjectHideFlags: 3

meng_yao/Assets/Scenes/main_scene.unity

@@ -384,7 +384,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   dissolveMaterial: {fileID: 2100000, guid: 55e741d1aba3d0c44917e893f6a834b6, type: 2}
   targetImage: {fileID: 304400298}
-  transitionSpeed: 1
+  transitionSpeed: 2.5
   isTransitioning: 1
 --- !u!1 &445174285
 GameObject:
@@ -1132,6 +1132,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: pop
       objectReference: {fileID: 0}
+    - target: {fileID: 1125018133084166437, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
 --- !u!224 &2002424411 stripped

meng_yao/Assets/communal/mount.cs

@@ -61,6 +61,11 @@ public class mount : MonoBehaviour
                 string jsonString = JsonUtility.ToJson(register);
                 string response = await web.SendRequest("http://47.109.133.52/Player/Register", "POST", jsonString); 
                 Debug.Log(response);
+
+
+                string response = await web.SendRequest("http://47.109.133.52/MinerElf/GetList", "POST");
+                Debug.Log(response);
+                
             }
         });
 

meng_yao/Assets/script/JumpScene/JinBidaoBtn.cs

@@ -32,6 +32,6 @@ public class JinBidaoBtn : MonoBehaviour
 
     void JUmpScem()
     {
-      //  SceneGuodu.instance.SlideInAndLoadScene(JumpScene.cultivation_Jinsha_mine_slices);
+        SceneGuodu.instance.SlideInAndLoadScene(JumpScene.cultivation_gold_coin_Island);
     }
 }

meng_yao/Assets/script/JumpScene/SceneGuodu.cs

@@ -33,7 +33,7 @@ public class SceneGuodu : MonoBehaviour
     {
         this.sceneName = sceneName;
         mask.transform.GetComponent<CircleDissolveEffect>().isTransitioning = false;
-        await Task.Delay(1100);
+        await Task.Delay(1000);
         SceneManager.LoadScene(sceneName);
 
     }

meng_yao/Assets/script/JumpScene/ZuanshiBtn.cs

@@ -32,6 +32,6 @@ public class ZuanshiBtn : MonoBehaviour
 
     void JUmpScem()
     {
-      //  SceneGuodu.instance.SlideInAndLoadScene(JumpScene.cultivation_Jinsha_mine_slices);
+        SceneGuodu.instance.SlideInAndLoadScene(JumpScene.cultivation_gem_island_slices);
     }
 }