Kaynağa Gözat

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

zg 4 gün önce
ebeveyn
işleme
62a86af4b3

+ 7 - 0
Assets/Res/Config/DaoyouGiftConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: B3NJ5yOlW31whr5vAMyg59A1nJrZSHeIE1O3ZY7QEvpluVlggZ+M6RgrMkQS
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Assets/Res/Config/DaoyouguajiResourcLevel.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: By8ZvXikU36Zq42PZhCvXyIj7HkedxnJrAb/t4n20gp3bQeQmP5JYNWlEHD8
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Assets/Res/Config/guajibuff.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CHlO5Hn4Ai4qbtF69betjCMAvVCM1LUlY+BiucV0NS3iAW/G0vSSkrPjJMNh
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 118 - 833
Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -314,7 +314,7 @@ GameObject:
   - component: {fileID: 5464397175096271046}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (1)
+  m_Name: Text_Count
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1535,7 +1535,7 @@ GameObject:
   - component: {fileID: 5933472359129119892}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Content
+  m_Name: GiveGiftContent
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1552,20 +1552,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1444148139607006161}
-  - {fileID: 3765454244016590533}
-  - {fileID: 1735292111134850528}
-  - {fileID: 38754111971326593}
-  - {fileID: 8868005295439462640}
-  - {fileID: 48861283584319273}
-  - {fileID: 8827150312465752523}
+  m_Children: []
   m_Father: {fileID: 8432637264575425488}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -22.547363, y: 217.48}
+  m_SizeDelta: {x: -22.547363, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &3562994113173717176
 MonoBehaviour:
@@ -2781,7 +2774,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 7374309657934420695}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1
@@ -4074,7 +4067,7 @@ GameObject:
   - component: {fileID: 4244724569272670404}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (2)
+  m_Name: Text_GiveGiftDesc
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4926,6 +4919,69 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5622873818283262262
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3439678394626154240}
+  - component: {fileID: 1546035446331631953}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: WidgetItemRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3439678394626154240
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5622873818283262262}
+  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: 1
+  m_Children: []
+  m_Father: {fileID: 1744558580528090098}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 7.700012, y: 12.27}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &1546035446331631953
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5622873818283262262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, 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!1 &5956694529114906883
 GameObject:
   m_ObjectHideFlags: 0
@@ -5671,8 +5727,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: 85.25252, y: 0}
-  m_SizeDelta: {x: 99.105, y: 30}
+  m_AnchoredPosition: {x: 56.406612, y: 0}
+  m_SizeDelta: {x: 128.7393, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &686079759204038695
 CanvasRenderer:
@@ -5709,7 +5765,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 2
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -6156,7 +6212,7 @@ GameObject:
   - component: {fileID: 4613580176866528582}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Slider
+  m_Name: Slider_Give
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -7183,820 +7239,49 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: GiveGiftContent
+    gameObject: {fileID: 7374309657934420695}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Give
+    gameObject: {fileID: 2219016568426203274}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Reduce
+    gameObject: {fileID: 8265382223966334198}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Add
+    gameObject: {fileID: 6242598047090904644}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Max
+    gameObject: {fileID: 503743259712263579}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Count
+    gameObject: {fileID: 5464397175096271046}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: WidgetItemRoot
+    gameObject: {fileID: 3439678394626154240}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_GiveGiftDesc
+    gameObject: {fileID: 4244724569272670404}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Slider_Give
+    gameObject: {fileID: 4613580176866528582}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
---- !u!1001 &75676171679338492
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7374309657934420695}
-    m_Modifications:
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 61
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -50
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Name
-      value: WidgetItem
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
---- !u!224 &1444148139607006161 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-  m_PrefabInstance: {fileID: 75676171679338492}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &941957092078741965
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7374309657934420695}
-    m_Modifications:
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 334.26
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -50
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Name
-      value: WidgetItem (2)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
---- !u!224 &1735292111134850528 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-  m_PrefabInstance: {fileID: 941957092078741965}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &1553689850649734828
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7374309657934420695}
-    m_Modifications:
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 470.89
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -50
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Name
-      value: WidgetItem (3)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
---- !u!224 &38754111971326593 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-  m_PrefabInstance: {fileID: 1553689850649734828}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &1561597964599266052
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7374309657934420695}
-    m_Modifications:
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 61
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -167.48
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Name
-      value: WidgetItem (5)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
---- !u!224 &48861283584319273 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-  m_PrefabInstance: {fileID: 1561597964599266052}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &2398143335654038248
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7374309657934420695}
-    m_Modifications:
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 197.63
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -50
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Name
-      value: WidgetItem (1)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
---- !u!224 &3765454244016590533 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-  m_PrefabInstance: {fileID: 2398143335654038248}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &4231781943546383149
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 1744558580528090098}
-    m_Modifications:
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 7.700012
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 12.27
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Name
-      value: WidgetItem
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
---- !u!224 &3439678394626154240 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-  m_PrefabInstance: {fileID: 4231781943546383149}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &7932815676698940637
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7374309657934420695}
-    m_Modifications:
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 607.52
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -50
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Name
-      value: WidgetItem (4)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
---- !u!224 &8868005295439462640 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-  m_PrefabInstance: {fileID: 7932815676698940637}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &8036155079940011494
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7374309657934420695}
-    m_Modifications:
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 197.63
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -167.48
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-      propertyPath: m_Name
-      value: WidgetItem (6)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
---- !u!224 &8827150312465752523 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
-  m_PrefabInstance: {fileID: 8036155079940011494}
-  m_PrefabAsset: {fileID: 0}

+ 91 - 0
Assets/Res/UI/DaoYouPanel/DaoYouWidget.prefab

@@ -80,6 +80,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7384\u7389"
+--- !u!1 &2295808650338809710
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1623775965119322130}
+  - component: {fileID: 7362884660115140346}
+  - component: {fileID: 4679484674909818624}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_DaoyouLvName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1623775965119322130
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2295808650338809710}
+  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: 5070300881352391495}
+  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: 6.6, y: -82.93171}
+  m_SizeDelta: {x: 160, y: 22.3406}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7362884660115140346
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2295808650338809710}
+  m_CullTransparentMesh: 1
+--- !u!114 &4679484674909818624
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2295808650338809710}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
 --- !u!1 &2295909799698196562
 GameObject:
   m_ObjectHideFlags: 0
@@ -117,6 +197,7 @@ RectTransform:
   - {fileID: 3875262291450751451}
   - {fileID: 6643801910764169905}
   - {fileID: 9093301904999720884}
+  - {fileID: 1623775965119322130}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -180,6 +261,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_DaoyouLvName
+    gameObject: {fileID: 4679484674909818624}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Type
+    gameObject: {fileID: 8294741053282449296}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &4195260018294081106
 GameObject:

+ 1 - 1
Assets/Res/UI/DaoYouPanel/DaoYouaaFfix Widget.prefab → Assets/Res/UI/DaoYouPanel/DaoYouaaFfixWidget.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 7982240772326421710}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: DaoYouaaFfix Widget
+  m_Name: DaoYouaaFfixWidget
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

+ 0 - 0
Assets/Res/UI/DaoYouPanel/DaoYouaaFfix Widget.prefab.meta → Assets/Res/UI/DaoYouPanel/DaoYouaaFfixWidget.prefab.meta


+ 11 - 0
Assets/Scripts/GameData/ExcelConfig/DaoyouGiftConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: D3lNvXn+V3vrAjDpZH/B+Vyo+jlFREoUkiJcxPy0zq8yx8Bdz0xjzm0LV2+2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 11 - 0
Assets/Scripts/GameData/ExcelConfig/DaoyouguajiResourcLevel.cs.meta

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

+ 11 - 0
Assets/Scripts/GameData/ExcelConfig/guajibuff.cs.meta

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

+ 1 - 1
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -100,7 +100,7 @@ namespace Fort23.Mono
             Btn_Back.onClick.AddListener(() =>
             {
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
-                currentOpenUIPanel = null;
+                // currentOpenUIPanel = null;
                 // UIManager.Instance.GetComponent<MainPanel>().Show();
                 // MainPanel.OpenPanel();
             });

+ 184 - 24
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -15,8 +17,11 @@ namespace Fort23.Mono
         private DaoyouModelConfig _daoyouModelConfig;
 
         List<WidgetItem> widgetItems = new List<WidgetItem>();
+        List<WidgetItem> giveWidgetItems = new List<WidgetItem>();
         List<DaoYouLevelWidget> _daoYouLevelWidgets = new List<DaoYouLevelWidget>();
 
+        private DaoyouGiftConfig[] daoyouGiftConfigs;
+
         private void Init()
         {
             IsShowAppBar = true;
@@ -31,11 +36,80 @@ namespace Fort23.Mono
         {
         }
 
+        public override void AddButtonEvent()
+        {
+            Btn_Facorability.onClick.AddListener(() =>
+            {
+                Info.SetActive(false);
+                Facorability.SetActive(true);
+            });
+            Btn_InfoMation.onClick.AddListener(() =>
+            {
+                Info.SetActive(true);
+                Facorability.SetActive(false);
+            });
+
+            Btn_SendGift.onClick.AddListener(async () =>
+            {
+                AppBarPanel.ClosePanel();
+                await UpdateGiveGiftRoot();
+                GiveGite.gameObject.SetActive(true);
+            });
+
+            Btn_Back.onClick.AddListener(() =>
+            {
+                ClosePoolGive();
+                GiveGite.gameObject.SetActive(false);
+                AppBarPanel.OpenPanel(this);
+            });
+
+            Btn_Add.onClick.AddListener(Add);
+            Btn_Reduce.onClick.AddListener(Reduce);
+
+            Btn_Max.onClick.AddListener(() => { Slider_Give.value = (int)widgetItem1.itemInfo.count.Value; });
+            Slider_Give.onValueChanged.AddListener((i) =>
+            {
+                count = (int)i;
+                UpdateGiveItemCount();
+            });
+
+            Btn_Give.onClick.AddListener(() =>
+            {
+                if (widgetItem1 == null)
+                {
+                    return;
+                }
+
+                if (daoyouGiftConfig.ID == 0)
+                    return;
+
+
+                PlayerManager.Instance.BagController.DeductItem(daoyouGiftConfig.ItemID, count);
+
+                daoYouData.exp += daoyouGiftConfig.emotionValue * count;
+
+                DaoyouLevelupConfig[] configs = ConfigComponent.Instance.GetAll<DaoyouLevelupConfig>();
+
+                for (var i = daoYouData.favorabilityLv; i < configs.Length; i++)
+                {
+                    if (daoYouData.exp >= configs[i].exp)
+                    {
+                        daoYouData.exp -= configs[i].exp;
+                        daoYouData.favorabilityLv++;
+                    }
+                }
+
+                AccountFileInfo.Instance.SavePlayerData();
+                UpdateUI();
+                UpdateGiveGiftRoot();
+            });
+        }
+
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             daoYouData = uiData[0] as AccountFileInfo.DaoYouData;
             _daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(daoYouData.id);
-
+            daoyouGiftConfigs = ConfigComponent.Instance.GetAll<DaoyouGiftConfig>();
             await UpdateUI();
             return await base.AsyncInit(uiData);
         }
@@ -55,10 +129,25 @@ namespace Fort23.Mono
 
             _daoYouLevelWidgets.Clear();
 
+            Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
+
+            int index = 0;
+            for (var i = 0; i < _daoyouModelConfig.desUnlockLv.Length; i++)
+            {
+                if (daoYouData.favorabilityLv >= _daoyouModelConfig.desUnlockLv[i])
+                {
+                    index = i;
+                }
+            }
+
+            Text_Desc.text = LanguageManager.Instance.Text(_daoyouModelConfig.des[index]);
 
-            DaoyouLevelupConfig currentDaoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.id);
+
+            DaoyouLevelupConfig currentDaoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
+            Text_CurrentName.text = LanguageManager.Instance.Text(currentDaoyouLevelupConfig.name);
             Text_CurrentLevel.text = daoYouData.favorabilityLv.ToString();
-            // Slider_LeveUp.maxValue = currentDaoyouLevelupConfig.
+            Slider_LeveUp.maxValue = currentDaoyouLevelupConfig.exp;
+            Text_Exp.text = $"{daoYouData.exp}/{currentDaoyouLevelupConfig.exp}";
             Slider_LeveUp.value = daoYouData.exp;
 
             if (_daoyouModelConfig.PreferGiftID != null)
@@ -79,50 +168,118 @@ namespace Fort23.Mono
             foreach (var daoyouLevelupConfig in configs)
             {
                 DaoYouLevelWidget daoYouLevelWidget = await UIManager.Instance.CreateGComponent<DaoYouLevelWidget>(null, DaoYouLevelWidgetContent);
-                daoYouLevelWidget.CustomInit(daoYouData,daoyouLevelupConfig.ID);
+                daoYouLevelWidget.CustomInit(daoYouData, daoyouLevelupConfig.ID);
                 _daoYouLevelWidgets.Add(daoYouLevelWidget);
             }
         }
 
-        public override CTask GetFocus()
+
+        public async CTask UpdateGiveGiftRoot()
         {
-            AppBarPanel.OpenPanel(this);
-            return base.GetFocus();
+            ClosePoolGive();
+            foreach (var daoyouGiftConfig in daoyouGiftConfigs)
+            {
+                if (PlayerManager.Instance.BagController.GetItemCount(daoyouGiftConfig.ItemID) > 0)
+                {
+                    ItemInfo itemInfo = PlayerManager.Instance.BagController.GetItemInfo(daoyouGiftConfig.ItemID);
+                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, GiveGiftContent);
+                    widgetItem.InitWidget(itemInfo);
+                    widgetItem.OnClick = OnClick;
+                    giveWidgetItems.Add(widgetItem);
+                }
+            }
         }
 
-        public override void AddButtonEvent()
+        DaoyouGiftConfig daoyouGiftConfig = default;
+        private int count = 1;
+        private WidgetItem widgetItem1;
+
+        private async void OnClick(ItemWidgetBasic obj)
         {
-            Btn_Facorability.onClick.AddListener(() =>
+            WidgetItem widgetItem = obj as WidgetItem;
+            if (widgetItem1 == null)
             {
-                Info.SetActive(false);
-                Facorability.SetActive(true);
-            });
-            Btn_InfoMation.onClick.AddListener(() =>
+                widgetItem1 = await UIManager.Instance.CreateGComponent<WidgetItem>(null, WidgetItemRoot);
+                widgetItem1.transform.GetComponent<RectTransform>().anchoredPosition = Vector2.zero;
+            }
+
+            widgetItem1.InitWidget(widgetItem.itemInfo);
+
+            foreach (var giftConfig in daoyouGiftConfigs)
             {
-                Info.SetActive(true);
-                Facorability.SetActive(false);
-            });
+                if (giftConfig.ItemID == widgetItem.itemInfo.itemID)
+                {
+                    daoyouGiftConfig = giftConfig;
+                    break;
+                }
+            }
+
+            Slider_Give.maxValue = widgetItem.itemInfo.count.Value;
+            Slider_Give.minValue = 1;
+
+            UpdateGiveItemCount();
+        }
 
-            Btn_SendGift.onClick.AddListener(() =>
+        private void Reduce()
+        {
+            count--;
+            if (count < 1)
             {
-                GiveGite.gameObject.SetActive(true);
-                AppBarPanel.ClosePanel();
-            });
+                count = 1;
+            }
 
-            Btn_Back.onClick.AddListener(() =>
+            Slider_Give.value = count;
+        }
+
+        private void Add()
+        {
+            count++;
+            if (count > widgetItem1.itemInfo.count.Value)
             {
-                GiveGite.gameObject.SetActive(false);
-                AppBarPanel.OpenPanel(this);
-            });
+                count = (int)widgetItem1.itemInfo.count.Value;
+            }
+
+            Slider_Give.value = count;
         }
 
+        private void UpdateGiveItemCount()
+        {
+            Text_Count.text = $"当前选择数量{count}";
+            Text_GiveGiftDesc.text = $"好感度+{daoyouGiftConfig.emotionValue * count}";
+        }
+
+        public override CTask GetFocus()
+        {
+            AppBarPanel.OpenPanel(this);
+            return base.GetFocus();
+        }
+
+
         public static async CTask OpenPanel(AccountFileInfo.DaoYouData daoYouData)
         {
             await UIManager.Instance.LoadAndOpenPanel<DaoYouInfoPanel>(null, uiData: new[] { daoYouData });
         }
 
+        private void ClosePoolGive()
+        {
+            count = 0;
+            daoyouGiftConfig = default;
+
+            foreach (var giveWidgetItem in giveWidgetItems)
+            {
+                UIManager.Instance.DormancyGComponent(giveWidgetItem);
+            }
+
+            giveWidgetItems.Clear();
+
+            UIManager.Instance.DormancyGComponent(widgetItem1);
+            widgetItem1 = null;
+        }
+
         public override void Close()
         {
+            daoyouGiftConfigs = null;
+
             foreach (var widgetItem in widgetItems)
             {
                 UIManager.Instance.DormancyGComponent(widgetItem);
@@ -135,6 +292,9 @@ namespace Fort23.Mono
             }
 
             _daoYouLevelWidgets.Clear();
+
+            ClosePoolGive();
+
             base.Close();
         }
     }

+ 99 - 0
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanelData.cs

@@ -206,6 +206,105 @@ namespace Fort23.Mono
 	      return _Btn_Back;
 	     }
 	   }
+	  private RectTransform _GiveGiftContent;
+	  public RectTransform GiveGiftContent
+	   {
+	   get{
+	      if (_GiveGiftContent == null)
+	       {
+	         _GiveGiftContent  = GetUIUnit<RectTransform>("GiveGiftContent"); 
+	       }
+	      return _GiveGiftContent;
+	     }
+	   }
+	  private Button _Btn_Give;
+	  public Button Btn_Give
+	   {
+	   get{
+	      if (_Btn_Give == null)
+	       {
+	         _Btn_Give  = GetUIUnit<Button>("Btn_Give"); 
+	       }
+	      return _Btn_Give;
+	     }
+	   }
+	  private Button _Btn_Reduce;
+	  public Button Btn_Reduce
+	   {
+	   get{
+	      if (_Btn_Reduce == null)
+	       {
+	         _Btn_Reduce  = GetUIUnit<Button>("Btn_Reduce"); 
+	       }
+	      return _Btn_Reduce;
+	     }
+	   }
+	  private Button _Btn_Add;
+	  public Button Btn_Add
+	   {
+	   get{
+	      if (_Btn_Add == null)
+	       {
+	         _Btn_Add  = GetUIUnit<Button>("Btn_Add"); 
+	       }
+	      return _Btn_Add;
+	     }
+	   }
+	  private Button _Btn_Max;
+	  public Button Btn_Max
+	   {
+	   get{
+	      if (_Btn_Max == null)
+	       {
+	         _Btn_Max  = GetUIUnit<Button>("Btn_Max"); 
+	       }
+	      return _Btn_Max;
+	     }
+	   }
+	  private Text _Text_Count;
+	  public Text Text_Count
+	   {
+	   get{
+	      if (_Text_Count == null)
+	       {
+	         _Text_Count  = GetUIUnit<Text>("Text_Count"); 
+	       }
+	      return _Text_Count;
+	     }
+	   }
+	  private RectTransform _WidgetItemRoot;
+	  public RectTransform WidgetItemRoot
+	   {
+	   get{
+	      if (_WidgetItemRoot == null)
+	       {
+	         _WidgetItemRoot  = GetUIUnit<RectTransform>("WidgetItemRoot"); 
+	       }
+	      return _WidgetItemRoot;
+	     }
+	   }
+	  private Text _Text_GiveGiftDesc;
+	  public Text Text_GiveGiftDesc
+	   {
+	   get{
+	      if (_Text_GiveGiftDesc == null)
+	       {
+	         _Text_GiveGiftDesc  = GetUIUnit<Text>("Text_GiveGiftDesc"); 
+	       }
+	      return _Text_GiveGiftDesc;
+	     }
+	   }
+	  private Slider _Slider_Give;
+	  public Slider Slider_Give
+	   {
+	   get{
+	      if (_Slider_Give == null)
+	       {
+	         _Slider_Give  = GetUIUnit<Slider>("Slider_Give"); 
+	       }
+	      return _Slider_Give;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 70 - 38
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouLevelWidget.cs

@@ -1,43 +1,75 @@
+using System.Collections.Generic;
+using System.Linq;
 using Excel2Json;
 using Fort23.UTool;
+using GameLogic.Bag;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "DaoYouLevelWidget"  )]
-	public partial class DaoYouLevelWidget : UIComponent
-	{
-		public DaoyouLevelupConfig _daoyouLevelupConfig;
-		private void Init()
-		{
-
-		}
-		public override void AddEvent()
-		{
-
-		}
-		public override void DelEvent()
-		{
-
-		}
-		public override void AddButtonEvent()
-		{
-
-		}
-
-		public void CustomInit(AccountFileInfo.DaoYouData daoYouData ,int configId)
-		{
-			_daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(configId);
-			Text_Level.text = configId.ToString();
-
-			if ( daoYouData.awardLevels.Contains(configId))
-			{
-				Text_Tips.gameObject.SetActive(true);
-			}
-			else
-			{
-				Text_Tips.gameObject.SetActive(false);
-			}
-		}
-
-	}
-}
+    [UIBinding(prefab = "DaoYouLevelWidget")]
+    public partial class DaoYouLevelWidget : UIComponent
+    {
+        public DaoyouLevelupConfig _daoyouLevelupConfig;
+
+        List<WidgetItem> _widgetItems = new List<WidgetItem>();
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public async void CustomInit(AccountFileInfo.DaoYouData daoYouData, int configId)
+        {
+            _daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(configId);
+            DaoyouModelConfig daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(daoYouData.id);
+            Text_Level.text = configId.ToString();
+
+            for (var i = 0; i < _daoyouLevelupConfig.prizeID?.Length; i++)
+            {
+                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
+                widgetItem.InitWidget(new ItemInfo(_daoyouLevelupConfig.prizeID[i], _daoyouLevelupConfig.prizeNum[i]));
+                _widgetItems.Add(widgetItem);
+            }
+
+            if (daoyouModelConfig.EmotionLvforspecialGift.Contains(configId))
+            {
+                int index = daoyouModelConfig.EmotionLvforspecialGift.ToList().IndexOf(configId);
+                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
+                widgetItem.InitWidget(new ItemInfo(daoyouModelConfig.specialGiftID[index], daoyouModelConfig.specialGiftNum[index]));
+                _widgetItems.Add(widgetItem);
+            }
+
+            if (daoYouData.awardLevels.Contains(configId))
+            {
+                Text_Tips.gameObject.SetActive(true);
+            }
+            else
+            {
+                Text_Tips.gameObject.SetActive(false);
+            }
+        }
+
+        public override void DormancyObj()
+        {
+            foreach (var widgetItem in _widgetItems)
+            {
+                UIManager.Instance.DormancyGComponent(widgetItem);
+            }
+
+            _widgetItems.Clear();
+
+            base.DormancyObj();
+        }
+    }
+}

+ 5 - 0
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
 
@@ -31,6 +32,10 @@ namespace Fort23.Mono
 			_daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(configId);
 			_daoYouData = AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(dy => dy.id == configId);
 
+			Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
+			DaoyouLevelupConfig daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(configId);
+			Text_DaoyouLvName.text = LanguageManager.Instance.Text(daoyouLevelupConfig.name);
+
 			if (_daoYouData == null)
 			{
 				transform.Gray();

+ 22 - 0
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidgetData.cs

@@ -19,6 +19,28 @@ namespace Fort23.Mono
 	      return _Text_Name;
 	     }
 	   }
+	  private Text _Text_DaoyouLvName;
+	  public Text Text_DaoyouLvName
+	   {
+	   get{
+	      if (_Text_DaoyouLvName == null)
+	       {
+	         _Text_DaoyouLvName  = GetUIUnit<Text>("Text_DaoyouLvName"); 
+	       }
+	      return _Text_DaoyouLvName;
+	     }
+	   }
+	  private Text _Text_Type;
+	  public Text Text_Type
+	   {
+	   get{
+	      if (_Text_Type == null)
+	       {
+	         _Text_Type  = GetUIUnit<Text>("Text_Type"); 
+	       }
+	      return _Text_Type;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor