修改表

Assets/Res/Config/EventConfig.json

@@ -18,7 +18,8 @@
       "EventVlaue": [
         0
       ],
-      "Description": 174
+      "EventName": 174,
+      "Description": null
     },
     {
       "ID": 2,
@@ -40,7 +41,8 @@
       "EventVlaue": [
         0
       ],
-      "Description": 175
+      "EventName": 175,
+      "Description": null
     },
     {
       "ID": 3,
@@ -62,7 +64,8 @@
       "EventVlaue": [
         0
       ],
-      "Description": 176
+      "EventName": 176,
+      "Description": null
     },
     {
       "ID": 4,
@@ -78,7 +81,8 @@
       "EventVlaue": [
         0
       ],
-      "Description": 217
+      "EventName": 217,
+      "Description": null
     },
     {
       "ID": 5,
@@ -94,7 +98,8 @@
       "EventVlaue": [
         0
       ],
-      "Description": 218
+      "EventName": 218,
+      "Description": null
     },
     {
       "ID": 6,
@@ -110,7 +115,8 @@
       "EventVlaue": [
         0
       ],
-      "Description": 219
+      "EventName": 219,
+      "Description": null
     },
     {
       "ID": 7,
@@ -126,7 +132,8 @@
       "EventVlaue": [
         0
       ],
-      "Description": 220
+      "EventName": 220,
+      "Description": null
     },
     {
       "ID": 11,
@@ -136,6 +143,7 @@
       "EventTriggerType": 2,
       "EventType": 1,
       "EventQuality": 1,
+      "EventName": null,
       "Description": null
     },
     {
@@ -146,6 +154,7 @@
       "EventTriggerType": 2,
       "EventType": 1,
       "EventQuality": 1,
+      "EventName": null,
       "Description": null
     },
     {
@@ -156,6 +165,7 @@
       "EventTriggerType": 2,
       "EventType": 1,
       "EventQuality": 1,
+      "EventName": null,
       "Description": null
     },
     {
@@ -166,6 +176,7 @@
       "EventTriggerType": 2,
       "EventType": 1,
       "EventQuality": 1,
+      "EventName": null,
       "Description": null
     },
     {
@@ -176,6 +187,7 @@
       "EventTriggerType": 2,
       "EventType": 1,
       "EventQuality": 1,
+      "EventName": null,
       "Description": null
     },
     {
@@ -186,7 +198,8 @@
       "EventTriggerType": 4,
       "EventType": 1,
       "EventQuality": 1,
-      "Description": 1906
+      "EventName": 1906,
+      "Description": 1914
     },
     {
       "ID": 10002,
@@ -196,7 +209,8 @@
       "EventTriggerType": 4,
       "EventType": 1,
       "EventQuality": 1,
-      "Description": 1907
+      "EventName": 1907,
+      "Description": 1915
     },
     {
       "ID": 10003,
@@ -206,7 +220,8 @@
       "EventTriggerType": 4,
       "EventType": 1,
       "EventQuality": 1,
-      "Description": 1908
+      "EventName": 1908,
+      "Description": 1916
     },
     {
       "ID": 10004,
@@ -216,7 +231,8 @@
       "EventTriggerType": 4,
       "EventType": 1,
       "EventQuality": 1,
-      "Description": 1909
+      "EventName": 1909,
+      "Description": 1917
     }
   ]
 }

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -164,149 +164,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0.509434, g: 0.33882165, b: 0.33882165, a: 1}
   direction: 1
---- !u!1 &1573232552483076684
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1935222612727109932}
-  - component: {fileID: 8619232221248716354}
-  - component: {fileID: 7172531054950919924}
-  - component: {fileID: 4910607662050102641}
-  - component: {fileID: 8014014210335560669}
-  - component: {fileID: 4418855113457263759}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_TaskMassge
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1935222612727109932
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1573232552483076684}
-  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: 483812832159869472}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 7.5, y: -38.644703}
-  m_SizeDelta: {x: 414.819, y: 76.8894}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &8619232221248716354
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1573232552483076684}
-  m_CullTransparentMesh: 1
---- !u!114 &7172531054950919924
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1573232552483076684}
-  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.45098042, g: 0.43529415, b: 0.39607847, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 22
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u4E00\u4E2A\u8001\u5934\u6B63\u5728\u6CB3\u8FB9..."
---- !u!114 &4910607662050102641
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1573232552483076684}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: 178.3554
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
---- !u!114 &8014014210335560669
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1573232552483076684}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
---- !u!114 &4418855113457263759
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1573232552483076684}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!1 &1760937640502948944
 GameObject:
   m_ObjectHideFlags: 0
@@ -956,88 +813,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!1 &3138673783748447636
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8451011069730739083}
-  - component: {fileID: 7907493528485244258}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: DynamicEvent
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8451011069730739083
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3138673783748447636}
-  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: 483812832159869472}
-  m_Father: {fileID: 5427787900727233847}
-  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: 276.4709, y: -24.6631}
-  m_SizeDelta: {x: 440.9418, y: 141.3263}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &7907493528485244258
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3138673783748447636}
-  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: 0
-  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: 0}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &3348075033185530517
 GameObject:
   m_ObjectHideFlags: 0
@@ -1282,86 +1057,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &4078923567955095082
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2301007846651890387}
-  - component: {fileID: 8787507019839027960}
-  - component: {fileID: 483222655172619623}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_TaskName
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2301007846651890387
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4078923567955095082}
-  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: 483812832159869472}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 67.39705, y: 25.3}
-  m_SizeDelta: {x: 209.7775, y: 35.318}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8787507019839027960
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4078923567955095082}
-  m_CullTransparentMesh: 1
---- !u!114 &483222655172619623
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4078923567955095082}
-  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.45098042, g: 0.43529415, b: 0.39607847, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 26
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u7B2C\u4E00\u7AE0:\u9493\u9C7C\u7FC1"
 --- !u!1 &5439861124006239330
 GameObject:
   m_ObjectHideFlags: 0
@@ -2009,7 +1704,7 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &7352086197235300010
+--- !u!1 &8091980665139676657
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2017,259 +1712,37 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5427787900727233847}
-  - component: {fileID: 5982490551636298201}
-  - component: {fileID: 1902789611665251421}
-  - component: {fileID: 7377593421214716020}
-  m_Layer: 0
+  - component: {fileID: 8853702443283609107}
+  m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Btn_Task
+  m_Name: Handle Slide Area
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &5427787900727233847
+--- !u!224 &8853702443283609107
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7352086197235300010}
+  m_GameObject: {fileID: 8091980665139676657}
   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: 8451011069730739083}
-  m_Father: {fileID: 9037135992368401232}
+  - {fileID: 7991042903017610511}
+  m_Father: {fileID: 4048428373501315793}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 13.299988, y: -1133}
-  m_SizeDelta: {x: 76, y: 74}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &5982490551636298201
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7352086197235300010}
-  m_CullTransparentMesh: 1
---- !u!114 &1902789611665251421
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7352086197235300010}
-  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_renwu
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
-  packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!114 &7377593421214716020
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7352086197235300010}
-  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: 1902789611665251421}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!1 &7816344930248353185
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5929282742778120016}
-  - component: {fileID: 1079986196912690948}
-  - component: {fileID: 297883569620714810}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: myImage
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5929282742778120016
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7816344930248353185}
-  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: 483812832159869472}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 165.02896, y: -19.8598}
-  m_SizeDelta: {x: 437.0445, y: 130.2431}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1079986196912690948
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7816344930248353185}
-  m_CullTransparentMesh: 1
---- !u!114 &297883569620714810
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7816344930248353185}
-  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: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_renwu_dise
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
-  packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!1 &8091980665139676657
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8853702443283609107}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Handle Slide Area
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8853702443283609107
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8091980665139676657}
-  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: 7991042903017610511}
-  m_Father: {fileID: 4048428373501315793}
-  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: -20, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &8157457863163446127
-GameObject:
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -20, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8157457863163446127
+GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2444,218 +1917,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!1 &8712562821128756198
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 483812832159869472}
-  - component: {fileID: 4178929015793443389}
-  - component: {fileID: 2050290114926485253}
-  - component: {fileID: 4460943036588396238}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Btn_TriggerTask
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &483812832159869472
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8712562821128756198}
-  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: 5929282742778120016}
-  - {fileID: 2301007846651890387}
-  - {fileID: 1935222612727109932}
-  m_Father: {fileID: 8451011069730739083}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -50}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!114 &4178929015793443389
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8712562821128756198}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  maxDuration: 0.3
-  isUpdate: 0
-  currTime: 0.3848319
-  GrpupInfos:
-  - Foldout: 1
-    isActive: 1
-    animName: 
-    isLoop: 0
-    allTargets:
-    - {fileID: 8712562821128756198}
-    TweenAssetInfo: {fileID: 11400000, guid: 45a33638e1bf2e040a04be1042aa2f06, type: 2}
-    TargetFoldout: 1
-    maxDuration: 0.3
-    isUpdate: 1
-    currTime: 0
-  MinMaxGradient:
-    m_Mode: 0
-    m_GradientMin:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_ColorSpace: -1
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    m_GradientMax:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_ColorSpace: -1
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
-    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
-  isLoop: 0
---- !u!114 &2050290114926485253
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8712562821128756198}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: myButton
-    gameObject: {fileID: 4460943036588396238}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Massge
-    gameObject: {fileID: 7172531054950919924}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: bg
-    gameObject: {fileID: 297883569620714810}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_Name
-    gameObject: {fileID: 483222655172619623}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
---- !u!114 &4460943036588396238
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8712562821128756198}
-  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: 0
-  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: 0}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &8986363544919513421
 GameObject:
   m_ObjectHideFlags: 0
@@ -2768,7 +2029,6 @@ RectTransform:
   - {fileID: 2024304381802793110}
   - {fileID: 1798015912972164048}
   - {fileID: 3695676087259227986}
-  - {fileID: 5427787900727233847}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2844,26 +2104,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Btn_Task
-    gameObject: {fileID: 7377593421214716020}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_TaskName
-    gameObject: {fileID: 483222655172619623}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_TaskMassge
-    gameObject: {fileID: 7172531054950919924}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Btn_TriggerTask
-    gameObject: {fileID: 4460943036588396238}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9153091249090986804
 GameObject:

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -59,6 +59,12 @@ public int[] EventVlaue;
 		/// <summary>
 		///描述（题目）
 		/// </summary>
+public int EventName;
+
+
+		/// <summary>
+		///
+		/// </summary>
 public int Description;
 
 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -5,6 +5,7 @@ using Common.Utility.CombatEvent;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
@@ -107,8 +108,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
         List<AccountFileInfo.EventList> eventLists = new List<AccountFileInfo.EventList>();
         for (var i = 0; i < eventConfigs.Count; i++)
         {
-            AccountFileInfo.EventList eventList = new AccountFileInfo.EventList();
-            eventList.eventID = eventConfigs[i].ID;
+            AccountFileInfo.EventList eventList = AddEvent(eventConfigs[i].ID);
+            // AccountFileInfo.EventList eventList = new AccountFileInfo.EventList();
+            // eventList.eventID = eventConfigs[i].ID;
             eventLists.Add(eventList);
         }
 
@@ -199,6 +201,17 @@ public class EventSystemManager : Singleton<EventSystemManager>
         return triggeredEvents;
     }
 
+
+    //添加事件
+    public AccountFileInfo.EventList AddEvent(int eventID)
+    {
+        AccountFileInfo.EventList eventList = new AccountFileInfo.EventList();
+        eventList.eventID =eventID;
+        AccountFileInfo.Instance.playerData.eventList.Add(eventList);
+        AccountFileInfo.Instance.SavePlayerData();
+        return eventList;
+    }
+    
     /// <summary>
     /// 触发随机事件
     /// </summary>
@@ -475,6 +488,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
         this.isTriggerEvent = isTriggerEvent;
         LogTool.Log($"完成事件{eventList.eventID}");
+        
+        EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
 
         AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
 
@@ -485,6 +500,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
         AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
         AccountFileInfo.Instance.SavePlayerData();
 
+        if (eventConfig.EventTriggerType == 4)
+        {
+            TaskInfoPanel.OpenPanel(eventList.eventID,"任务完成");
+        }
+
         EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
         CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
         onCompleteCallback?.Invoke();
@@ -497,27 +517,27 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// <param name="eventID">事件ID</param>
     public void CompleteEvent(AccountFileInfo.EventLinkData eventLinkData)
     {
-        AccountFileInfo.EventList eventList = new AccountFileInfo.EventList();
-        eventList.eventID = eventLinkData.eventId;
-        AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
-
-        if (AccountFileInfo.Instance.playerData.senceExplorationProgress < 100)
-            AccountFileInfo.Instance.playerData.senceExplorationProgress += 1;
-
-
-        AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
-
-        EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventLinkData.eventLinkId);
-        if (eventLinkConfig.ResultType == 3)
-        {
-            //触发新事件
-            //弹出任务完成ui
-        }
-
-        AccountFileInfo.Instance.SavePlayerData();
-
-        EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
-        CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+        // AccountFileInfo.EventList eventList = new AccountFileInfo.EventList();
+        // eventList.eventID = eventLinkData.eventId;
+        // AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
+        //
+        // if (AccountFileInfo.Instance.playerData.senceExplorationProgress < 100)
+        //     AccountFileInfo.Instance.playerData.senceExplorationProgress += 1;
+        //
+        //
+        // AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
+        //
+        // EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventLinkData.eventLinkId);
+        // if (eventLinkConfig.ResultType == 3)
+        // {
+        //     //触发新事件
+        //     //弹出任务完成ui
+        // }
+        //
+        // AccountFileInfo.Instance.SavePlayerData();
+        //
+        // EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
+        // CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
     }
 
     /// <summary>
@@ -540,4 +560,18 @@ public class EventSystemManager : Singleton<EventSystemManager>
         AccountFileInfo.Instance.SavePlayerData();
         EventManager.Instance.Dispatch(CustomEventType.RemoveEvent, null);
     }
+    
+    public AccountFileInfo.EventList GetMainEventDta()
+    {
+        foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+        {
+            EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+            if (eventConfig.EventType == 4)
+            {
+                return eventList;
+            }
+        }
+
+        return null;
+    }
 }

Assets/Scripts/GameUI/TaskManager.cs

@@ -108,7 +108,7 @@ public class TaskManager : Singleton<TaskManager>
             else
             {
                 EventSystemManager.Instance.isOpenUi = false;
-                TaskInfoPanel.OpenPanel(taskId, "任务信息");
+                // TaskInfoPanel.OpenPanel(taskId, "任务信息");
             }
         }
     }
@@ -207,7 +207,7 @@ public class TaskManager : Singleton<TaskManager>
         //可能需要处理弹出任务完成ui
         if (awardList != null)
         {
-            TaskInfoPanel taskInfoPanel = await TaskInfoPanel.OpenPanel(taskID, "任务完成");
+            // TaskInfoPanel taskInfoPanel = await TaskInfoPanel.OpenPanel(taskID, "任务完成");
             // await taskInfoPanel.UIClosed();
         }
 

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -146,8 +146,8 @@ namespace Fort23.Mono
 
 
             CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
-            AccountFileInfo.Instance.playerData.eventList.AddRange(eventLists);
-            AccountFileInfo.Instance.SavePlayerData();
+            // AccountFileInfo.Instance.playerData.eventList.AddRange(eventLists);
+            // AccountFileInfo.Instance.SavePlayerData();
             EventManager.Instance.Dispatch(CustomEventType.ShengShiOnClick, null);
         }
 

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

@@ -27,13 +27,8 @@ namespace Fort23.Mono
             EventManager.Instance.AddEventListener(CustomEventType.ShengShiOnClick, ShengShiOnClick);
             EventManager.Instance.AddEventListener(CustomEventType.CompleteEvent, CompleteEvent);
             EventManager.Instance.AddEventListener(CustomEventType.RemoveEvent, RemoveEvent);
-            EventManager.Instance.AddEventListener(CustomEventType.TaskUpdate, TaskUpdate);
         }
 
-        private void TaskUpdate(IEventData e)
-        {
-            UpdateTaskInfo();
-        }
 
         public async override CTask GetFocus()
         {
@@ -82,24 +77,6 @@ namespace Fort23.Mono
                 EventSystemManager.Instance.isOpenUi = true;
                 DivineSenceEventPreviewPanel.OpenPanel();
             });
-
-            Btn_TriggerTask.onClick.AddListener(() =>
-            {
-                AccountFileInfo.TaskData taskData = TaskManager.Instance.GetMainTaskData();
-                if (taskData != null)
-                {
-                    TaskManager.Instance.TriggerTask(taskData.taskID);
-                }
-            });
-
-            Btn_Task.onClick.AddListener(() =>
-            {
-                AccountFileInfo.TaskData taskData = TaskManager.Instance.GetMainTaskData();
-                if (taskData != null)
-                {
-                    TaskInfoPanel.OpenPanel(taskData.taskID,"任务信息");
-                }
-            });
         }
 
         public override CTask<bool> AsyncInit(object[] uiData)
@@ -144,36 +121,6 @@ namespace Fort23.Mono
             UpdateTaskInfo();
         }
 
-        public void UpdateTaskInfo()
-        {
-            AccountFileInfo.TaskData taskData = TaskManager.Instance.GetMainTaskData();
-            if (taskData != null)
-            {
-                Btn_Task.gameObject.SetActive(true);
-                TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskData.taskID);
-                Text_TaskName.text = $"第{taskConfig.mapID}章:" + LanguageManager.Instance.Text(taskConfig.taskName);
-                if (taskConfig.finishConditionType == 1 || taskConfig.finishConditionType == 2)
-                {
-                    Text_TaskMassge.text = LanguageManager.Instance.Text(taskConfig.conciseTaskMessage, taskData.fishCount, taskConfig.finishCount);
-                }
-                else if (taskConfig.finishConditionType == 4)
-                {
-                    HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(taskConfig.finishVlaue[0]);
-                    string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
-                                     LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
-                                     LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
-                    Text_TaskMassge.text = LanguageManager.Instance.Text(taskConfig.conciseTaskMessage, jingjie);
-                }
-                else
-                {
-                    Text_TaskMassge.text = LanguageManager.Instance.Text(taskConfig.conciseTaskMessage);
-                }
-            }
-            else
-            {
-                Btn_Task.gameObject.SetActive(false);
-            }
-        }
 
         private void CameraSelect_onValueChanged(float value)
         {
@@ -249,11 +196,14 @@ namespace Fort23.Mono
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
             int count = AccountFileInfo.Instance.playerData.eventList.Count >= 1 ? 1 : AccountFileInfo.Instance.playerData.eventList.Count;
-            for (var i = 0; i < count; i++)
+
+            if (count >= 1)
             {
+                AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta() == null ? null : EventSystemManager.Instance.GetMainEventDta().EventList;
+                eventList = eventList == null ? AccountFileInfo.Instance.playerData.eventList[0] : eventList;
                 ShengShiEventWidget shengShiEventWidget =
                     await UIManager.Instance.CreateGComponent<ShengShiEventWidget>(null, DynamicEvent);
-                shengShiEventWidget.InitShengShiEventWidget(AccountFileInfo.Instance.playerData.eventList[i]);
+                shengShiEventWidget.InitShengShiEventWidget(eventList);
             }
         }
 

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

@@ -129,50 +129,6 @@ namespace Fort23.Mono
 	      return _Slider_Exp;
 	     }
 	   }
-	  private Button _Btn_Task;
-	  public Button Btn_Task
-	   {
-	   get{
-	      if (_Btn_Task == null)
-	       {
-	         _Btn_Task  = GetUIUnit<Button>("Btn_Task"); 
-	       }
-	      return _Btn_Task;
-	     }
-	   }
-	  private Text _Text_TaskName;
-	  public Text Text_TaskName
-	   {
-	   get{
-	      if (_Text_TaskName == null)
-	       {
-	         _Text_TaskName  = GetUIUnit<Text>("Text_TaskName"); 
-	       }
-	      return _Text_TaskName;
-	     }
-	   }
-	  private Text _Text_TaskMassge;
-	  public Text Text_TaskMassge
-	   {
-	   get{
-	      if (_Text_TaskMassge == null)
-	       {
-	         _Text_TaskMassge  = GetUIUnit<Text>("Text_TaskMassge"); 
-	       }
-	      return _Text_TaskMassge;
-	     }
-	   }
-	  private Button _Btn_TriggerTask;
-	  public Button Btn_TriggerTask
-	   {
-	   get{
-	      if (_Btn_TriggerTask == null)
-	       {
-	         _Btn_TriggerTask  = GetUIUnit<Button>("Btn_TriggerTask"); 
-	       }
-	      return _Btn_TriggerTask;
-	     }
-	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -33,35 +33,35 @@ namespace Fort23.Mono
 
         public async void CustomInit(int taskId, string title)
         {
-            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskId);
+            EventConfig taskConfig = ConfigComponent.Instance.Get<EventConfig>(taskId);
             Text_Title.text = title;
-            Text_Name.text = LanguageManager.Instance.Text(taskConfig.taskName);
+            Text_Name.text = LanguageManager.Instance.Text(taskConfig.EventName);
             Text_desc.text = LanguageManager.Instance.Text(taskConfig.Description);
-            if (taskConfig.awardItemId != null)
-            {
-                List<ItemInfo> itemInfos = new List<ItemInfo>();
-                for (var i = 0; i < taskConfig.awardItemId.Length; i++)
-                {
-                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(taskConfig.awardItemId[i]);
-                    if (dropConfig.dropType == 3)
-                    {
-                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], taskConfig.awardItemCount[i]);
-                        itemInfos.Add(itemInfo);
-                    }
-                    else
-                    {
-                        List<ItemInfo> items = DropManager.Instance.DropItem(taskConfig.awardItemCount[i]);
-                        itemInfos.AddRange(items);
-                    }
-                }
-
-                foreach (var itemInfo in itemInfos)
-                {
-                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, root: ItemRoot);
-                    widgetItem.InitWidget(itemInfo);
-                    widgetItems.Add(widgetItem);
-                }
-            }
+            // if (taskConfig.awardItemId != null)
+            // {
+            //     List<ItemInfo> itemInfos = new List<ItemInfo>();
+            //     for (var i = 0; i < taskConfig.awardItemId.Length; i++)
+            //     {
+            //         DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(taskConfig.awardItemId[i]);
+            //         if (dropConfig.dropType == 3)
+            //         {
+            //             ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], taskConfig.awardItemCount[i]);
+            //             itemInfos.Add(itemInfo);
+            //         }
+            //         else
+            //         {
+            //             List<ItemInfo> items = DropManager.Instance.DropItem(taskConfig.awardItemCount[i]);
+            //             itemInfos.AddRange(items);
+            //         }
+            //     }
+                //
+                // foreach (var itemInfo in itemInfos)
+                // {
+                //     WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, root: ItemRoot);
+                //     widgetItem.InitWidget(itemInfo);
+                //     widgetItems.Add(widgetItem);
+                // }
+            // }
         }
 
         public async static CTask<TaskInfoPanel> OpenPanel(int taskId,string title)