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

# Conflicts:
#	Excel2Json/Excel/DaoyouConfig.xlsx   resolved by origin/master(远端) version

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -35,7 +35,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 18.2, y: 2.2}
+  m_AnchoredPosition: {x: 20, y: 2.2}
   m_SizeDelta: {x: 25, y: 26}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &744498413847965706
@@ -879,7 +879,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 40
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -1061,7 +1061,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 31.5949, y: 0}
+  m_AnchoredPosition: {x: 48, y: -2}
   m_SizeDelta: {x: -63.1898, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7163272866229212282
@@ -1085,7 +1085,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.91372555, g: 0.9058824, b: 0.9215687, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1094,7 +1094,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 66
+    m_FontSize: 52
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
@@ -1105,7 +1105,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7384\u7389"
+  m_Text: "\u96C0\u7075\u513F"
 --- !u!1 &957334741870432535
 GameObject:
   m_ObjectHideFlags: 0
@@ -1232,7 +1232,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 283.9711, y: -0.8999634}
+  m_AnchoredPosition: {x: 247, y: -0.8999634}
   m_SizeDelta: {x: 29.7794, y: 29.7794}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8269233364737267016
@@ -1256,7 +1256,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.17499542, g: 0.27735734, b: 0.3066036, a: 1}
+  m_Color: {r: 0.58431375, g: 0.68235296, b: 0.59607846, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1367,8 +1367,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 197.0892, y: -38}
-  m_SizeDelta: {x: 394.1784, y: 0}
+  m_AnchoredPosition: {x: 150, y: -95.28037}
+  m_SizeDelta: {x: 300, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8219955351092879517
 CanvasRenderer:
@@ -1391,7 +1391,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19215688, g: 0.1764706, b: 0.14901961, a: 1}
+  m_Color: {r: 0.16981101, g: 0.049022578, b: 0.04004974, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1400,18 +1400,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 1
+    m_FontSize: 40
+    m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
+    m_MinSize: 0
+    m_MaxSize: 183
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u5F00\u5FC3"
+  m_Text: "\u4ECA\u5929\u7684\u5FC3\u60C5\u4E48\u4E48\u54D2!"
 --- !u!114 &2485191496078184997
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1515,7 +1515,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 46
+    m_FontSize: 42
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -1720,7 +1720,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 36
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -2157,7 +2157,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8000001, g: 0.8196079, b: 0.81568635, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2858,7 +2858,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 36
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -2967,18 +2967,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 46
+    m_FontSize: 42
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
-    m_MaxSize: 46
+    m_MaxSize: 48
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u559C\u6B22\u793C\u7269"
+  m_Text: "\u559C\u6B22\u7684\u793C\u7269"
 --- !u!114 &3448716094321876748
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3132,7 +3132,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 102.980064, y: 137.5}
+  m_AnchoredPosition: {x: 0, y: 137.5}
   m_SizeDelta: {x: 494.86, y: 35.9968}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4125139517950329887
@@ -3166,17 +3166,17 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 30
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u9001\u73A9\u5BB6\u559C\u6B22\u5F97\u7269\u54C1\u597D\u611F\u5EA6\u52A0\u5F97\u66F4\u591A\u54DF"
+  m_Text: "\u8D60\u9001\u9053\u53CB\u559C\u6B22\u7684\u793C\u7269"
 --- !u!114 &4178572551010760513
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3504,7 +3504,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.3529412, g: 0.31764707, b: 0.3019608, a: 1}
+  m_Color: {r: 0.122641206, g: 0.11062628, b: 0.105286315, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3513,8 +3513,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 1
+    m_FontSize: 32
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -3770,7 +3770,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 67.84, y: -319.34}
+  m_AnchoredPosition: {x: 0, y: -323}
   m_SizeDelta: {x: 505.1024, y: 31.711}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8461724369163925533
@@ -3804,11 +3804,11 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -4460,7 +4460,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: -58.6, y: 11.9}
+  m_AnchoredPosition: {x: -39, y: 9}
   m_SizeDelta: {x: 329, y: 135}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &234858011452441900
@@ -4484,7 +4484,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.18823531, g: 0.454902, b: 0.46274513, a: 1}
+  m_Color: {r: 0.06214389, g: 0.6933961, b: 0.6900855, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -6052,7 +6052,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 281.0711, y: 3.4000092}
+  m_AnchoredPosition: {x: 244, y: 1}
   m_SizeDelta: {x: 29.7794, y: 29.7794}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6172267074859294437
@@ -6076,7 +6076,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.17499542, g: 0.27735734, b: 0.3066036, a: 1}
+  m_Color: {r: 0.583965, g: 0.683, b: 0.5956162, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -6219,7 +6219,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 46
+    m_FontSize: 42
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -6360,7 +6360,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -295.22, y: -188.45}
+  m_AnchoredPosition: {x: -295.22, y: -199}
   m_SizeDelta: {x: -651.2059, y: -823.6446}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5310920071325626268
@@ -6398,7 +6398,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -6487,7 +6487,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 46
+    m_FontSize: 42
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -6546,8 +6546,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: 165.8, y: -27.1}
-  m_SizeDelta: {x: 272.8918, y: 76.393}
+  m_AnchoredPosition: {x: 131, y: -154}
+  m_SizeDelta: {x: 280, y: 74}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5475174839614059240
 GameObject:
@@ -6956,7 +6956,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000009536743, y: 0}
+  m_AnchoredPosition: {x: 0.0000076293945, y: 0}
   m_SizeDelta: {x: 12.0853, y: 19.7181}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2038504056846951328
@@ -7047,7 +7047,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -15.5, y: -127.1}
-  m_SizeDelta: {x: 302, y: 107}
+  m_SizeDelta: {x: 385.7, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4670394487777031405
 CanvasRenderer:
@@ -7070,7 +7070,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0.46226406, b: 0.7060526, a: 0.7058824}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -7087,7 +7087,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_daoyou_songli_di
+  _icon_name: dec_xudb
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
   packInfo:
@@ -7305,8 +7305,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -211.26437, y: -128.4}
-  m_SizeDelta: {x: 327.4713, y: 63.6956}
+  m_AnchoredPosition: {x: -211.26437, y: -122}
+  m_SizeDelta: {x: 333, y: 51.9}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8931983443319189626
 CanvasRenderer:
@@ -7895,7 +7895,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 297.48, y: -51.980633}
+  m_AnchoredPosition: {x: 297.48, y: -64}
   m_SizeDelta: {x: 155.04, y: 46.1422}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1916760802098350641
@@ -7919,7 +7919,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.42352945, g: 0.5529412, b: 0.5176471, a: 1}
+  m_Color: {r: 0.21426654, g: 0.42452818, b: 0.3671841, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -8050,7 +8050,7 @@ GameObject:
   - component: {fileID: 6566338979143667368}
   - component: {fileID: 3426517287418739909}
   - component: {fileID: 6681611969160843806}
-  - component: {fileID: 3457877069773292889}
+  - component: {fileID: 1673723515708135352}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_GiftGailv
@@ -8120,7 +8120,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9001\u793C\u6982\u7387\uFF1A20%"
---- !u!114 &3457877069773292889
+--- !u!114 &1673723515708135352
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8129,12 +8129,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 6928571901326992704}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.6666667, g: 0.46274513, b: 0.24313727, a: 1}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
+  effectColor: {r: 1, g: 0.46031806, b: 0.40094328, a: 0.3529412}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &7080839778448439822
 GameObject:
   m_ObjectHideFlags: 0
@@ -8367,8 +8368,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: 231.8, y: -156.32}
-  m_SizeDelta: {x: 61.6906, y: 58.7529}
+  m_AnchoredPosition: {x: 262, y: -14}
+  m_SizeDelta: {x: 42, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1114926871017867092
 CanvasRenderer:
@@ -9420,7 +9421,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 36
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 47
@@ -10032,7 +10033,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ty_juxing_dahu
+  _icon_name: dec_juxing_shaadow
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -10200,7 +10201,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 210}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2618094518405530268
@@ -10231,7 +10232,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 4c1fca290e143d5448a92f1fd291820e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0b2b6fa156e4ba84fa1db191d7765dc3, type: 3}
   m_Type: 0
   m_PreserveAspect: 1
   m_FillCenter: 1
@@ -10241,7 +10242,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: bg_lh_xuyou
+  _icon_name: bg_lh_queyinger
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 0}
   packInfo:

Assets/Scripts/Core/CTask/CTaskAwaitBufferT.cs

@@ -31,6 +31,14 @@ namespace Fort23.Core
             return _results.ToArray();
             
         }
+        
+        public List<T> GetResultsLists()
+        {
+
+            
+            return _results.ToList();
+            
+        }
 
         public void Clear()
         {

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -281,7 +281,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// <summary>
         /// 经验
         /// </summary>
-        public int exp;
+        public float exp;
 
         /// <summary>
         /// 已经领取奖励的好感等级

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -17,7 +17,7 @@ namespace Fort23.Mono
 
         private DaoyouModelConfig _daoyouModelConfig;
 
-        private WidgetItem currentSelectWidgetItem;
+        private ItemInfo currentSelectWidgetItem;
 
         List<WidgetItem> widgetItems = new List<WidgetItem>();
         List<WidgetItem> giveWidgetItems = new List<WidgetItem>();
@@ -161,13 +161,13 @@ namespace Fort23.Mono
                         //喜好礼物翻倍
                         if (_daoyouModelConfig.PreferGiftID.Contains(daoyouGiftConfig.ItemID))
                         {
-                            daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f *
-                                                    PlayerManager.Instance.gameConstantConfig.daolvfavoratePara *
-                                                    0.01f);
+                            daoYouData.exp += (daoyouGiftConfig.emotionValue * bl * 0.001f *
+                                               PlayerManager.Instance.gameConstantConfig.daolvfavoratePara *
+                                               0.01f);
                         }
                         else
                         {
-                            daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f);
+                            daoYouData.exp += (daoyouGiftConfig.emotionValue * bl * 0.001f);
                         }
                     }
 
@@ -181,6 +181,10 @@ namespace Fort23.Mono
                             daoYouData.exp -= configs[i].exp;
                             daoYouData.favorabilityLv++;
                         }
+                        else
+                        {
+                            break;
+                        }
                     }
 
                     AudioManager.Instance.PlayAudio("ui_shiyonghuode");
@@ -326,54 +330,92 @@ namespace Fort23.Mono
             DaoyouLevelupConfig[] configs = ConfigComponent.Instance.GetAll<DaoyouLevelupConfig>();
             if (daoYouData.favorabilityLv >= configs.Length)
             {
-                Text_Exp.text = $"{daoYouData.exp}/MAX";
+                Text_Exp.text = $"{daoYouData.exp.ToString("0.0")}/MAX";
             }
             else
             {
-                Text_Exp.text = $"{daoYouData.exp}/{currentDaoyouLevelupConfig.exp}";
+                Text_Exp.text = $"{daoYouData.exp.ToString("0.0")}/{currentDaoyouLevelupConfig.exp}";
             }
 
 
             Slider_LeveUp.value = daoYouData.exp;
 
+            CTaskAwaitBuffer taskAwaitBuffer = new CTaskAwaitBuffer();
+
+            CTaskAwaitBuffer<WidgetItem> cts = null;
             if (_daoyouModelConfig.PreferGiftID != null)
             {
+                cts = new CTaskAwaitBuffer<WidgetItem>();
                 foreach (var i in _daoyouModelConfig.PreferGiftID)
                 {
-                    WidgetItem widgetItem =
-                        await UIManager.Instance.CreateGComponent<WidgetItem>(null, LoveItemContent);
-                    widgetItems.Add(widgetItem);
-                    if (_daoyouModelConfig.shownPreferGiftID.Contains(i) ||
-                        (daoYouData != null && daoYouData.loveIds.Contains(i)))
+                    cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, LoveItemContent));
+                }
+
+
+                taskAwaitBuffer.AddTask(cts.WaitAll());
+            }
+
+            CTaskAwaitBuffer<DaoYouaaFfixWidget> cts2 = null;
+
+            if (_daoyouModelConfig.daolvSkillID != null)
+            {
+                cts2 = new CTaskAwaitBuffer<DaoYouaaFfixWidget>();
+                for (var i = 0; i < _daoyouModelConfig.daolvSkillID.Length; i++)
+                {
+                    cts2.AddTask(UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, DaoLvContent));
+                }
+
+                taskAwaitBuffer.AddTask(cts2.WaitAll());
+            }
+
+            CTaskAwaitBuffer<DaoYouLevelWidget> cts1 = new CTaskAwaitBuffer<DaoYouLevelWidget>();
+            foreach (var daoyouLevelupConfig in configs)
+            {
+                cts1.AddTask(UIManager.Instance.CreateGComponent<DaoYouLevelWidget>(null, DaoYouLevelWidgetContent));
+            }
+
+            taskAwaitBuffer.AddTask(cts1.WaitAll());
+
+            await taskAwaitBuffer.WaitAll();
+
+            if (_daoyouModelConfig.PreferGiftID != null)
+            {
+                widgetItems = cts.GetResultsLists();
+
+                for (var i = 0; i < _daoyouModelConfig.PreferGiftID.Length; i++)
+                {
+                    if (_daoyouModelConfig.shownPreferGiftID.Contains(_daoyouModelConfig.PreferGiftID[i]) ||
+                        (daoYouData != null && daoYouData.loveIds.Contains(_daoyouModelConfig.PreferGiftID[i])))
                     {
-                        widgetItem.InitWidget(new ItemInfo(i, 0));
+                        widgetItems[i].InitWidget(new ItemInfo(_daoyouModelConfig.PreferGiftID[i], 0));
                     }
                     else
                     {
-                        widgetItem.ShowWenhao();
+                        widgetItems[i].ShowWenhao();
                     }
                 }
             }
 
+
             if (_daoyouModelConfig.daolvSkillID != null)
             {
-                foreach (var i in _daoyouModelConfig.daolvSkillID)
+                daoYouaaFfixWidgets = cts2.GetResultsLists();
+                for (var i = 0; i < _daoyouModelConfig.daolvSkillID.Length; i++)
                 {
-                    DaoYouaaFfixWidget daoYouaaFfixWidge =
-                        await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, DaoLvContent);
-                    daoYouaaFfixWidge.CustomInit(i);
-                    daoYouaaFfixWidgets.Add(daoYouaaFfixWidge);
+                    daoYouaaFfixWidgets[i].CustomInit(_daoyouModelConfig.daolvSkillID[i]);
                 }
             }
 
-
-            foreach (var daoyouLevelupConfig in configs)
+            _daoYouLevelWidgets = cts1.GetResultsLists();
+            for (var i = 0; i < configs.Length; i++)
             {
-                DaoYouLevelWidget daoYouLevelWidget =
-                    await UIManager.Instance.CreateGComponent<DaoYouLevelWidget>(null, DaoYouLevelWidgetContent);
-                daoYouLevelWidget.CustomInit(daoYouData, daoyouLevelupConfig.ID);
-                _daoYouLevelWidgets.Add(daoYouLevelWidget);
+                _daoYouLevelWidgets[i].CustomInit(daoYouData, configs[i].ID);
             }
+
+            taskAwaitBuffer?.Dispose();
+            cts?.Dispose();
+            cts1?.Dispose();
+            cts2?.Dispose();
         }
 
 
@@ -432,14 +474,20 @@ namespace Fort23.Mono
 
         private async CTask CreatItem(List<ItemInfo> shownItems)
         {
-            // ClosePoolGive();
+            using (CTaskAwaitBuffer<WidgetItem> cts = new CTaskAwaitBuffer<WidgetItem>())
+            {
+                foreach (var itemInfo in shownItems)
+                {
+                    cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, GiveGiftContent));
+                }
+
+                giveWidgetItems = await cts.WaitAll();
+            }
 
-            foreach (var itemInfo in shownItems)
+            for (var i = 0; i < shownItems.Count; i++)
             {
-                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, GiveGiftContent);
-                widgetItem.InitWidget(itemInfo, false);
-                widgetItem.OnClick = OnClick;
-                giveWidgetItems.Add(widgetItem);
+                giveWidgetItems[i].InitWidget(shownItems[i], false);
+                giveWidgetItems[i].OnClick = OnClick;
             }
 
 
@@ -447,7 +495,19 @@ namespace Fort23.Mono
             {
                 if (currentSelectWidgetItem != null)
                 {
-                    currentSelectWidgetItem.OnPointerClick();
+                    bool isHave = false;
+                    foreach (var giveWidgetItem in giveWidgetItems)
+                    {
+                        if (giveWidgetItem.itemInfo == currentSelectWidgetItem)
+                        {
+                            giveWidgetItem.OnPointerClick();
+                            isHave = true;
+                            break;
+                        }
+                    }
+
+                    if(!isHave)
+                        giveWidgetItems[0].OnPointerClick();
                 }
                 else
                 {
@@ -463,7 +523,7 @@ namespace Fort23.Mono
         private async void OnClick(ItemWidgetBasic obj)
         {
             WidgetItem widgetItem = obj as WidgetItem;
-            currentSelectWidgetItem = widgetItem;
+            currentSelectWidgetItem = widgetItem.itemInfo;
             if (widgetItem1 == null)
             {
                 widgetItem1 = await UIManager.Instance.CreateGComponent<WidgetItem>(null, WidgetItemRoot);

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouPanel.cs

@@ -52,13 +52,23 @@ namespace Fort23.Mono
             daoYouWidgets.Clear();
 
             DaoyouModelConfig[] daoyouModelConfigs = ConfigComponent.Instance.GetAll<DaoyouModelConfig>();
-            foreach (var daoyouModelConfig in daoyouModelConfigs)
+
+            using (CTaskAwaitBuffer<DaoYouWidget> cts = new CTaskAwaitBuffer<DaoYouWidget>())
+            {
+                foreach (var daoyouModelConfig in daoyouModelConfigs)
+                {
+                    cts.AddTask(UIManager.Instance.CreateGComponent<DaoYouWidget>(null, Content));
+                }
+
+                daoYouWidgets = await cts.WaitAll();
+            }
+            
+            for (var i = 0; i < daoyouModelConfigs.Length; i++)
             {
-                DaoYouWidget daoYouWidget = await UIManager.Instance.CreateGComponent<DaoYouWidget>(null, Content);
-                daoYouWidget.CustomInit(daoyouModelConfig.ID);
-                daoYouWidget.OnClick = OnClick;
-                daoYouWidgets.Add(daoYouWidget);
+                daoYouWidgets[i].CustomInit(daoyouModelConfigs[i].ID);
+                daoYouWidgets[i].OnClick = OnClick;
             }
+      
         }
 
         private void OnClick(ItemWidgetBasic obj)

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -34,7 +34,7 @@ namespace Fort23.Mono
         {
             _daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(configId);
             _daoYouData = AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(dy => dy.id == configId);
-            Icon_Daoyou.icon_name = _daoyouModelConfig.bodyIcon;
+            Icon_Daoyou.icon_name = _daoyouModelConfig.headIcon;
 
             Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
             if (_daoYouData != null)

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -92,7 +92,7 @@ namespace Fort23.Mono
             AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(placesConfig.ID);
             int jindu = placesData == null ? 0 : placesData.progress;
             Text_PlacesComplteProgress.text =
-                LanguageManager.Instance.Text(10378, (jindu / placesConfig.TotalScore * 100f).ToString("0"));
+                LanguageManager.Instance.Text(10378, ((float)jindu / placesConfig.TotalScore * 100f).ToString("0"));
             return await base.AsyncInit(uiData);
         }
 

Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -121,6 +121,10 @@ namespace Fort23.Mono
                 {
                     icon.icon_name = "dec_gfbook_tu";
                 }
+                else if (skillConfig.attribute == 0)
+                {
+                    icon.icon_name = "dec_gfbook_fuzhu";
+                }
 
                 Icon_Item2.gameObject.SetActive(false);
                 Icon_Skill.gameObject.SetActive(true);