Parcourir la source

添加跳转逻辑

lzx il y a 12 heures
Parent
commit
021abf3c01
31 fichiers modifiés avec 1839 ajouts et 84 suppressions
  1. 165 15
      Assets/Res/Config/EventConditionConfig.json
  2. 16 0
      Assets/Res/Config/LanguageChineseConfig.json
  3. 32 0
      Assets/Res/Config/SkiptoConfig.json
  4. 7 0
      Assets/Res/Config/SkiptoConfig.json.meta
  5. 901 0
      Assets/Res/UI/DivineSence/EventTipsPanel.prefab
  6. 7 0
      Assets/Res/UI/DivineSence/EventTipsPanel.prefab.meta
  7. 192 0
      Assets/Res/UI/DivineSence/SkipToWidget.prefab
  8. 7 0
      Assets/Res/UI/DivineSence/SkipToWidget.prefab.meta
  9. 10 10
      Assets/Res/UI/MainPanel/MainPanel.prefab
  10. 6 0
      Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs
  11. 56 0
      Assets/Scripts/GameData/ExcelConfig/SkiptoConfig.cs
  12. 11 0
      Assets/Scripts/GameData/ExcelConfig/SkiptoConfig.cs.meta
  13. 1 0
      Assets/Scripts/GameUI/EventManager/DialogueManager.cs
  14. 63 55
      Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs
  15. 9 3
      Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs
  16. 96 0
      Assets/Scripts/GameUI/UI/DivineSence/EventTipsPanel.cs
  17. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/EventTipsPanel.cs.meta
  18. 73 0
      Assets/Scripts/GameUI/UI/DivineSence/EventTipsPanelData.cs
  19. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/EventTipsPanelData.cs.meta
  20. 36 0
      Assets/Scripts/GameUI/UI/DivineSence/SkipToWidget.cs
  21. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/SkipToWidget.cs.meta
  22. 29 0
      Assets/Scripts/GameUI/UI/DivineSence/SkipToWidgetData.cs
  23. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/SkipToWidgetData.cs.meta
  24. 1 1
      Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs
  25. 3 0
      Assets/Scripts/GameUI/Utility.meta
  26. 63 0
      Assets/Scripts/GameUI/Utility/SkiptoHelper.cs
  27. 11 0
      Assets/Scripts/GameUI/Utility/SkiptoHelper.cs.meta
  28. 0 0
      Assets/StreamingAssets/assetConfig.txt
  29. BIN
      Excel2Json/Excel/EventConfig.xlsx
  30. BIN
      Excel2Json/Excel/Language.xlsx
  31. BIN
      Excel2Json/Excel/Skipto.xlsx

+ 165 - 15
Assets/Res/Config/EventConditionConfig.json

@@ -8,7 +8,13 @@
       "ConditionPara": [
         1001
       ],
-      "finishCount": 10
+      "finishCount": 10,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 2,
@@ -18,7 +24,13 @@
       "ConditionPara": [
         11
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 3,
@@ -31,6 +43,12 @@
       "finishCount": 5,
       "RelatedEvents": [
         9031
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
       ]
     },
     {
@@ -41,21 +59,39 @@
       "ConditionPara": [
         1002
       ],
-      "finishCount": 10
+      "finishCount": 10,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 5,
       "message": 2082,
       "Operation": null,
       "ConditionType": 8,
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 6,
       "message": 2094,
       "Operation": null,
       "ConditionType": 9,
-      "finishCount": 6
+      "finishCount": 6,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 7,
@@ -65,7 +101,13 @@
       "ConditionPara": [
         1002
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 8,
@@ -75,7 +117,13 @@
       "ConditionPara": [
         21
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 9,
@@ -88,6 +136,12 @@
       "finishCount": 1,
       "RelatedEvents": [
         30003
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
       ]
     },
     {
@@ -101,6 +155,12 @@
       "finishCount": 3,
       "RelatedEvents": [
         30004
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
       ]
     },
     {
@@ -114,6 +174,12 @@
       "finishCount": 3,
       "RelatedEvents": [
         30011
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
       ]
     },
     {
@@ -127,6 +193,12 @@
       "finishCount": 1,
       "RelatedEvents": [
         30005
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
       ]
     },
     {
@@ -140,6 +212,12 @@
       "finishCount": 1,
       "RelatedEvents": [
         30006
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
       ]
     },
     {
@@ -150,7 +228,13 @@
       "ConditionPara": [
         31
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 15,
@@ -163,6 +247,12 @@
       "finishCount": 1,
       "RelatedEvents": [
         30007
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
       ]
     },
     {
@@ -176,6 +266,12 @@
       "finishCount": 1,
       "RelatedEvents": [
         30008
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
       ]
     },
     {
@@ -189,6 +285,12 @@
       "finishCount": 1,
       "RelatedEvents": [
         30009
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
       ]
     },
     {
@@ -202,6 +304,12 @@
       "finishCount": 1,
       "RelatedEvents": [
         30010
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
       ]
     },
     {
@@ -212,7 +320,13 @@
       "ConditionPara": [
         1001
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 21,
@@ -222,7 +336,13 @@
       "ConditionPara": [
         41
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 22,
@@ -232,7 +352,13 @@
       "ConditionPara": [
         51
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 23,
@@ -242,7 +368,13 @@
       "ConditionPara": [
         61
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 24,
@@ -252,7 +384,13 @@
       "ConditionPara": [
         71
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 25,
@@ -262,7 +400,13 @@
       "ConditionPara": [
         81
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     },
     {
       "ID": 26,
@@ -272,7 +416,13 @@
       "ConditionPara": [
         91
       ],
-      "finishCount": 1
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     }
   ]
 }

+ 16 - 0
Assets/Res/Config/LanguageChineseConfig.json

@@ -13023,6 +13023,22 @@
     {
       "ID": 3256,
       "txt": "道具描述_感悟点7"
+    },
+    {
+      "ID": 3257,
+      "txt": "功法界面"
+    },
+    {
+      "ID": 3258,
+      "txt": "法宝界面"
+    },
+    {
+      "ID": 3259,
+      "txt": "洞府界面"
+    },
+    {
+      "ID": 3260,
+      "txt": "商店界面"
     }
   ]
 }

+ 32 - 0
Assets/Res/Config/SkiptoConfig.json

@@ -0,0 +1,32 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "SkipType": 1,
+      "SkipID": 1,
+      "SkipTxt1": 3257,
+      "SkipTxt2": -1
+    },
+    {
+      "ID": 2,
+      "SkipType": 2,
+      "SkipID": 2,
+      "SkipTxt1": 3258,
+      "SkipTxt2": 405487
+    },
+    {
+      "ID": 3,
+      "SkipType": 3,
+      "SkipID": 3,
+      "SkipTxt1": 3259,
+      "SkipTxt2": 405488
+    },
+    {
+      "ID": 4,
+      "SkipType": 4,
+      "SkipID": 4,
+      "SkipTxt1": 3260,
+      "SkipTxt2": 405489
+    }
+  ]
+}

+ 7 - 0
Assets/Res/Config/SkiptoConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXIZtin5AXigGxYJZYlenFBfxOcWg/q+ZuJPCQcQGnM3THnbIo0zOFyoeQ/4
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 901 - 0
Assets/Res/UI/DivineSence/EventTipsPanel.prefab

@@ -0,0 +1,901 @@
+%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: EventTipsPanel
+  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: 2708046515207152597}
+  - {fileID: 562321534252030192}
+  - {fileID: 5659305390174163116}
+  - {fileID: 5866622043385976589}
+  - {fileID: 3258887086271990041}
+  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: Content
+    gameObject: {fileID: 3168022605306893254}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_EventName
+    gameObject: {fileID: 4734895600006074142}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_TiaoJian
+    gameObject: {fileID: 1171374253833545421}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &1866119032993322482
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2708046515207152597}
+  - component: {fileID: 1851182301441702079}
+  - component: {fileID: 4734895600006074142}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_EventName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2708046515207152597
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1866119032993322482}
+  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.00049281, y: 391.9}
+  m_SizeDelta: {x: 475.88, y: 44.8081}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1851182301441702079
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1866119032993322482}
+  m_CullTransparentMesh: 1
+--- !u!114 &4734895600006074142
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1866119032993322482}
+  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: 23
+    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\u547D\u540D\u79F0XXX"
+--- !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: 0.86666673, g: 0.854902, b: 0.8078432, 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
+  imageH: 777.9515
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &2661625032725589361
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5866622043385976589}
+  - component: {fileID: 3793524203819905834}
+  - component: {fileID: 1516881070545428959}
+  - component: {fileID: 2167687040082266731}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5866622043385976589
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2661625032725589361}
+  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: 9019401354127365474}
+  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: 2.4004, y: -35.376793}
+  m_SizeDelta: {x: 451.8007, y: 532.0372}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3793524203819905834
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2661625032725589361}
+  m_CullTransparentMesh: 1
+--- !u!114 &1516881070545428959
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2661625032725589361}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  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: 10907, guid: 0000000000000000f000000000000000, type: 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
+--- !u!114 &2167687040082266731
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2661625032725589361}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 3168022605306893254}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 9019401354127365474}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3888980628067459391
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9019401354127365474}
+  - component: {fileID: 5837963181449810003}
+  - component: {fileID: 964150754109543819}
+  - component: {fileID: 6704193234492597571}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9019401354127365474
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3888980628067459391}
+  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: 3168022605306893254}
+  m_Father: {fileID: 5866622043385976589}
+  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: -17}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &5837963181449810003
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3888980628067459391}
+  m_CullTransparentMesh: 1
+--- !u!114 &964150754109543819
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3888980628067459391}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 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
+--- !u!114 &6704193234492597571
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3888980628067459391}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &6433875597589258302
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3258887086271990041}
+  - component: {fileID: 8123075089451312824}
+  - component: {fileID: 7236800057139731354}
+  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 &3258887086271990041
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6433875597589258302}
+  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: 304.478}
+  m_SizeDelta: {x: 446.4749, y: 3.2457}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8123075089451312824
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6433875597589258302}
+  m_CullTransparentMesh: 1
+--- !u!114 &7236800057139731354
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6433875597589258302}
+  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.34509805, g: 0.36078432, b: 0.3647059, 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: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &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 &7405747344607976440
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5659305390174163116}
+  - component: {fileID: 8440945211878829813}
+  - component: {fileID: 4303213804421114956}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_EventName (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5659305390174163116
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7405747344607976440}
+  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.00049281, y: 274.4}
+  m_SizeDelta: {x: 475.88, y: 27.75}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8440945211878829813
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7405747344607976440}
+  m_CullTransparentMesh: 1
+--- !u!114 &4303213804421114956
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7405747344607976440}
+  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: 20
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5C1D\u8BD5\u9014\u5F84"
+--- !u!1 &8121345727853060345
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3168022605306893254}
+  - component: {fileID: 2186481738682490150}
+  - component: {fileID: 336136416440708660}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3168022605306893254
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8121345727853060345}
+  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: 9019401354127365474}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &2186481738682490150
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8121345727853060345}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_Spacing: 16.56
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &336136416440708660
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8121345727853060345}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!1 &9151032839066011116
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 562321534252030192}
+  - component: {fileID: 5417248340603968389}
+  - component: {fileID: 1171374253833545421}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_TiaoJian
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &562321534252030192
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9151032839066011116}
+  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.00049281, y: 346.92905}
+  m_SizeDelta: {x: 475.88, y: 27.75}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5417248340603968389
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9151032839066011116}
+  m_CullTransparentMesh: 1
+--- !u!114 &1171374253833545421
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9151032839066011116}
+  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: 20
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9700\u8981XX"

+ 7 - 0
Assets/Res/UI/DivineSence/EventTipsPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CiscsH6tUHPXV5Bkc9fpxJLOgTcXIV6xCFuGKk5IpAbn2sWbUX1IgaTikeXO
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 192 - 0
Assets/Res/UI/DivineSence/SkipToWidget.prefab

@@ -0,0 +1,192 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &552283852197464311
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2031025586594099529}
+  - component: {fileID: 2764239713808331299}
+  - component: {fileID: 5564107046295165446}
+  - component: {fileID: 5077043043105525706}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: SkipToWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2031025586594099529
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 552283852197464311}
+  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: 7051915568679705722}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 225.90034, y: -37.6329}
+  m_SizeDelta: {x: 427.5148, y: 75.2658}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2764239713808331299
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 552283852197464311}
+  m_CullTransparentMesh: 1
+--- !u!114 &5564107046295165446
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 552283852197464311}
+  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.13725491, g: 0.17254902, b: 0.19215688, 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: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &5077043043105525706
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 552283852197464311}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 5074312253101209296}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &7526857406869084359
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7051915568679705722}
+  - component: {fileID: 8970334290530347802}
+  - component: {fileID: 5074312253101209296}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7051915568679705722
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7526857406869084359}
+  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: 2031025586594099529}
+  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: 34.96904, y: -0.00016212}
+  m_SizeDelta: {x: 328.0219, y: 75.265}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8970334290530347802
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7526857406869084359}
+  m_CullTransparentMesh: 1
+--- !u!114 &5074312253101209296
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7526857406869084359}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u3010\u795E\u8BC6\u3011\u795E\u8BC6\u63A2\u7D22"

+ 7 - 0
Assets/Res/UI/DivineSence/SkipToWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DCwesS35AX7lgqUJu0FUnN9rdiz5bX7CBw9SpgoxiaToUcJDJXUa8bh1vVej
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 10 - 10
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -412,7 +412,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: 146, y: -150.3}
+  m_AnchoredPosition: {x: 135.09998, y: -150.29999}
   m_SizeDelta: {x: 140, y: 79}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5266103379137653520
@@ -771,11 +771,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4070775161762383813}
+  - {fileID: 6506910486868409184}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 631, y: -151.8}
+  m_AnchoredPosition: {x: 620.1, y: -151.8}
   m_SizeDelta: {x: 99, y: 70}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &2833581182454625980
@@ -1094,12 +1095,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8620268506487690809}
+  m_Father: {fileID: 6895274337125899519}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 4.711212, y: -1.4107742}
-  m_SizeDelta: {x: 549.448, y: 36.6216}
+  m_AnchoredPosition: {x: 0, y: 25.5}
+  m_SizeDelta: {x: 180.9052, y: 36.6216}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8449163745382179136
 CanvasRenderer:
@@ -1136,13 +1137,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 5
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u706B\u7130\u5C71    30%"
+  m_Text: "\u706B\u7130\u5C71 0%"
 --- !u!114 &5407159726911301663
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1527,7 +1528,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: 309, y: -150.3}
+  m_AnchoredPosition: {x: 298.09998, y: -150.29999}
   m_SizeDelta: {x: 140, y: 79}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &841335345974793160
@@ -1796,7 +1797,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: 470.5, y: -150.3}
+  m_AnchoredPosition: {x: 459.59998, y: -150.29999}
   m_SizeDelta: {x: 140, y: 79}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &1440766704785151486
@@ -1926,7 +1927,6 @@ RectTransform:
   m_Children:
   - {fileID: 5356781300361507259}
   - {fileID: 3729966574632931888}
-  - {fileID: 6506910486868409184}
   m_Father: {fileID: 1798015912972164048}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}

+ 6 - 0
Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs

@@ -56,6 +56,12 @@ public int finishCount;
 public int[] RelatedEvents;
 
 
+		/// <summary>
+		///跳转Id
+		/// </summary>
+public int[] SkiptoIds;
+
+
 	}
 
 }

+ 56 - 0
Assets/Scripts/GameData/ExcelConfig/SkiptoConfig.cs

@@ -0,0 +1,56 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\Skipto.xlsx. SheetName: SkiptoConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "SkiptoConfig.json")]
+	public partial class SkiptoConfigHolder : ConfigHolder<SkiptoConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct SkiptoConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///跳转类型
+		/// </summary>
+public int SkipType;
+
+
+		/// <summary>
+		///跳转ID 填写方法见附页
+		/// </summary>
+public int SkipID;
+
+
+		/// <summary>
+		///跳转参数 填写方法见附页
+		/// </summary>
+public int[] SkipArguments;
+
+
+		/// <summary>
+		///跳转来源语言表ID1
+		/// </summary>
+public int SkipTxt1;
+
+
+		/// <summary>
+		///跳转来源语言表ID2
+		/// </summary>
+public int SkipTxt2;
+
+
+	}
+
+}
+// End of Auto Generated Code

+ 11 - 0
Assets/Scripts/GameData/ExcelConfig/SkiptoConfig.cs.meta

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

+ 1 - 0
Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -81,6 +81,7 @@ public class DialogueManager : Singleton<DialogueManager>
             var eventLinkDatas = CurrentEventList.eventLinks.FirstOrDefault(el => el.eventLinkId == dialogueID);
             if (eventLinkDatas != null && !EventSystemManager.Instance.CeekEventGroupComplete(eventLinkDatas.eventConditions))
             {
+                EventTipsPanel.OpenPanel(eventLinkDatas);
                 onCancel?.Invoke();
                 return;
             }

+ 63 - 55
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -38,63 +38,12 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            Btn_Shop.onClick.AddListener(async () =>
-            {
-                if (currentOpenUIPanel is ShopPanel)
-                {
-                    return;
-                }
-
-                UIPanel uiPanel = currentOpenUIPanel;
-
-                CombatDrive.Instance.CombatController.isUpdate = false;
-                ShopPanel shopPanel = await ShopPanel.OpenPanel();
-                UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
-                if (!shopPanel.IsClose)
-                    await shopPanel.UIClosed();
-                CombatDrive.Instance.CombatController.isUpdate = true;
-            });
+            Btn_Shop.onClick.AddListener(async () => { Btn_Shop_Click(); });
 
             bnt_shengShi.onClick.AddListener(() => { DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); }); });
-            Btn_GongFa.onClick.AddListener(async () =>
-            {
-                if (currentOpenUIPanel is SkillSelectPanel)
-                {
-                    return;
-                }
-
-                UIPanel uiPanel = currentOpenUIPanel;
-                SkillSelectPanel skillSelectPanel = await SkillSelectPanel.OpenSkillSelectPanel();
-                UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
-            });
-            Btn_HeroInfomation.onClick.AddListener(async () =>
-            {
-                if (currentOpenUIPanel is MainHeroPanel)
-                {
-                    return;
-                }
-
-                UIPanel uiPanel = currentOpenUIPanel;
-                MainHeroPanel mainHeroPanel = await MainHeroPanel.OpenPanel();
-                UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
-                if (!mainHeroPanel.IsClose)
-                    await mainHeroPanel.UIClosed();
-            });
-            Btn_DongFu.onClick.AddListener(async () =>
-            {
-                if (currentOpenUIPanel is HeroInformationPanel)
-                {
-                    return;
-                }
-
-                UIPanel uiPanel = currentOpenUIPanel;
-                CombatDrive.Instance.CombatController.isUpdate = false;
-                CaveMainPanel heroInformationPanel = await CaveMainPanel.OpenPanel();
-                UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
-                if (!heroInformationPanel.IsClose)
-                    await heroInformationPanel.UIClosed();
-                CombatDrive.Instance.CombatController.isUpdate = true;
-            });
+            Btn_GongFa.onClick.AddListener(async () => { Btn_GongFa_Click(); });
+            Btn_HeroInfomation.onClick.AddListener(async () => { Btn_HeroInfomation_Click(); });
+            Btn_DongFu.onClick.AddListener(async () => { Bne_dongfu_Click(); });
 
             Btn_Back.onClick.AddListener(() =>
             {
@@ -103,6 +52,65 @@ namespace Fort23.Mono
             });
         }
 
+        public async void Btn_Shop_Click()
+        {
+            if (currentOpenUIPanel is ShopPanel)
+            {
+                return;
+            }
+
+            UIPanel uiPanel = currentOpenUIPanel;
+
+            CombatDrive.Instance.CombatController.isUpdate = false;
+            ShopPanel shopPanel = await ShopPanel.OpenPanel();
+            UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
+            if (!shopPanel.IsClose)
+                await shopPanel.UIClosed();
+            CombatDrive.Instance.CombatController.isUpdate = true;
+        }
+
+        public async void Btn_GongFa_Click()
+        {
+            if (currentOpenUIPanel is SkillSelectPanel)
+            {
+                return;
+            }
+
+            UIPanel uiPanel = currentOpenUIPanel;
+            SkillSelectPanel skillSelectPanel = await SkillSelectPanel.OpenSkillSelectPanel();
+            UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
+        }
+
+        public async void Btn_HeroInfomation_Click()
+        {
+            if (currentOpenUIPanel is MainHeroPanel)
+            {
+                return;
+            }
+
+            UIPanel uiPanel = currentOpenUIPanel;
+            MainHeroPanel mainHeroPanel = await MainHeroPanel.OpenPanel();
+            UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
+            if (!mainHeroPanel.IsClose)
+                await mainHeroPanel.UIClosed();
+        }
+
+        public async void Bne_dongfu_Click()
+        {
+            if (currentOpenUIPanel is HeroInformationPanel)
+            {
+                return;
+            }
+
+            UIPanel uiPanel = currentOpenUIPanel;
+            CombatDrive.Instance.CombatController.isUpdate = false;
+            CaveMainPanel heroInformationPanel = await CaveMainPanel.OpenPanel();
+            UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
+            if (!heroInformationPanel.IsClose)
+                await heroInformationPanel.UIClosed();
+            CombatDrive.Instance.CombatController.isUpdate = true;
+        }
+
         private async CTask OpenSelectSkillPanel()
         {
         }

+ 9 - 3
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -310,15 +310,21 @@ namespace Fort23.Mono
 
 
                 LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
-
-              
             }
         }
 
-        private void SelectOption(DialogueOptionWidget obj)
+        private async void SelectOption(DialogueOptionWidget obj)
         {
             if (!EventSystemManager.Instance.CeekEventGroupComplete(obj.eventLinkData.eventConditions))
             {
+                bool isOk = await EventTipsPanel.OpenPanel(obj.eventLinkData);
+
+                if (isOk)
+                {
+                    UIManager.Instance.HideUIUIPanel(this);
+                    finish?.Invoke(-1);
+                }
+
                 // TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(selectedOptionID));
                 return;
             }

+ 96 - 0
Assets/Scripts/GameUI/UI/DivineSence/EventTipsPanel.cs

@@ -0,0 +1,96 @@
+using System.Collections.Generic;
+using Core.Language;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+using Mono.Utility;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "EventTipsPanel")]
+    public partial class EventTipsPanel : UIPanel
+    {
+        List<SkipToWidget> skipToWidgets = new List<SkipToWidget>();
+        private CTask<bool> callBack;
+        private bool isSkipto = false;
+
+        private void Init()
+        {
+            isPopUi = true;
+            isAddStack = false;
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
+
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            AccountFileInfo.EventLinkData eventLinkData = uiData[0] as AccountFileInfo.EventLinkData;
+            callBack = uiData[1] as CTask<bool>;
+            EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventLinkData.eventId);
+            EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventLinkData.eventLinkId);
+            Text_EventName.text = LanguageManager.Instance.Text(eventConfig.EventName);
+            string desc = "";
+
+            foreach (var eventConditionData in eventLinkData.eventConditions)
+            {
+                desc += EventHelper.GetTaskMessage(eventConditionData) + "\n";
+            }
+
+            Text_TiaoJian.text = desc;
+            foreach (var eventConditionData in eventLinkData.eventConditions)
+            {
+                EventConditionConfig eventConditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
+                foreach (var skiptoId in eventConditionConfig.SkiptoIds)
+                {
+                    SkipToWidget skipToWidget = await UIManager.Instance.CreateGComponent<SkipToWidget>(null, Content);
+                    skipToWidget.CustonInit(skiptoId);
+                    skipToWidgets.Add(skipToWidget);
+                    skipToWidget.OnClick = OnClick;
+                }
+            }
+
+
+            return await base.AsyncInit(uiData);
+        }
+
+        private void OnClick(ItemWidgetBasic obj)
+        {
+            SkipToWidget skipToWidget = obj as SkipToWidget;
+            isSkipto = true;
+            UIManager.Instance.HideUIUIPanel(this);
+            SkiptoHelper.Skipto(skipToWidget.SkiptoConfig.ID);
+        }
+
+        public static async CTask<bool> OpenPanel(AccountFileInfo.EventLinkData eventLinkData)
+        {
+            CTask<bool> callBack = CTask<bool>.Create();
+            await UIManager.Instance.LoadAndOpenPanel<EventTipsPanel>(null, UILayer.Top, uiData: new object[] { eventLinkData, callBack });
+            return await callBack;
+        }
+
+        public override void Close()
+        {
+            foreach (var skipToWidget in skipToWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(skipToWidget);
+            }
+
+            skipToWidgets.Clear();
+            callBack?.SetResult(isSkipto);
+            isSkipto = false;
+
+            base.Close();
+        }
+    }
+}

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

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

+ 73 - 0
Assets/Scripts/GameUI/UI/DivineSence/EventTipsPanelData.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 EventTipsPanel 
+	{
+	  #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 RectTransform _Content;
+	  public RectTransform Content
+	   {
+	   get{
+	      if (_Content == null)
+	       {
+	         _Content  = GetUIUnit<RectTransform>("Content"); 
+	       }
+	      return _Content;
+	     }
+	   }
+	  private Text _Text_EventName;
+	  public Text Text_EventName
+	   {
+	   get{
+	      if (_Text_EventName == null)
+	       {
+	         _Text_EventName  = GetUIUnit<Text>("Text_EventName"); 
+	       }
+	      return _Text_EventName;
+	     }
+	   }
+	  private Text _Text_TiaoJian;
+	  public Text Text_TiaoJian
+	   {
+	   get{
+	      if (_Text_TiaoJian == null)
+	       {
+	         _Text_TiaoJian  = GetUIUnit<Text>("Text_TiaoJian"); 
+	       }
+	      return _Text_TiaoJian;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 36 - 0
Assets/Scripts/GameUI/UI/DivineSence/SkipToWidget.cs

@@ -0,0 +1,36 @@
+using Core.Language;
+using Excel2Json;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "SkipToWidget"  )]
+	public partial class SkipToWidget : ItemWidgetBasic
+	{
+		public SkiptoConfig SkiptoConfig;
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+			base.AddButtonEvent();
+
+		}
+		
+		public void CustonInit(int skiptoId)
+		{
+			SkiptoConfig = ConfigComponent.Instance.Get<SkiptoConfig>(skiptoId);
+			Text_Name.text = LanguageManager.Instance.Text(SkiptoConfig.SkipTxt1);
+		}
+
+	}
+}

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

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

+ 29 - 0
Assets/Scripts/GameUI/UI/DivineSence/SkipToWidgetData.cs

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

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

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

+ 1 - 1
Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -172,7 +172,7 @@ namespace Fort23.Mono
                 ConfigComponent.Instance.Get<PlacesConfig>(PlayerManager.Instance.CurrentPlaces.id);
 
             Text_ExplorationProgress.text =
-                $"{LanguageManager.Instance.Text(placesConfig.placeName)}   {PlayerManager.Instance.PlacesBl}%";
+                $"{LanguageManager.Instance.Text(placesConfig.placeName)}{PlayerManager.Instance.PlacesBl}%";
             Slider_Map.value = PlayerManager.Instance.PlacesBl;
         }
 

+ 3 - 0
Assets/Scripts/GameUI/Utility.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b26dff8ae26e4562a4c85b37caa1fbe3
+timeCreated: 1752653628

+ 63 - 0
Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -0,0 +1,63 @@
+using Excel2Json;
+using Fort23.Core;
+using Fort23.Mono;
+using Fort23.UTool;
+
+namespace Mono.Utility
+{
+    public static class SkiptoHelper
+    {
+        public async static CTask Skipto(int skiptoId)
+        {
+            SkiptoConfig skiptoConfig = ConfigComponent.Instance.Get<SkiptoConfig>(skiptoId);
+
+
+            switch (skiptoConfig.SkipID)
+            {
+                //不跳转
+                case 0:
+
+                    return;
+                //功法界面
+                case 1:
+                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_GongFa_Click();
+                    return;
+                //法宝界面
+                case 2:
+                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_HeroInfomation_Click();
+                    return;
+                //洞府界面
+                case 3:
+                    UIManager.Instance.GetComponent<AppBarPanel>().Bne_dongfu_Click();
+                    return;
+                //商店界面
+                case 4:
+                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click();
+                    return;
+
+                default:
+                    return;
+            }
+        }
+
+
+        public async static CTask<bool> IsSkipto(int skiptoId)
+        {
+            SkiptoConfig skiptoConfig = ConfigComponent.Instance.Get<SkiptoConfig>(skiptoId);
+
+            switch (skiptoConfig.SkipID)
+            {
+                //不跳转
+                case 0:
+                    return false;
+                default:
+                    return true;
+            }
+        }
+
+
+        public async static CTask SkiptoTips(int skiptoId)
+        {
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/Utility/SkiptoHelper.cs.meta

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

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/Skipto.xlsx


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff