Resolve merge conflicts

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

@@ -160,7 +160,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2919302046822192506}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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
@@ -234,9 +234,12 @@ MonoBehaviour:
     is_required: 0
     content: 
     Type: 0
+    icon: {fileID: 0}
+    details: 
   textobj: {fileID: 0}
   promptobj: {fileID: 0}
   contentobj: {fileID: 0}
+  details: {fileID: 0}
 --- !u!1 &2919302046862792451
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -26,13 +26,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6309443630211586364}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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: 6309443631721649518}
   - {fileID: 6309443631891643867}
+  - {fileID: 6309443630760581656}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -54,7 +55,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
-  m_VerticalFit: 0
+  m_VerticalFit: 2
 --- !u!114 &6309443630211586354
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -68,15 +69,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 7
+    m_Left: 0
-    m_Right: 266
+    m_Right: 0
     m_Top: 0
-    m_Bottom: -21
+    m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 1
-  m_Spacing: 66.25
+  m_Spacing: 66
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
+  m_ChildControlWidth: 1
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
@@ -101,9 +102,11 @@ MonoBehaviour:
     content: 
     Type: 0
     icon: {fileID: 0}
+    details: 
   textobj: {fileID: 0}
   promptobj: {fileID: 6309443631891643866}
   contentobj: {fileID: 0}
+  details: {fileID: 0}
 --- !u!1 &6309443630760581659
 GameObject:
   m_ObjectHideFlags: 0
@@ -134,13 +137,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6309443631891643867}
+  m_Father: {fileID: 6309443630211586365}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 349.7624, y: -16}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 180, y: 32}
+  m_SizeDelta: {x: 0, y: 32}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6309443630760581662
 CanvasRenderer:
@@ -216,7 +219,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 180, y: 32}
+  m_SizeDelta: {x: 0, y: 32}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6309443631721649516
 CanvasRenderer:
@@ -285,15 +288,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
+  m_Children: []
-  - {fileID: 6309443630760581656}
   m_Father: {fileID: 6309443630211586365}
   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: 179.7625, y: 43.6816}
+  m_SizeDelta: {x: 0, y: 43.6816}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6309443631891643865
 CanvasRenderer:

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

@@ -345,7 +345,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 414, y: -199.99948}
+  m_AnchoredPosition: {x: 414, y: -25}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &9071259163023854629
@@ -486,6 +486,7 @@ MonoBehaviour:
   boxTypes: []
   scroll_mode: 0
   minHeight: 400
+  is_force: 0
 --- !u!114 &5254082942373224363
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -38,7 +38,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 336.25, y: -79}
+  m_AnchoredPosition: {x: 340.39, y: -79}
   m_SizeDelta: {x: 357.9, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &378018514714711432
@@ -466,7 +466,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 602, y: -79}
+  m_AnchoredPosition: {x: 610.28, y: -79}
   m_SizeDelta: {x: 139, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &378018516203360773
@@ -751,9 +751,11 @@ MonoBehaviour:
     content: 
     Type: 0
     icon: {fileID: 0}
+    details: 
   textobj: {fileID: 0}
   promptobj: {fileID: 0}
   contentobj: {fileID: 0}
+  details: {fileID: 0}
 --- !u!1 &3518287654542512807
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -85,6 +85,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7312455269648156699}
+  - component: {fileID: 218572923371924387}
+  - component: {fileID: 1422487797370688703}
   m_Layer: 5
   m_Name: talent_gift_input
   m_TagString: Untagged
@@ -99,7 +101,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7312455269648156696}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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
@@ -113,6 +115,46 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &218572923371924387
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455269648156696}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &1422487797370688703
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7312455269648156696}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
 --- !u!1 &7312455269798856153
 GameObject:
   m_ObjectHideFlags: 0
@@ -230,10 +272,10 @@ RectTransform:
   m_Father: {fileID: 7312455269648156699}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 347.96002, y: -37}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 695.92004, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7312455270258174017
 CanvasRenderer:

meng_yao/Assets/communal/ugui/input_box_pop_up_window/input_box_pop_up_window.cs

@@ -17,6 +17,9 @@ public class BoxType
     public string content = "";
     public int Type = 0;
     public UnityEngine.UI.Image icon = null;
+    public string details = "";
+    public string button_0_text = "";
+    public string button_1_text = "";
 
 }
 public class input_box_pop_up_window : MonoBehaviour
@@ -25,6 +28,8 @@ public class input_box_pop_up_window : MonoBehaviour
     public GameObject contentList;
     public GameObject viewport;
     public GameObject scroll_view;
+    public GameObject button_0;
+    public GameObject button_1;
     public List<BoxType> boxTypes;
 
     public delegate void OnClikeWT(List<BoxType> boxTypes);//事件函数执行委托回调