浏览代码

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

李桃 1 天之前
父节点
当前提交
c9655fab27
共有 52 个文件被更改,包括 2015 次插入553 次删除
  1. 0 8
      Assets/Res/Config/BigMapConfig.json
  2. 1 1
      Assets/Res/Config/BigMapConfig.json.meta
  3. 55 7
      Assets/Res/Config/EventConfig.json
  4. 1 4
      Assets/Res/Config/EventLinkConfig.json
  5. 100 30
      Assets/Res/Config/PlacesConfig.json
  6. 1 1
      Assets/Res/Config/PlacesConfig.json.meta
  7. 6 3
      Assets/Res/Config/WorldMapConfig.json
  8. 1 1
      Assets/Res/Config/WorldMapConfig.json.meta
  9. 8 0
      Assets/Res/UI/LevelChoosePanel.meta
  10. 191 0
      Assets/Res/UI/LevelChoosePanel/BigMapWidget.prefab
  11. 7 0
      Assets/Res/UI/LevelChoosePanel/BigMapWidget.prefab.meta
  12. 661 0
      Assets/Res/UI/LevelChoosePanel/LevelChoosePanel.prefab
  13. 7 0
      Assets/Res/UI/LevelChoosePanel/LevelChoosePanel.prefab.meta
  14. 401 0
      Assets/Res/UI/LevelChoosePanel/PengLaiDaoBigMapPanel.prefab
  15. 7 0
      Assets/Res/UI/LevelChoosePanel/PengLaiDaoBigMapPanel.prefab.meta
  16. 4 28
      Assets/Scripts/GameData/ExcelConfig/BigMapConfig.cs
  17. 1 1
      Assets/Scripts/GameData/ExcelConfig/BigMapConfig.cs.meta
  18. 21 3
      Assets/Scripts/GameData/ExcelConfig/EventConfig.cs
  19. 4 4
      Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs
  20. 0 56
      Assets/Scripts/GameData/ExcelConfig/Places.cs
  21. 98 0
      Assets/Scripts/GameData/ExcelConfig/PlacesConfig.cs
  22. 1 1
      Assets/Scripts/GameData/ExcelConfig/PlacesConfig.cs.meta
  23. 11 5
      Assets/Scripts/GameData/ExcelConfig/WorldMapConfig.cs
  24. 1 1
      Assets/Scripts/GameData/ExcelConfig/WorldMapConfig.cs.meta
  25. 3 1
      Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs
  26. 1 11
      Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
  27. 7 3
      Assets/Scripts/GameUI/Combat/CombatDrive.cs
  28. 31 17
      Assets/Scripts/GameUI/EventManager/DialogueManager.cs
  29. 20 8
      Assets/Scripts/GameUI/EventManager/EventHelper.cs
  30. 75 51
      Assets/Scripts/GameUI/EventManager/EventSystemManager.cs
  31. 6 2
      Assets/Scripts/GameUI/GameApplction.cs
  32. 0 299
      Assets/Scripts/GameUI/TaskManager.cs
  33. 15 5
      Assets/Scripts/GameUI/UI/CombatPanel/ShengShiEventWidget.cs
  34. 1 1
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs
  35. 8 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel.meta
  36. 27 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapItem.cs
  37. 3 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapItem.cs.meta
  38. 34 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapWidget.cs
  39. 1 1
      Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapWidget.cs.meta
  40. 29 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapWidgetData.cs
  41. 11 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapWidgetData.cs.meta
  42. 41 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/LevelChoosePanel.cs
  43. 11 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/LevelChoosePanel.cs.meta
  44. 29 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PengLaiDaoBigMapPanel.cs
  45. 11 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PengLaiDaoBigMapPanel.cs.meta
  46. 51 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PengLaiDaoBigMapPanelData.cs
  47. 11 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PengLaiDaoBigMapPanelData.cs.meta
  48. 二进制
      Excel2Json/Excel/DaoyouConfig.xlsx
  49. 二进制
      Excel2Json/Excel/DivineSenseConfig.xlsx
  50. 二进制
      Excel2Json/Excel/EventConfig.xlsx
  51. 二进制
      Excel2Json/Excel/Maps.xlsx
  52. 1 0
      XiuXianGame.sln.DotSettings.user

+ 0 - 8
Assets/Res/Config/BigMap.json → Assets/Res/Config/BigMapConfig.json

@@ -14,12 +14,6 @@
         6,
         7
       ],
-      "DivineSenseGeneralEvent": [
-        1,
-        2,
-        3
-      ],
-      "DivineSenseGeneralProbability": 50,
       "ulockFunction": [
         0
       ],
@@ -38,7 +32,6 @@
         11,
         12
       ],
-      "DivineSenseGeneralProbability": null,
       "ulockFunction": [
         0
       ],
@@ -57,7 +50,6 @@
         16,
         17
       ],
-      "DivineSenseGeneralProbability": null,
       "ulockFunction": [
         0
       ],

+ 1 - 1
Assets/Res/Config/Places.json.meta → Assets/Res/Config/BigMapConfig.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CXMctiP4V3sZ59REcK7pRcPFJiSogUmNA6o2Dj9jzPYlqWOtUQtLIiLtVVa1
+guid: CSwe5nj+VHPbZdRxGOmqpHasSNrL/jKIj95rm6JfocMTNdDdcR1VyOoFwiD4
 TextScriptImporter:
   externalObjects: {}
   userData: 

+ 55 - 7
Assets/Res/Config/EventConfig.json

@@ -10,14 +10,17 @@
         1005
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 174,
       "Description": null
     },
@@ -33,14 +36,17 @@
         1016
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 175,
       "Description": null
     },
@@ -56,14 +62,17 @@
         1026
       ],
       "EventTriggerType": 3,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 176,
       "Description": null
     },
@@ -73,14 +82,17 @@
         1030
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 2,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 217,
       "Description": null
     },
@@ -90,14 +102,17 @@
         1040
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 2,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 218,
       "Description": null
     },
@@ -107,14 +122,17 @@
         1050
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 2,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 219,
       "Description": null
     },
@@ -124,14 +142,17 @@
         1060
       ],
       "EventTriggerType": 1,
+      "EventTag": null,
       "EventType": 2,
+      "Score": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
       ],
-      "EventVlaue": [
+      "EventValue": [
         0
       ],
+      "EventCount": null,
       "EventName": 220,
       "Description": null
     },
@@ -141,8 +162,11 @@
         10001
       ],
       "EventTriggerType": 2,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": null,
       "Description": null
     },
@@ -152,8 +176,11 @@
         10003
       ],
       "EventTriggerType": 2,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": null,
       "Description": null
     },
@@ -163,8 +190,11 @@
         10004
       ],
       "EventTriggerType": 2,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": null,
       "Description": null
     },
@@ -174,8 +204,11 @@
         10005
       ],
       "EventTriggerType": 2,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": null,
       "Description": null
     },
@@ -185,8 +218,11 @@
         10006
       ],
       "EventTriggerType": 2,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": null,
       "Description": null
     },
@@ -196,8 +232,11 @@
         100001
       ],
       "EventTriggerType": 4,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": 1906,
       "Description": 1914
     },
@@ -207,8 +246,11 @@
         100002
       ],
       "EventTriggerType": 4,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": 1907,
       "Description": 1915
     },
@@ -218,8 +260,11 @@
         100003
       ],
       "EventTriggerType": 4,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": 1908,
       "Description": 1916
     },
@@ -229,8 +274,11 @@
         100004
       ],
       "EventTriggerType": 4,
+      "EventTag": null,
       "EventType": 1,
+      "Score": 1,
       "EventQuality": 1,
+      "EventCount": null,
       "EventName": 1909,
       "Description": 1917
     }

+ 1 - 4
Assets/Res/Config/EventLinkConfig.json

@@ -558,10 +558,7 @@
         1001
       ],
       "finishCount": 1,
-      "optionType": 4,
-      "optionPara1": [
-        100004
-      ],
+      "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
         10004

+ 100 - 30
Assets/Res/Config/Places.json → Assets/Res/Config/PlacesConfig.json

@@ -6,7 +6,19 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "a",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "ZhixianID": [
+        10,
+        15,
+        20
+      ],
+      "DivineSenseGeneralProbability": 40,
+      "SpecialTaskID": [
+        1,
+        2,
+        3
+      ]
     },
     {
       "ID": 2,
@@ -14,7 +26,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "b",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 3,
@@ -22,7 +36,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "c",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 4,
@@ -30,7 +46,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "h",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 5,
@@ -38,7 +56,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 6,
@@ -46,7 +66,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 7,
@@ -54,7 +76,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 8,
@@ -62,7 +86,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 9,
@@ -70,7 +96,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 10,
@@ -78,7 +106,9 @@
       "placePrefabName": null,
       "bigMapID": 1,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 11,
@@ -86,7 +116,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 12,
@@ -94,7 +126,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 13,
@@ -102,7 +136,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 14,
@@ -110,7 +146,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 15,
@@ -118,7 +156,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 16,
@@ -126,7 +166,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 17,
@@ -134,7 +176,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 18,
@@ -142,7 +186,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 19,
@@ -150,7 +196,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 20,
@@ -158,7 +206,9 @@
       "placePrefabName": null,
       "bigMapID": 2,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 21,
@@ -166,7 +216,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 22,
@@ -174,7 +226,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 23,
@@ -182,7 +236,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 24,
@@ -190,7 +246,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 25,
@@ -198,7 +256,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 26,
@@ -206,7 +266,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 27,
@@ -214,7 +276,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 28,
@@ -222,7 +286,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 29,
@@ -230,7 +296,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 30,
@@ -238,7 +306,9 @@
       "placePrefabName": null,
       "bigMapID": 3,
       "to3DPrefab": "j",
-      "placeDesc": null
+      "placeDesc": null,
+      "TotalScore": null,
+      "DivineSenseGeneralProbability": null
     }
   ]
 }

+ 1 - 1
Assets/Res/Config/BigMap.json.meta → Assets/Res/Config/PlacesConfig.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: W3IW4CmrVi7pWWZKoyWiTK7fXtdMQNOQhmx455AzaFuXkF6jj0xfQNdtRtZW
+guid: CS9N4Xz8BXN2Hci6jTEpDBdgM9SPsnTZB0A5oVTD/seW0gli42w5BrwPTRQY
 TextScriptImporter:
   externalObjects: {}
   userData: 

+ 6 - 3
Assets/Res/Config/HelloWorld.json → Assets/Res/Config/WorldMapConfig.json

@@ -8,7 +8,8 @@
         5,
         6
       ],
-      "places": [
+      "bigMapPrefabName": "",
+      "bigMapId": [
         1,
         2,
         3
@@ -21,7 +22,8 @@
         7,
         8,
         9
-      ]
+      ],
+      "bigMapPrefabName": ""
     },
     {
       "ID": 3,
@@ -30,7 +32,8 @@
         10,
         11,
         12
-      ]
+      ],
+      "bigMapPrefabName": ""
     }
   ]
 }

+ 1 - 1
Assets/Res/Config/HelloWorld.json.meta → Assets/Res/Config/WorldMapConfig.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CilJ5CqvBXi8lsgxF02dIHD8BmOV/2SIZJDjj54zrT0GmxXeALgvZettqZol
+guid: DH0avCz+B3uS5Tzxf5e8feDBS8UcHWQYea9WNJJGZ+8fZ1jbKbI9S59a3IdT
 TextScriptImporter:
   externalObjects: {}
   userData: 

+ 8 - 0
Assets/Res/UI/LevelChoosePanel.meta

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

+ 191 - 0
Assets/Res/UI/LevelChoosePanel/BigMapWidget.prefab

@@ -0,0 +1,191 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &4964757208108384375
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8423439952912832828}
+  - component: {fileID: 826370215426712507}
+  - component: {fileID: 1944931098781189842}
+  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 &8423439952912832828
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4964757208108384375}
+  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: 4082683059370445195}
+  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 &826370215426712507
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4964757208108384375}
+  m_CullTransparentMesh: 1
+--- !u!114 &1944931098781189842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4964757208108384375}
+  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, g: 0, 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    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: "\u5927\u5730\u56FE1"
+--- !u!1 &7668790083925925932
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4082683059370445195}
+  - component: {fileID: 8610999826623597163}
+  - component: {fileID: 2877469230410552301}
+  - component: {fileID: 2957358901986344820}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: BigMapWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4082683059370445195
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7668790083925925932}
+  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: 8423439952912832828}
+  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: 94, y: -341}
+  m_SizeDelta: {x: 190.1699, y: 149.7444}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8610999826623597163
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7668790083925925932}
+  m_CullTransparentMesh: 1
+--- !u!114 &2877469230410552301
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7668790083925925932}
+  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_xiadiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &2957358901986344820
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7668790083925925932}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 1944931098781189842}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1

+ 7 - 0
Assets/Res/UI/LevelChoosePanel/BigMapWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DnMXsiKqVXzbgq6Kykm+qTAcbdU98XRwKKZFFEp/98FUJnSukehhR0u/PUE7
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 661 - 0
Assets/Res/UI/LevelChoosePanel/LevelChoosePanel.prefab

@@ -0,0 +1,661 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1423012334977505450
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2828819390130533136}
+  - component: {fileID: 961122240027238045}
+  - component: {fileID: 7963950151040856964}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2828819390130533136
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1423012334977505450}
+  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: 324091128240362783}
+  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 &961122240027238045
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1423012334977505450}
+  m_CullTransparentMesh: 1
+--- !u!114 &7963950151040856964
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1423012334977505450}
+  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: 40
+    m_FontStyle: 1
+    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: "\u9B54\u754C"
+--- !u!1 &2715226420501695494
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 521721975639574570}
+  - component: {fileID: 3718845904213325484}
+  - component: {fileID: 7809627053528897939}
+  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 &521721975639574570
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2715226420501695494}
+  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: 7939915476203004500}
+  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 &3718845904213325484
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2715226420501695494}
+  m_CullTransparentMesh: 1
+--- !u!114 &7809627053528897939
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2715226420501695494}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_diban
+  isNotLoadDeftIcon: 1
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 3c03c9ef85decb2db50053e08067fb5c
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3881840993377848576
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7939915476203004500}
+  - component: {fileID: 8510129603972019916}
+  - component: {fileID: 3181852693172486306}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: LevelChoosePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7939915476203004500
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3881840993377848576}
+  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: 521721975639574570}
+  - {fileID: 3955771721407637355}
+  - {fileID: 6655763953880212584}
+  - {fileID: 324091128240362783}
+  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 &8510129603972019916
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3881840993377848576}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data: []
+  isAssetBundle: 1
+--- !u!222 &3181852693172486306
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3881840993377848576}
+  m_CullTransparentMesh: 1
+--- !u!1 &4004745461571394297
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 324091128240362783}
+  - component: {fileID: 6309791452607622204}
+  - component: {fileID: 4918003727059701871}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &324091128240362783
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4004745461571394297}
+  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: 2828819390130533136}
+  m_Father: {fileID: 7939915476203004500}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -222, y: -747}
+  m_SizeDelta: {x: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6309791452607622204
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4004745461571394297}
+  m_CullTransparentMesh: 1
+--- !u!114 &4918003727059701871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4004745461571394297}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_lingwu
+  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: d4e5a262b3976e33870ab7190f3a5bdb
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &4357533111604745581
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6655763953880212584}
+  - component: {fileID: 1686301719136768646}
+  - component: {fileID: 361703926144020833}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6655763953880212584
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4357533111604745581}
+  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: 8335262283286990159}
+  m_Father: {fileID: 7939915476203004500}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -222, y: -650}
+  m_SizeDelta: {x: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1686301719136768646
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4357533111604745581}
+  m_CullTransparentMesh: 1
+--- !u!114 &361703926144020833
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4357533111604745581}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_lingwu
+  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: d4e5a262b3976e33870ab7190f3a5bdb
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5633601075625078261
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2288821390004617472}
+  - component: {fileID: 5443727524580300374}
+  - component: {fileID: 8058911990039453626}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2288821390004617472
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5633601075625078261}
+  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: 3955771721407637355}
+  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 &5443727524580300374
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5633601075625078261}
+  m_CullTransparentMesh: 1
+--- !u!114 &8058911990039453626
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5633601075625078261}
+  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: 40
+    m_FontStyle: 1
+    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: "\u4EBA\u754C"
+--- !u!1 &5726463043886027655
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8335262283286990159}
+  - component: {fileID: 9053078275643866145}
+  - component: {fileID: 7120461414791229134}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8335262283286990159
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5726463043886027655}
+  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: 6655763953880212584}
+  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 &9053078275643866145
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5726463043886027655}
+  m_CullTransparentMesh: 1
+--- !u!114 &7120461414791229134
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5726463043886027655}
+  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: 40
+    m_FontStyle: 1
+    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: "\u4ED9\u754C"
+--- !u!1 &6281397011944718311
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3955771721407637355}
+  - component: {fileID: 4330467426497608781}
+  - component: {fileID: 2341815189538280730}
+  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 &3955771721407637355
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6281397011944718311}
+  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: 2288821390004617472}
+  m_Father: {fileID: 7939915476203004500}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -222, y: -554}
+  m_SizeDelta: {x: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4330467426497608781
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6281397011944718311}
+  m_CullTransparentMesh: 1
+--- !u!114 &2341815189538280730
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6281397011944718311}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_lingwu
+  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: d4e5a262b3976e33870ab7190f3a5bdb
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

+ 7 - 0
Assets/Res/UI/LevelChoosePanel/LevelChoosePanel.prefab.meta

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

+ 401 - 0
Assets/Res/UI/LevelChoosePanel/PengLaiDaoBigMapPanel.prefab

@@ -0,0 +1,401 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &4765704617560779763
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7590336990808084973}
+  - component: {fileID: 4337750289727126355}
+  - component: {fileID: 6585269129001634317}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: PengLaiDaoBigMapPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7590336990808084973
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4765704617560779763}
+  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: 642166502082881739}
+  - {fileID: 1818970075329393185}
+  - {fileID: 2173202582578597933}
+  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!222 &4337750289727126355
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4765704617560779763}
+  m_CullTransparentMesh: 1
+--- !u!114 &6585269129001634317
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4765704617560779763}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: map_1
+    gameObject: {fileID: 6497839287960633708}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: map_2
+    gameObject: {fileID: 5475214733984684934}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: map_3
+    gameObject: {fileID: 5543189330962004362}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1001 &2420365090421554090
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7590336990808084973}
+    m_Modifications:
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 190.1699
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 149.7444
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -133
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -54
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7668790083925925932, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_Name
+      value: map_2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+--- !u!224 &1818970075329393185 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+  m_PrefabInstance: {fileID: 2420365090421554090}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5475214733984684934 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7668790083925925932, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+  m_PrefabInstance: {fileID: 2420365090421554090}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2774321414361635238
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7590336990808084973}
+    m_Modifications:
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 190.1699
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 149.7444
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 144
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 316
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7668790083925925932, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_Name
+      value: map_3
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+--- !u!224 &2173202582578597933 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+  m_PrefabInstance: {fileID: 2774321414361635238}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5543189330962004362 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7668790083925925932, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+  m_PrefabInstance: {fileID: 2774321414361635238}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3477330405710487872
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7590336990808084973}
+    m_Modifications:
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 190.1699
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 149.7444
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 94
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -341
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7668790083925925932, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+      propertyPath: m_Name
+      value: map_1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+--- !u!224 &642166502082881739 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4082683059370445195, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+  m_PrefabInstance: {fileID: 3477330405710487872}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &6497839287960633708 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7668790083925925932, guid: 1987876731036244eb3c3fec1818c4c1, type: 3}
+  m_PrefabInstance: {fileID: 3477330405710487872}
+  m_PrefabAsset: {fileID: 0}

+ 7 - 0
Assets/Res/UI/LevelChoosePanel/PengLaiDaoBigMapPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXNN4H+kBi4RWT5gS/RXS7h6jSOZcwO4oq4ZPCcnRtQuJ4xTE1Nf0X21F+m4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 28
Assets/Scripts/GameData/ExcelConfig/BigMap.cs → Assets/Scripts/GameData/ExcelConfig/BigMapConfig.cs

@@ -1,18 +1,18 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Maps.xlsx. SheetName: BigMap
+// Generate From Excel\Maps.xlsx. SheetName: BigMapConfig
 
 using System;
 using Fort23.GameData;
 
 namespace Excel2Json
 {
-	[Config(prefab = "BigMap.json")]
-	public partial class BigMapHolder : ConfigHolder<BigMap>
	{
+	[Config(prefab = "BigMapConfig.json")]
+	public partial class BigMapConfigHolder : ConfigHolder<BigMapConfig>
	{
 	}
 
 
 	[Serializable]
-	public struct BigMap : IConfig
	{
+	public struct BigMapConfig : IConfig
	{
 		public int GetID() {return ID;} 
 		/// <summary>
 		///ID
@@ -44,30 +44,6 @@ public int mapDesc;
 public int[] places;
 
 
-		/// <summary>
-		///神识场景事件列表
-		/// </summary>
-public int[] DivineSenseGeneralEvent;
-
-
-		/// <summary>
-		///神识专用事件 优先刷
-		/// </summary>
-public int[] DivineSenseDedicatedEvent;
-
-
-		/// <summary>
-		///刷场景事件概率
-		/// </summary>
-public int DivineSenseGeneralProbability;
-
-
-		/// <summary>
-		///挂机包含的事件列表
-		/// </summary>
-public int[] GuajiEvent;
-
-
 		/// <summary>
 		///解锁表ulockFunction
 		/// </summary>

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/HelloWorld.cs.meta → Assets/Scripts/GameData/ExcelConfig/BigMapConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XChO4Sv5AHkj3JQkkRm2Ea0S3uaHQgXudAjFldzdktqbMEjYtcg5dRhoF5Xv
+guid: XH8bvX74B3P96VcZyxxDt3L5lsSrNhHDRMOy+vF2gh9uJm0972GQIQKpqYvI
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 21 - 3
Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -27,17 +27,29 @@ public int[] EventLinksId;
 
 
 		/// <summary>
-		///触发事件类型: 1.通用事件 2.挂机事件 3.地图专用事件 4.主线任务
+		///触发事件类型: 1.通用事件 2.挂机事件 4.主线任务 99.无标记事件 
 		/// </summary>
 public int EventTriggerType;
 
 
+		/// <summary>
+		///tag 1主线 2支线 3通用 4地图通用 5道友
+		/// </summary>
+public int EventTag;
+
+
 		/// <summary>
 		///1.正常触发 2.直接结算
 		/// </summary>
 public int EventType;
 
 
+		/// <summary>
+		///增加进度值
+		/// </summary>
+public int Score;
+
+
 		/// <summary>
 		///事件品质
 		/// </summary>
@@ -45,7 +57,7 @@ public int EventQuality;
 
 
 		/// <summary>
-		///触发条件类型
+		///触发条件类型 只能配处于什么状态和数值,不能配变化的数值
 		/// </summary>
 public int[] EventConditionId;
 
@@ -53,7 +65,13 @@ public int[] EventConditionId;
 		/// <summary>
 		///触发效果值
 		/// </summary>
-public int[] EventVlaue;
+public int[] EventValue;
+
+
+		/// <summary>
+		///触发判定数量or次数
+		/// </summary>
+public int EventCount;
 
 
 		/// <summary>

+ 4 - 4
Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -39,19 +39,19 @@ public int ConditionType;
 
 
 		/// <summary>
-		///条件判断
+		///条件判断值
 		/// </summary>
 public int[] ConditionPara;
 
 
 		/// <summary>
-		///条件完成次数
+		///条件完成次数or数量
 		/// </summary>
 public int finishCount;
 
 
 		/// <summary>
-		///事件类型 1=提供选项 2=进入战斗 3=获得奖励 4=触发下一个事件
+		///步骤类型 1=提供选项 2=进入战斗 3=获得奖励
 		/// </summary>
 public int optionType;
 
@@ -81,7 +81,7 @@ public int[] PrizeNums;
 
 
 		/// <summary>
-		///事件结束类型 1:跳转事件 2:根据战斗解锁跳转事件 3.触发新事件
+		///事件结束类型 1:跳转步骤 2:根据战斗结果跳转步骤 3.触发新事件
 		/// </summary>
 public int ResultType;
 

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

@@ -1,56 +0,0 @@
-// Auto Generated Code By excel2json
-// Generate From Excel\Maps.xlsx. SheetName: Places
-
-using System;
-using Fort23.GameData;
-
-namespace Excel2Json
-{
-	[Config(prefab = "Places.json")]
-	public partial class PlacesHolder : ConfigHolder<Places>
	{
-	}
-
-
-	[Serializable]
-	public struct Places : IConfig
	{
-		public int GetID() {return ID;} 
-		/// <summary>
-		///ID
-		/// </summary>
-public int ID;
-
-
-		/// <summary>
-		///地点名称(语言表ID)
-		/// </summary>
-public int placeName;
-
-
-		/// <summary>
-		///区域预制件 (不配就做成固定)
-		/// </summary>
-public int placePrefabName;
-
-
-		/// <summary>
-		///属于哪个大地图
-		/// </summary>
-public int bigMapID;
-
-
-		/// <summary>
-		///3D世界
-		/// </summary>
-public string to3DPrefab;
-
-
-		/// <summary>
-		///3D世界
-		/// </summary>
-public int placeDesc;
-
-
-	}
-
-}
-// End of Auto Generated Code

+ 98 - 0
Assets/Scripts/GameData/ExcelConfig/PlacesConfig.cs

@@ -0,0 +1,98 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\Maps.xlsx. SheetName: PlacesConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "PlacesConfig.json")]
+	public partial class PlacesConfigHolder : ConfigHolder<PlacesConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct PlacesConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///地点名称(语言表ID)
+		/// </summary>
+public int placeName;
+
+
+		/// <summary>
+		///区域预制件 (不配就做成固定)
+		/// </summary>
+public int placePrefabName;
+
+
+		/// <summary>
+		///属于哪个大地图
+		/// </summary>
+public int bigMapID;
+
+
+		/// <summary>
+		///3D世界
+		/// </summary>
+public string to3DPrefab;
+
+
+		/// <summary>
+		///3D世界
+		/// </summary>
+public int placeDesc;
+
+
+		/// <summary>
+		///总进度值
+		/// </summary>
+public int TotalScore;
+
+
+		/// <summary>
+		///主线事件ID
+		/// </summary>
+public int[] MainTaskID;
+
+
+		/// <summary>
+		///支线事件ID 
+		/// </summary>
+public int[] ZhixianID;
+
+
+		/// <summary>
+		///触发支线的进度百分比
+		/// </summary>
+public int[] ZhixianActivatedPercentage;
+
+
+		/// <summary>
+		///刷该地图特定无限次事件的概率 40=40%
+		/// </summary>
+public int DivineSenseGeneralProbability;
+
+
+		/// <summary>
+		///该地图特定的无限次事件
+		/// </summary>
+public int[] SpecialTaskID;
+
+
+		/// <summary>
+		///挂机包含的特殊事件列表
+		/// </summary>
+public int[] GuajiEvent;
+
+
+	}
+
+}
+// End of Auto Generated Code

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/Places.cs.meta → Assets/Scripts/GameData/ExcelConfig/PlacesConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Xn0c4SKuV3MWXT5NyNktjuwejkClXIfUydBGXRt8G5TB/oIXmc9vL/2Z2vqt
+guid: CnJNt36tUC9jdxojSWWfgxGiqNYRikt4OY7lVFTxV1KIio9YPKQ9BYieFwXd
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 11 - 5
Assets/Scripts/GameData/ExcelConfig/HelloWorld.cs → Assets/Scripts/GameData/ExcelConfig/WorldMapConfig.cs

@@ -1,18 +1,18 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Maps.xlsx. SheetName: HelloWorld
+// Generate From Excel\Maps.xlsx. SheetName: WorldMapConfig
 
 using System;
 using Fort23.GameData;
 
 namespace Excel2Json
 {
-	[Config(prefab = "HelloWorld.json")]
-	public partial class HelloWorldHolder : ConfigHolder<HelloWorld>
	{
+	[Config(prefab = "WorldMapConfig.json")]
+	public partial class WorldMapConfigHolder : ConfigHolder<WorldMapConfig>
	{
 	}
 
 
 	[Serializable]
-	public struct HelloWorld : IConfig
	{
+	public struct WorldMapConfig : IConfig
	{
 		public int GetID() {return ID;} 
 		/// <summary>
 		///ID
@@ -32,10 +32,16 @@ public int worldName;
 public int[] mpDesc;
 
 
+		/// <summary>
+		///带地图预制件名称
+		/// </summary>
+public string bigMapPrefabName;
+
+
 		/// <summary>
 		///包含的大地图
 		/// </summary>
-public int[] places;
+public int[] bigMapId;
 
 
 	}

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/BigMap.cs.meta → Assets/Scripts/GameData/ExcelConfig/WorldMapConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CitO4SKsWiojbce6iCEwdvburlTmAJ2/LlOxW1rCIFAJshnKTquimu/0vFMw
+guid: DH5Ns3irWyk909hXagh4q1E0l9NvKLKgbR1jnfazlOvUHWJYNl/WghytwQxV
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 1
Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -26,6 +26,8 @@ namespace GameLogic.Combat.CombatType
 
         private int _currBoChi;
 
+        public LevelbattleConfig levelbattleConfig;
+
 
         protected Vector3[] enemyHeroPosOff =
         {
@@ -70,7 +72,7 @@ namespace GameLogic.Combat.CombatType
 
         public async CTask LoadCombat(int levelBattleId, System.Action<bool> caombatFinish)
         {
-            LevelbattleConfig levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levelBattleId);
+            levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levelBattleId);
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
             for (int i = 0; i < levelbattleConfig.Group.Length; i++)
             {

+ 1 - 11
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -33,10 +33,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     public class PlayerData
     {
         
-        /// <summary>
-        /// 任务数据
-        /// </summary>
-        public  List<TaskData> tasks = new List<TaskData>();
+
         
         /// <summary>
         /// 商店数据
@@ -478,13 +475,6 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public int TaoismSkillId;
     }
     
-    // 任务数据
-    [Serializable]
-    public class TaskData
-    {
-        public int taskID;
-        public int fishCount;
-    }
 
     [System.Serializable]
     public class ItemData

+ 7 - 3
Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -106,7 +106,6 @@ namespace GameLogic.Combat
         {
             UIManager.Instance.GetComponent<CombatPanel>().Hide();
             await combatMonoBaisc.GameOver(isWin);
-            
         }
 
         /// <summary>
@@ -115,10 +114,15 @@ namespace GameLogic.Combat
         /// <param name="isWin"></param>
         public void CombatToStage(bool isWin)
         {
-          
             CombatController.CombatHeroController.CombatFinishDispose();
             CombatController.DisposeOneCombatInfo();
-            
+
+            if (isWin)
+            {
+                LevelBattleCombatType levelBattleCombatType = CombatController.CombatTypeBasic as LevelBattleCombatType;
+                EventSystemManager.Instance.CeekEventCompletes(5, levelBattleCombatType.levelbattleConfig.ID);
+            }
+
             caombatFinish?.Invoke(isWin);
             UIManager.Instance.ShowLastHindAllShowPanel();
         }

+ 31 - 17
Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -47,7 +47,10 @@ public class DialogueManager : Singleton<DialogueManager>
     private void PlayDialogue(int dialogueID)
     {
         currentDialogueID = dialogueID;
-        if (!EventSystemManager.Instance.IsEvenkLinkComplete(currentDialogueID))
+        // 找到当前对话组
+        var dialogueConfig = ConfigComponent.Instance.Get<EventLinkConfig>(dialogueID);
+
+        if (!EventSystemManager.Instance.IsEvenkLinkComplete(currentDialogueID) && dialogueConfig.optionType != 2)
         {
             onCancel?.Invoke();
             return;
@@ -56,11 +59,15 @@ public class DialogueManager : Singleton<DialogueManager>
 
         //神识探索的事件记录步骤
         if (EventSystemManager.Instance.CurrentEventList != null)
-            EventSystemManager.Instance.CurrentEventList.curStep = currentDialogueID;
+        {
+            EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(EventSystemManager.Instance.CurrentEventList.eventID);
+            if (eventConfig.EventLinksId.Contains(currentDialogueID))
+            {
+                EventSystemManager.Instance.CurrentEventList.curStep = currentDialogueID;
+            }
+        }
 
 
-        // 找到当前对话组
-        var dialogueConfig = ConfigComponent.Instance.Get<EventLinkConfig>(dialogueID);
         if (dialogueConfig.ID == 0)
         {
             EndDialogue();
@@ -73,8 +80,15 @@ public class DialogueManager : Singleton<DialogueManager>
         //挂机事件 弹出简单气泡对话
         if (eventConfig.EventTriggerType != 2)
         {
-            DialoguePanel.OpenDialoguePanel(dialogueConfig.ID, null, ShowDialogueEventData.MessageShowType.Verbatim,
-                FishDialogue);
+            if (dialogueConfig.LanID != null)
+            {
+                DialoguePanel.OpenDialoguePanel(dialogueConfig.ID, null, ShowDialogueEventData.MessageShowType.Verbatim,
+                    FishDialogue);
+            }
+            else
+            {
+                FishDialogue(null);
+            }
         }
         else
         {
@@ -187,17 +201,12 @@ public class DialogueManager : Singleton<DialogueManager>
                 await OpenRewardsPanel(eventConfig.ID, itemInfos);
                 LogTool.Log("对话结束,获得奖励");
                 break;
+        }
 
-            //任务检测
-            case 4:
-
-                bool isComplete = TaskManager.Instance.IsTaskComplete(dialogueConfig.optionPara1[0]);
-                if (!isComplete)
-                {
-                    return;
-                }
-
-                break;
+        if (!EventSystemManager.Instance.IsEvenkLinkComplete(currentDialogueID))
+        {
+            onCancel?.Invoke();
+            return;
         }
 
 
@@ -222,7 +231,12 @@ public class DialogueManager : Singleton<DialogueManager>
                 break;
             //触发新的事件 eventConfigId
             case 3:
-
+                AccountFileInfo.EventList eventList = EventSystemManager.Instance.AddEvent(dialogueConfig.ResultOptions[0]);
+                if (eventList != null)
+                {
+                    AccountFileInfo.Instance.playerData.eventList.Add(eventList);
+                    AccountFileInfo.Instance.SavePlayerData();
+                }
 
                 EndDialogue();
                 break;

+ 20 - 8
Assets/Scripts/GameUI/EventManager/EventHelper.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
@@ -10,26 +11,37 @@ public static class EventHelper
     {
         string result = String.Empty;
         EventLinkConfig eventCondition = ConfigComponent.Instance.Get<EventLinkConfig>(eventConfigId);
+        AccountFileInfo.EventLinkData eventLinkData = AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(e => e.eventLinkId == eventConfigId);
+
+        int fishCount = eventLinkData == null ? 0 : eventLinkData.fishCount;
         switch (eventCondition.ConditionType)
         {
             case 1:
-                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-                result = $"需要拥有{LanguageManager.Instance.Text(itemConfig.itemName)}{eventCondition.finishCount}个";
-                break;
-            case 2:
+                // ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
+                result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage,fishCount, eventCondition.finishCount.ToString() + "个");
+
                 break;
             case 3:
                 HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(eventCondition.ConditionPara[0]);
                 string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
                                  LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
                                  LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
-                result = $"需要达到境界{jingjie}";
+
+                result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, jingjie);
                 break;
 
-            case 4:
+            case 5:
+                result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
 
-                TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(eventCondition.ConditionPara[0]);
-                result = $"需要完成任务{LanguageManager.Instance.Text(taskConfig.taskName)}";
+                break;
+            case 6:
+
+                // ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
+                result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
+
+                break;
+            default:
+                result =LanguageManager.Instance.Text(eventCondition.conciseEventMessage);
                 break;
         }
 

+ 75 - 51
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -109,11 +109,14 @@ public class EventSystemManager : Singleton<EventSystemManager>
         for (var i = 0; i < eventConfigs.Count; i++)
         {
             AccountFileInfo.EventList eventList = AddEvent(eventConfigs[i].ID);
-            // AccountFileInfo.EventList eventList = new AccountFileInfo.EventList();
-            // eventList.eventID = eventConfigs[i].ID;
+            if (eventList == null)
+                continue;
+
             eventLists.Add(eventList);
         }
 
+        AccountFileInfo.Instance.playerData.eventList.AddRange(eventLists);
+        AccountFileInfo.Instance.SavePlayerData();
         return eventLists;
     }
 
@@ -147,7 +150,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     private List<EventConfig> DetectEvents(int bigMapId, int eventCount)
     {
-        BigMap bigMap = ConfigComponent.Instance.Get<BigMap>(bigMapId);
+        PlacesConfig bigMap = ConfigComponent.Instance.Get<PlacesConfig>(bigMapId);
         DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
 
 
@@ -166,7 +169,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
             //神识场景事件
-            List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.DivineSenseGeneralEvent.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID)).ToList();
+            List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.ZhixianID.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID)).ToList();
 
             if (candidateEvents.Count == 0 && globalEvents.Count == 0)
             {
@@ -205,13 +208,55 @@ public class EventSystemManager : Singleton<EventSystemManager>
     //添加事件
     public AccountFileInfo.EventList AddEvent(int eventID)
     {
-        AccountFileInfo.EventList eventList = new AccountFileInfo.EventList();
-        eventList.eventID =eventID;
-        AccountFileInfo.Instance.playerData.eventList.Add(eventList);
-        AccountFileInfo.Instance.SavePlayerData();
+        EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventID);
+        AccountFileInfo.EventList eventList = null;
+        AccountFileInfo.EventList e = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e => e.eventID == eventID);
+        if (e == null)
+        {
+            //主线任务只能刷一次
+            if (eventConfig.EventTriggerType == 4)
+            {
+                e = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(e => e.eventID == eventID);
+                if (e == null)
+                {
+                    eventList = new AccountFileInfo.EventList();
+                    eventList.eventID = eventID;
+
+
+                    // return eventList;
+                }
+            }
+            else
+            {
+                eventList = new AccountFileInfo.EventList();
+                eventList.eventID = eventID;
+            }
+        }
+
+        if (eventList != null && eventConfig.EventType != 2)
+        {
+            foreach (var i in eventConfig.EventLinksId)
+            {
+                AccountFileInfo.EventLinkData eventLinkData = AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(el => el.eventLinkId == i);
+
+                if (eventLinkData == null)
+                {
+                    eventLinkData = new AccountFileInfo.EventLinkData();
+                    eventLinkData.eventId = eventList.eventID;
+                    eventLinkData.eventLinkId = i;
+                    AccountFileInfo.Instance.playerData.eventLinkDatas.Add(eventLinkData);
+                }
+
+                eventLinkData.fishCount = 0;
+                EventSystemManager.Instance.CeekTaskComplete(eventLinkData.eventLinkId, 1, 0);
+                EventSystemManager.Instance.CeekTaskComplete(eventLinkData.eventLinkId, 3, 0);
+            }
+        }
+
+
         return eventList;
     }
-    
+
     /// <summary>
     /// 触发随机事件
     /// </summary>
@@ -270,25 +315,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
         {
             dialogueID = eventConfig.EventLinksId[0];
 
-            foreach (var i in eventConfig.EventLinksId)
-            {
-                AccountFileInfo.EventLinkData eventLinkData = AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(el => el.eventLinkId == i);
-
-                if (eventLinkData == null)
-                {
-                    eventLinkData = new AccountFileInfo.EventLinkData();
-                    eventLinkData.eventId = evt.eventID;
-                    eventLinkData.eventLinkId = i;
-                    AccountFileInfo.Instance.playerData.eventLinkDatas.Add(eventLinkData);
-                }
 
-                eventLinkData.fishCount = 0;
-                EventSystemManager.Instance.CeekTaskComplete(eventLinkData.eventLinkId, 1, 0);
-                EventSystemManager.Instance.CeekTaskComplete(eventLinkData.eventLinkId, 3, 0);
-            }
-
-
-            AccountFileInfo.Instance.SavePlayerData();
+            // AccountFileInfo.Instance.SavePlayerData();
         }
         else
         {
@@ -390,7 +418,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
             //获得道具
             case 6:
-                if (eventLinkConfig.ConditionType == 5 && eventLinkConfig.ConditionPara[0] == value)
+                if (eventLinkConfig.ConditionType == 6 && eventLinkConfig.ConditionPara[0] == value)
                 {
                     eventLinkData.fishCount++;
 
@@ -421,12 +449,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
         if (evt.ID == 0)
             return false;
 
-
-        for (var i = 0; i < evt.EventConditionId?.Length; i++)
-        {
-            if (!CheckCondition(evt.EventConditionId[i], evt.EventVlaue))
-                return false;
-        }
+        if (!CheckCondition(evt.EventConditionId[0], evt.EventValue,evt.EventCount))
+            return false;
+        // for (var i = 0; i < evt.EventConditionId?.Length; i++)
+        // {
+        //     
+        // }
 
         return true;
     }
@@ -434,28 +462,24 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// <summary>
     /// 检查单个触发条件。
     /// </summary>
-    public bool CheckCondition(int conditionid, int[] EventVlaue)
+    public bool CheckCondition(int conditionid, int[] EventVlaue,int value)
     {
         if (conditionid == 0)
             return true;
 
 
         //道具id判断
-        if (conditionid == 1)
-        {
-            return PlayerManager.Instance.BagController.IsEnough(EventVlaue[0], EventVlaue[1]);
-        }
-        else if (conditionid == 3)
-        {
-            return PlayerManager.Instance.myHero.powerUpConfig.ID >= EventVlaue[0];
-        }
-        else if (conditionid == 4)
-        {
-            return TaskManager.Instance.IsTaskComplete(EventVlaue[0]);
-        }
+        // if (conditionid == 1)
+        // {
+        //     return PlayerManager.Instance.BagController.IsEnough(EventVlaue[0], EventVlaue[1]);
+        // }
+        // else if (conditionid == 3)
+        // {
+        //     return PlayerManager.Instance.myHero.powerUpConfig.ID >= EventVlaue[0];
+        // }
 
 
-        return false;
+        return true;
     }
 
     /// <summary>
@@ -488,7 +512,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
         this.isTriggerEvent = isTriggerEvent;
         LogTool.Log($"完成事件{eventList.eventID}");
-        
+
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
 
         AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
@@ -502,7 +526,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         if (eventConfig.EventTriggerType == 4)
         {
-            TaskInfoPanel.OpenPanel(eventList.eventID,"任务完成");
+            TaskInfoPanel.OpenPanel(eventList.eventID, "任务完成");
         }
 
         EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
@@ -560,7 +584,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         AccountFileInfo.Instance.SavePlayerData();
         EventManager.Instance.Dispatch(CustomEventType.RemoveEvent, null);
     }
-    
+
     public AccountFileInfo.EventList GetMainEventDta()
     {
         foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)

+ 6 - 2
Assets/Scripts/GameUI/GameApplction.cs

@@ -161,8 +161,12 @@ public class GameApplction : IGameStart
         CombatDrive.Instance.AddCombatController(new CombatController());
         gameStartUIPanel.ShowMassge("loadCombat");
         gameStartUIPanel.SetSlider(0.95f);
-        TaskManager.Instance.AcceptTask(1);
-        
+        var eventList =EventSystemManager.Instance.AddEvent(10001);
+        if (eventList != null)
+        {
+            AccountFileInfo.Instance.playerData.eventList.Add(eventList);
+            AccountFileInfo.Instance.SavePlayerData();
+        }
         await CombatDrive.Instance.StartCombat(startCombatInfo);
         PlayerManager.Instance.GongFaControl.SaveUseSkill();
         PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(AccountFileInfo.Instance.playerData.heroData

+ 0 - 299
Assets/Scripts/GameUI/TaskManager.cs

@@ -1,299 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-using System.Linq;
-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>
-{
-    private List<TaskConfig> allTasks;
-    private Dictionary<int, AccountFileInfo.TaskData> allTsk;
-
-
-    public TaskManager()
-    {
-        allTasks = ConfigComponent.Instance.GetAll<TaskConfig>().ToList();
-        allTsk = new Dictionary<int, AccountFileInfo.TaskData>();
-
-        foreach (var playerDataTask in AccountFileInfo.Instance.playerData.tasks)
-        {
-            allTsk.Add(playerDataTask.taskID, playerDataTask);
-        }
-
-        EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, ItemUpdate);
-        EventManager.Instance.AddEventListener(CustomEventType.JingJieUpgrade, JingJieUpgrade);
-    }
-
-    private void JingJieUpgrade(IEventData e)
-    {
-        CeekTaskComplete(4, 0);
-    }
-
-    private void ItemUpdate(IEventData e)
-    {
-        ItemUpdateData data = e as ItemUpdateData;
-        CeekTaskComplete(1, data.ItemInfo.itemID);
-        CeekTaskComplete(5, data.ItemInfo.itemID);
-    }
-
-
-    // 接取任务
-    public void AcceptTask(int taskID)
-    {
-        if (!allTsk.ContainsKey(taskID))
-        {
-            AccountFileInfo.TaskData taskData = new AccountFileInfo.TaskData();
-            taskData.taskID = taskID;
-            allTsk.Add(taskID, taskData);
-            AccountFileInfo.Instance.playerData.tasks.Clear();
-            AccountFileInfo.Instance.playerData.tasks.AddRange(allTsk.Values);
-            AccountFileInfo.Instance.SavePlayerData();
-            EventManager.Instance.Dispatch(CustomEventType.TaskUpdate, null);
-
-            CeekTaskComplete(4, 0);
-        }
-    }
-
-
-    public void TriggerTask(int taskId)
-    {
-        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) =>
-                {
-                    CeekTaskComplete(3, taskConfig.ID);
-                    EventSystemManager.Instance.isOpenUi = false;
-                });
-            }
-            else if (taskConfig.finishConditionType == 2)
-            {
-                if (!IsTaskTrigger(taskId))
-                {
-                    return;
-                }
-
-                CombatDrive.Instance.LoadLevelBattleCombat(taskConfig.finishVlaue[0], (iswin) =>
-                {
-                    if (iswin)
-                    {
-                        CeekTaskComplete(2, taskConfig.finishVlaue[0]);
-                        CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
-                        EventSystemManager.Instance.isOpenUi = false;
-                    }
-                });
-                //进入战斗
-            }
-            //不能直接做任务 通过其他系统检测完成任务条件
-            //这里直接弹出提示
-            else
-            {
-                EventSystemManager.Instance.isOpenUi = false;
-                // TaskInfoPanel.OpenPanel(taskId, "任务信息");
-            }
-        }
-    }
-
-
-    public void CeekTaskComplete(int type, int value)
-    {
-        List<AccountFileInfo.TaskData> tasks = allTsk.Values.ToList();
-        foreach (var taskData in tasks)
-        {
-            //任务完成了跳过检测
-            if (IsTaskComplete(taskData.taskID))
-                continue;
-            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskData.taskID);
-            switch (type)
-            {
-                //获得道具
-                case 1:
-                    if (taskConfig.finishConditionType == 1 && taskConfig.finishVlaue[0] == value)
-                    {
-                        taskData.fishCount++;
-
-                        if (IsTaskComplete(taskData.taskID))
-                        {
-                            CompleteTask(taskData.taskID);
-                        }
-                    }
-
-                    break;
-                //战斗胜利
-                case 2:
-                    if (taskConfig.finishConditionType == 2 && taskConfig.finishVlaue[0] == value)
-                    {
-                        taskData.fishCount++;
-
-                        if (IsTaskComplete(taskData.taskID))
-                        {
-                            CompleteTask(taskData.taskID);
-                        }
-                    }
-
-                    break;
-                //对话 
-                case 3:
-                    if (taskConfig.finishConditionType == 3 && taskConfig.ID == value)
-                    {
-                        taskData.fishCount++;
-
-                        if (IsTaskComplete(taskData.taskID))
-                        {
-                            CompleteTask(taskData.taskID);
-                        }
-                    }
-
-                    break;
-                //境界检测
-                case 4:
-                    if (taskConfig.finishConditionType == 4 && PlayerManager.Instance.myHero.powerUpConfig.ID >= taskConfig.finishVlaue[0])
-                    {
-                        taskData.fishCount++;
-
-                        if (IsTaskComplete(taskData.taskID))
-                        {
-                            CompleteTask(taskData.taskID);
-                        }
-                    }
-
-                    break;
-                //检测背包道具
-                case 5:
-                    if (taskConfig.finishConditionType == 5)
-                    {
-                        taskData.fishCount += (int)PlayerManager.Instance.BagController.GetItemCount(taskConfig.finishVlaue[0]);
-
-                        if (IsTaskComplete(taskData.taskID))
-                        {
-                            CompleteTask(taskData.taskID);
-                        }
-                    }
-
-                    break;
-            }
-        }
-
-
-        AccountFileInfo.Instance.SavePlayerData();
-    }
-
-    // 完成任务
-    private async void CompleteTask(int taskID)
-    {
-        TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskID);
-
-
-        List<ItemInfo> awardList = GrantReward(taskID);
-        //可能需要处理弹出任务完成ui
-        if (awardList != null)
-        {
-            // TaskInfoPanel taskInfoPanel = await TaskInfoPanel.OpenPanel(taskID, "任务完成");
-            // await taskInfoPanel.UIClosed();
-        }
-
-
-        // 触发下一个任务(主线)
-        if (taskConfig.nextTaskID != 0)
-        {
-            AcceptTask(taskConfig.nextTaskID);
-        }
-    }
-
-
-    // 发放奖励
-    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;
-    }
-
-    //获取任务数据
-    public AccountFileInfo.TaskData GetTaskData(int taskID)
-    {
-        if (allTsk.ContainsKey(taskID))
-        {
-            return allTsk[taskID];
-        }
-
-        return null;
-    }
-
-    //任务是否完成
-    public bool IsTaskComplete(int taskID)
-    {
-        if (allTsk.ContainsKey(taskID))
-        {
-            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(taskID);
-            return allTsk[taskID].fishCount >= taskConfig.finishCount;
-        }
-
-        return false;
-    }
-
-    //获得主线任务
-    public AccountFileInfo.TaskData GetMainTaskData()
-    {
-        foreach (var keyValuePair in allTsk)
-        {
-            TaskConfig taskConfig = ConfigComponent.Instance.Get<TaskConfig>(keyValuePair.Key);
-            if (taskConfig.taskType == 10 && !IsTaskComplete(keyValuePair.Key))
-            {
-                return keyValuePair.Value;
-            }
-        }
-
-        return null;
-    }
-}

+ 15 - 5
Assets/Scripts/GameUI/UI/CombatPanel/ShengShiEventWidget.cs

@@ -1,3 +1,4 @@
+using System;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -41,15 +42,24 @@ namespace Fort23.Mono
         {
             this.eventList = eventList;
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
-            Text_Name.text = LanguageManager.Instance.Text(randomEventConfig.Description);
+            Text_Name.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
 
             EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
-            string desc = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
-            if (desc.Length > 8)
+            string desc = String.Empty;
+            // if (conditionConfig.LanID == null)
             {
-                desc = desc.Substring(0, 8);
-                desc += "...";
+                desc = EventHelper.GetTaskMessage(randomEventConfig.EventLinksId[0]);
             }
+            // else
+            // {
+            //     desc = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
+            //     if (desc.Length > 8)
+            //     {
+            //         desc = desc.Substring(0, 8);
+            //         desc += "...";
+            //     }
+            // }
+ 
             Massge.text = LanguageManager.Instance.Text(desc);
         }
     }

+ 1 - 1
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -40,7 +40,7 @@ namespace Fort23.Mono
 			randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
 			Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.Description);
 			EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
-			Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
+			// Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
 
 		}
 		

+ 8 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel.meta

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

+ 27 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapItem.cs

@@ -0,0 +1,27 @@
+using Excel2Json;
+using Fort23.UTool;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+    public class BigMapItem
+    {
+        public GameObjectPool gameObjectPool;
+        public WorldMapConfig worldMapConfig;
+        private ReferenceCollector referenceCollector;
+
+
+        public async void CustomInit(int worldMapId, GameObjectPool gameObjectPool)
+        {
+            this.gameObjectPool = gameObjectPool;
+            worldMapConfig = ConfigComponent.Instance.Get<WorldMapConfig>(worldMapId);
+            referenceCollector = gameObjectPool.own.GetComponent<ReferenceCollector>();
+            for (var i = 0; i < worldMapConfig.bigMapId.Length; i++)
+            {
+                GameObject gam = referenceCollector.Get<GameObject>("map_" + worldMapConfig.bigMapId[i]);
+                BigMapWidget bigMapWidget = await UIManager.Instance.CreateGComponentForObject<BigMapWidget>(gam, null);
+                bigMapWidget.CustomInit(worldMapConfig.bigMapId[i]);
+            }
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapItem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 55134e0d158e4cb5ad52ccf2e3b3808a
+timeCreated: 1748504310

+ 34 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapWidget.cs

@@ -0,0 +1,34 @@
+using Excel2Json;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "BigMapWidget"  )]
+	public partial class BigMapWidget : ItemWidgetBasic
+	{
+
+		public BigMapConfig bigMap;
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+			base.AddButtonEvent();
+		}
+
+		public void CustomInit(int bigMapId)
+		{
+			bigMap = ConfigComponent.Instance.Get<BigMapConfig>(bigMapId);
+		}
+
+	}
+}

+ 1 - 1
Assets/Scripts/GameUI/TaskManager.cs.meta → Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapWidget.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CHwWsyz4UHK1S9Qaf/fZKw5o61oMa4SsDFiFesZKKzAHUKhehIXscKpdc1y2
+guid: Di4evCqkUng/vZEs9WrxNZWgXFWEdmDkzVMdAdzTQJiqu0yAESKnHfNy5r10
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 29 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/BigMapWidgetData.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 BigMapWidget 
+	{
+	  #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/LevelChoosePanel/BigMapWidgetData.cs.meta

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

+ 41 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/LevelChoosePanel.cs

@@ -0,0 +1,41 @@
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "LevelChoosePanel")]
+    public partial class LevelChoosePanel : UIPanel
+    {
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public async void CustomInit()
+        {
+            WorldMapConfig worldMapConfig = ConfigComponent.Instance.Get<WorldMapConfig>(1);
+            BigMapItem bigMapItem = new BigMapItem();
+            GameObjectPool gameObjectPool2 = await GObjectPool.Instance.FetchAsync<GameObjectPool>(worldMapConfig.bigMapPrefabName + ".prefab");
+
+            bigMapItem.CustomInit(worldMapConfig.ID, gameObjectPool2);
+        }
+
+        public async static CTask OpenPanel()
+        {
+            LevelChoosePanel levelChoosePanel = await UIManager.Instance.LoadAndOpenPanel<LevelChoosePanel>(null);
+            levelChoosePanel.CustomInit();
+        }
+    }
+}

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

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

+ 29 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/PengLaiDaoBigMapPanel.cs

@@ -0,0 +1,29 @@
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "PengLaiDaoBigMapPanel"  )]
+	public partial class PengLaiDaoBigMapPanel : UIPanel
+	{
+		private void Init()
+		{
+
+		}
+		protected override void AddEvent()
+		{
+
+		}
+		protected override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+
+		public void CustomInit()
+		{
+			
+		}
+
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/PengLaiDaoBigMapPanel.cs.meta

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

+ 51 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/PengLaiDaoBigMapPanelData.cs

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

+ 11 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/PengLaiDaoBigMapPanelData.cs.meta

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

二进制
Excel2Json/Excel/DaoyouConfig.xlsx


二进制
Excel2Json/Excel/DivineSenseConfig.xlsx


二进制
Excel2Json/Excel/EventConfig.xlsx


二进制
Excel2Json/Excel/Maps.xlsx


+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -3,6 +3,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AApplication_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F69_003F6bd97609_003FApplication_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAppStatusBar_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003Fbc_003F8cd214f9_003FAppStatusBar_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsyncInstantiateOperationHelper_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F3b_003F82aeb7a5_003FAsyncInstantiateOperationHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsyncMethodBuilderCore_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F82_003F86e88926_003FAsyncMethodBuilderCore_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollectionExtensions_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fde80aed0bd3646409e8bfb15c101f005e2000_003Fb3_003F5c77f01e_003FCollectionExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollider_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2193ba18cb0546b2832917f7674384cf20000_003F3a_003Fa0da6a1e_003FCollider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>