Resolve merge conflicts

2024-10-30 13:16:11 +08:00 · 2024-10-30 13:16:11 +08:00 · 96caa4d13e
commit 96caa4d13e
parent 52890f81d5 8550d5d74b
4 changed files with 12 additions and 576 deletions
--- a/meng_yao/Assets/Resources/preform/gui/Hero_Ui.prefab
+++ b/meng_yao/Assets/Resources/preform/gui/Hero_Ui.prefab
@ -863,9 +863,11 @@ MonoBehaviour:
    content: 
    Type: 0
    icon: {fileID: 0}
+    details: 
  textobj: {fileID: 0}
-  promptobj: {fileID: 0}
+  promptobj: {fileID: 5616551305478333436}
  contentobj: {fileID: 0}
+  details: {fileID: 5616551307087571641}
 --- !u!1 &5616551307087571641
 GameObject:
  m_ObjectHideFlags: 0
--- a/meng_yao/Assets/Resources/preform/gui/number_of_layers.prefab
+++ b/meng_yao/Assets/Resources/preform/gui/number_of_layers.prefab
@ -100,8 +100,9 @@ MonoBehaviour:
    is_required: 0
    content: 
    Type: 0
+    icon: {fileID: 0}
  textobj: {fileID: 0}
-  promptobj: {fileID: 0}
+  promptobj: {fileID: 6309443631891643866}
  contentobj: {fileID: 0}
 --- !u!1 &6309443630760581659
 GameObject:
--- a/meng_yao/Assets/Scenes/customInput_Scene.unity
+++ b/meng_yao/Assets/Scenes/customInput_Scene.unity
@ -190,11 +190,6 @@ 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
@ -289,212 +284,6 @@ 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
@ -680,357 +469,3 @@ PrefabInstance:
      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}
--- a/meng_yao/Assets/script/cultivation_Jinsha_mine_slices/jinsha.cs
+++ b/meng_yao/Assets/script/cultivation_Jinsha_mine_slices/jinsha.cs
@ -14,13 +14,14 @@ public class jinsha : mount
    }
    public void buy_miners()//购买金币矿工界面
    {
-        List<GameObject> gameObjects1 = new List<GameObject>();
+        
        List<BoxType> boxTypes = new List<BoxType>();
-        boxTypes.Add(new BoxType { Name = "矿工1文本", prompt = "矿工1", Type = 4, is_required = true });
-        boxTypes.Add(new BoxType { Name = "矿工1", prompt = "矿工1", Type = 3, is_required = true });
-        boxTypes.Add(new BoxType { Name = "挖矿设备1", prompt = "挖矿设备1", Type = 3, is_required = true });

-        boxTypes.Add(new BoxType { Name = "矿工1文本", prompt = "矿工1", Type = 4, is_required = true });
+        boxTypes.Add(new BoxType { Name = "矿工1文本", prompt = "第一层", Type = 4, is_required = true});
+        boxTypes.Add(new BoxType { Name = "矿工1", prompt = "红精灵", Type = 3, is_required = true, details = "100$" });
+        boxTypes.Add(new BoxType { Name = "挖矿设备1", prompt = "挖矿设备.红", Type = 3, is_required = true });
+
+        boxTypes.Add(new BoxType { Name = "矿工1文本", prompt = "第二层", Type = 4, is_required = true });
        boxTypes.Add(new BoxType { Name = "矿工1", prompt = "矿工1", Type = 3, is_required = true });
        boxTypes.Add(new BoxType { Name = "挖矿设备1", prompt = "挖矿设备1", Type = 3, is_required = true });

@ -45,12 +46,10 @@ public class jinsha : mount
        //gameObject.GetComponent<input_box_pop_up_window>().setScrollMode(0);//设置滚动模式为自动填充
        List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "购买人才");//测试输入框回调处理
        gameObjects[1].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//登录确定或取消
-        {
-            Debug.Log("====");          
+        {        
            if (type == 1)
            {
                OnType?.Invoke(0, 1);
-                Debug.Log("====0");
            }
        });
        gameObjects[2].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//登录确定或取消
@ -58,7 +57,6 @@ public class jinsha : mount
            if (type == 1)
            {
                OnType?.Invoke(1, 1);
-                Debug.Log("====1");
            }
        });