瀏覽代碼

修改选择神识符ui

lzx 5 天之前
父節點
當前提交
4defd2ff7d

+ 6 - 6
Assets/Res/UI/DivineSence/DivineSenceItemPanel.prefab

@@ -37,7 +37,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: -72.68805, y: 236.08755}
+  m_AnchoredPosition: {x: -133, y: 335}
   m_SizeDelta: {x: 361.2239, y: 58.0248}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3249463790938390749
@@ -192,7 +192,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: 552.1149, y: 716.6434}
+  m_SizeDelta: {x: 691.8183, y: 936.8817}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &507674846458028489
 CanvasRenderer:
@@ -370,7 +370,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, y: 305.6999}
+  m_AnchoredPosition: {x: 0, y: 404}
   m_SizeDelta: {x: 535.2303, y: 77.6791}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1851182301441702079
@@ -403,7 +403,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 38
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -465,8 +465,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: 0, y: -58.851562}
-  m_SizeDelta: {x: 497.8617, y: 529.825}
+  m_AnchoredPosition: {x: 5.1467, y: -54.075}
+  m_SizeDelta: {x: 628.7791, y: 718.0969}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3793524203819905834
 CanvasRenderer:

+ 5 - 5
Assets/Res/UI/DivineSence/DivineSenceItemWidget.prefab

@@ -35,8 +35,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: 10.371, y: -21.9}
-  m_SizeDelta: {x: 263.74, y: 59.859}
+  m_AnchoredPosition: {x: 14.2851, y: -21.9}
+  m_SizeDelta: {x: 389.3103, y: 59.859}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1464163033993409006
 CanvasRenderer:
@@ -117,7 +117,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -6.7, y: -2.9}
+  m_AnchoredPosition: {x: -6.700012, y: -2.9}
   m_SizeDelta: {x: 84.2938, y: 26.6543}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &5808357202455032408
@@ -256,7 +256,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 1.3744, y: 250.00993}
-  m_SizeDelta: {x: 479, y: 120}
+  m_SizeDelta: {x: 613, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3768621067810424691
 CanvasRenderer:
@@ -378,7 +378,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: -41.5, y: 28.9}
+  m_AnchoredPosition: {x: -98.2, y: 28.9}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1132523784647200610

+ 187 - 48
Assets/Res/UI/DivineSence/DivineSenceRestoredPanel.prefab

@@ -115,7 +115,8 @@ GameObject:
   m_Component:
   - component: {fileID: 7663317156490623705}
   - component: {fileID: 5167498229776329142}
-  - component: {fileID: 5596494148847257560}
+  - component: {fileID: 3476787703103115249}
+  - component: {fileID: 4103133152247279751}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (2)
@@ -138,12 +139,12 @@ RectTransform:
   m_Children:
   - {fileID: 2814642152154327770}
   - {fileID: 305009398688895597}
-  m_Father: {fileID: 5852862441037819201}
+  m_Father: {fileID: 3364756798453222837}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.56381226, y: 266.55963}
-  m_SizeDelta: {x: -30.7806, y: -710.0225}
+  m_AnchoredPosition: {x: 0, y: 0.000061035156}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5167498229776329142
 CanvasRenderer:
@@ -153,7 +154,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 719445197697255642}
   m_CullTransparentMesh: 1
---- !u!114 &5596494148847257560
+--- !u!114 &3476787703103115249
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -162,40 +163,37 @@ MonoBehaviour:
   m_GameObject: {fileID: 719445197697255642}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.8470589, g: 0.8235295, b: 0.7607844, 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_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
-  imageH: 777.9515
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &4103133152247279751
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 719445197697255642}
+  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: 4
+  m_Spacing: 1.94
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &1610468003939772099
 GameObject:
   m_ObjectHideFlags: 0
@@ -229,7 +227,7 @@ RectTransform:
   m_Children:
   - {fileID: 8842124393281780795}
   - {fileID: 3914291755169970593}
-  - {fileID: 7663317156490623705}
+  - {fileID: 3364756798453222837}
   - {fileID: 6275148584250070916}
   - {fileID: 3375913756600433316}
   - {fileID: 5866622043385976589}
@@ -324,9 +322,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7663317156490623705}
   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: 251.1, y: 0.000024319}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 38.951, y: 38.5277}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3956759277254579743
@@ -563,6 +561,96 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10325
+--- !u!1 &2337243987887052608
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3364756798453222837}
+  - component: {fileID: 4839442019015864082}
+  - component: {fileID: 623014506328580064}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3364756798453222837
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2337243987887052608}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7663317156490623705}
+  m_Father: {fileID: 5852862441037819201}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.5645447, y: 266.55957}
+  m_SizeDelta: {x: -30.781, y: -710.0225}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4839442019015864082
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2337243987887052608}
+  m_CullTransparentMesh: 1
+--- !u!114 &623014506328580064
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2337243987887052608}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8470589, g: 0.8235295, b: 0.7607844, 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_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing_fang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 777.9515
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2453067890370699829
 GameObject:
   m_ObjectHideFlags: 0
@@ -598,7 +686,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: 15.075, y: -294.8}
+  m_AnchoredPosition: {x: 0, y: -294.8}
   m_SizeDelta: {x: 525.9169, y: 47.657}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2600124819267049154
@@ -1405,6 +1493,7 @@ GameObject:
   - component: {fileID: 305009398688895597}
   - component: {fileID: 4294669017348956789}
   - component: {fileID: 5689669388365980960}
+  - component: {fileID: 7188400047378717485}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_DivineSencePoint
@@ -1427,10 +1516,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7663317156490623705}
   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: 19.9724, y: 0.23427}
-  m_SizeDelta: {x: 488.2202, y: 50.719}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 112.891, y: -25.125275}
+  m_SizeDelta: {x: 144, y: 50.719}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4294669017348956789
 CanvasRenderer:
@@ -1453,7 +1542,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.19215688, g: 0.6, b: 0.6862745, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1473,7 +1562,21 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 100
+  m_Text: 100/10000
+--- !u!114 &7188400047378717485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8974309411131815615}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1001 &4650861149860321092
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1502,6 +1605,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -49.37755
       objectReference: {fileID: 0}
+    - target: {fileID: 1976249583501454292, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 106.233
+      objectReference: {fileID: 0}
     - target: {fileID: 3337014157320303617, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
@@ -1606,6 +1713,38 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7297962785026578990, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7297962785026578990, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7297962785026578990, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 72
+      objectReference: {fileID: 0}
+    - target: {fileID: 7297962785026578990, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 70.233
+      objectReference: {fileID: 0}
+    - target: {fileID: 7297962785026578990, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -23.75155
+      objectReference: {fileID: 0}
+    - target: {fileID: 7333865065052166968, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7333865065052166968, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7333865065052166968, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -23.75155
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

+ 411 - 63
Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2505339750209570349
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7333865065052166968}
+  - component: {fileID: 1539409951239889049}
+  - component: {fileID: 1602017985168492090}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7333865065052166968
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2505339750209570349}
+  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: 1976249583501454292}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 28.453, y: 28.1438}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &1539409951239889049
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2505339750209570349}
+  m_CullTransparentMesh: 1
+--- !u!114 &1602017985168492090
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2505339750209570349}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  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
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_shenshi_tu
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: cdfc87cecacbc6d43a18b124c77cdb3c, type: 3}
+  packInfo:
+    packName: shenshi
+    packgJsonPath: /Art/UIAssets/TextrueJson\shenshi.txt
+    packgSpritePath: Assets/Res/UIAtlas/shenshi.spriteatlasv2
+    lasetJsonGUID: 390613cb2a0c25f30d6ab3483d292479
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2938712519296013926
 GameObject:
   m_ObjectHideFlags: 0
@@ -11,6 +100,7 @@ GameObject:
   - component: {fileID: 7297962785026578990}
   - component: {fileID: 4250289077533234639}
   - component: {fileID: 3673052118314143390}
+  - component: {fileID: 2292524886426336724}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -26,17 +116,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2938712519296013926}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4587225501482666958}
+  m_Father: {fileID: 1976249583501454292}
   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.000010967, y: -5.3476}
-  m_SizeDelta: {x: 174.72, y: 50.7486}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 70.233, y: -23.75155}
+  m_SizeDelta: {x: 72, y: 47.5031}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4250289077533234639
 CanvasRenderer:
@@ -59,7 +149,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.4901961, g: 0.6901961, b: 0.6, a: 1}
+  m_Color: {r: 0.19215688, g: 0.6, b: 0.6862745, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,7 +158,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 44
+    m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -79,7 +169,21 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: x60
+  m_Text: +200
+--- !u!114 &2292524886426336724
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2938712519296013926}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &4297272316447963653
 GameObject:
   m_ObjectHideFlags: 0
@@ -191,7 +295,7 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
---- !u!1 &6526869912422005467
+--- !u!1 &5743750762486126431
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -199,87 +303,133 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1353168168416546914}
-  - component: {fileID: 3284452442884090342}
-  - component: {fileID: 3608024703213584012}
+  - component: {fileID: 1976249583501454292}
+  - component: {fileID: 7853229133918442277}
+  - component: {fileID: 8960734776047001427}
+  - component: {fileID: 2738827138918176167}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Icon_Itemicon
+  m_Name: root
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &1353168168416546914
+--- !u!224 &1976249583501454292
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6526869912422005467}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_GameObject: {fileID: 5743750762486126431}
+  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_Children:
+  - {fileID: 7333865065052166968}
+  - {fileID: 7297962785026578990}
   m_Father: {fileID: 4587225501482666958}
   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.3, y: 67.4}
-  m_SizeDelta: {x: 120, y: 120}
+  m_AnchoredPosition: {x: -0.000010967, y: -13.4611}
+  m_SizeDelta: {x: 0, y: 47.5031}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3284452442884090342
+--- !u!222 &7853229133918442277
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6526869912422005467}
+  m_GameObject: {fileID: 5743750762486126431}
   m_CullTransparentMesh: 1
---- !u!114 &3608024703213584012
+--- !u!114 &8960734776047001427
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6526869912422005467}
+  m_GameObject: {fileID: 5743750762486126431}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  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
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_shenshitishengfu
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
-  packInfo:
-    packName: daoju
-    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
-    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
-    lasetJsonGUID: 1d33824861d7fb9fd50c0d939197e59c
-  imageH: 100
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &2738827138918176167
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5743750762486126431}
+  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: 4
+  m_Spacing: 5.78
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &6526869912422005467
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1353168168416546914}
+  - component: {fileID: 3284452442884090342}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: itemRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1353168168416546914
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6526869912422005467}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1015609600778953068}
+  m_Father: {fileID: 4587225501482666958}
+  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, y: 67.4}
+  m_SizeDelta: {x: 120, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3284452442884090342
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6526869912422005467}
+  m_CullTransparentMesh: 1
 --- !u!1 &6695895445153222173
 GameObject:
   m_ObjectHideFlags: 0
@@ -348,7 +498,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
+    m_FontSize: 22
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -392,8 +542,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7114848985680709073}
   - {fileID: 1353168168416546914}
-  - {fileID: 7297962785026578990}
+  - {fileID: 1976249583501454292}
   - {fileID: 3706575773279824409}
   - {fileID: 406692840561159699}
   m_Father: {fileID: 0}
@@ -482,11 +633,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Icon_Itemicon
-    gameObject: {fileID: 3608024703213584012}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Group_Price
     gameObject: {fileID: 8213533085173273109}
     isAssetBundle: 0
@@ -507,7 +653,102 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Name
+    gameObject: {fileID: 3000685593432697294}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: itemRoot
+    gameObject: {fileID: 1353168168416546914}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: WidgetItemGam
+    gameObject: {fileID: 8046928928335380314}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &7737101299879585357
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7114848985680709073}
+  - component: {fileID: 4638788016422827024}
+  - component: {fileID: 3000685593432697294}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7114848985680709073
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7737101299879585357}
+  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: 4587225501482666958}
+  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, y: 143.8}
+  m_SizeDelta: {x: 173.47, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4638788016422827024
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7737101299879585357}
+  m_CullTransparentMesh: 1
+--- !u!114 &3000685593432697294
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7737101299879585357}
+  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.5921569, g: 0.47058827, b: 0.1764706, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 300
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u67DC\u5F0F\u8FD8\u539F\u4F46"
 --- !u!1 &8160886246538214610
 GameObject:
   m_ObjectHideFlags: 0
@@ -878,3 +1119,110 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u514D\u8D39"
+--- !u!1001 &1954093340297164097
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1353168168416546914}
+    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.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      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: -0.000018119812
+      objectReference: {fileID: 0}
+    - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      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: WidgetItemGam
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+--- !u!224 &1015609600778953068 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+  m_PrefabInstance: {fileID: 1954093340297164097}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &8046928928335380314 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+  m_PrefabInstance: {fileID: 1954093340297164097}
+  m_PrefabAsset: {fileID: 0}

+ 3 - 3
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -604,14 +604,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
             {
                 for (var i = 0; i < eventConfig.PrizeIDs.Length; i++)
                 {
-                    
                     List<ItemInfo> itemInfoss = DropManager.Instance.Drop(eventConfig.PrizeIDs[i],
                         eventConfig.PrizeNums[i]);
                     foreach (var itemInfo in itemInfoss)
                     {
                         eventList.itemInfos.Add(itemInfo.ToItemData());
                     }
-                    
+
                     // DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(eventConfig.PrizeIDs[i]);
                     // if (dropConfig.dropType == 3)
                     // {
@@ -753,7 +752,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(
                         LanguageManager.Instance.Text(10379,
                             lastSmallPlacesConfig.CompletionEventCount - lastSmallPlacesData?.completionEventCount));
-                    if (PlayerGuideManager.Instance.GuideIsCanDo(3))
+
+                    if (eventConfig.ID == 10003 && PlayerGuideManager.Instance.GuideIsCanDo(3))
                     {
                         PlayerGuideManager.Instance.SetGuid(3);
                     }

+ 10 - 9
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceItemPanel.cs

@@ -89,11 +89,7 @@ namespace Fort23.Mono
                 }
             }
 
-            if (selectType.Count == 0)
-            {
-                type = 1;
-            }
-            else if (selectType.Contains(7))
+            if (itemInfos1.Count > 0 || itemInfos2.Count == 0)
             {
                 type = 1;
             }
@@ -102,6 +98,7 @@ namespace Fort23.Mono
                 type = 2;
             }
 
+
             CreatWidget(type);
 
             return await base.AsyncInit(uiData);
@@ -120,7 +117,8 @@ namespace Fort23.Mono
                 toogleList.ShowTargetIndex(0);
                 foreach (var itemInfo in itemInfos1)
                 {
-                    DivineSenceItemWidget divineSenceItemWidget = await UIManager.Instance.CreateGComponent<DivineSenceItemWidget>(null, Content);
+                    DivineSenceItemWidget divineSenceItemWidget =
+                        await UIManager.Instance.CreateGComponent<DivineSenceItemWidget>(null, Content);
                     divineSenceItemWidget.CustomInit(itemInfo, CancelClick, selectItemInit);
                     divineSenceItemWidget.OnClick = OnClick;
                     _divineSenceItemWidgets.Add(divineSenceItemWidget);
@@ -131,7 +129,8 @@ namespace Fort23.Mono
                 toogleList.ShowTargetIndex(1);
                 foreach (var itemInfo in itemInfos2)
                 {
-                    DivineSenceItemWidget divineSenceItemWidget = await UIManager.Instance.CreateGComponent<DivineSenceItemWidget>(null, Content);
+                    DivineSenceItemWidget divineSenceItemWidget =
+                        await UIManager.Instance.CreateGComponent<DivineSenceItemWidget>(null, Content);
                     divineSenceItemWidget.CustomInit(itemInfo, CancelClick, selectItemInit);
                     divineSenceItemWidget.OnClick = OnClick;
                     _divineSenceItemWidgets.Add(divineSenceItemWidget);
@@ -152,9 +151,11 @@ namespace Fort23.Mono
             UIManager.Instance.HideUIUIPanel(this);
         }
 
-        public static async CTask OpenPanel(ItemInfo selectItemInit, List<int> selectType, Action<int> itemId, Action cancelCallBack)
+        public static async CTask OpenPanel(ItemInfo selectItemInit, List<int> selectType, Action<int> itemId,
+            Action cancelCallBack)
         {
-            await UIManager.Instance.LoadAndOpenPanel<DivineSenceItemPanel>(null, UILayer.Top, uiData: new object[] { selectItemInit, selectType,itemId, cancelCallBack },isShowBG:true);
+            await UIManager.Instance.LoadAndOpenPanel<DivineSenceItemPanel>(null, UILayer.Top,
+                uiData: new object[] { selectItemInit, selectType, itemId, cancelCallBack }, isShowBG: true);
         }
 
         public async override CTask Close()

+ 12 - 15
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceRestoredPanel.cs

@@ -31,7 +31,7 @@ namespace Fort23.Mono
         private void DivineSensePointChange(IEventData e)
         {
             Text_DivineSencePoint.text =
-                $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}";
+                $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax}";
         }
 
         public override void AddButtonEvent()
@@ -42,10 +42,8 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-      
-
             Text_DivineSencePoint.text =
-                $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}";
+                $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax}";
 
 
             await CreatWidget();
@@ -68,15 +66,8 @@ namespace Fort23.Mono
             }
 
             _divineSenceRestoredWidgets.Clear();
-            if (PlayerManager.Instance.BagController.GetItemCount(1702) <= 0)
-            {
-                DivineSenceRestoredWidget divineSenceRestoredWidget1 =
-                    await UIManager.Instance.CreateGComponentForObject<DivineSenceRestoredWidget>(
-                        DivineSenceRestoredWidget1, null, Content, isInstance: true);
-                divineSenceRestoredWidget1.CustomInit(601);
-                _divineSenceRestoredWidgets.Add(divineSenceRestoredWidget1);
-            }
-            
+
+
             ItemConfig[] itemConfigs = ConfigComponent.Instance.GetAll<ItemConfig>();
             for (var i = 0; i < itemConfigs.Length; i++)
             {
@@ -84,6 +75,11 @@ namespace Fort23.Mono
                 {
                     if (itemConfigs[i].ID == 1702 && PlayerManager.Instance.BagController.GetItemCount(1702) <= 0)
                     {
+                        DivineSenceRestoredWidget divineSenceRestoredWidget1 =
+                            await UIManager.Instance.CreateGComponentForObject<DivineSenceRestoredWidget>(
+                                DivineSenceRestoredWidget1, null, Content, isInstance: true);
+                        divineSenceRestoredWidget1.CustomInit(601);
+                        _divineSenceRestoredWidgets.Add(divineSenceRestoredWidget1);
                         continue;
                     }
 
@@ -95,7 +91,6 @@ namespace Fort23.Mono
                     _divineSenceRestoredWidgets.Add(divineSenceRestoredWidget3);
                 }
             }
-            
         }
 
         private void UpdateText()
@@ -103,6 +98,8 @@ namespace Fort23.Mono
             HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
             if (AccountFileInfo.Instance.playerData.divineSensePoint < heroPowerUpConfig.ShenshiMax)
             {
+                if (!Text_Tips2.gameObject.activeInHierarchy)
+                    Text_Tips2.gameObject.SetActive(true);
                 if (AccountFileInfo.Instance.playerData.todayDivineSensePoint <
                     PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[0])
                 {
@@ -124,7 +121,7 @@ namespace Fort23.Mono
             else
             {
                 Text_Tips1.text = LanguageManager.Instance.Text(10334);
-                Text_Tips2.text = LanguageManager.Instance.Text(10334);
+                Text_Tips2.gameObject.SetActive(false);
             }
         }
 

+ 53 - 6
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceRestoredWidget.cs

@@ -95,7 +95,7 @@ namespace Fort23.Mono
             });
         }
 
-        public void CustomInit(int shopitemId)
+        public async void CustomInit(int shopitemId)
         {
             openType = 1;
             ShopItemConfig = ConfigComponent.Instance.Get<ShopItemConfig>(shopitemId);
@@ -116,23 +116,70 @@ namespace Fort23.Mono
                 Text_Price.text = ShopItemConfig.price.ToString();
             }
 
-            Icon_Itemicon.icon_name = itemConfig.icon;
-            Text_Count.text = $"x{itemConfig.associateVlaue[0]}";
+            Text_Name.text = LanguageManager.Instance.Text(itemConfig.itemName);
+
+
+            Text_Count.text = $"+{itemConfig.associateVlaue[0]}";
             Text_Tip.text = LanguageManager.Instance.Text(10369, ShopItemConfig.buyCount - shopItem.buyCount);
+
+
+            bool isCanBuy = true;
+
+            if (ShopItemConfig.buyCount != -1 && shopItem.buyCount >= ShopItemConfig.buyCount)
+            {
+                isCanBuy = false;
+            }
+
+            if (ShopItemConfig.price != 0 &&
+                !PlayerManager.Instance.BagController.IsEnough(ShopItemConfig.costItemId,
+                    ShopItemConfig.price * 1))
+            {
+                isCanBuy = false;
+            }
+
+            if (isCanBuy)
+            {
+                Btn_Use.transform.RecoverColor();
+            }
+            else
+            {
+                Btn_Use.transform.Gray();
+            }
+
+
+            WidgetItem widgetItem =
+                await UIManager.Instance.CreateGComponentForObject<WidgetItem>(WidgetItemGam, null, itemRoot);
+            widgetItem.InitWidget(new ItemInfo(itemConfig.ID, 0));
         }
 
-        public void CustomInit1(int itemId)
+        public async void CustomInit1(int itemId)
         {
             openType = 2;
             itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemId);
-            Icon_Itemicon.icon_name = itemConfig.icon;
-            Text_Count.text = $"x{itemConfig.associateVlaue[0]}";
+
+
+            Text_Name.text = LanguageManager.Instance.Text(itemConfig.itemName);
+
+            Text_Count.text = $"+{itemConfig.associateVlaue[0]}";
 
             Text_Tip.text =
                 LanguageManager.Instance.Text(10327, PlayerManager.Instance.BagController.GetItemCount(itemId));
             Group_Price.SetActive(false);
             Text_Free.gameObject.SetActive(true);
             Text_Free.text = LanguageManager.Instance.Text(10329);
+
+            if (PlayerManager.Instance.BagController.IsEnough(itemConfig.ID, 1))
+            {
+                Btn_Use.transform.RecoverColor();
+            }
+            else
+            {
+                Btn_Use.transform.Gray();
+            }
+
+            WidgetItem widgetItem =
+                await UIManager.Instance.CreateGComponentForObject<WidgetItem>(WidgetItemGam, null, itemRoot);
+            widgetItem.InitWidget(new ItemInfo(itemConfig.ID, 0));
         }
     }
 }

+ 33 - 11
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceRestoredWidgetData.cs

@@ -41,17 +41,6 @@ namespace Fort23.Mono
 	      return _Text_Count;
 	     }
 	   }
-	  private MyImage _Icon_Itemicon;
-	  public MyImage Icon_Itemicon
-	   {
-	   get{
-	      if (_Icon_Itemicon == null)
-	       {
-	         _Icon_Itemicon  = GetUIUnit<MyImage>("Icon_Itemicon"); 
-	       }
-	      return _Icon_Itemicon;
-	     }
-	   }
 	  private GameObject _Group_Price;
 	  public GameObject Group_Price
 	   {
@@ -96,6 +85,39 @@ namespace Fort23.Mono
 	      return _Text_Free;
 	     }
 	   }
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  private RectTransform _itemRoot;
+	  public RectTransform itemRoot
+	   {
+	   get{
+	      if (_itemRoot == null)
+	       {
+	         _itemRoot  = GetUIUnit<RectTransform>("itemRoot"); 
+	       }
+	      return _itemRoot;
+	     }
+	   }
+	  private GameObject _WidgetItemGam;
+	  public GameObject WidgetItemGam
+	   {
+	   get{
+	      if (_WidgetItemGam == null)
+	       {
+	         _WidgetItemGam  = GetUIUnit<GameObject>("WidgetItemGam"); 
+	       }
+	      return _WidgetItemGam;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{