任务修改

Assets/Res/Config/TaskConfig.json

@@ -8,6 +8,9 @@
       "mapID": 1,
       "taskType": 10,
       "finishConditionType": 3,
+      "finishVlaue": [
+        1914
+      ],
       "finishCount": 1,
       "unlockType": -1,
       "unlockLevel": 1,
@@ -35,7 +38,7 @@
       "finishVlaue": [
         100001
       ],
-      "finishCount": 5,
+      "finishCount": 2,
       "unlockType": -1,
       "unlockLevel": 1,
       "nextTaskID": 3,
@@ -59,10 +62,13 @@
       "mapID": 1,
       "taskType": 10,
       "finishConditionType": 1,
+      "finishVlaue": [
+        1001
+      ],
       "finishCount": 1,
       "unlockType": -1,
       "unlockLevel": 1,
-      "nextTaskID": 0,
+      "nextTaskID": 4,
       "showType": 0,
       "isInheritCount": -1,
       "taskIcon": "asd",

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -965,7 +965,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 8451011069730739083}
-  - component: {fileID: 4151086886705111501}
+  - component: {fileID: 7907493528485244258}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: DynamicEvent
@@ -991,10 +991,10 @@ 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: 106, y: -4}
-  m_SizeDelta: {x: 100, y: 100}
+  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 &4151086886705111501
+--- !u!114 &7907493528485244258
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1003,21 +1003,41 @@ MonoBehaviour:
   m_GameObject: {fileID: 3138673783748447636}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_StartCorner: 0
-  m_StartAxis: 0
-  m_CellSize: {x: 100, y: 100}
-  m_Spacing: {x: 0, y: -50.3}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  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
@@ -2438,7 +2458,7 @@ GameObject:
   - component: {fileID: 4460943036588396238}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: ShengShiEventWidget
+  m_Name: Btn_TriggerTask
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2461,10 +2481,10 @@ RectTransform:
   - {fileID: 1935222612727109932}
   m_Father: {fileID: 8451011069730739083}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 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:
@@ -2839,6 +2859,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_TriggerTask
+    gameObject: {fileID: 4460943036588396238}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9153091249090986804
 GameObject:

Assets/Res/UI/Task.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Wn0Y4CP5US4su6thD1uITpNBo2Vi4oC37V9t+vCvWwe+1ZKFhB511VEWAfZB
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/Task/TaskInfoPanel.prefab

@@ -0,0 +1,666 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &650584255987892480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8599819629026832582}
+  - component: {fileID: 7897761964867798499}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: TaskInfoPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8599819629026832582
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  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: 2896655462721008753}
+  - {fileID: 2569128129379278262}
+  - {fileID: 4688522053669353716}
+  - {fileID: 8515100903656146540}
+  - {fileID: 3220702368838562604}
+  m_Father: {fileID: 0}
+  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: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7897761964867798499
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: bg
+    gameObject: {fileID: 8488195482551738332}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Close
+    gameObject: {fileID: 3651346582420827263}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Ok
+    gameObject: {fileID: 3169074378938001994}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Name
+    gameObject: {fileID: 1087322108478024986}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_desc
+    gameObject: {fileID: 1040938809657299556}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &2132268725135064903
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2569128129379278262}
+  - component: {fileID: 9156533754913033698}
+  - component: {fileID: 8488195482551738332}
+  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 &2569128129379278262
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  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: []
+  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: 0, y: 46.5656}
+  m_SizeDelta: {x: 475.8763, y: 777.9515}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9156533754913033698
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_CullTransparentMesh: 1
+--- !u!114 &8488195482551738332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  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_dadi_01
+  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
+  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
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4688522053669353716}
+  - component: {fileID: 2934276402299459566}
+  - component: {fileID: 2433990691951363383}
+  - component: {fileID: 3169074378938001994}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Ok
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4688522053669353716
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  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}
+  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: -288.69}
+  m_SizeDelta: {x: 132.3538, y: 50.3799}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2934276402299459566
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_CullTransparentMesh: 1
+--- !u!114 &2433990691951363383
+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: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.27792454, g: 1, b: 0, 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: btn_23
+  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: 
+  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 &3552915526930824737
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6150498200931894423}
+  - component: {fileID: 2944092694878402809}
+  - component: {fileID: 2519922024915380815}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6150498200931894423
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  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_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
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  m_CullTransparentMesh: 1
+--- !u!114 &2519922024915380815
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  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_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: 21
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6311\u6218"
+--- !u!1 &3627747089450203247
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3220702368838562604}
+  - component: {fileID: 9047568930966635103}
+  - component: {fileID: 1040938809657299556}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_desc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3220702368838562604
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  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: 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: -0.0022316, y: 163.5149}
+  m_SizeDelta: {x: 410.77, y: 350.0495}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9047568930966635103
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3627747089450203247}
+  m_CullTransparentMesh: 1
+--- !u!114 &1040938809657299556
+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: 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_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: 26
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    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!1 &6864546897549033815
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2896655462721008753}
+  - component: {fileID: 1550575800954493607}
+  - component: {fileID: 8853780473327312120}
+  - component: {fileID: 3651346582420827263}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2896655462721008753
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  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: 8599819629026832582}
+  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 &1550575800954493607
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_CullTransparentMesh: 1
+--- !u!114 &8853780473327312120
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  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: 0, g: 0, b: 0, a: 0.69411767}
+  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 &3651346582420827263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  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: 8853780473327312120}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &8794085188831228050
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8515100903656146540}
+  - component: {fileID: 126500885704442088}
+  - component: {fileID: 1087322108478024986}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8515100903656146540
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8794085188831228050}
+  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: 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: -0.0000038147, y: 380}
+  m_SizeDelta: {x: 410.7655, y: 55.7865}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &126500885704442088
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8794085188831228050}
+  m_CullTransparentMesh: 1
+--- !u!114 &1087322108478024986
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8794085188831228050}
+  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_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: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4EFB\u52A1\u4FE1\u606F"

Assets/Res/UI/Task/TaskInfoPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WXMf4CKrAi7hr08s4Yu3r4QyKNW2jUJNzv4sb7Z5Oz+GdeYwA/YO0mqwRimf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -94,7 +94,15 @@ namespace Fort23.Core
       /// </summary>
       RefenceBreakthrough,
       ShengShiOnClick,
-      ShopRefence
+      ShopRefence,
+      /// <summary>
+      /// 任务刷新
+      /// </summary>
+      TaskUpdate,
+      /// <summary>
+      /// 境界升级
+      /// </summary>
+      JingJieUpgrade,
       
     }
 }

Assets/Scripts/GameData/ExcelConfig/TaskConfig.cs

@@ -69,7 +69,7 @@ public int finishCount;
 
 
 		/// <summary>
-		///奖励道具ID 新手任务的积分道具必须是最后一位
+		///奖励道具ID
 		/// </summary>
 public int[] awardItemId;
 

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -181,6 +181,7 @@ namespace GameLogic.Bag
             EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() { ItemInfo = item });
 
             AccountFileInfo.Instance.SaveItemData(item);
+        
             return true;
         }
 

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -50,6 +50,7 @@ namespace GameLogic.Hero
             heroData.heroPowerId++;
             InitHero(heroData);
             PlayerManager.Instance.SaveHeroData(this);
+            EventManager.Instance.Dispatch(CustomEventType.JingJieUpgrade,null);
             return this;
         }
 

Assets/Scripts/GameUI/TaskManager.cs

@@ -5,9 +5,13 @@ using System;
 using System.Threading.Tasks;
 using Common.Utility.CombatEvent;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Combat;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Player;
 using Utility;
 
 public class TaskManager : Singleton<TaskManager>
@@ -25,6 +29,20 @@ public class TaskManager : Singleton<TaskManager>
         {
             allTsk.Add(playerDataTask.taskID, playerDataTask);
         }
+
+        EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, ItemUpdate);
+        EventManager.Instance.AddEventListener(CustomEventType.JingJieUpgrade, JingJieUpgrade);
+    }
+
+    private void JingJieUpgrade(IEventData e)
+    {
+        OnJingJieUp();
+    }
+
+    private void ItemUpdate(IEventData e)
+    {
+        ItemUpdateData data = e as ItemUpdateData;
+        OnItemCollected(data.ItemInfo.itemID);
     }
 
 
@@ -48,25 +66,36 @@ public class TaskManager : Singleton<TaskManager>
         if (allTsk.ContainsKey(taskId))
         {
             TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskId);
+            EventSystemManager.Instance.isOpenUi = true;
             if (taskConfig.finishConditionType == 3)
             {
+                if (!IsTaskTrigger(taskId))
+                {
+                    return;
+                }
+                
                 //触发对话
-                DialoguePanel.OpenDialoguePanel(taskConfig.finishVlaue,null, ShowDialogueEventData.MessageShowType.Verbatim, (int? s) =>
+                DialoguePanel.OpenDialoguePanel(taskConfig.finishVlaue, null, ShowDialogueEventData.MessageShowType.Verbatim, (int? s) =>
                 {
                     OnDialog(taskConfig.ID);
+                    EventSystemManager.Instance.isOpenUi = false;
                 });
-              
             }
-
             else if (taskConfig.finishConditionType == 2)
             {
+                if (!IsTaskTrigger(taskId))
+                {
+                    return;
+                }
+                
                 CombatDrive.Instance.LoadLevelBattleCombat(taskConfig.finishVlaue[0], (iswin) =>
                 {
                     if (iswin)
                     {
                         OnMonsterKilled(taskConfig.finishVlaue[0]);
+                        CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+                        EventSystemManager.Instance.isOpenUi = false;
                     }
-                    
                 });
                 //进入战斗
             }
@@ -74,26 +103,29 @@ public class TaskManager : Singleton<TaskManager>
             //这里直接弹出提示
             else
             {
-                
+                EventSystemManager.Instance.isOpenUi = false;
+                TaskInfoPanel.OpenPanel(taskId);
             }
         }
     }
 
     public void OnDialog(int taskId)
     {
-        foreach (var taskData in allTsk)
+        List<AccountFileInfo.TaskData> tasks = allTsk.Values.ToList();
+        foreach (var taskData in tasks)
         {
-            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskData.Key);
-            if (!IsTaskComplete(taskData.Key) && taskConfig.finishConditionType == 3 && taskConfig.ID== taskId)
+            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskData.taskID);
+            if (!IsTaskComplete(taskData.taskID) && taskConfig.finishConditionType == 3 && taskConfig.ID == taskId)
             {
-                taskData.Value.fishCount++;
+                taskData.fishCount++;
 
-                if (IsTaskComplete(taskData.Key))
+                if (IsTaskComplete(taskData.taskID))
                 {
-                    CompleteTask(taskData.Key);
+                    CompleteTask(taskData.taskID);
                 }
 
                 AccountFileInfo.Instance.SavePlayerData();
+                EventManager.Instance.Dispatch(CustomEventType.TaskUpdate, null);
             }
         }
     }
@@ -101,19 +133,42 @@ public class TaskManager : Singleton<TaskManager>
     // 击杀怪物
     public void OnMonsterKilled(int leveBattleId)
     {
-        foreach (var taskData in allTsk)
+        List<AccountFileInfo.TaskData> tasks = allTsk.Values.ToList();
+        foreach (var taskData in tasks)
         {
-            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskData.Key);
-            if (!IsTaskComplete(taskData.Key) && taskConfig.finishConditionType == 2 && taskConfig.finishVlaue[0] == leveBattleId)
+            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskData.taskID);
+            if (!IsTaskComplete(taskData.taskID) && taskConfig.finishConditionType == 2 && taskConfig.finishVlaue[0] == leveBattleId)
             {
-                taskData.Value.fishCount++;
+                taskData.fishCount++;
 
-                if (IsTaskComplete(taskData.Key))
+                if (IsTaskComplete(taskData.taskID))
                 {
-                    CompleteTask(taskData.Key);
+                    CompleteTask(taskData.taskID);
                 }
 
                 AccountFileInfo.Instance.SavePlayerData();
+                EventManager.Instance.Dispatch(CustomEventType.TaskUpdate, null);
+            }
+        }
+    }
+
+    public void OnJingJieUp()
+    {
+        List<AccountFileInfo.TaskData> tasks = allTsk.Values.ToList();
+        foreach (var taskData in tasks)
+        {
+            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskData.taskID);
+            if (!IsTaskComplete(taskData.taskID) && taskConfig.finishConditionType == 4 && PlayerManager.Instance.myHero.powerUpConfig.ID >= taskConfig.finishVlaue[0])
+            {
+                taskData.fishCount++;
+
+                if (IsTaskComplete(taskData.taskID))
+                {
+                    CompleteTask(taskData.taskID);
+                }
+
+                AccountFileInfo.Instance.SavePlayerData();
+                EventManager.Instance.Dispatch(CustomEventType.TaskUpdate, null);
             }
         }
     }
@@ -121,19 +176,21 @@ public class TaskManager : Singleton<TaskManager>
     // 收集道具
     public void OnItemCollected(int itemID)
     {
-        foreach (var taskData in allTsk)
+        List<AccountFileInfo.TaskData> tasks = allTsk.Values.ToList();
+        foreach (var taskData in tasks)
         {
-            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskData.Key);
-            if (!IsTaskComplete(taskData.Key) && taskConfig.finishConditionType == 1 && taskConfig.finishVlaue[0] == itemID)
+            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskData.taskID);
+            if (!IsTaskComplete(taskData.taskID) && taskConfig.finishConditionType == 1 && taskConfig.finishVlaue[0] == itemID)
             {
-                taskData.Value.fishCount++;
+                taskData.fishCount++;
 
-                if (IsTaskComplete(taskData.Key))
+                if (IsTaskComplete(taskData.taskID))
                 {
-                    CompleteTask(taskData.Key);
+                    CompleteTask(taskData.taskID);
                 }
 
                 AccountFileInfo.Instance.SavePlayerData();
+                EventManager.Instance.Dispatch(CustomEventType.TaskUpdate, null);
             }
         }
     }
@@ -142,21 +199,55 @@ public class TaskManager : Singleton<TaskManager>
     private void CompleteTask(int taskID)
     {
         TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskID);
+      
 
-        GrantReward(taskID);
+        List<ItemInfo> awardList = GrantReward(taskID);
+        //可能需要处理弹出任务完成ui
+        
         // 触发下一个任务（主线）
         if (taskConfig.nextTaskID != 0)
         {
             AcceptTask(taskConfig.nextTaskID);
         }
-
-        //发送事件 更新主线任务
     }
 
 
     // 发放奖励
-    private void GrantReward(int taskID)
+    private List<ItemInfo> GrantReward(int taskID)
+    {
+        TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskID);
+        if (taskConfig.awardItemId != null && taskConfig.awardItemId.Length > 0)
+        {
+            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);
+                }
+            }
+            return itemInfos;
+        }
+
+        return null;
+    }
+
+    private bool IsTaskTrigger(int taskId)
     {
+        TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskId);
+        if (taskConfig.unlockType == 1)
+        {
+            return PlayerManager.Instance.myHero.powerUpConfig.ID >= taskConfig.unlockLevel;
+        }
+
+        return true;
     }
 
     //获取任务数据

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

@@ -38,9 +38,9 @@ namespace Fort23.Mono
             DialoguePanel dialoguePanel = await UIManager.Instance.LoadAndOpenPanel<DialoguePanel>(null, UILayer.Top);
             dialoguePanel.ShowPanel(id, icon, messageShowType, finish);
         }
-        
-        
-        public static async void OpenDialoguePanel( int[] LanID, string[] icon,
+
+
+        public static async void OpenDialoguePanel(int[] LanID, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
@@ -81,7 +81,6 @@ namespace Fort23.Mono
                 ShowNextIcon();
                 if (index >= dialogueMessaga.Length)
                 {
-                    
                     // 所有句子显示完成，检查是否有选项
                     if (eventConditionConfig.optionType == 1 && !_isShowingOptions)
                     {
@@ -125,13 +124,12 @@ namespace Fort23.Mono
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
             StartShowMassge();
         }
-        
-        
-        public void ShowPanel( int[] LanID, string[] icon,
+
+
+        public void ShowPanel(int[] LanID, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
-       
             showIconName = icon;
             this.dialogueMessaga = LanID;
             this.messageShowType = messageShowType;
@@ -229,9 +227,9 @@ namespace Fort23.Mono
 
         public void Update()
         {
-            if(EventSystemManager.Instance.isOpenUi)
+            if (EventSystemManager.Instance.isOpenUi && eventConditionConfig.ID != 0)
                 return;
-            
+
             if (!_isUpdate) return;
 
             if (messageShowType == ShowDialogueEventData.MessageShowType.Verbatim)

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

@@ -27,6 +27,12 @@ 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()
@@ -61,6 +67,7 @@ namespace Fort23.Mono
             EventManager.Instance.RemoveEventListener(CustomEventType.CompleteEvent, CompleteEvent);
             EventManager.Instance.RemoveEventListener(CustomEventType.RemoveEvent, RemoveEvent);
             EventManager.Instance.RemoveEventListener(CustomEventType.ShengShiOnClick, ShengShiOnClick);
+            EventManager.Instance.RemoveEventListener(CustomEventType.TaskUpdate, TaskUpdate);
         }
 
         public override void AddButtonEvent()
@@ -75,6 +82,24 @@ 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)
@@ -127,7 +152,22 @@ namespace Fort23.Mono
                 Btn_Task.gameObject.SetActive(true);
                 TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskData.taskID);
                 Text_TaskName.text = LanguageManager.Instance.Text(taskConfig.taskName);
-                Text_TaskMassge.text = LanguageManager.Instance.Text(taskConfig.conciseTaskMessage);
+                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
             {

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

@@ -162,6 +162,17 @@ namespace Fort23.Mono
 	      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.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WXgatnilUi6hFDjnsklpVlSuhgScxeRClVXLZASs7Nk8qTT5e88tf/xcHh0i
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,42 @@
+using Core.Language;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "TaskInfoPanel")]
+    public partial class TaskInfoPanel : UIPanel
+    {
+        private void Init()
+        {
+            isAddStack = false;
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
+
+        public void CustomInit(int taskId)
+        {
+            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskId);
+            Text_Name.text = LanguageManager.Instance.Text(taskConfig.taskName);
+            Text_desc.text = LanguageManager.Instance.Text(taskConfig.Description);
+        }
+
+        public async static CTask OpenPanel(int taskId)
+        {
+            TaskInfoPanel taskInfoPanel = await UIManager.Instance.LoadAndOpenPanel<TaskInfoPanel>(null);
+            taskInfoPanel.CustomInit(taskId);
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Cygf4SmuVHJf4jdQyst3d4Yx4uV8lqQd3NvyTwYg/1mWdX0jRrIqys/wBTX8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,73 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class TaskInfoPanel 
+	{
+	  #region 自定义数据 
+	  private MyImage _bg;
+	  public MyImage bg
+	   {
+	   get{
+	      if (_bg == null)
+	       {
+	         _bg  = GetUIUnit<MyImage>("bg"); 
+	       }
+	      return _bg;
+	     }
+	   }
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  private Button _Btn_Ok;
+	  public Button Btn_Ok
+	   {
+	   get{
+	      if (_Btn_Ok == null)
+	       {
+	         _Btn_Ok  = GetUIUnit<Button>("Btn_Ok"); 
+	       }
+	      return _Btn_Ok;
+	     }
+	   }
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  private Text _Text_desc;
+	  public Text Text_desc
+	   {
+	   get{
+	      if (_Text_desc == null)
+	       {
+	         _Text_desc  = GetUIUnit<Text>("Text_desc"); 
+	       }
+	      return _Text_desc;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/Task/TaskInfoPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: W3JK4CqtUCkjQJKOllYaYUC4xLqErfpbuTNPAQ5w0NEvLTtrbbAivQ3N6ifw
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: