神识优化

Assets/Res/UI/DialoguePanel/DialogueOptionWidget.prefab

@@ -13,6 +13,7 @@ GameObject:
   - component: {fileID: 2934525852061817999}
   - component: {fileID: 6116667400179102108}
   - component: {fileID: 6887871023316888409}
+  - component: {fileID: 1493722273264314552}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_desc
@@ -35,10 +36,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8347964422981004825}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 320.29395, y: -36.5}
+  m_SizeDelta: {x: 628.4258, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5086374945530126731
 CanvasRenderer:
@@ -81,7 +82,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 12321312
+  m_Text: 12321312123213121232131212321312123213121232131212321312
 --- !u!114 &6116667400179102108
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -94,8 +95,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!114 &6887871023316888409
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -111,6 +112,26 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &1493722273264314552
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 250408078146684751}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 628.4258
+  m_MinHeight: -1
+  m_PreferredWidth: 628.4258
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &1586153670201676115
 GameObject:
   m_ObjectHideFlags: 0
@@ -125,7 +146,7 @@ GameObject:
   - component: {fileID: 2912968521683004226}
   - component: {fileID: 1772693467188324289}
   - component: {fileID: 1077933337324274719}
-  - component: {fileID: 1072443894772605252}
+  - component: {fileID: 4043256606555709721}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: DialogueOptionWidget
@@ -151,8 +172,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: 4.2567, y: 0}
-  m_SizeDelta: {x: 628.4258, y: 47}
+  m_AnchoredPosition: {x: 10.3377, y: 0}
+  m_SizeDelta: {x: 640.5879, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2619129949825441592
 CanvasRenderer:
@@ -200,6 +221,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
+  imageH: 47
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -279,31 +301,31 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1586153670201676115}
-  m_Enabled: 0
+  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!114 &1072443894772605252
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &4043256606555709721
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1586153670201676115}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 1
-    m_Right: 2
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
+    m_Left: 5
+    m_Right: 5
+    m_Top: 5
+    m_Bottom: 5
+  m_ChildAlignment: 1
   m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -218,6 +218,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: bf80d9ac134912f98d951197cdcc8fc6
+  imageH: 28
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -422,6 +423,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
+  imageH: 206
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -718,6 +720,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 70
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -766,6 +769,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5411678273692701274
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4876923545589450363}
+  - component: {fileID: 3547886679702880668}
+  - component: {fileID: 1016046656120999018}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Name1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4876923545589450363
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5411678273692701274}
+  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: 3275273584098972649}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 40.2, y: -145.58}
+  m_SizeDelta: {x: 204.8788, y: 54.4193}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &3547886679702880668
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5411678273692701274}
+  m_CullTransparentMesh: 1
+--- !u!114 &1016046656120999018
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5411678273692701274}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 29
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 6
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
 --- !u!1 &5477700202101321355
 GameObject:
   m_ObjectHideFlags: 0
@@ -796,7 +879,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5221273778027939417}
   - {fileID: 311482651042689352}
   - {fileID: 3275273584098972649}
   - {fileID: 5263293711959085783}
@@ -909,6 +991,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Name1
+    gameObject: {fileID: 1016046656120999018}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5657917399314919801
 GameObject:
@@ -1040,6 +1127,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1166,7 +1254,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_dadi_02
+  _icon_name: dec_di_01
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1174,6 +1262,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
+  imageH: 336.082
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1263,6 +1352,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: bf80d9ac134912f98d951197cdcc8fc6
+  imageH: 28
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1444,6 +1534,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1577,6 +1668,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: bf80d9ac134912f98d951197cdcc8fc6
+  imageH: 28
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1704,12 +1796,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1803833552231621266}
+  m_Father: {fileID: 3275273584098972649}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 455.95898}
+  m_SizeDelta: {x: 34.599976, y: 1087.918}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2437030225407380323
 CanvasRenderer:
@@ -1757,6 +1849,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1847,6 +1940,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1937,6 +2031,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2089,8 +2184,10 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 5221273778027939417}
   - {fileID: 5617782115550842872}
   - {fileID: 3450449309247689875}
+  - {fileID: 4876923545589450363}
   m_Father: {fileID: 1803833552231621266}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -2222,6 +2319,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 405.4359
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/DivineSence/ShengShiConditionWidget.prefab

@@ -11,6 +11,8 @@ GameObject:
   - component: {fileID: 2059370578134625917}
   - component: {fileID: 8829860962623938134}
   - component: {fileID: 418351672045357513}
+  - component: {fileID: 5679773787401789534}
+  - component: {fileID: 8202365557988125062}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -80,6 +82,35 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9493\u9C7C\u7FC1"
+--- !u!114 &5679773787401789534
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4314931744859409028}
+  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!114 &8202365557988125062
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4314931744859409028}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &7999435953416995087
 GameObject:
   m_ObjectHideFlags: 0
@@ -98,7 +129,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5851165397762221054
 RectTransform:
   m_ObjectHideFlags: 0
@@ -164,6 +195,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
     packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
     lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
+  imageH: 27.5663
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -397,6 +397,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 32.4386
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -530,6 +531,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 70
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -740,6 +742,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 79.3394
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -801,7 +804,7 @@ GameObject:
   - component: {fileID: 7694624349492924708}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy)
+  m_Name: Text_Go
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -880,7 +883,7 @@ GameObject:
   - component: {fileID: 4166089039989576680}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Button
+  m_Name: Button1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1107,6 +1110,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 250
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1227,6 +1231,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Go
+    gameObject: {fileID: 7694624349492924708}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &6161269103075097772
 GameObject:
@@ -1313,6 +1322,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 35.969
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1541,6 +1551,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\event.txt
     packgSpritePath: Assets/Res/UIAtlas/event.spriteatlasv2
     lasetJsonGUID: df80f818a4f258d33b8038600af6f215
+  imageH: 53.466114
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1710,6 +1721,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 31.607994
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1894,6 +1906,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/ItemDetailsPanel/FaBaoDetailsPanel.prefab

@@ -85,6 +85,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 69.5521
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -149,7 +150,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -174,6 +175,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -307,6 +309,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 204.23534
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -571,6 +574,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 1164.7156
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -660,6 +664,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 69.5521
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1054,6 +1059,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 230.6788
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1190,6 +1196,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 253.3462
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1358,6 +1365,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: 7fb091d8ea8692b1350a9fd8f408874a
+  imageH: 99.84776
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1635,6 +1643,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 69.5521
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1884,6 +1893,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
+  imageH: 66
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab

@@ -84,6 +84,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -252,6 +253,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -340,6 +342,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -449,6 +452,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
+  imageH: 66
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -617,6 +621,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -974,6 +979,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: 151dde130cdc5228de9614f608886409
+  imageH: 150.4743
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1161,6 +1167,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 437.793
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1457,6 +1464,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 1309.6
   useGradient: 0
   topOrLeftColor: {r: 0.09411766, g: 0.16862746, b: 0.18431373, a: 1}
   bottomOrRightColor: {r: 0.6117647, g: 0.80392164, b: 0.7843138, a: 1}
@@ -1744,6 +1752,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1993,6 +2002,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
+  imageH: 166.9464
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2244,7 +2254,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2269,6 +2279,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2405,6 +2416,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 0.14901961, g: 0.26666668, b: 0.27058825, a: 1}
   bottomOrRightColor: {r: 0.14509805, g: 0.25490198, b: 0.28235295, a: 1}

Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab

@@ -84,6 +84,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 113
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -524,7 +525,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -672,6 +673,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 646.9775
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -855,6 +857,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
     packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
     lasetJsonGUID: c28e54f99ed5b137a09ad8c2e8fcb311
+  imageH: 92.897125
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/Task/TaskInfoPanel.prefab

@@ -31,7 +31,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2896655462721008753}
-  - {fileID: 4688522053669353716}
   - {fileID: 2569128129379278262}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -63,11 +62,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Btn_Ok
-    gameObject: {fileID: 3169074378938001994}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Text_desc
     gameObject: {fileID: 1040938809657299556}
     isAssetBundle: 0
@@ -93,6 +87,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Ok
+    gameObject: {fileID: 4156534679474792106}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1408015899473625068
 GameObject:
@@ -165,7 +164,7 @@ MonoBehaviour:
   m_Spacing: {x: 2.8, y: 0}
   m_Constraint: 1
   m_ConstraintCount: 4
---- !u!1 &2132268725135064903
+--- !u!1 &2042386527690377487
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -173,53 +172,53 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2569128129379278262}
-  - component: {fileID: 9156533754913033698}
-  - component: {fileID: 8488195482551738332}
+  - component: {fileID: 5610190620975497141}
+  - component: {fileID: 1252414563731702906}
+  - component: {fileID: 7510239777471755436}
+  - component: {fileID: 4156534679474792106}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Btn_Ok
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &2569128129379278262
+--- !u!224 &5610190620975497141
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2132268725135064903}
+  m_GameObject: {fileID: 2042386527690377487}
   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: 8887379241100265904}
-  - {fileID: 441960678594688368}
-  m_Father: {fileID: 8599819629026832582}
+  - {fileID: 5583053337137462152}
+  m_Father: {fileID: 2569128129379278262}
   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: 46.565613}
-  m_SizeDelta: {x: 475.8763, y: 777.9515}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &9156533754913033698
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 56}
+  m_SizeDelta: {x: 204.4998, y: 64.664}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &1252414563731702906
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2132268725135064903}
+  m_GameObject: {fileID: 2042386527690377487}
   m_CullTransparentMesh: 1
---- !u!114 &8488195482551738332
+--- !u!114 &7510239777471755436
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2132268725135064903}
+  m_GameObject: {fileID: 2042386527690377487}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
@@ -234,7 +233,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -243,19 +242,64 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_dadi_01
+  _icon_name: btn_quxiao
   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
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  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 &2553589566839113697
+--- !u!114 &4156534679474792106
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2042386527690377487}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7510239777471755436}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &2132268725135064903
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -263,53 +307,54 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4688522053669353716}
-  - component: {fileID: 2934276402299459566}
-  - component: {fileID: 2433990691951363383}
-  - component: {fileID: 3169074378938001994}
+  - component: {fileID: 2569128129379278262}
+  - component: {fileID: 9156533754913033698}
+  - component: {fileID: 8488195482551738332}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Btn_Ok
+  m_Name: myImage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &4688522053669353716
+  m_IsActive: 1
+--- !u!224 &2569128129379278262
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
+  m_GameObject: {fileID: 2132268725135064903}
   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: 6150498200931894423}
+  - {fileID: 8887379241100265904}
+  - {fileID: 441960678594688368}
+  - {fileID: 5610190620975497141}
   m_Father: {fileID: 8599819629026832582}
   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: -9, y: -276.2}
-  m_SizeDelta: {x: 253, y: 80}
+  m_AnchoredPosition: {x: 0, y: 46.565613}
+  m_SizeDelta: {x: 475.8763, y: 777.9515}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2934276402299459566
+--- !u!222 &9156533754913033698
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
+  m_GameObject: {fileID: 2132268725135064903}
   m_CullTransparentMesh: 1
---- !u!114 &2433990691951363383
+--- !u!114 &8488195482551738332
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
+  m_GameObject: {fileID: 2132268725135064903}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
@@ -324,7 +369,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -333,62 +378,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_lingwu
+  _icon_name: dec_xiadiban
   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: 
+    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!114 &3169074378938001994
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 2433990691951363383}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &2684168885766463697
 GameObject:
   m_ObjectHideFlags: 0
@@ -474,6 +476,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 70
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -522,7 +525,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &3552915526930824737
+--- !u!1 &3627747089450203247
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -530,58 +533,59 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6150498200931894423}
-  - component: {fileID: 2944092694878402809}
-  - component: {fileID: 2519922024915380815}
+  - component: {fileID: 3220702368838562604}
+  - component: {fileID: 9047568930966635103}
+  - component: {fileID: 1040938809657299556}
+  - component: {fileID: 2900250309646589645}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (1)
+  m_Name: Text_desc
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &6150498200931894423
+--- !u!224 &3220702368838562604
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3552915526930824737}
+  m_GameObject: {fileID: 3627747089450203247}
   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: 4688522053669353716}
+  m_Father: {fileID: 8887379241100265904}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2944092694878402809
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 238, y: -84.5865}
+  m_SizeDelta: {x: 410.77, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &9047568930966635103
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3552915526930824737}
+  m_GameObject: {fileID: 3627747089450203247}
   m_CullTransparentMesh: 1
---- !u!114 &2519922024915380815
+--- !u!114 &1040938809657299556
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3552915526930824737}
+  m_GameObject: {fileID: 3627747089450203247}
   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.9490197, g: 0.94117653, b: 0.94117653, a: 1}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -590,19 +594,33 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 33
-    m_FontStyle: 1
+    m_FontSize: 26
+    m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4EFB\u52A1\u5B8C\u6210"
---- !u!1 &3627747089450203247
+  m_Text: "\u5317\u6D77\u9065\u8FDC\uFF0C\u5C71\u9AD8\u8DEF\u9669\uFF0C\u6211\u5982\u4ECA\u53EA\u6709\u7EC3\u6C14\u4FEE\u4E3A\uFF0C\u4F55\u65F6\u80FD\u5230\uFF1F\u5F97\u4E00\u8FB9\u4FEE\u70BC\u4E00\u8FB9\u627E\u8DEF\u3002"
+--- !u!114 &2900250309646589645
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3627747089450203247}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!1 &4702846350262094641
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -610,59 +628,58 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3220702368838562604}
-  - component: {fileID: 9047568930966635103}
-  - component: {fileID: 1040938809657299556}
-  - component: {fileID: 2900250309646589645}
+  - component: {fileID: 5583053337137462152}
+  - component: {fileID: 6183999152419239743}
+  - component: {fileID: 1857994004787129470}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text_desc
+  m_Name: Text (Legacy)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3220702368838562604
+--- !u!224 &5583053337137462152
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3627747089450203247}
+  m_GameObject: {fileID: 4702846350262094641}
   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: 8887379241100265904}
+  m_Father: {fileID: 5610190620975497141}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 238, y: -84.5865}
-  m_SizeDelta: {x: 410.77, y: 0}
-  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &9047568930966635103
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6183999152419239743
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3627747089450203247}
+  m_GameObject: {fileID: 4702846350262094641}
   m_CullTransparentMesh: 1
---- !u!114 &1040938809657299556
+--- !u!114 &1857994004787129470
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3627747089450203247}
+  m_GameObject: {fileID: 4702846350262094641}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_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
@@ -671,32 +688,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
-    m_FontStyle: 0
+    m_FontSize: 32
+    m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 2
+    m_MinSize: 10
     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: "\u5317\u6D77\u9065\u8FDC\uFF0C\u5C71\u9AD8\u8DEF\u9669\uFF0C\u6211\u5982\u4ECA\u53EA\u6709\u7EC3\u6C14\u4FEE\u4E3A\uFF0C\u4F55\u65F6\u80FD\u5230\uFF1F\u5F97\u4E00\u8FB9\u4FEE\u70BC\u4E00\u8FB9\u627E\u8DEF\u3002"
---- !u!114 &2900250309646589645
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3627747089450203247}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 0
-  m_VerticalFit: 2
+  m_Text: "\u5B8C\u6210\u4EFB\u52A1"
 --- !u!1 &6187359724244078961
 GameObject:
   m_ObjectHideFlags: 0
@@ -707,7 +710,6 @@ GameObject:
   m_Component:
   - component: {fileID: 8887379241100265904}
   - component: {fileID: 2541774699167515807}
-  - component: {fileID: 8352399863819387752}
   - component: {fileID: 4096449100553992080}
   - component: {fileID: 1843378295882593034}
   m_Layer: 0
@@ -749,36 +751,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6187359724244078961}
   m_CullTransparentMesh: 1
---- !u!114 &8352399863819387752
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6187359724244078961}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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
 --- !u!114 &4096449100553992080
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scenes/testCombat.scene

@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -348,6 +348,10 @@ namespace GameLogic.Bag
         /// <returns></returns>
         public bool DeductItem(ItemInfo item, long count)
         {
+            if (item == null)
+            {
+                return false;
+            }
             if (item.config.ID <= 0)
             {
                 return false;

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -60,7 +60,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// </summary>
         public HeroData heroData;
 
-        public EventList CurrentZuiZhongEventList;
+        public int CurrentZuiZhongEventListId;
 
         public List<DaoYouData> daoYouDatas = new List<DaoYouData>();
 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -146,15 +146,17 @@ public class EventSystemManager : Singleton<EventSystemManager>
             return null;
         }
 
-
+        CeekEventCompletes(8, new[] { 1 });
         EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
 
 
         var eventConfigs = DetectEvents(useCount, useItems);
         if (eventConfigs == null || eventConfigs.Count == 0)
+        {
+            TipMessagePanel.OpenTipMessagePanel("没有可以触发的事件");
             return default;
+        }
 
-        CeekEventCompletes(8, new[] { 1 });
 
         //扣除神识值 增加神识经验
         int xiaoHao = eventConfigs.Count * PlayerManager.Instance.gameConstantConfig.DetectEventCount;
@@ -173,16 +175,17 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     public void UpdateZuizhongEventData()
     {
-        if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList == null || AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == 0)
+        AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e => e.guid == AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId);
+        if (eventList == null || eventList.guid == 0)
         {
             var mainEventData = GetMainEventDta();
             if (mainEventData != null)
             {
-                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = mainEventData;
+                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId = mainEventData.guid;
             }
             else if (AccountFileInfo.Instance.playerData.eventList.Count > 0)
             {
-                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = AccountFileInfo.Instance.playerData.eventList[0];
+                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId = AccountFileInfo.Instance.playerData.eventList[0].guid;
             }
         }
     }
@@ -923,15 +926,14 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
         PlayerManager.Instance.BagController.AddItem(itemInfos);
-        RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
-        await rewardsPanel.UIClosed();
 
 
         if (eventConfig.EventTriggerType == 4)
         {
             AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
             AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
-            TaskInfoPanel.OpenPanel(eventList);
+            TaskInfoPanel taskInfoPanel = await TaskInfoPanel.OpenPanel(eventList,2);
+            await taskInfoPanel.UIClosed();
         }
         else
         {
@@ -939,9 +941,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
             eventList.isCompleted = true;
         }
 
-        if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid)
+        RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
+        await rewardsPanel.UIClosed();
+
+        if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid)
         {
-            AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = null;
+            AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId = 0;
             UpdateZuizhongEventData();
         }
 

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -160,6 +160,9 @@ namespace Fort23.Mono
                 shownextIcon = nextIcon3;
             }
 
+            EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
+            Text_Name1.text = LanguageManager.Instance.Text(eventNpc.name);
+
             StartShowMassge();
         }
 
@@ -386,9 +389,9 @@ namespace Fort23.Mono
             _currShowMessage = null;
             dialogueMessaga = null;
 
-            DialgueType1.gameObject.SetActive(false);
-            DialgueType2.gameObject.SetActive(false);
-            OptionMarsk.SetActive(false);
+            // DialgueType1.gameObject.SetActive(false);
+            // DialgueType2.gameObject.SetActive(false);
+            // OptionMarsk.SetActive(false);
             isOver = false;
             base.Close();
         }

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs

@@ -195,6 +195,17 @@ namespace Fort23.Mono
 	      return _StartPos;
 	     }
 	   }
+	  private Text _Text_Name1;
+	  public Text Text_Name1
+	   {
+	   get{
+	      if (_Text_Name1 == null)
+	       {
+	         _Text_Name1  = GetUIUnit<Text>("Text_Name1"); 
+	       }
+	      return _Text_Name1;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs

@@ -147,7 +147,7 @@ namespace Fort23.Mono
         public async static CTask<bool> OpenPanel(int levebattleId)
         {
             CTask<bool> result = CTask<bool>.Create();
-            BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, uiData: new object[] { levebattleId, result });
+            BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null,UILayer.Top, uiData: new object[] { levebattleId, result });
             // bossInfoPanel.CustomInit(levebattleId, result);
             return await result;
         }

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -166,12 +166,12 @@ namespace Fort23.Mono
                 return;
 
             isTriggerEvent = true;
-            this.GObjectPoolInterface.SetActive(false);
+            //this.GObjectPoolInterface.SetActive(false);
             // EventSystemManager.Instance.isOpenUi = false;
 
             EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
             {
-                this.GObjectPoolInterface.SetActive(true);
+                //this.GObjectPoolInterface.SetActive(true);
                 isTriggerEvent = false;
                 UpdateContent();
             });
@@ -182,7 +182,17 @@ namespace Fort23.Mono
         {
             ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
 
-            TaskInfoPanel.OpenPanel(shengShiEventWidgetType2.eventList);
+            if (shengShiEventWidgetType2.isComplete)
+            {
+                if (shengShiEventWidgetType2.evenkConfig.ResultType == 0 || shengShiEventWidgetType2.evenkConfig.ResultType == 3)
+                {
+                    GoOnClick(shengShiEventWidgetType2);
+                    return;
+                }
+            }
+
+
+            TaskInfoPanel.OpenPanel(shengShiEventWidgetType2.eventList, 1);
         }
 
         public void HindIScorllListWidget(IScorllListWidget widget)
@@ -192,7 +202,7 @@ namespace Fort23.Mono
 
         public async static CTask<DivineSenceEventPreviewPanel> OpenPanel()
         {
-            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null,UILayer.Top);
+            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null, UILayer.Top);
             return divineSenceEventPreviewPanel;
         }
 

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanel.cs

@@ -40,10 +40,11 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
             Content.Init(this, eventList.Count);
         }
+
         public override CTask<bool> AsyncInit(object[] uiData)
         {
             eventList = uiData[0] as List<AccountFileInfo.EventList>;
-         
+
             if (eventList != null && eventList.Count > 0)
                 Content.Init(this, eventList.Count);
 
@@ -70,7 +71,7 @@ namespace Fort23.Mono
             // else
             {
                 ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(eventList[index],GoOnClick);
+                shengShiEventWidgetType2.CustomInit(eventList[index], GoOnClick);
                 shengShiEventWidgetType2.OnClick = OnClick;
                 return shengShiEventWidgetType2;
             }
@@ -82,27 +83,27 @@ namespace Fort23.Mono
                 return;
 
             ShengShiEventWidgetType3 shengShiEventWidgetType3 = obj as ShengShiEventWidgetType3;
-            this.GObjectPoolInterface.SetActive(false);
+            //this.GObjectPoolInterface.SetActive(false);
             EventSystemManager.Instance.isOpenUi = false;
             EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType3.eventList, () =>
             {
                 eventList.Remove(shengShiEventWidgetType3.eventList);
                 Content.Init(this, eventList.Count);
                 EventSystemManager.Instance.isOpenUi = true;
-                this.GObjectPoolInterface.SetActive(true);
+                //this.GObjectPoolInterface.SetActive(true);
             });
         }
-        
+
         private void OnClick(ItemWidgetBasic obj)
         {
             ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
-            
-            TaskInfoPanel.OpenPanel(shengShiEventWidgetType2.eventList);
-            
+
+            TaskInfoPanel.OpenPanel(shengShiEventWidgetType2.eventList,1);
+
             // if (EventSystemManager.Instance.isTriggerEvent)
             //     return;
             //
-        
+
             // this.GObjectPoolInterface.SetActive(false);
             // EventSystemManager.Instance.isOpenUi = false;
             // EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
@@ -115,25 +116,24 @@ namespace Fort23.Mono
             // });
         }
 
-       private void GoOnClick(ItemWidgetBasic obj)
+        private void GoOnClick(ItemWidgetBasic obj)
         {
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
 
             ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
-            this.GObjectPoolInterface.SetActive(false);
+            //this.GObjectPoolInterface.SetActive(false);
             EventSystemManager.Instance.isOpenUi = false;
             EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
             {
                 eventList.Remove(shengShiEventWidgetType2.eventList);
                 Content.Init(this, eventList.Count);
                 EventSystemManager.Instance.isOpenUi = true;
-                this.GObjectPoolInterface.SetActive(true);
-            
+                //this.GObjectPoolInterface.SetActive(true);
             });
         }
 
- 
+
         public void HindIScorllListWidget(IScorllListWidget widget)
         {
             UIManager.Instance.DormancyGComponent(widget as UIComponent);

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -16,6 +16,8 @@ namespace Fort23.Mono
     {
         List<WidgetItem> widgetList = new List<WidgetItem>();
         private Action<ItemWidgetBasic> goCallBack;
+        public EventLinkConfig evenkConfig;
+        public bool isComplete;
 
         private void Init()
         {
@@ -51,7 +53,7 @@ namespace Fort23.Mono
 
             Btn_ZuiZhong.onClick.AddListener(() =>
             {
-                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = eventList;
+                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId = eventList.guid;
 
                 EventManager.Instance.Dispatch(CustomEventType.UpdateZuiZhongEvent, null);
             });
@@ -67,9 +69,9 @@ namespace Fort23.Mono
         private void UpdateZuiZhongEvent(IEventData e)
         {
             // if(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid)
-            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid != eventList.guid);
+            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId != eventList.guid);
 
-            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid);
+            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid);
         }
 
         public async void CustomInit(AccountFileInfo.EventList eventList, Action<ItemWidgetBasic> goCallBack)
@@ -84,7 +86,7 @@ namespace Fort23.Mono
             this.eventList = eventList;
             this.goCallBack = goCallBack;
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
-            EventLinkConfig evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
+            evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
 
             AccountFileInfo.EventLinkData eventLinkData = eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
 
@@ -103,7 +105,7 @@ namespace Fort23.Mono
                     break;
                 }
             }
-
+            Text_Go.text = "前往";
             if (eventLinkData == null || eventLinkData.eventConditions == null || eventLinkData.eventConditions.Count == 0)
             {
                 if (evenkConfig.EventConditionMessage != 0)
@@ -120,7 +122,7 @@ namespace Fort23.Mono
             else
             {
                 string desc = "";
-                bool isComplete = true;
+                isComplete = true;
                 foreach (var eventConditionData in eventLinkData.eventConditions)
                 {
                     if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionData))
@@ -134,6 +136,17 @@ namespace Fort23.Mono
                 if (isComplete)
                 {
                     EventconditionState.ChangeState(1);
+
+                    if (evenkConfig.ResultType == 0 || evenkConfig.ResultType == 3)
+                    {
+                        Text_Go.text = "完成";
+                    }
+                    // else
+                    // {
+                    //     Text_Go.text = "前往";
+                    // }
+                    
+                    
                 }
                 else
                 {
@@ -144,9 +157,9 @@ namespace Fort23.Mono
                 Text_Eventcondition.text = desc;
             }
 
-            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid != eventList.guid);
+            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId != eventList.guid);
 
-            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid);
+            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid);
             Icon_Marsk.gameObject.SetActive(eventList.isCompleted);
 
 
@@ -174,16 +187,7 @@ namespace Fort23.Mono
                         ItemInfo itemInfo = new ItemInfo( i1, randomEventConfig.PrizeNums[i]);
                         itemInfos.Add(itemInfo);
                     }
-                    //
-                    // if (dropConfig.dropType == 3)
-                    // {
-                    //     
-                    // }
-                    // else
-                    // {
-                    //     List<ItemInfo> items = DropManager.Instance.DropItem(randomEventConfig.PrizeIDs[i]);
-                    //     itemInfos.AddRange(items);
-                    // }
+       
                 }
 
                 for (var i = 0; i < itemInfos.Count; i++)

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2Data.cs

@@ -151,6 +151,17 @@ namespace Fort23.Mono
 	      return _Btn_Bag;
 	     }
 	   }
+	  private Text _Text_Go;
+	  public Text Text_Go
+	   {
+	   get{
+	      if (_Text_Go == null)
+	       {
+	         _Text_Go  = GetUIUnit<Text>("Text_Go"); 
+	       }
+	      return _Text_Go;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -204,7 +204,7 @@ namespace Fort23.Mono
 
             _shengShiConditionWidgets.Clear();
 
-            AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList;
+            AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e => e.guid==AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId);
             if (eventList != null)
             {
                 if (shengShiEventWidget == null)

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -97,7 +97,11 @@ namespace Fort23.Mono
                 int conFigId = curretnSentimentProperty.groupId * 100 + level + 1;
                 SentimentEffectConfig sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
 
-                PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId, sentimentEffectConfig.upConstCount);
+                if (PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId, sentimentEffectConfig.upConstCount))
+                {
+                    TipMessagePanel.OpenTipMessagePanel("道具不足");
+                    return;
+                }
                 //扣除道具
                 // sentimentEffectConfig.upConstItemId.
                 // s

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

@@ -42,22 +42,34 @@ namespace Fort23.Mono
         {
             Btn_Coin.onClick.AddListener(() =>
             {
-                if (_itemConfig.ID == GlobalParam.Item_Coin_ID)
+                // if (_itemConfig.ID == GlobalParam.Item_Coin_ID)
+                // {
+                //     OnClickIcon_Coin_button();
+                // }
+                // else  if (_itemConfig.ID == GlobalParam.Item_Diamond_ID)
+                // {
+                //     OnClickIcon_Diamon_button();
+                // }
+                // else  if (_itemConfig.ID == GlobalParam.Item_HeroExp_ID)
+                // {
+                //     OnClickIcon_HeroExp_button();
+                // }
+                if (_itemConfig.associateID == 3)
                 {
-                    OnClickIcon_Coin_button();
+                    GongFaDetailsPanel.Open(new ItemInfo(_itemConfig.ID));
                 }
-                else  if (_itemConfig.ID == GlobalParam.Item_Diamond_ID)
+                else if (_itemConfig.associateID == 4)
                 {
-                    OnClickIcon_Diamon_button();
+                    FaBaoDetailsPanel.OpenPanel(new ItemInfo(_itemConfig.ID));
                 }
-                else  if (_itemConfig.ID == GlobalParam.Item_HeroExp_ID)
+                else
                 {
-                    OnClickIcon_HeroExp_button();
+                    ItemDetailsPanel.OpenPanel(new ItemInfo(_itemConfig.ID));
                 }
             });
         }
-        
-        
+
+
         private void OnClickIcon_HeroExp_button()
         {
             // TipMessagePanel.OpenTipMessagePanel("英雄经验，可用于升级英雄等级<color=#ff0000>（每杀死一个小怪能获得经验，击杀boss能获得大量经验）</color>",
@@ -79,14 +91,13 @@ namespace Fort23.Mono
             TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(106),
                 new Vector2(Icon_Energy.transform.position.x, Icon_Energy.transform.position.y - 0.5f));
         }
-        
+
 
         public void CustomInit(int id)
         {
             _itemConfig = ConfigComponent.Instance.Get<ItemConfig>(id);
             Icon_Energy.icon_name = _itemConfig.icon;
-            Text_Count.text =  PlayerManager.Instance.BagController.GetItemCount(id).ToString();
-            
+            Text_Count.text = PlayerManager.Instance.BagController.GetItemCount(id).ToString();
         }
     }
 }

Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -14,6 +14,8 @@ namespace Fort23.Mono
     {
         List<WidgetItem> widgetItems = new List<WidgetItem>();
 
+        private int type;
+
         private void Init()
         {
             isAddStack = false;
@@ -29,12 +31,23 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+            Btn_Close.onClick.AddListener(() =>
+            {
+                if (type == 2)
+                {
+                    return;
+                }
+
+                UIManager.Instance.HideUIUIPanel(this);
+            });
             Btn_Bag.onClick.AddListener(() => { TipMessagePanel.OpenTipMessagePanel("事件的选择会影响获得的道具！"); });
+            Btn_Ok.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public async void CustomInit(AccountFileInfo.EventList eventList)
+        public async void CustomInit(AccountFileInfo.EventList eventList, int type)
         {
+            this.type = type;
+            Btn_Ok.gameObject.SetActive(type == 2);
             EventConfig taskConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             Text_Name.text = LanguageManager.Instance.Text(taskConfig.EventName);
             Text_desc.text = LanguageManager.Instance.Text(taskConfig.Description);
@@ -100,10 +113,10 @@ namespace Fort23.Mono
             }
         }
 
-        public async static CTask<TaskInfoPanel> OpenPanel(AccountFileInfo.EventList eventList)
+        public async static CTask<TaskInfoPanel> OpenPanel(AccountFileInfo.EventList eventList, int type)
         {
             TaskInfoPanel taskInfoPanel = await UIManager.Instance.LoadAndOpenPanel<TaskInfoPanel>(null, UILayer.Top);
-            taskInfoPanel.CustomInit(eventList);
+            taskInfoPanel.CustomInit(eventList, type);
             return taskInfoPanel;
         }