浏览代码

事件ui修改

lzx 12 小时之前
父节点
当前提交
9ef8808b3d

文件差异内容过多而无法显示
+ 620 - 134
Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab


+ 288 - 46
Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -171,7 +171,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.49411768, g: 0.48235297, b: 0.4666667, a: 1}
+  m_Color: {r: 0.34509805, g: 0.3137255, b: 0.3019608, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -317,7 +317,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: 222.42291, y: -93.9532}
+  m_AnchoredPosition: {x: 221.6, y: -90.7}
   m_SizeDelta: {x: 192.4328, y: 52.7449}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8044263114105609004
@@ -341,7 +341,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7830189, g: 0.7819636, b: 0.7793254, a: 1}
+  m_Color: {r: 0.40000004, g: 0.6509804, b: 0.64705884, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -447,7 +447,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1007467258602941415
 RectTransform:
   m_ObjectHideFlags: 0
@@ -598,7 +598,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 7.100006, y: -7.0699997}
+  m_AnchoredPosition: {x: 49.4, y: -5.3}
   m_SizeDelta: {x: 69.9286, y: 32.8052}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5479443627435669674
@@ -622,7 +622,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.48627454, g: 0.36862746, b: 0.19607845, a: 1}
+  m_Color: {r: 0.25882354, g: 0.4039216, b: 0.3529412, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -664,6 +664,7 @@ GameObject:
   - component: {fileID: 4485080243282319686}
   - component: {fileID: 5018190062906650215}
   - component: {fileID: 1530431928590719805}
+  - component: {fileID: 1929591076646090578}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_ZuiZhong
@@ -689,8 +690,8 @@ 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: -20, y: 17}
-  m_SizeDelta: {x: 68, y: 68}
+  m_AnchoredPosition: {x: -31.305, y: 10}
+  m_SizeDelta: {x: 61.1748, y: 61.1748}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &4485080243282319686
 CanvasRenderer:
@@ -713,7 +714,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6627451, g: 0.7686275, b: 0.74509805, a: 1}
+  m_Color: {r: 0.60784316, g: 0.78823537, b: 0.61960787, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -787,6 +788,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1929591076646090578
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987942260868545690}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3348088768749406642
 GameObject:
   m_ObjectHideFlags: 0
@@ -915,6 +929,7 @@ RectTransform:
   m_Children:
   - {fileID: 8807649875490934103}
   - {fileID: 1357522047238736597}
+  - {fileID: 5225875953063125181}
   - {fileID: 3650536308811846443}
   - {fileID: 7566769296908980725}
   - {fileID: 712579681456886399}
@@ -978,7 +993,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: -3.5069, y: -50.50203}
+  m_AnchoredPosition: {x: -3.5069, y: -41.1}
   m_SizeDelta: {x: 646.882, y: 1.4916}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2294293068954379236
@@ -1002,7 +1017,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6, g: 0.6039216, b: 0.6117647, a: 1}
+  m_Color: {r: 0.2509804, g: 0.24313727, b: 0.21568629, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1032,6 +1047,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &4231878762216119874
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5225875953063125181}
+  - component: {fileID: 2412484749260562235}
+  - component: {fileID: 113776996774915988}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5225875953063125181
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4231878762216119874}
+  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: 3764721290890148754}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -319.9, y: -3.0615}
+  m_SizeDelta: {x: 36.877, y: 36.877}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2412484749260562235
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4231878762216119874}
+  m_CullTransparentMesh: 1
+--- !u!114 &113776996774915988
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4231878762216119874}
+  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_dengji_sheng
+  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: 53.466114
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &4442584923359408203
 GameObject:
   m_ObjectHideFlags: 0
@@ -1067,8 +1171,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: -52.941902, y: 107.13}
-  m_SizeDelta: {x: 388.5786, y: 42.713}
+  m_AnchoredPosition: {x: -10.2, y: 107.13}
+  m_SizeDelta: {x: 388.5786, y: 47.752}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6912937265734038597
 CanvasRenderer:
@@ -1091,7 +1195,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.86666673, g: 0.8352942, b: 0.7803922, a: 1}
+  m_Color: {r: 0.9960785, g: 0.9921569, b: 0.98823535, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1147,8 +1251,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.000014781952, y: 0}
-  m_SizeDelta: {x: 683, y: 262}
+  m_AnchoredPosition: {x: -0.24937, y: 0}
+  m_SizeDelta: {x: 683.5, y: 262}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2778409128145198339
 CanvasRenderer:
@@ -1171,7 +1275,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9058824, g: 0.882353, b: 0.82745105, a: 1}
+  m_Color: {r: 0.95294124, g: 0.9294118, b: 0.8431373, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1346,38 +1450,100 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5529412, y: 0.47450984, z: 0.3529412, w: 1}
+      - {x: 0.70980394, y: 0.68235296, z: 0.64705884, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.48627454, y: 0.36862746, z: 0.19607845, w: 1}
+      - {x: 0.40784317, y: 0.5058824, z: 0.40000004, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.86666673, y: 0.7294118, z: 0.4901961, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.86666673, y: 0.7294118, z: 0.4901961, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
-    - Target: {fileID: 6161269103075097772}
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_fan
+  - StateInfos:
+    - Target: {fileID: 6730899750744253868}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.5568628, y: 0.6901961, z: 0.8196079, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 1904131733610652650}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.7830189, y: 0.67551905, z: 0.49123356, w: 1}
+      - {x: 0.25882354, y: 0.4039216, z: 0.3529412, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
+    - Target: {fileID: 8552613376447685522}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 6198714990258003341}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_yi
+  - StateInfos:
+    - Target: {fileID: 6730899750744253868}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.7411765, y: 0.5921569, z: 0.8431373, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 1904131733610652650}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.25882354, y: 0.4039216, z: 0.3529412, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 8552613376447685522}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 6198714990258003341}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_qi
   - StateInfos:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.36862746, y: 0.48235297, z: 0.41960788, w: 1}
+      - {x: 0.81568635, y: 0.73333335, z: 0.5568628, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1398,20 +1564,82 @@ MonoBehaviour:
       - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
-    - Target: {fileID: 6161269103075097772}
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_ling
+  - StateInfos:
+    - Target: {fileID: 6730899750744253868}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.81568635, y: 0.64705884, z: 0.54509807, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 1904131733610652650}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.46274513, y: 0.7568628, z: 0.59607846, w: 1}
+      - {x: 0.25882354, y: 0.4039216, z: 0.3529412, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 8552613376447685522}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
+    - Target: {fileID: 6198714990258003341}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_xuan
+  - StateInfos:
+    - Target: {fileID: 6730899750744253868}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.7960785, y: 0.5686275, z: 0.5411765, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 1904131733610652650}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.25882354, y: 0.4039216, z: 0.3529412, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 8552613376447685522}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 6198714990258003341}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_sheng
   AllComs:
   - {fileID: 6730899750744253868}
   - {fileID: 1904131733610652650}
   - {fileID: 8552613376447685522}
   - {fileID: 6198714990258003341}
-  - {fileID: 6161269103075097772}
-  AllComsStateTypes: 4000000040000000800000004000000040000000
-  CurrIndex: 0
+  - {fileID: 4231878762216119874}
+  AllComsStateTypes: 4000000040000000800000004000000000020000
+  CurrIndex: 5
 --- !u!1 &6161269103075097772
 GameObject:
   m_ObjectHideFlags: 0
@@ -1424,6 +1652,7 @@ GameObject:
   - component: {fileID: 8916865937304356244}
   - component: {fileID: 1194226542967252147}
   - component: {fileID: 6612899029550089941}
+  - component: {fileID: 1443081443139902709}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_RemoveEvent
@@ -1448,8 +1677,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -11.700012, y: -10}
-  m_SizeDelta: {x: 28, y: 29}
+  m_AnchoredPosition: {x: -4.100006, y: -2.874298}
+  m_SizeDelta: {x: 42, y: 42}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &8916865937304356244
 CanvasRenderer:
@@ -1472,7 +1701,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7830189, g: 0.67551905, b: 0.49123356, 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
@@ -1489,7 +1718,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ty_x
+  _icon_name: dec_guanbi
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1546,6 +1775,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1443081443139902709
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6161269103075097772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6198714990258003341
 GameObject:
   m_ObjectHideFlags: 0
@@ -1605,7 +1847,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.86666673, g: 0.7294118, b: 0.4901961, a: 1}
+  m_Color: {r: 0.5686275, g: 0.72156864, b: 0.6392157, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1750,7 +1992,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0.24751, y: 0}
+  m_AnchoredPosition: {x: -0.24876, y: 0}
   m_SizeDelta: {x: 683.5, y: 47.7486}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8013943971233128026
@@ -1774,7 +2016,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5529412, g: 0.47450984, b: 0.3529412, a: 1}
+  m_Color: {r: 0.7960785, g: 0.5686275, b: 0.5411765, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2036,7 +2278,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8173313993394265504
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2044,18 +2286,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8193172811373753691}
-  m_LocalRotation: {x: -0, y: -0, z: -0.20965268, w: 0.97777593}
+  m_LocalRotation: {x: 0, y: 0, z: -0.20791169, w: 0.9781476}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1132527634272378842}
   m_Father: {fileID: 3764721290890148754}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24.204}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 307.4, y: 108.4}
-  m_SizeDelta: {x: 104.2876, y: 38.2108}
+  m_AnchoredPosition: {x: 307.5, y: 109.63}
+  m_SizeDelta: {x: 104.507, y: 36.614}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3700033355154013030
 CanvasRenderer:
@@ -2078,7 +2320,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.65882355, g: 0.41176474, b: 0.34901962, a: 1}
+  m_Color: {r: 0.72156864, g: 0.3803922, b: 0.28627452, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2095,7 +2337,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing
+  _icon_name: dec_juxing_135
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -2144,7 +2386,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: 224.25584, y: 106.1}
+  m_AnchoredPosition: {x: 252.6, y: 106.1}
   m_SizeDelta: {x: 151.6817, y: 36.6236}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3905264220941356025
@@ -2168,7 +2410,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.86666673, g: 0.7294118, b: 0.4901961, a: 1}
+  m_Color: {r: 0.54509807, g: 0.69411767, b: 0.6156863, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2207,7 +2449,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6639653483637829207
 RectTransform:
   m_ObjectHideFlags: 0

二进制
Assets/Res/UI/DivineSence/仙途事件-改png.png


+ 203 - 0
Assets/Res/UI/DivineSence/仙途事件-改png.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XXwesy+sASq20yiQ3dKoPBW2GPvlwyQ1N41zCNV6S3O9D21KidINNbw2fY13
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 95 - 0
Assets/Res/UI/WidgetItem.prefab

@@ -215,6 +215,7 @@ RectTransform:
   - {fileID: 5439489424817645504}
   - {fileID: 5126391295778819725}
   - {fileID: 7511937068176871878}
+  - {fileID: 5738742128793975259}
   m_Father: {fileID: 1515036893769208877}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -593,6 +594,95 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &7449426115042760147
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5738742128793975259}
+  - component: {fileID: 8516978430190664473}
+  - component: {fileID: 917252801775961981}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_shenshiJiangli
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5738742128793975259
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7449426115042760147}
+  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: 6062762002596746888}
+  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: 33.583, y: -33.979}
+  m_SizeDelta: {x: 33.166, y: 32.042}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8516978430190664473
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7449426115042760147}
+  m_CullTransparentMesh: 1
+--- !u!114 &917252801775961981
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7449426115042760147}
+  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_ewaijiangli
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8072384164870005523
 GameObject:
   m_ObjectHideFlags: 0
@@ -779,6 +869,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_shenshiJiangli
+    gameObject: {fileID: 917252801775961981}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &259851968356172009
 MonoBehaviour:

+ 21 - 12
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -33,12 +33,13 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(3, 2))
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
-            
-            
+
+
             if (isTriggerEvent)
                 GObjectPoolInterface.SetActive(false);
             AppBarPanel.OpenPanel(this);
@@ -96,7 +97,7 @@ namespace Fort23.Mono
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             await UpdateContent();
-          
+
             return await base.AsyncInit(uiData);
         }
 
@@ -115,14 +116,17 @@ namespace Fort23.Mono
             {
                 toggleList.ShowTargetIndex(0);
                 TitleRoot.SetActive(true);
-                Rect_Sv.sizeDelta = new Vector2(718.82f, 865.36f);
-                Rect_Sv.anchoredPosition = new Vector2(2.61f, -126.23f);
+                Rect_Sv.sizeDelta = new Vector2(718.82f, 844.7f);
+                Rect_Sv.anchoredPosition = new Vector2(2.61f, -190.52f);
                 Text_Tips.gameObject.SetActive(false);
                 AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
                 if (eventList != null)
                 {
                     if (mainShengShiEventWidgetType2 == null)
-                        mainShengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ShengShiEventWidgetType2Root);
+                        mainShengShiEventWidgetType2 =
+                            await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidgetType2>(
+                                ShengShiEventWidgetType2Game, null, ShengShiEventWidgetType2Root);
+                    mainShengShiEventWidgetType2.own.SetActive(true);
                     mainShengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
                     mainShengShiEventWidgetType2.OnClick = OnClick;
                 }
@@ -131,8 +135,9 @@ namespace Fort23.Mono
             else
             {
                 toggleList.ShowTargetIndex(1);
-                UIManager.Instance.DormancyGComponent(mainShengShiEventWidgetType2);
-                mainShengShiEventWidgetType2 = null;
+                mainShengShiEventWidgetType2?.own.SetActive(false);
+                // UIManager.Instance.DormancyGComponent(mainShengShiEventWidgetType2);
+                // mainShengShiEventWidgetType2 = null;
                 TitleRoot.SetActive(false);
 
                 Rect_Sv.sizeDelta = new Vector2(664, 1210.8f);
@@ -141,7 +146,8 @@ namespace Fort23.Mono
             }
 
 
-            int maxCount = PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+            int maxCount = PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax /
+                           PlayerManager.Instance.gameConstantConfig.DetectEventCount;
 
             Text_ShenShiCount.text = $"神识({EventSystemManager.Instance.GetShenShiCount()}/{maxCount})";
             SaiXuan(saixuanType);
@@ -194,7 +200,8 @@ namespace Fort23.Mono
             }
 
 
-            ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
+            ShengShiEventWidgetType2 shengShiEventWidgetType2 =
+                await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
             shengShiEventWidgetType2.CustomInit(showEventList[index], GoOnClick);
             shengShiEventWidgetType2.OnClick = OnClick;
             shengShiEventWidgetTypeList.Add(shengShiEventWidgetType2);
@@ -232,7 +239,8 @@ namespace Fort23.Mono
             //条件完成 任务没有完成 是最后一步就直接开始任务
             if (shengShiEventWidgetType2.isComplete && !shengShiEventWidgetType2.eventList.isCompleted)
             {
-                if (shengShiEventWidgetType2.evenkConfig.ResultType == 0 || shengShiEventWidgetType2.evenkConfig.ResultType == 3)
+                if (shengShiEventWidgetType2.evenkConfig.ResultType == 0 ||
+                    shengShiEventWidgetType2.evenkConfig.ResultType == 3)
                 {
                     GoOnClick(shengShiEventWidgetType2);
                     return;
@@ -250,7 +258,8 @@ namespace Fort23.Mono
 
         public async static CTask<DivineSenceEventPreviewPanel> OpenPanel()
         {
-            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null, UILayer.Middle);
+            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel =
+                await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null, UILayer.Middle);
             return divineSenceEventPreviewPanel;
         }
 

+ 11 - 0
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanelData.cs

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

+ 39 - 21
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -65,9 +65,12 @@ namespace Fort23.Mono
 
         private void UpdateZuiZhongEvent(IEventData e)
         {
-            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId != eventList.guid);
-
-            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid);
+            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
+                                              eventList.guid);
+            Btn_RemoveEvent.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
+                                                 eventList.guid);
+            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId ==
+                                              eventList.guid);
         }
 
         public async void CustomInit(AccountFileInfo.EventList eventList, Action<ItemWidgetBasic> goCallBack)
@@ -84,36 +87,30 @@ namespace Fort23.Mono
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
 
-            AccountFileInfo.EventLinkData eventLinkData = eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
+            AccountFileInfo.EventLinkData eventLinkData =
+                eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
 
 
             Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
 
             Text_EventDesc.text = LanguageManager.Instance.Text(evenkConfig.conciseEventMessage);
 
-            Btn_Bag.gameObject.SetActive(false);
-            foreach (var eventListEventLink in eventList.eventLinks)
-            {
-                EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventListEventLink.eventLinkId);
-                if (eventLinkConfig.optionType == 3)
-                {
-                    Btn_Bag.gameObject.SetActive(true);
-                    break;
-                }
-            }
+            // Btn_Bag.gameObject.SetActive(false);
+
 
             if (randomEventConfig.EventTag == 1)
             {
-                csc.ChangeState(0);
+                // csc.ChangeState(0);
             }
             else
             {
-                csc.ChangeState(1);
+                csc.ChangeState(randomEventConfig.EventQuality);
             }
 
 
             Text_Go.text = "前往";
-            if (eventLinkData == null || eventLinkData.eventConditions == null || eventLinkData.eventConditions.Count == 0)
+            if (eventLinkData == null || eventLinkData.eventConditions == null ||
+                eventLinkData.eventConditions.Count == 0)
             {
                 if (evenkConfig.EventConditionMessage != 0)
                 {
@@ -169,15 +166,21 @@ namespace Fort23.Mono
             }
 
 
-            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId != eventList.guid);
+            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
+                                              eventList.guid);
+            Btn_RemoveEvent.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
+                                                 eventList.guid);
 
-            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid);
+            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId ==
+                                              eventList.guid);
             Icon_Marsk.gameObject.SetActive(eventList.isCompleted);
             if (randomEventConfig.SmallPlacesId != 0)
             {
-                SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(randomEventConfig.SmallPlacesId);
+                SmallPlacesConfig smallPlacesConfig =
+                    ConfigComponent.Instance.Get<SmallPlacesConfig>(randomEventConfig.SmallPlacesId);
                 PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
-                Text_Mapname.text = $"{LanguageManager.Instance.Text(placesConfig.placeName)}-{LanguageManager.Instance.Text(smallPlacesConfig.placeName)}";
+                Text_Mapname.text =
+                    $"{LanguageManager.Instance.Text(placesConfig.placeName)}-{LanguageManager.Instance.Text(smallPlacesConfig.placeName)}";
                 Text_Mapname.gameObject.SetActive(true);
             }
             else if (randomEventConfig.placeID != 0)
@@ -223,6 +226,21 @@ namespace Fort23.Mono
                 widgetItem.InitWidget(new ItemInfo(eventListItemInfo));
                 widgetList.Add(widgetItem);
             }
+
+            foreach (var eventListEventLink in eventList.eventLinks)
+            {
+                if(eventListEventLink.eventLinkId < eventList.curStep)
+                    continue;
+                EventLinkConfig eventLinkConfig =
+                    ConfigComponent.Instance.Get<EventLinkConfig>(eventListEventLink.eventLinkId);
+                if (eventLinkConfig.optionType == 3)
+                {
+                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
+                    widgetItem.ShowShenShiWenHao(() => { TipMessagePanel.OpenTipMessagePanel("事件的选择会影响获得的道具!"); });
+                    widgetList.Add(widgetItem);
+                    break;
+                }
+            }
         }
 
 

+ 21 - 0
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -1,3 +1,4 @@
+using System;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -11,6 +12,8 @@ namespace Fort23.Mono
         public ItemInfo itemInfo;
         public bool isClick = false;
 
+        public Action callBack;
+
 
         private void Init()
         {
@@ -30,6 +33,11 @@ namespace Fort23.Mono
             {
                 if (!isClick)
                     return;
+                if (callBack != null)
+                {
+                    callBack?.Invoke();
+                    return;
+                }
                 if (itemInfo.config.associateID == 3)
                 {
                     GongFaDetailsPanel.Open(itemInfo);
@@ -159,12 +167,25 @@ namespace Fort23.Mono
             Icon_WenHao.gameObject.SetActive(true);
             icon.gameObject.SetActive(false);
             Text_Count.gameObject.SetActive(false);
+          
         }
 
         public override void DormancyObj()
         {
             transform.RecoverColor();
+            Icon_WenHao.gameObject.SetActive(false);
+            Icon_shenshiJiangli.gameObject.SetActive(false);
+            callBack = null;
             base.DormancyObj();
         }
+
+        public void ShowShenShiWenHao(Action callBack = null)
+        {
+            this.callBack = callBack;
+            Icon_shenshiJiangli.gameObject.SetActive(true);
+            Icon_WenHao.gameObject.SetActive(true);
+            icon.gameObject.SetActive(false);
+            Text_Count.gameObject.SetActive(false);
+        }
     }
 }

+ 11 - 0
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItemData.cs

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

部分文件因为文件数量过多而无法显示