Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Assets/Res/UI/MainPanel/MainPanel.prefab

Assets/Res/Config/EventConditionConfig.json

@@ -103,7 +103,7 @@
       "ConditionPara": [
         1004
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30003
       ],
@@ -119,7 +119,7 @@
       "ConditionPara": [
         1005
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30004
       ],
@@ -135,7 +135,7 @@
       "ConditionPara": [
         20003
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30011
       ],
@@ -351,7 +351,7 @@
       "ConditionPara": [
         20004
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30012
       ],
@@ -516,7 +516,7 @@
       "ConditionPara": [
         20006
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30015
       ],
@@ -548,7 +548,7 @@
       "ConditionPara": [
         20007
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30017
       ],

Assets/Res/Config/EventConfig.json

@@ -2676,7 +2676,7 @@
       "Score": 0,
       "EventQuality": 1,
       "RefreshProbability": 50,
-      "RefreshCount": 5,
+      "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -2717,7 +2717,7 @@
       "Score": 0,
       "EventQuality": 1,
       "RefreshProbability": 50,
-      "RefreshCount": 3,
+      "RefreshCount": 2,
       "placeID": 1,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -2738,7 +2738,7 @@
       "Score": 0,
       "EventQuality": 1,
       "RefreshProbability": 50,
-      "RefreshCount": 3,
+      "RefreshCount": 2,
       "placeID": 2,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -2899,7 +2899,7 @@
         1
       ],
       "RefreshProbability": 50,
-      "RefreshCount": 3,
+      "RefreshCount": 2,
       "placeID": 2,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -2925,7 +2925,7 @@
         1
       ],
       "RefreshProbability": 50,
-      "RefreshCount": 1,
+      "RefreshCount": 2,
       "placeID": 3,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -2974,7 +2974,7 @@
       "Score": 0,
       "EventQuality": 1,
       "RefreshProbability": 50,
-      "RefreshCount": 1,
+      "RefreshCount": 2,
       "placeID": 1,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -3003,7 +3003,7 @@
         1
       ],
       "RefreshProbability": 50,
-      "RefreshCount": 1,
+      "RefreshCount": 2,
       "placeID": 1,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -3058,7 +3058,7 @@
         1
       ],
       "RefreshProbability": 50,
-      "RefreshCount": 1,
+      "RefreshCount": 2,
       "placeID": 1,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -3145,7 +3145,7 @@
         1
       ],
       "RefreshProbability": 50,
-      "RefreshCount": 1,
+      "RefreshCount": 3,
       "placeID": 2,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -3176,7 +3176,7 @@
         1
       ],
       "RefreshProbability": 50,
-      "RefreshCount": 1,
+      "RefreshCount": 2,
       "placeID": 2,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -3206,7 +3206,7 @@
         1
       ],
       "RefreshProbability": 50,
-      "RefreshCount": 1,
+      "RefreshCount": 3,
       "placeID": 3,
       "SmallPlacesId": 0,
       "XiantuID": 0,
@@ -3978,7 +3978,7 @@
       "PrizeNums": [
         1,
         1,
-        650
+        700
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -3991,7 +3991,7 @@
       ],
       "EventValue": [
         6021,
-        31
+        36
       ],
       "EventName": 4180,
       "Description": 4186
@@ -4031,7 +4031,7 @@
       ],
       "EventValue": [
         6022,
-        36
+        41
       ],
       "EventName": 4181,
       "Description": 4187
@@ -4059,7 +4059,7 @@
       "PrizeNums": [
         1,
         2,
-        700
+        750
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4072,7 +4072,7 @@
       ],
       "EventValue": [
         6023,
-        41
+        46
       ],
       "EventName": 4182,
       "Description": 4188
@@ -4113,7 +4113,7 @@
       ],
       "EventValue": [
         6024,
-        46
+        51
       ],
       "EventName": 4183,
       "Description": 4189
@@ -4144,7 +4144,7 @@
       "PrizeNums": [
         1,
         1,
-        750
+        800
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4157,7 +4157,7 @@
       ],
       "EventValue": [
         6025,
-        51
+        56
       ],
       "EventName": 4184,
       "Description": 4190
@@ -5014,8 +5014,8 @@
         1003
       ],
       "PrizeNums": [
-        3000,
-        600
+        3150,
+        650
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -5028,7 +5028,7 @@
       ],
       "EventValue": [
         9113,
-        21
+        26
       ],
       "EventName": 4247,
       "Description": 4329
@@ -5053,8 +5053,8 @@
       ],
       "PrizeNums": [
         3,
-        3150,
-        650
+        3400,
+        700
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -5067,7 +5067,7 @@
       ],
       "EventValue": [
         9114,
-        26
+        36
       ],
       "EventName": 4248,
       "Description": 4330
@@ -5110,8 +5110,8 @@
       ],
       "PrizeNums": [
         1,
-        3250,
-        650
+        3650,
+        750
       ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
@@ -5198,7 +5198,7 @@
         1003
       ],
       "PrizeNums": [
-        2900,
+        3000,
         600
       ],
       "RefreshProbability": 35,
@@ -5212,7 +5212,7 @@
       ],
       "EventValue": [
         9117,
-        16
+        21
       ],
       "EventName": 4251,
       "Description": 4333
@@ -5246,8 +5246,8 @@
         1003
       ],
       "PrizeNums": [
-        3000,
-        600
+        3500,
+        700
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -5260,7 +5260,7 @@
       ],
       "EventValue": [
         9118,
-        21
+        41
       ],
       "EventName": 4252,
       "Description": 4334
@@ -5291,8 +5291,8 @@
       ],
       "PrizeNums": [
         1,
-        3150,
-        650
+        2900,
+        600
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -5305,7 +5305,7 @@
       ],
       "EventValue": [
         9119,
-        26
+        16
       ],
       "EventName": 4253,
       "Description": 4335
@@ -5332,8 +5332,8 @@
         1003
       ],
       "PrizeNums": [
-        3250,
-        650
+        3400,
+        700
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -5346,7 +5346,7 @@
       ],
       "EventValue": [
         9120,
-        31
+        36
       ],
       "EventName": 4254,
       "Description": 4336
@@ -5384,8 +5384,8 @@
       ],
       "PrizeNums": [
         1,
-        3400,
-        700
+        3900,
+        800
       ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
@@ -5398,7 +5398,7 @@
       ],
       "EventValue": [
         9121,
-        36
+        56
       ],
       "EventName": 4255,
       "Description": 4337
@@ -5484,7 +5484,7 @@
         1003
       ],
       "PrizeNums": [
-        3150,
+        3250,
         650
       ],
       "RefreshProbability": 35,
@@ -5498,7 +5498,7 @@
       ],
       "EventValue": [
         9123,
-        26
+        31
       ],
       "EventName": 4257,
       "Description": 4339
@@ -5524,8 +5524,8 @@
       ],
       "PrizeNums": [
         1,
-        3250,
-        650
+        3500,
+        700
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -5538,7 +5538,7 @@
       ],
       "EventValue": [
         9124,
-        31
+        41
       ],
       "EventName": 4258,
       "Description": 4340
@@ -5565,8 +5565,8 @@
       ],
       "PrizeNums": [
         1,
-        3400,
-        700
+        4000,
+        800
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -5579,7 +5579,7 @@
       ],
       "EventValue": [
         9125,
-        36
+        61
       ],
       "EventName": 4259,
       "Description": 4341
@@ -6488,7 +6488,7 @@
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
         10,
@@ -6496,7 +6496,7 @@
       ],
       "EventValue": [
         9111,
-        1
+        26
       ],
       "EventName": 4282,
       "Description": 4362
@@ -6529,7 +6529,7 @@
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
         10,
@@ -6537,7 +6537,7 @@
       ],
       "EventValue": [
         9147,
-        11
+        46
       ],
       "EventName": 4283,
       "Description": 4363
@@ -6571,7 +6571,7 @@
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
         10,
@@ -6579,7 +6579,7 @@
       ],
       "EventValue": [
         9148,
-        21
+        66
       ],
       "EventName": 4284,
       "Description": 4364
@@ -6651,14 +6651,14 @@
       ],
       "RefreshProbability": 50,
       "RefreshCount": 1,
-      "placeID": 0,
+      "placeID": 2,
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
         3
       ],
       "EventValue": [
-        21
+        36
       ],
       "EventName": 4286,
       "Description": 4366
@@ -6696,7 +6696,7 @@
       ],
       "RefreshProbability": 50,
       "RefreshCount": 1,
-      "placeID": 0,
+      "placeID": 2,
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
@@ -6705,7 +6705,7 @@
       ],
       "EventValue": [
         9151,
-        26
+        46
       ],
       "EventName": 4287,
       "Description": 4367
@@ -6745,7 +6745,7 @@
       ],
       "RefreshProbability": 50,
       "RefreshCount": 1,
-      "placeID": 0,
+      "placeID": 2,
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
@@ -6754,7 +6754,7 @@
       ],
       "EventValue": [
         9152,
-        31
+        56
       ],
       "EventName": 4288,
       "Description": 4368
@@ -6789,7 +6789,7 @@
       ],
       "RefreshProbability": 50,
       "RefreshCount": 1,
-      "placeID": 0,
+      "placeID": 2,
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
@@ -6798,7 +6798,7 @@
       ],
       "EventValue": [
         23200,
-        31
+        76
       ],
       "EventCount": [
         3

Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -262,6 +262,7 @@ GameObject:
   - component: {fileID: 4251176618484867663}
   - component: {fileID: 7108258747564116440}
   - component: {fileID: 9137017659689659031}
+  - component: {fileID: 7933938423984907002}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (1)
@@ -341,6 +342,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7933938423984907002
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1814268402840942092}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &1947865541254548843
 GameObject:
   m_ObjectHideFlags: 0
@@ -778,7 +794,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1125, y: 2436}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7203008914783957009
 CanvasRenderer:

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -459,7 +459,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1500, y: 3248}
+  m_SizeDelta: {x: 898, y: 1944}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7897761964867798499
 MonoBehaviour:
@@ -1196,6 +1196,7 @@ GameObject:
   - component: {fileID: 3637005864510300227}
   - component: {fileID: 5727746862753107768}
   - component: {fileID: 7009910568533120546}
+  - component: {fileID: 3054755758390033935}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1278,6 +1279,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10151
+--- !u!114 &3054755758390033935
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &4063004393881817651
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -1053,7 +1053,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1798015912972164048}
   - component: {fileID: 5298345569981142061}
-  - component: {fileID: 5174341453871170226}
+  - component: {fileID: 7484319669545627100}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: PlayerInfo
@@ -1077,10 +1077,10 @@ RectTransform:
   - {fileID: 7383390820428798537}
   m_Father: {fileID: 9037135992368401232}
   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: 0, y: 63.271}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -220, y: 0}
+  m_SizeDelta: {x: 440, y: 63.271}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5298345569981142061
 CanvasRenderer:
@@ -1090,7 +1090,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1760937640502948944}
   m_CullTransparentMesh: 1
---- !u!114 &5174341453871170226
+--- !u!114 &7484319669545627100
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1340,6 +1340,7 @@ GameObject:
   - component: {fileID: 6261009774886538096}
   - component: {fileID: 3656203349713481960}
   - component: {fileID: 4472099066628972237}
+  - component: {fileID: 6709258874224180911}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn1_Map
@@ -1476,6 +1477,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &6709258874224180911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1956023067385650890}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &2067316311261386271
 GameObject:
   m_ObjectHideFlags: 0
@@ -5104,6 +5120,7 @@ GameObject:
   - component: {fileID: 8753960067471709537}
   - component: {fileID: 8766683629811078357}
   - component: {fileID: 7489813112688999977}
+  - component: {fileID: 3102808955735513020}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Daoyou
@@ -5240,6 +5257,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &3102808955735513020
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8816327462997807595}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &8986363544919513421
 GameObject:
   m_ObjectHideFlags: 0
@@ -5361,7 +5393,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 961, y: 2081}
+  m_SizeDelta: {x: 439, y: 951}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -2311,7 +2311,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 628, y: 1360}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/SentimentPanel/SentimentPanel.prefab

@@ -356,6 +356,7 @@ GameObject:
   - component: {fileID: 8433458334176511681}
   - component: {fileID: 4170656597210444513}
   - component: {fileID: 4909662600279504468}
+  - component: {fileID: 8077185464686204676}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (1)
@@ -435,6 +436,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &8077185464686204676
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5380674767276986663}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &5692448650326671997
 GameObject:
   m_ObjectHideFlags: 0
@@ -749,7 +765,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1200, y: 2670}
+  m_SizeDelta: {x: 628, y: 1360}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -120,6 +120,7 @@ namespace Fort23.Mono
                     //小突破
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
                     {
+                        AudioManager.Instance.PlayAudio("ui_shengji.wav");
                         var heroAttributData =
                             HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, heroInfo);
                         PlayerManager.Instance.myHero.Upgrade();
@@ -156,7 +157,7 @@ namespace Fort23.Mono
                         await heroBreakthroughSuccessPanel.UIClosed();
 
 
-                        AudioManager.Instance.PlayAudio("ui_shengji.wav");
+                      
                     }
                     //大突破
                     else

Assets/Scripts/GameUI/UI/ShopPanel/ShopGroupWidgetType1.cs

@@ -45,7 +45,8 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    Text_RefenceTime.text = PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
+                    Text_RefenceTime.text =
+                        PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
                 }
             }
         }
@@ -70,7 +71,8 @@ namespace Fort23.Mono
             Text_Title.text = LanguageManager.Instance.Text(_shopConfig.shopName);
             if (this.shopData.refreshTime != -1)
             {
-                Text_RefenceTime.text = PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
+                Text_RefenceTime.text =
+                    PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
                 RefenceTimeRoot.gameObject.SetActive(true);
             }
             else
@@ -79,21 +81,36 @@ namespace Fort23.Mono
             }
 
 
-            foreach (var shopItem in shopData.shopItemList)
+            using (CTaskAwaitBuffer<ShopItemWidgetType2> cts = new CTaskAwaitBuffer<ShopItemWidgetType2>())
             {
-                // if (shopData.id == 1 || shopData.id == 5)
-                // {
-                //     ShopItemWidgetType1 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType1>(null, Connect);
-                //     shopItemWidgetType1.CustomInit(shopItem);
-                //     _shopItemWidgetType1s.Add(shopItemWidgetType1);
-                // }
-                // else
+                foreach (var shopItem in shopData.shopItemList)
                 {
-                    ShopItemWidgetType2 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType2>(null, Connect);
-                    shopItemWidgetType1.CustomInit(shopItem);
-                    _shopItemWidgetType2s.Add(shopItemWidgetType1);
+                    cts.AddTask(UIManager.Instance.CreateGComponent<ShopItemWidgetType2>(null, Connect));
                 }
+
+                _shopItemWidgetType2s = await cts.WaitAll();
             }
+
+            for (var i = 0; i < shopData.shopItemList.Count; i++)
+            {
+                _shopItemWidgetType2s[i].CustomInit(shopData.shopItemList[i]);
+            }
+
+            // foreach (var shopItem in shopData.shopItemList)
+            // {
+            //     // if (shopData.id == 1 || shopData.id == 5)
+            //     // {
+            //     //     ShopItemWidgetType1 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType1>(null, Connect);
+            //     //     shopItemWidgetType1.CustomInit(shopItem);
+            //     //     _shopItemWidgetType1s.Add(shopItemWidgetType1);
+            //     // }
+            //     // else
+            //     {
+            //         ShopItemWidgetType2 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType2>(null, Connect);
+            //         shopItemWidgetType1.CustomInit(shopItem);
+            //         _shopItemWidgetType2s.Add(shopItemWidgetType1);
+            //     }
+            // }
             LayoutRebuilder.ForceRebuildLayoutImmediate(Connect);
             LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
         }