Ver Fonte

添加一些通用组件,修改事件系统一些ui

lzx há 2 dias atrás
pai
commit
0fb7b04e57
81 ficheiros alterados com 7187 adições e 1133 exclusões
  1. 16 2
      Assets/Art/UIAssets/Button/btn_01.png.meta
  2. 16 2
      Assets/Art/UIAssets/decorate/dec_dadi_01.png.meta
  3. 16 2
      Assets/Art/UIAssets/decorate/dec_di_05.png.meta
  4. 52 0
      Assets/Res/Config/EventConditionConfig.json
  5. 69 7
      Assets/Res/Config/EventConfig.json
  6. 140 0
      Assets/Res/Config/LanguageChineseConfig.json
  7. 2 2
      Assets/Res/UI/DialoguePanel/DialogueOptionWidget.prefab
  8. 8 0
      Assets/Res/UI/DivineSence.meta
  9. 720 0
      Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab
  10. 7 0
      Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab.meta
  11. 928 0
      Assets/Res/UI/DivineSence/DivineSenceEventResultPanel.prefab
  12. 7 0
      Assets/Res/UI/DivineSence/DivineSenceEventResultPanel.prefab.meta
  13. 485 0
      Assets/Res/UI/DivineSence/ShengShiEventWidget.prefab
  14. 7 0
      Assets/Res/UI/DivineSence/ShengShiEventWidget.prefab.meta
  15. 664 0
      Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab
  16. 7 0
      Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab.meta
  17. 622 0
      Assets/Res/UI/DivineSence/ShengShiEventWidgetType3.prefab
  18. 7 0
      Assets/Res/UI/DivineSence/ShengShiEventWidgetType3.prefab.meta
  19. 223 394
      Assets/Res/UI/MainPanel/MainPanel.prefab
  20. 3 319
      Assets/Scenes/testCombat.scene
  21. 4 0
      Assets/Scripts/Core/Event/Event/CustomEventType.cs
  22. 7 1
      Assets/Scripts/GameData/ExcelConfig/EventConfig.cs
  23. 21 9
      Assets/Scripts/GameLogic/EventManager/EventSystemManager.cs
  24. 8 0
      Assets/Scripts/GameUI/CustomStateController.meta
  25. 381 0
      Assets/Scripts/GameUI/CustomStateController/CustomStateController.cs
  26. 11 0
      Assets/Scripts/GameUI/CustomStateController/CustomStateController.cs.meta
  27. 8 0
      Assets/Scripts/GameUI/Editor/CustomTools.meta
  28. 175 0
      Assets/Scripts/GameUI/Editor/CustomTools/CustomStateControllerEditor.cs
  29. 11 0
      Assets/Scripts/GameUI/Editor/CustomTools/CustomStateControllerEditor.cs.meta
  30. 2 1
      Assets/Scripts/GameUI/Editor/GameUIEditor.asmdef
  31. 8 0
      Assets/Scripts/GameUI/ScorolList.meta
  32. 11 0
      Assets/Scripts/GameUI/ScorolList/IScorllListWidget.cs
  33. 11 0
      Assets/Scripts/GameUI/ScorolList/IScorllListWidget.cs.meta
  34. 10 0
      Assets/Scripts/GameUI/ScorolList/IScrollListContent.cs
  35. 11 0
      Assets/Scripts/GameUI/ScorolList/IScrollListContent.cs.meta
  36. 877 0
      Assets/Scripts/GameUI/ScorolList/ScrollList.cs
  37. 11 0
      Assets/Scripts/GameUI/ScorolList/ScrollList.cs.meta
  38. 3 0
      Assets/Scripts/GameUI/UI/Component.meta
  39. 78 0
      Assets/Scripts/GameUI/UI/Component/ItemWidgetBasic.cs
  40. 3 0
      Assets/Scripts/GameUI/UI/Component/ItemWidgetBasic.cs.meta
  41. 126 0
      Assets/Scripts/GameUI/UI/Component/LongPressBtn.cs
  42. 3 0
      Assets/Scripts/GameUI/UI/Component/LongPressBtn.cs.meta
  43. 8 0
      Assets/Scripts/GameUI/UI/DivineSence.meta
  44. 88 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs
  45. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs.meta
  46. 84 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanelData.cs
  47. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanelData.cs.meta
  48. 87 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanel.cs
  49. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanel.cs.meta
  50. 106 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanelData.cs
  51. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanelData.cs.meta
  52. 48 0
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs
  53. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs.meta
  54. 62 0
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2Data.cs
  55. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2Data.cs.meta
  56. 87 0
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3.cs
  57. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3.cs.meta
  58. 62 0
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3Data.cs
  59. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3Data.cs.meta
  60. 58 7
      Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs
  61. 22 11
      Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs
  62. 8 0
      Assets/Scripts/GameUI/UIToggle.meta
  63. 23 0
      Assets/Scripts/GameUI/UIToggle/UIToggleBagButtom.cs
  64. 3 0
      Assets/Scripts/GameUI/UIToggle/UIToggleBagButtom.cs.meta
  65. 68 0
      Assets/Scripts/GameUI/UIToggle/UIToggleImageSet.cs
  66. 3 0
      Assets/Scripts/GameUI/UIToggle/UIToggleImageSet.cs.meta
  67. 124 0
      Assets/Scripts/GameUI/UIToggle/UIToggleList.cs
  68. 3 0
      Assets/Scripts/GameUI/UIToggle/UIToggleList.cs.meta
  69. 23 0
      Assets/Scripts/GameUI/UIToggle/UIToggleObjectActiveWidget.cs
  70. 3 0
      Assets/Scripts/GameUI/UIToggle/UIToggleObjectActiveWidget.cs.meta
  71. 33 0
      Assets/Scripts/GameUI/UIToggle/UIToggleObjectCustomStateWidget.cs
  72. 3 0
      Assets/Scripts/GameUI/UIToggle/UIToggleObjectCustomStateWidget.cs.meta
  73. 35 0
      Assets/Scripts/GameUI/UIToggle/UIToggleWidgetBasic.cs
  74. 3 0
      Assets/Scripts/GameUI/UIToggle/UIToggleWidgetBasic.cs.meta
  75. 67 0
      Assets/Scripts/GameUI/UIToggle/UiToggleChangeColor.cs
  76. 3 0
      Assets/Scripts/GameUI/UIToggle/UiToggleChangeColor.cs.meta
  77. 0 0
      Assets/StreamingAssets/assetConfig.txt
  78. BIN
      Excel2Json/Excel/EventConfig.xlsx
  79. BIN
      Excel2Json/Excel/Language.xlsx
  80. 205 376
      UserSettings/Layouts/default-2022.dwlt
  81. 1 0
      XiuXianGame.sln.DotSettings.user

+ 16 - 2
Assets/Art/UIAssets/Button/btn_01.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 64, y: 0, z: 65, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -168,6 +168,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -175,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

+ 16 - 2
Assets/Art/UIAssets/decorate/dec_dadi_01.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 28, y: 68, z: 29, w: 69}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -168,6 +168,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -175,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

+ 16 - 2
Assets/Art/UIAssets/decorate/dec_di_05.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 56, y: 56, z: 56, w: 57}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -168,6 +168,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -175,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

+ 52 - 0
Assets/Res/Config/EventConditionConfig.json

@@ -282,6 +282,58 @@
         206
       ]
     },
+    {
+      "ID": 1030,
+      "LanID": [
+        221
+      ],
+      "ConditionType": null,
+      "optionType": 3,
+      "PrizeIDs": [
+        1002
+      ],
+      "PrizeNums": [
+        10
+      ]
+    },
+    {
+      "ID": 1040,
+      "LanID": [
+        222
+      ],
+      "ConditionType": null,
+      "optionType": 3,
+      "PrizeIDs": [
+        1002
+      ],
+      "PrizeNums": [
+        10
+      ]
+    },
+    {
+      "ID": 1050,
+      "LanID": [
+        223
+      ],
+      "ConditionType": null,
+      "optionType": 3,
+      "PrizeIDs": [
+        1002,
+        1001
+      ],
+      "PrizeNums": [
+        10,
+        20
+      ]
+    },
+    {
+      "ID": 1060,
+      "LanID": [
+        224
+      ],
+      "ConditionType": null,
+      "optionType": null
+    },
     {
       "ID": 10001,
       "LanID": [

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

@@ -2,8 +2,9 @@
   "configList": [
     {
       "ID": 1,
-      "EventType": 1001,
+      "EventBeginId": 1001,
       "EventTriggerType": 1,
+      "EventType": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
@@ -15,8 +16,9 @@
     },
     {
       "ID": 2,
-      "EventType": 1010,
+      "EventBeginId": 1010,
       "EventTriggerType": 1,
+      "EventType": 1,
       "EventQuality": 1,
       "EventConditionId": [
         0
@@ -28,9 +30,10 @@
     },
     {
       "ID": 3,
-      "EventType": 1020,
+      "EventBeginId": 1020,
       "EventTriggerType": 3,
-      "EventQuality": 2,
+      "EventType": 1,
+      "EventQuality": 1,
       "EventConditionId": [
         0
       ],
@@ -39,24 +42,83 @@
       ],
       "Description": 176
     },
+    {
+      "ID": 4,
+      "EventBeginId": 1030,
+      "EventTriggerType": 1,
+      "EventType": 2,
+      "EventQuality": 1,
+      "EventConditionId": [
+        0
+      ],
+      "EventVlaue": [
+        0
+      ],
+      "Description": 217
+    },
+    {
+      "ID": 5,
+      "EventBeginId": 1040,
+      "EventTriggerType": 1,
+      "EventType": 2,
+      "EventQuality": 1,
+      "EventConditionId": [
+        0
+      ],
+      "EventVlaue": [
+        0
+      ],
+      "Description": 218
+    },
+    {
+      "ID": 6,
+      "EventBeginId": 1050,
+      "EventTriggerType": 1,
+      "EventType": 2,
+      "EventQuality": 1,
+      "EventConditionId": [
+        0
+      ],
+      "EventVlaue": [
+        0
+      ],
+      "Description": 219
+    },
+    {
+      "ID": 7,
+      "EventBeginId": 1060,
+      "EventTriggerType": 1,
+      "EventType": 2,
+      "EventQuality": 1,
+      "EventConditionId": [
+        0
+      ],
+      "EventVlaue": [
+        0
+      ],
+      "Description": 220
+    },
     {
       "ID": 11,
-      "EventType": 10001,
+      "EventBeginId": 10001,
       "EventTriggerType": 2,
+      "EventType": 1,
       "EventQuality": 1,
       "Description": null
     },
     {
       "ID": 12,
-      "EventType": 10003,
+      "EventBeginId": 10003,
       "EventTriggerType": 2,
+      "EventType": 1,
       "EventQuality": 2,
       "Description": null
     },
     {
       "ID": 13,
-      "EventType": 10004,
+      "EventBeginId": 10004,
       "EventTriggerType": 2,
+      "EventType": 1,
       "EventQuality": 3,
       "Description": null
     }

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

@@ -863,6 +863,146 @@
     {
       "ID": 216,
       "txt": "你被怪物击败了,事件结束。"
+    },
+    {
+      "ID": 217,
+      "txt": "溅血背包"
+    },
+    {
+      "ID": 218,
+      "txt": "废弃矿山"
+    },
+    {
+      "ID": 219,
+      "txt": "吵架声"
+    },
+    {
+      "ID": 220,
+      "txt": "一座道观"
+    },
+    {
+      "ID": 221,
+      "txt": "发现一个血迹斑斑的背包,好像刚刚发生了战斗,我翻翻背包..."
+    },
+    {
+      "ID": 222,
+      "txt": "啥也没有....除了钱"
+    },
+    {
+      "ID": 223,
+      "txt": "两夫妻在吵架,似乎为了一件大事.."
+    },
+    {
+      "ID": 224,
+      "txt": "没有任何发现,但感觉空气很好....下次有空再来看看"
+    },
+    {
+      "ID": 225,
+      "txt": "0"
+    },
+    {
+      "ID": 226,
+      "txt": "0"
+    },
+    {
+      "ID": 227,
+      "txt": "0"
+    },
+    {
+      "ID": 228,
+      "txt": "0"
+    },
+    {
+      "ID": 229,
+      "txt": "0"
+    },
+    {
+      "ID": 230,
+      "txt": "0"
+    },
+    {
+      "ID": 231,
+      "txt": "0"
+    },
+    {
+      "ID": 232,
+      "txt": "0"
+    },
+    {
+      "ID": 233,
+      "txt": "0"
+    },
+    {
+      "ID": 234,
+      "txt": "0"
+    },
+    {
+      "ID": 235,
+      "txt": "0"
+    },
+    {
+      "ID": 236,
+      "txt": "0"
+    },
+    {
+      "ID": 237,
+      "txt": "0"
+    },
+    {
+      "ID": 238,
+      "txt": "0"
+    },
+    {
+      "ID": 239,
+      "txt": "0"
+    },
+    {
+      "ID": 240,
+      "txt": "0"
+    },
+    {
+      "ID": 241,
+      "txt": "0"
+    },
+    {
+      "ID": 242,
+      "txt": "0"
+    },
+    {
+      "ID": 243,
+      "txt": "0"
+    },
+    {
+      "ID": 244,
+      "txt": "0"
+    },
+    {
+      "ID": 245,
+      "txt": "0"
+    },
+    {
+      "ID": 246,
+      "txt": "0"
+    },
+    {
+      "ID": 247,
+      "txt": "0"
+    },
+    {
+      "ID": 248,
+      "txt": "0"
+    },
+    {
+      "ID": 249,
+      "txt": "0"
+    },
+    {
+      "ID": 250,
+      "txt": "0"
+    },
+    {
+      "ID": 251,
+      "txt": "0"
     }
   ]
 }

+ 2 - 2
Assets/Res/UI/DialoguePanel/DialogueOptionWidget.prefab

@@ -38,7 +38,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 65, y: -23.5}
-  m_SizeDelta: {x: 128, y: 46.8846}
+  m_SizeDelta: {x: 0, y: 46.8846}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5086374945530126731
 CanvasRenderer:
@@ -183,7 +183,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4

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

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

+ 720 - 0
Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -0,0 +1,720 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &650584255987892480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8599819629026832582}
+  - component: {fileID: 7897761964867798499}
+  - component: {fileID: 5478100459915039784}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: DivineSenceEventPreviewPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8599819629026832582
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2896655462721008753}
+  - {fileID: 2569128129379278262}
+  - {fileID: 3581464887972855309}
+  - {fileID: 9037408276187403176}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7897761964867798499
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: myButton
+    gameObject: {fileID: 5478100459915039784}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Massge
+    gameObject: {fileID: 0}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: bg
+    gameObject: {fileID: 8488195482551738332}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Content
+    gameObject: {fileID: 8646134070111592716}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ContentRoot
+    gameObject: {fileID: 5944675064355718479}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Close
+    gameObject: {fileID: 3651346582420827263}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!114 &5478100459915039784
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &2132268725135064903
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2569128129379278262}
+  - component: {fileID: 9156533754913033698}
+  - component: {fileID: 8488195482551738332}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2569128129379278262
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 46.5656}
+  m_SizeDelta: {x: 475.8763, y: 777.9515}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9156533754913033698
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_CullTransparentMesh: 1
+--- !u!114 &8488195482551738332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_dadi_01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &2360665792630318950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5944675064355718479}
+  - component: {fileID: 6191317521368894502}
+  - component: {fileID: 8839471078149707097}
+  - component: {fileID: 8646134070111592716}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5944675064355718479
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2360665792630318950}
+  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: 6744614164039454483}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -4.7759, y: 635.16}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &6191317521368894502
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2360665792630318950}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 5.07
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &8839471078149707097
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2360665792630318950}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &8646134070111592716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2360665792630318950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 468e09835aeba9b4e84172dbf122fdef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ScrollRect: {fileID: 7883865494936010614}
+  ScrollRectSizedata: {x: 0, y: 0}
+  Page: {x: 1, y: 1}
+  bottom: 0
+  wdiget: {fileID: 0}
+  sizeData: {x: 444.0557, y: 143.8421}
+  isCustomizeHeight: 0
+  posOff: {x: 13, y: 0}
+  isDelay: 0
+  delayTime: 0
+  isAdaptationWidth: 0
+  layoutType: 0
+  overflowDistance: 0
+--- !u!1 &3651587731235081858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9037408276187403176}
+  - component: {fileID: 3637005864510300227}
+  - component: {fileID: 5727746862753107768}
+  m_Layer: 5
+  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 &9037408276187403176
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -2.9302979, y: 367.5232}
+  m_SizeDelta: {x: 450.1394, y: 78.9535}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3637005864510300227
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_CullTransparentMesh: 1
+--- !u!114 &5727746862753107768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 34
+    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\u9014\u4E8B\u4EF6"
+--- !u!1 &4665951811628086642
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3581464887972855309}
+  - component: {fileID: 5904849993517078433}
+  - component: {fileID: 381179604564797926}
+  - component: {fileID: 7883865494936010614}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3581464887972855309
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4665951811628086642}
+  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: 6744614164039454483}
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -2.147, y: -5.5664}
+  m_SizeDelta: {x: 471.58, y: 652.1576}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5904849993517078433
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4665951811628086642}
+  m_CullTransparentMesh: 1
+--- !u!114 &381179604564797926
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4665951811628086642}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7883865494936010614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4665951811628086642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 5944675064355718479}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 6744614164039454483}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &6864546897549033815
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2896655462721008753}
+  - component: {fileID: 1550575800954493607}
+  - component: {fileID: 8853780473327312120}
+  - component: {fileID: 3651346582420827263}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2896655462721008753
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1550575800954493607
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_CullTransparentMesh: 1
+--- !u!114 &8853780473327312120
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.69411767}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3651346582420827263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8853780473327312120}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &9135198254365544974
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6744614164039454483}
+  - component: {fileID: 5322424460263804303}
+  - component: {fileID: 8187640928662968955}
+  - component: {fileID: 5511738281904160630}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6744614164039454483
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9135198254365544974}
+  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: 5944675064355718479}
+  m_Father: {fileID: 3581464887972855309}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: -17}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &5322424460263804303
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9135198254365544974}
+  m_CullTransparentMesh: 1
+--- !u!114 &8187640928662968955
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9135198254365544974}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5511738281904160630
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9135198254365544974}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Wy4XsHikV387WzZfasIPQpNnnIvc4aI1YbwUbglOpzvnO++pPJ77J/+aaczH
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 928 - 0
Assets/Res/UI/DivineSence/DivineSenceEventResultPanel.prefab

@@ -0,0 +1,928 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &650584255987892480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8599819629026832582}
+  - component: {fileID: 7897761964867798499}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: DivineSenceEventResultPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8599819629026832582
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2896655462721008753}
+  - {fileID: 2569128129379278262}
+  - {fileID: 3581464887972855309}
+  - {fileID: 9037408276187403176}
+  - {fileID: 4737429402125406338}
+  - {fileID: 4316220808628158048}
+  - {fileID: 5376868448112468229}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7897761964867798499
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: myButton
+    gameObject: {fileID: 0}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: bg
+    gameObject: {fileID: 8488195482551738332}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Content
+    gameObject: {fileID: 8646134070111592716}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ContentRoot
+    gameObject: {fileID: 5944675064355718479}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Close
+    gameObject: {fileID: 3651346582420827263}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_AllEvent
+    gameObject: {fileID: 3433724065042445742}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Teshu
+    gameObject: {fileID: 684429506329786227}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Result
+    gameObject: {fileID: 2826526502033341643}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &2132268725135064903
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2569128129379278262}
+  - component: {fileID: 9156533754913033698}
+  - component: {fileID: 8488195482551738332}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2569128129379278262
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 46.5656}
+  m_SizeDelta: {x: 475.8763, y: 777.9515}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9156533754913033698
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_CullTransparentMesh: 1
+--- !u!114 &8488195482551738332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_dadi_01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &2360665792630318950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5944675064355718479}
+  - component: {fileID: 6191317521368894502}
+  - component: {fileID: 8839471078149707097}
+  - component: {fileID: 8646134070111592716}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5944675064355718479
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2360665792630318950}
+  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: 6744614164039454483}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -4.7759, y: 635.16}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &6191317521368894502
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2360665792630318950}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 5.07
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &8839471078149707097
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2360665792630318950}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &8646134070111592716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2360665792630318950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 468e09835aeba9b4e84172dbf122fdef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ScrollRect: {fileID: 7883865494936010614}
+  ScrollRectSizedata: {x: 0, y: 0}
+  Page: {x: 1, y: 1}
+  bottom: 0
+  wdiget: {fileID: 0}
+  sizeData: {x: 444.0557, y: 143.8421}
+  isCustomizeHeight: 0
+  posOff: {x: 13, y: 0}
+  isDelay: 0
+  delayTime: 0
+  isAdaptationWidth: 0
+  layoutType: 0
+  overflowDistance: 0
+--- !u!1 &3651587731235081858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9037408276187403176}
+  - component: {fileID: 3637005864510300227}
+  - component: {fileID: 5727746862753107768}
+  m_Layer: 5
+  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 &9037408276187403176
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -2.9302979, y: 390.72327}
+  m_SizeDelta: {x: 450.1394, y: 78.9535}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3637005864510300227
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_CullTransparentMesh: 1
+--- !u!114 &5727746862753107768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 34
+    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: "\u795E\u8BC6\u63A2\u7D22\u7ED3\u679C"
+--- !u!1 &4665951811628086642
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3581464887972855309}
+  - component: {fileID: 5904849993517078433}
+  - component: {fileID: 381179604564797926}
+  - component: {fileID: 7883865494936010614}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3581464887972855309
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4665951811628086642}
+  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: 6744614164039454483}
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -2.147, y: -38.5947}
+  m_SizeDelta: {x: 471.58, y: 586.101}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5904849993517078433
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4665951811628086642}
+  m_CullTransparentMesh: 1
+--- !u!114 &381179604564797926
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4665951811628086642}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7883865494936010614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4665951811628086642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 5944675064355718479}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 6744614164039454483}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &6864546897549033815
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2896655462721008753}
+  - component: {fileID: 1550575800954493607}
+  - component: {fileID: 8853780473327312120}
+  - component: {fileID: 3651346582420827263}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2896655462721008753
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1550575800954493607
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_CullTransparentMesh: 1
+--- !u!114 &8853780473327312120
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.69411767}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3651346582420827263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8853780473327312120}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &6879381305336152130
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4737429402125406338}
+  - component: {fileID: 7642327290700519805}
+  - component: {fileID: 3433724065042445742}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_AllEvent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4737429402125406338
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6879381305336152130}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -99.399994, y: 350.9001}
+  m_SizeDelta: {x: 228, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7642327290700519805
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6879381305336152130}
+  m_CullTransparentMesh: 1
+--- !u!114 &3433724065042445742
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6879381305336152130}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4E00\u5171\u63A2\u5BFB\u523010\u4E2A\u4E8B\u4EF6"
+--- !u!1 &8069783746261929962
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4316220808628158048}
+  - component: {fileID: 332447216940605213}
+  - component: {fileID: 684429506329786227}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Teshu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4316220808628158048
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8069783746261929962}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -99.399994, y: 314.00006}
+  m_SizeDelta: {x: 228, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &332447216940605213
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8069783746261929962}
+  m_CullTransparentMesh: 1
+--- !u!114 &684429506329786227
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8069783746261929962}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "3\u4E2A\u7279\u6B8A"
+--- !u!1 &8717336479815438225
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5376868448112468229}
+  - component: {fileID: 3816265697136476390}
+  - component: {fileID: 2826526502033341643}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Result
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5376868448112468229
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8717336479815438225}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -99.4, y: 282.3}
+  m_SizeDelta: {x: 228, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3816265697136476390
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8717336479815438225}
+  m_CullTransparentMesh: 1
+--- !u!114 &2826526502033341643
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8717336479815438225}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "7\u4E2A\u5DF2\u5904\u7406"
+--- !u!1 &9135198254365544974
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6744614164039454483}
+  - component: {fileID: 5322424460263804303}
+  - component: {fileID: 8187640928662968955}
+  - component: {fileID: 5511738281904160630}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6744614164039454483
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9135198254365544974}
+  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: 5944675064355718479}
+  m_Father: {fileID: 3581464887972855309}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: -17}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &5322424460263804303
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9135198254365544974}
+  m_CullTransparentMesh: 1
+--- !u!114 &8187640928662968955
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9135198254365544974}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5511738281904160630
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9135198254365544974}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0

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

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

+ 485 - 0
Assets/Res/UI/DivineSence/ShengShiEventWidget.prefab

@@ -0,0 +1,485 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &248617179133417211
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2872877237895524070}
+  - component: {fileID: 7591801964078417207}
+  - component: {fileID: 1808640921471069902}
+  - component: {fileID: 5805178405078727768}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Massge (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2872877237895524070
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 248617179133417211}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -5.2072, y: 0}
+  m_SizeDelta: {x: 64.5679, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7591801964078417207
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 248617179133417211}
+  m_CullTransparentMesh: 1
+--- !u!114 &1808640921471069902
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 248617179133417211}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: NPC
+--- !u!114 &5805178405078727768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 248617179133417211}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &650584255987892480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8599819629026832582}
+  - component: {fileID: 5192899521709455579}
+  - component: {fileID: 7897761964867798499}
+  - component: {fileID: 5478100459915039784}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ShengShiEventWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8599819629026832582
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2569128129379278262}
+  - {fileID: 7725117982298227658}
+  - {fileID: 2872877237895524070}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -50}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &5192899521709455579
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0.3
+  isUpdate: 0
+  currTime: 0.3848319
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 1
+    animName: 
+    isLoop: 0
+    allTargets:
+    - {fileID: 650584255987892480}
+    TweenAssetInfo: {fileID: 11400000, guid: 45a33638e1bf2e040a04be1042aa2f06, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.3
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!114 &7897761964867798499
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: myButton
+    gameObject: {fileID: 5478100459915039784}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Massge
+    gameObject: {fileID: 1326197565086495762}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: bg
+    gameObject: {fileID: 8488195482551738332}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!114 &5478100459915039784
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &2132268725135064903
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2569128129379278262}
+  - component: {fileID: 9156533754913033698}
+  - component: {fileID: 8488195482551738332}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2569128129379278262
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 96.739456, y: 0}
+  m_SizeDelta: {x: 293.4785, y: 37.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9156533754913033698
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_CullTransparentMesh: 1
+--- !u!114 &8488195482551738332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_duihua_01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: af8b6f708ee6b254b9e6976ea8852a55, type: 3}
+  packInfo:
+    packName: event
+    packgJsonPath: /Art/UIAssets/TextrueJson\event.txt
+    packgSpritePath: Assets/Res/UIAtlas/event.spriteatlasv2
+    lasetJsonGUID: df80f818a4f258d33b8038600af6f215
+--- !u!1 &7222460974042505386
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7725117982298227658}
+  - component: {fileID: 464927802296640676}
+  - component: {fileID: 1326197565086495762}
+  - component: {fileID: 2797231222288135629}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Massge
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7725117982298227658
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7222460974042505386}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 177.80884, y: 0}
+  m_SizeDelta: {x: 289.5823, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &464927802296640676
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7222460974042505386}
+  m_CullTransparentMesh: 1
+--- !u!114 &1326197565086495762
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7222460974042505386}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
+--- !u!114 &2797231222288135629
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7222460974042505386}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1

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

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

+ 664 - 0
Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -0,0 +1,664 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &869698564475441709
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 712579681456886399}
+  - component: {fileID: 2062974483703860703}
+  - component: {fileID: 690487615239233780}
+  - component: {fileID: 889280321881254045}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_EventDesc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &712579681456886399
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 869698564475441709}
+  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: 3370061335406075943}
+  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.0000052154, y: 2.9}
+  m_SizeDelta: {x: 433.7711, y: 36.0552}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2062974483703860703
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 869698564475441709}
+  m_CullTransparentMesh: 1
+--- !u!114 &690487615239233780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 869698564475441709}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
+--- !u!114 &889280321881254045
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 869698564475441709}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &4442584923359408203
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3650536308811846443}
+  - component: {fileID: 6912937265734038597}
+  - component: {fileID: 5475241518208705779}
+  - component: {fileID: 9173177645400499500}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_EventName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3650536308811846443
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4442584923359408203}
+  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: 3370061335406075943}
+  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: 37.3, y: 46.638}
+  m_SizeDelta: {x: 348.9613, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6912937265734038597
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4442584923359408203}
+  m_CullTransparentMesh: 1
+--- !u!114 &5475241518208705779
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4442584923359408203}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
+--- !u!114 &9173177645400499500
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4442584923359408203}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &4903075935192002470
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8807649875490934103}
+  - component: {fileID: 2778409128145198339}
+  - component: {fileID: 3193138308975251261}
+  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 &8807649875490934103
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4903075935192002470}
+  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: 3370061335406075943}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0.0000052452087, y: 0}
+  m_SizeDelta: {x: 444, y: 133.84}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2778409128145198339
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4903075935192002470}
+  m_CullTransparentMesh: 1
+--- !u!114 &3193138308975251261
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4903075935192002470}
+  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_di_01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &5808298135736668641
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3370061335406075943}
+  - component: {fileID: 3748703702239827202}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ShengShiEventWidgetType2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3370061335406075943
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5808298135736668641}
+  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: 8807649875490934103}
+  - {fileID: 1357522047238736597}
+  - {fileID: 3650536308811846443}
+  - {fileID: 9098093879968300551}
+  - {fileID: 712579681456886399}
+  - {fileID: 6760469126628422357}
+  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.9154, y: 247.47897}
+  m_SizeDelta: {x: 444.0557, y: 133.8421}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3748703702239827202
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5808298135736668641}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: myButton
+    gameObject: {fileID: 0}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_EventDesc
+    gameObject: {fileID: 690487615239233780}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_EventName
+    gameObject: {fileID: 5475241518208705779}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_RemoveEvent
+    gameObject: {fileID: 6612899029550089941}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &6161269103075097772
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6760469126628422357}
+  - component: {fileID: 8916865937304356244}
+  - component: {fileID: 1194226542967252147}
+  - component: {fileID: 6612899029550089941}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_RemoveEvent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6760469126628422357
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6161269103075097772}
+  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: 3370061335406075943}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -3.100006, y: -3.0999985}
+  m_SizeDelta: {x: 36.4424, y: 35.969}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &8916865937304356244
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6161269103075097772}
+  m_CullTransparentMesh: 1
+--- !u!114 &1194226542967252147
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6161269103075097772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 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_close_01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!114 &6612899029550089941
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6161269103075097772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1194226542967252147}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &6552502779736589850
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9098093879968300551}
+  - component: {fileID: 3514796896117511638}
+  - component: {fileID: 4649399110665748015}
+  - component: {fileID: 651981322583502009}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Massge (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9098093879968300551
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6552502779736589850}
+  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: 3370061335406075943}
+  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: -184.6, y: 46.723}
+  m_SizeDelta: {x: 64.5679, y: 29.83}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3514796896117511638
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6552502779736589850}
+  m_CullTransparentMesh: 1
+--- !u!114 &4649399110665748015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6552502779736589850}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: NPC
+--- !u!114 &651981322583502009
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6552502779736589850}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &6730899750744253868
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1357522047238736597}
+  - component: {fileID: 8013943971233128026}
+  - component: {fileID: 6869502338291853798}
+  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 &1357522047238736597
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6730899750744253868}
+  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: 3370061335406075943}
+  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: 46.637783}
+  m_SizeDelta: {x: -0.0557, y: -93.2756}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8013943971233128026
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6730899750744253868}
+  m_CullTransparentMesh: 1
+--- !u!114 &6869502338291853798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6730899750744253868}
+  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_duihua_01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: af8b6f708ee6b254b9e6976ea8852a55, type: 3}
+  packInfo:
+    packName: event
+    packgJsonPath: /Art/UIAssets/TextrueJson\event.txt
+    packgSpritePath: Assets/Res/UIAtlas/event.spriteatlasv2
+    lasetJsonGUID: df80f818a4f258d33b8038600af6f215

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WSkctSikV3yKUqTBLZ/gkQrcDNKwnJ/UB1c2e0J81bV1/+YIrfdeeJRB+r/u
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 622 - 0
Assets/Res/UI/DivineSence/ShengShiEventWidgetType3.prefab

@@ -0,0 +1,622 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &869698564475441709
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 712579681456886399}
+  - component: {fileID: 2062974483703860703}
+  - component: {fileID: 690487615239233780}
+  - component: {fileID: 889280321881254045}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_EventDesc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &712579681456886399
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 869698564475441709}
+  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: 3370061335406075943}
+  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: -87.55634, y: -18.936792}
+  m_SizeDelta: {x: 258.6584, y: 79.7284}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2062974483703860703
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 869698564475441709}
+  m_CullTransparentMesh: 1
+--- !u!114 &690487615239233780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 869698564475441709}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
+--- !u!114 &889280321881254045
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 869698564475441709}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &2893425264750841484
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2581404301119584838}
+  - component: {fileID: 7008100311386754448}
+  - component: {fileID: 5593797294158318015}
+  - component: {fileID: 7400716166675393664}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ItemRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2581404301119584838
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2893425264750841484}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 3370061335406075943}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 280, y: -18.5}
+  m_SizeDelta: {x: 0, y: 86.8594}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &7008100311386754448
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2893425264750841484}
+  m_CullTransparentMesh: 1
+--- !u!114 &5593797294158318015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2893425264750841484}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 29.18
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &7400716166675393664
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2893425264750841484}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!1 &4442584923359408203
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3650536308811846443}
+  - component: {fileID: 6912937265734038597}
+  - component: {fileID: 5475241518208705779}
+  - component: {fileID: 9173177645400499500}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_EventName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3650536308811846443
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4442584923359408203}
+  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: 3370061335406075943}
+  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: 37.3, y: 46.638}
+  m_SizeDelta: {x: 348.9613, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6912937265734038597
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4442584923359408203}
+  m_CullTransparentMesh: 1
+--- !u!114 &5475241518208705779
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4442584923359408203}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
+--- !u!114 &9173177645400499500
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4442584923359408203}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &4903075935192002470
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8807649875490934103}
+  - component: {fileID: 2778409128145198339}
+  - component: {fileID: 3193138308975251261}
+  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 &8807649875490934103
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4903075935192002470}
+  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: 3370061335406075943}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0.0000052452087, y: 0}
+  m_SizeDelta: {x: 444, y: 133.84}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2778409128145198339
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4903075935192002470}
+  m_CullTransparentMesh: 1
+--- !u!114 &3193138308975251261
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4903075935192002470}
+  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_di_01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &5808298135736668641
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3370061335406075943}
+  - component: {fileID: 3748703702239827202}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ShengShiEventWidgetType3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3370061335406075943
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5808298135736668641}
+  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: 8807649875490934103}
+  - {fileID: 1357522047238736597}
+  - {fileID: 3650536308811846443}
+  - {fileID: 9098093879968300551}
+  - {fileID: 712579681456886399}
+  - {fileID: 2581404301119584838}
+  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.9154, y: 247.47897}
+  m_SizeDelta: {x: 444.0557, y: 133.8421}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3748703702239827202
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5808298135736668641}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: myButton
+    gameObject: {fileID: 0}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_EventDesc
+    gameObject: {fileID: 690487615239233780}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_EventName
+    gameObject: {fileID: 5475241518208705779}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ItemRoot
+    gameObject: {fileID: 2581404301119584838}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &6552502779736589850
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9098093879968300551}
+  - component: {fileID: 3514796896117511638}
+  - component: {fileID: 4649399110665748015}
+  - component: {fileID: 651981322583502009}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Massge (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9098093879968300551
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6552502779736589850}
+  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: 3370061335406075943}
+  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: -184.6, y: 46.723}
+  m_SizeDelta: {x: 64.5679, y: 29.83}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3514796896117511638
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6552502779736589850}
+  m_CullTransparentMesh: 1
+--- !u!114 &4649399110665748015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6552502779736589850}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: NPC
+--- !u!114 &651981322583502009
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6552502779736589850}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &6730899750744253868
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1357522047238736597}
+  - component: {fileID: 8013943971233128026}
+  - component: {fileID: 6869502338291853798}
+  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 &1357522047238736597
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6730899750744253868}
+  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: 3370061335406075943}
+  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: 46.637783}
+  m_SizeDelta: {x: -0.0557, y: -93.2756}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8013943971233128026
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6730899750744253868}
+  m_CullTransparentMesh: 1
+--- !u!114 &6869502338291853798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6730899750744253868}
+  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_duihua_01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: af8b6f708ee6b254b9e6976ea8852a55, type: 3}
+  packInfo:
+    packName: event
+    packgJsonPath: /Art/UIAssets/TextrueJson\event.txt
+    packgSpritePath: Assets/Res/UIAtlas/event.spriteatlasv2
+    lasetJsonGUID: df80f818a4f258d33b8038600af6f215

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

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

+ 223 - 394
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -440,6 +440,136 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
     packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
     lasetJsonGUID: e1c5b270b3ca9ddf87be5864ad756cc0
+--- !u!1 &1843990269898586624
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3695676087259227986}
+  - component: {fileID: 76856068010717943}
+  - component: {fileID: 3946755311289505782}
+  - component: {fileID: 1719125691031047753}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Event
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3695676087259227986
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1843990269898586624}
+  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: 5171746521320677542}
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 12, y: -335.6}
+  m_SizeDelta: {x: 44.0842, y: 44.0842}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &76856068010717943
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1843990269898586624}
+  m_CullTransparentMesh: 1
+--- !u!114 &3946755311289505782
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1843990269898586624}
+  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_21
+  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: 73747c90ef6f3497ab9cd07d8ff19dd0
+--- !u!114 &1719125691031047753
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1843990269898586624}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3946755311289505782}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1895290362571120975
 GameObject:
   m_ObjectHideFlags: 0
@@ -766,13 +896,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5847779211741130419}
+  m_Children: []
   m_Father: {fileID: 9037135992368401232}
   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: -302, y: 455}
+  m_AnchoredPosition: {x: -270, y: 455}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3343567801882054818
@@ -1153,212 +1282,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &3420651838577565557
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5847779211741130419}
-  - component: {fileID: 7957628322511627950}
-  - component: {fileID: 5468974134767934358}
-  - component: {fileID: 7672393299554912861}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: ShengShiEventWidget
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &5847779211741130419
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3420651838577565557}
-  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: 421278144963576771}
-  - {fileID: 5569527455350480319}
-  m_Father: {fileID: 6634741294730613967}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -50}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!114 &7957628322511627950
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3420651838577565557}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  maxDuration: 0.3
-  isUpdate: 0
-  currTime: 0.3848319
-  GrpupInfos:
-  - Foldout: 1
-    isActive: 1
-    animName: 
-    isLoop: 0
-    allTargets:
-    - {fileID: 3420651838577565557}
-    TweenAssetInfo: {fileID: 11400000, guid: 45a33638e1bf2e040a04be1042aa2f06, type: 2}
-    TargetFoldout: 1
-    maxDuration: 0.3
-    isUpdate: 1
-    currTime: 0
-  MinMaxGradient:
-    m_Mode: 0
-    m_GradientMin:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_ColorSpace: -1
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    m_GradientMax:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_ColorSpace: -1
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
-    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
-  isLoop: 0
---- !u!114 &5468974134767934358
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3420651838577565557}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: myButton
-    gameObject: {fileID: 7672393299554912861}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Massge
-    gameObject: {fileID: 3753847041753279079}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: bg
-    gameObject: {fileID: 6031426593623065001}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
---- !u!114 &7672393299554912861
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3420651838577565557}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 0
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &3496447070391495751
 GameObject:
   m_ObjectHideFlags: 0
@@ -1600,90 +1523,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &4316868802843550002
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 421278144963576771}
-  - component: {fileID: 6443882205668840343}
-  - component: {fileID: 6031426593623065001}
-  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 &421278144963576771
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4316868802843550002}
-  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: 5847779211741130419}
-  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: 143.7002, y: 0}
-  m_SizeDelta: {x: 387.4, y: 37.9}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6443882205668840343
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4316868802843550002}
-  m_CullTransparentMesh: 1
---- !u!114 &6031426593623065001
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4316868802843550002}
-  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_duihua_01
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: af8b6f708ee6b254b9e6976ea8852a55, type: 3}
-  packInfo:
-    packName: event
-    packgJsonPath: /Art/UIAssets/TextrueJson\event.txt
-    packgSpritePath: Assets/Res/UIAtlas/event.spriteatlasv2
-    lasetJsonGUID: df80f818a4f258d33b8038600af6f215
 --- !u!1 &4494942614175898413
 GameObject:
   m_ObjectHideFlags: 0
@@ -1769,102 +1608,6 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
---- !u!1 &4775112663690772191
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5569527455350480319}
-  - component: {fileID: 2309237241038584529}
-  - component: {fileID: 3753847041753279079}
-  - component: {fileID: 48990594779884472}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Massge
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5569527455350480319
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4775112663690772191}
-  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: 5847779211741130419}
-  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: 138.5, y: 0}
-  m_SizeDelta: {x: 368.2, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2309237241038584529
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4775112663690772191}
-  m_CullTransparentMesh: 1
---- !u!114 &3753847041753279079
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4775112663690772191}
-  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
---- !u!114 &48990594779884472
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4775112663690772191}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
 --- !u!1 &4781133734701845668
 GameObject:
   m_ObjectHideFlags: 0
@@ -2295,6 +2038,86 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8157457863163446127
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5171746521320677542}
+  - component: {fileID: 443331176857040011}
+  - component: {fileID: 2892609539916653567}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_EventNum
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5171746521320677542
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8157457863163446127}
+  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: 3695676087259227986}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 10.5, y: -20}
+  m_SizeDelta: {x: 0, y: -22.8661}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &443331176857040011
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8157457863163446127}
+  m_CullTransparentMesh: 1
+--- !u!114 &2892609539916653567
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8157457863163446127}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 19
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 10
 --- !u!1 &8542463699263459027
 GameObject:
   m_ObjectHideFlags: 0
@@ -2584,6 +2407,7 @@ RectTransform:
   - {fileID: 4048428373501315793}
   - {fileID: 6895274337125899519}
   - {fileID: 1798015912972164048}
+  - {fileID: 3695676087259227986}
   - {fileID: 6634741294730613967}
   - {fileID: 5559010447687375213}
   - {fileID: 2081484081694752030}
@@ -2617,11 +2441,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: ShengShiEventWidget
-    gameObject: {fileID: 3420651838577565557}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Text_divineSensePoint
     gameObject: {fileID: 2031905454085863219}
     isAssetBundle: 0
@@ -2637,6 +2456,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Event
+    gameObject: {fileID: 1719125691031047753}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_EventNum
+    gameObject: {fileID: 2892609539916653567}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9153091249090986804
 GameObject:

Diff do ficheiro suprimidas por serem muito extensas
+ 3 - 319
Assets/Scenes/testCombat.scene


+ 4 - 0
Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -85,6 +85,10 @@ namespace Fort23.Core
       /// 完成事件
       /// </summary>
       CompleteEvent,
+      /// <summary>
+      /// 移除事件
+      /// </summary>
+      RemoveEvent
       
     }
 }

+ 7 - 1
Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -23,7 +23,7 @@ public int ID;
 		/// <summary>
 		///事件的起始ID
 		/// </summary>
-public int EventType;
+public int EventBeginId;
 
 
 		/// <summary>
@@ -32,6 +32,12 @@ public int EventType;
 public int EventTriggerType;
 
 
+		/// <summary>
+		///1.正常触发 2.直接结算
+		/// </summary>
+public int EventType;
+
+
 		/// <summary>
 		///事件品质
 		/// </summary>

+ 21 - 9
Assets/Scripts/GameLogic/EventManager/EventSystemManager.cs

@@ -27,6 +27,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     List<int> qualitys = new List<int>() { 1, 2, 3, 4, 5, 6 };
 
+    public bool isOpenUi;
+
     public void CustomInit(IDialogueMono dialogueMono)
     {
         eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
@@ -169,6 +171,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
         if (isTriggerEvent)
             return;
+        
+        if(isOpenUi)
+            return;
         // 获取随机事件
         List<EventConfig> randomEvents = eventConfigs.Where(e => e.EventTriggerType == 2 && CanTriggerEvent(e.ID)).ToList();
 
@@ -196,7 +201,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         LogTool.Log($"触发事件: {evt.Description} (ID: {evt.ID}, 品质: {evt.EventQuality})");
         dialogueMono.ChangeComabtState(CombatController.idle);
 
-        DialogueManager.Instance.StartDialogue(evt.EventType, evt.ID, () => { CompleteEvent(evt.ID); });
+        DialogueManager.Instance.StartDialogue(evt.EventBeginId, evt.ID, () => { CompleteEvent(evt.ID); });
     }
 
     /// <summary>
@@ -213,7 +218,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         int dialogueID = 0;
         if (evt.curStep == 0)
         {
-            dialogueID = eventConfig.EventType;
+            dialogueID = eventConfig.EventBeginId;
         }
         else
         {
@@ -222,7 +227,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         CurrentEventList = evt;
         dialogueMono.ChangeComabtState(CombatController.idle);
-        DialogueManager.Instance.StartDialogue(dialogueID, eventConfig.ID, () => { CompleteEvent(); });
+        DialogueManager.Instance.StartDialogue(dialogueID, eventConfig.ID, () => { CompleteEvent(CurrentEventList); });
     }
 
     /// <summary>
@@ -298,15 +303,15 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// 完成事件
     /// </summary>
     /// <param name="eventID">事件ID</param>
-    public void CompleteEvent()
+    public void CompleteEvent(AccountFileInfo.EventList eventList,bool isTriggerEvent = false)
     {
-        isTriggerEvent = false;
-        LogTool.Log($"完成事件{CurrentEventList.eventID}");
-        AccountFileInfo.EventData eventData = AccountFileInfo.Instance.playerData.events.FirstOrDefault((e) => e.eventID == CurrentEventList.eventID);
+        this.isTriggerEvent = isTriggerEvent;
+        LogTool.Log($"完成事件{eventList.eventID}");
+        AccountFileInfo.EventData eventData = AccountFileInfo.Instance.playerData.events.FirstOrDefault((e) => e.eventID == eventList.eventID);
         if (eventData == null)
         {
             eventData = new AccountFileInfo.EventData();
-            eventData.eventID = CurrentEventList.eventID;
+            eventData.eventID = eventList.eventID;
         }
 
         eventData.completeCount++;
@@ -316,10 +321,17 @@ public class EventSystemManager : Singleton<EventSystemManager>
             AccountFileInfo.Instance.playerData.senceExplorationProgress += 1;
 
 
-        AccountFileInfo.Instance.playerData.eventList.Remove(CurrentEventList);
+        AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
         AccountFileInfo.Instance.SavePlayerData();
 
         EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
         dialogueMono.ChangeComabtState(CombatController.update);
     }
+
+    public void RemoveEvent(AccountFileInfo.EventList eventList)
+    {
+        AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
+        AccountFileInfo.Instance.SavePlayerData();
+        EventManager.Instance.Dispatch(CustomEventType.RemoveEvent, null);
+    }
 }

+ 8 - 0
Assets/Scripts/GameUI/CustomStateController.meta

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

+ 381 - 0
Assets/Scripts/GameUI/CustomStateController/CustomStateController.cs

@@ -0,0 +1,381 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Fort23.Core;
+using Fort23.Mono;
+using Fort23.UTool;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+using Utility;
+using Object = UnityEngine.Object;
+
+public class CustomStateController : MonoBehaviour, ISerializationCallbackReceiver
+{
+    [Flags]
+    [Serializable]
+    public enum UIStateType
+    {
+        Null = 0,
+        Scale = 2,
+        Active = 4,
+        Position = 8,
+        Rotation = 16,
+        RBSize = 32,
+        ImageColor = 64,
+        TextColor = 128,
+        TextValue = 256,
+        Icon = 512,
+        OutLineColor = 1024,
+        Sizedata = 2048,
+        CustomState = 4096,
+        TmpColor = 8192
+    }
+
+
+    [Serializable]
+    public class UIStateData
+    {
+        public List<StateInfo> StateInfos;
+
+        public UIStateData()
+        {
+            StateInfos = new List<StateInfo>();
+        }
+    }
+
+
+    [Serializable]
+    public class StateInfo
+    {
+        [SerializeField] public GameObject Target;
+
+        //v4专用数据源
+        [SerializeField] public List<UIStateType> UIStateV4Types;
+        [SerializeField] public List<Vector4> UIStateV4Datas;
+
+        //Str 专用数据源
+        [SerializeField] public List<UIStateType> UIStateStrTypes;
+        [SerializeField] public List<string> UIStateStrDatas;
+    }
+
+
+    [SerializeField] public List<UIStateData> data = new List<UIStateData>();
+
+
+    public List<Object> AllComs = new List<Object>();
+
+    [SerializeField] public List<UIStateType> AllComsStateTypes = new List<UIStateType>();
+
+    public int CurrIndex;
+
+
+    public void AddData()
+    {
+        data.Add(CreatData());
+        CurrIndex = data.Count - 1;
+    }
+
+    public void RemoveData(int index)
+    {
+        data.RemoveAt(index);
+        CurrIndex = data.Count - 1;
+        if (data.Count == 0)
+        {
+            ChangeState(-1);
+        }
+    }
+
+    public void SaveData()
+    {
+        data[CurrIndex] = CreatData();
+    }
+
+
+    public UIStateData CreatData()
+    {
+        UIStateData uiStateData = new UIStateData();
+
+
+        for (var i = 0; i < AllComs.Count; i++)
+        {
+            Object _object = AllComs[i];
+
+            if (_object == null)
+            {
+                LogTool.Error("保存状态数据的目标为空");
+                continue;
+            }
+
+
+            GameObject go = AllComs[i] as GameObject;
+            if (go == null)
+            {
+                LogTool.Error("保存状态数据的目标为空");
+                continue;
+            }
+
+            StateInfo stateInfo = new StateInfo();
+
+            stateInfo.UIStateV4Datas = new List<Vector4>();
+            stateInfo.UIStateV4Types = new List<UIStateType>();
+
+
+            stateInfo.Target = AllComs[i] as GameObject;
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.Active))
+            {
+                Vector4 vector4 = new Vector4();
+                vector4.x = go.gameObject.activeSelf ? 1 : 0;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.Active);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.Position))
+            {
+                Vector4 vector4 = go.GetComponent<RectTransform>().anchoredPosition;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.Position);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.Scale))
+            {
+                Vector4 vector4 = go.GetComponent<RectTransform>().localScale;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.Scale);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.Rotation))
+            {
+                Vector4 vector4 = go.GetComponent<RectTransform>().localRotation.eulerAngles;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.Rotation);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.Sizedata))
+            {
+                Vector4 vector4 = go.GetComponent<RectTransform>().sizeDelta;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.Sizedata);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.RBSize))
+            {
+                Vector4 vector4 = go.GetComponent<RectTransform>().sizeDelta;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.RBSize);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.ImageColor))
+            {
+                Vector4 vector4 = go.GetComponent<Image>().color;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.ImageColor);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.TextColor))
+            {
+                Vector4 vector4 = go.GetComponent<Text>().color;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.TextColor);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+            
+            if (AllComsStateTypes[i].HasFlag(UIStateType.TmpColor))
+            {
+                Vector4 vector4 = go.GetComponent<TextMeshProUGUI>().color;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.TmpColor);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.OutLineColor))
+            {
+                Vector4 vector4 = go.GetComponent<Outline>().effectColor;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.OutLineColor);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.TextValue))
+            {
+                if (stateInfo.UIStateStrDatas == null)
+                {
+                    stateInfo.UIStateStrDatas = new List<string>();
+                    stateInfo.UIStateStrTypes = new List<UIStateType>();
+                }
+
+                string str = String.Empty;
+                if (go.GetComponent<TextLanguageMono>().id != 0)
+                {
+                    str = go.GetComponent<TextLanguageMono>().id.ToString();
+                }
+                else
+                {
+                    str = go.GetComponent<Text>().text;
+                }
+
+
+                stateInfo.UIStateStrTypes.Add(UIStateType.TextValue);
+                stateInfo.UIStateStrDatas.Add(str);
+            }
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.Icon))
+            {
+                if (stateInfo.UIStateStrDatas == null)
+                {
+                    stateInfo.UIStateStrDatas = new List<string>();
+                    stateInfo.UIStateStrTypes = new List<UIStateType>();
+                }
+
+                string str = go.GetComponent<MyImage>().icon_name.ToString();
+
+                stateInfo.UIStateStrTypes.Add(UIStateType.Icon);
+                stateInfo.UIStateStrDatas.Add(str);
+            }
+
+            if (AllComsStateTypes[i].HasFlag(UIStateType.CustomState))
+            {
+                Vector4 vector4 = new Vector4();
+                vector4.x = go.GetComponent<CustomStateController>().CurrIndex;
+
+                stateInfo.UIStateV4Types.Add(UIStateType.CustomState);
+                stateInfo.UIStateV4Datas.Add(vector4);
+            }
+
+            uiStateData.StateInfos.Add(stateInfo);
+        }
+
+        return uiStateData;
+    }
+
+
+    public void ChangeState(int selectIndex)
+    {
+        if (selectIndex < 0)
+        {
+            return;
+        }
+
+        CurrIndex = selectIndex;
+        UIStateData uiStateData = data[selectIndex];
+
+
+        foreach (var keyValuePair in uiStateData.StateInfos)
+        {
+            GameObject go = keyValuePair.Target;
+            if (go == null)
+            {
+                LogTool.Error("保存状态数据的目标不存在");
+                continue;
+            }
+
+            if (keyValuePair.UIStateV4Types != null)
+            {
+                for (var i = 0; i < keyValuePair.UIStateV4Types.Count; i++)
+                {
+                    switch (keyValuePair.UIStateV4Types[i])
+                    {
+                        case UIStateType.Active:
+                            bool active;
+
+                            active = Math.Abs(keyValuePair.UIStateV4Datas[i].x - 1) < 0.00001;
+
+                            go.gameObject.SetActive(active);
+                            break;
+                        case UIStateType.Position:
+                            Vector2 pos = keyValuePair.UIStateV4Datas[i];
+                            go.GetComponent<RectTransform>().anchoredPosition = pos;
+                            break;
+
+                        case UIStateType.Scale:
+                            Vector3 scale = keyValuePair.UIStateV4Datas[i];
+                            go.GetComponent<RectTransform>().localScale = scale;
+                            break;
+                        case UIStateType.Rotation:
+                            Quaternion rotation = Quaternion.Euler(keyValuePair.UIStateV4Datas[i]);
+
+                            go.GetComponent<RectTransform>().localRotation = rotation;
+                            break;
+                        case UIStateType.Sizedata:
+                            Vector3 sizedata = keyValuePair.UIStateV4Datas[i];
+
+                            go.GetComponent<RectTransform>().sizeDelta = sizedata;
+                            break;
+                        case UIStateType.RBSize:
+                            Vector2 sizeDelta = keyValuePair.UIStateV4Datas[i];
+                            go.GetComponent<RectTransform>().sizeDelta = sizeDelta;
+                            break;
+                        case UIStateType.ImageColor:
+                            Color imageColorData = keyValuePair.UIStateV4Datas[i];
+                            go.GetComponent<Image>().color = imageColorData;
+                            break;
+                        case UIStateType.TextColor:
+                            Color textColorData = keyValuePair.UIStateV4Datas[i];
+                            go.GetComponent<Text>().color = textColorData;
+                            break;
+                        case UIStateType.TmpColor:
+                            Color textColorData1 = keyValuePair.UIStateV4Datas[i];
+                            go.GetComponent<TextMeshProUGUI>().color = textColorData1;
+                            break;
+                        case UIStateType.OutLineColor:
+                            Color outLineColorData = keyValuePair.UIStateV4Datas[i];
+                            go.GetComponent<Outline>().effectColor = outLineColorData;
+                            break;
+
+                        case UIStateType.CustomState:
+                            int index = (int)keyValuePair.UIStateV4Datas[i].x;
+                            go.GetComponent<CustomStateController>().ChangeState(index);
+                            break;
+                    }
+                }
+            }
+
+
+            if (keyValuePair.UIStateStrTypes != null)
+            {
+                for (var i = 0; i < keyValuePair.UIStateStrTypes.Count; i++)
+                {
+                    switch (keyValuePair.UIStateStrTypes[i])
+                    {
+                        case UIStateType.TextValue:
+                            string str = keyValuePair.UIStateStrDatas[i];
+                            int id = 0;
+                            if (int.TryParse(str, out id))
+                            {
+                                // go.GetComponent<TextLanguageMono>().SetLanguage(str.ToInt());
+                            }
+                            else
+                            {
+                                go.GetComponent<Text>().text = str;
+                            }
+
+                            break;
+                        case UIStateType.Icon:
+                            string iconName = keyValuePair.UIStateStrDatas[i];
+                            go.GetComponent<MyImage>().icon_name = iconName;
+                            break;
+                    }
+                }
+            }
+        }
+    }
+
+
+    public void OnBeforeSerialize()
+    {
+    }
+
+    public void OnAfterDeserialize()
+    {
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/CustomStateController/CustomStateController.cs.meta

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

+ 8 - 0
Assets/Scripts/GameUI/Editor/CustomTools.meta

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

+ 175 - 0
Assets/Scripts/GameUI/Editor/CustomTools/CustomStateControllerEditor.cs

@@ -0,0 +1,175 @@
+using System.Collections.Generic;
+using Fort23.UTool;
+using UnityEditor;
+using UnityEngine;
+using Utility;
+
+namespace Mono.UI.UIComs
+{
+    [CustomEditor(typeof(CustomStateController))]
+    public class CustomStateControllerEditor : UnityEditor.Editor
+    {
+        private CustomStateController uIStateController;
+
+
+        private void OnEnable()
+        {
+            uIStateController = (CustomStateController)target;
+        }
+
+        public int SelectIndex
+        {
+            get { return _selectIndex; }
+            set
+            {
+                if (value != _selectIndex && value >= 0)
+                {
+                    _selectIndex = value;
+                    uIStateController.CurrIndex = _selectIndex;
+                    uIStateController.ChangeState(_selectIndex);
+
+                    Debug.Log("切换状态+" + uIStateController.data[_selectIndex].StateInfos[0].UIStateV4Datas.Count);
+                }
+            }
+        }
+
+        private int _selectIndex;
+        private Object ObjectPrefab;
+
+
+        bool isInited = false;
+
+        public override void OnInspectorGUI()
+        {
+            SerializedProperty AllComsProperty = serializedObject.FindProperty("AllComs");
+            SerializedProperty AllComsStateTypesProperty = serializedObject.FindProperty("AllComsStateTypes");
+
+
+            if (uIStateController.AllComsStateTypes.Count < uIStateController.AllComs.Count)
+            {
+                uIStateController.AllComsStateTypes.Add(CustomStateController.UIStateType.Null);
+            }
+
+
+            GUILayout.BeginHorizontal(GUI.skin.box);
+
+            _selectIndex = uIStateController.CurrIndex;
+            for (var i = 0; i < uIStateController.data.Count; i++)
+            {
+                if (GUILayout.Toggle(SelectIndex == i, i.ToString()))
+                {
+                    SelectIndex = i;
+                }
+            }
+
+            EditorGUILayout.EndHorizontal();
+
+            EditorGUILayout.ObjectField(ObjectPrefab, typeof(Object), false);
+
+
+            SerializedProperty property;
+            EditorGUILayout.LabelField("需要保存状态数据的组件列表:");
+            var delList = new List<int>();
+            for (var i = 0; i < uIStateController.AllComs.Count; i++)
+            {
+                GUILayout.BeginHorizontal();
+                property = AllComsProperty.GetArrayElementAtIndex(i);
+
+                property.objectReferenceValue = EditorGUILayout.ObjectField(property.objectReferenceValue, typeof(Object), true);
+
+                uIStateController.AllComsStateTypes[i] = (CustomStateController.UIStateType)EditorGUILayout.EnumFlagsField(uIStateController.AllComsStateTypes[i]);
+
+
+                if (GUILayout.Button("X"))
+                {
+                    //将元素添加进删除list
+                    delList.Add(i);
+                }
+
+                GUILayout.EndHorizontal();
+            }
+
+
+            //遍历删除list,将其删除掉
+            foreach (var i in delList)
+            {
+                AllComsProperty.DeleteArrayElementAtIndex(i);
+                AllComsStateTypesProperty.DeleteArrayElementAtIndex(i);
+            }
+
+
+            // EditorGUILayout.LabelField("当前保存的状态数据列表:");
+            // for (var i = 0; i < uIStateController.data.Count; i++)
+            // {
+            //     property = AllComDatasProperty.GetArrayElementAtIndex(i);
+            //     EditorGUILayout.PropertyField(property);
+            // }
+
+            EditorGUILayout.BeginHorizontal();
+
+            if (GUILayout.Button("添加当前状态数据"))
+            {
+                uIStateController.AddData();
+                SelectIndex = uIStateController.data.Count - 1;
+                Debug.Log("添加当前状态数据");
+                EditorUtility.SetDirty(uIStateController.gameObject);
+            }
+
+            if (GUILayout.Button("保存当前状态数据"))
+            {
+                uIStateController.SaveData();
+
+
+                EditorUtility.SetDirty(uIStateController.gameObject);
+                Debug.Log("保存当前状态数据");
+            }
+
+            if (GUILayout.Button("删除当前状态数据"))
+            {
+                uIStateController.RemoveData(SelectIndex);
+                SelectIndex = uIStateController.data.Count - 1;
+                EditorUtility.SetDirty(uIStateController.gameObject);
+                Debug.Log("删除当前状态数据");
+            }
+
+            EditorGUILayout.EndHorizontal();
+
+
+            var eventType = Event.current.type;
+            //在Inspector 窗口上创建区域,向区域拖拽资源对象,获取到拖拽到区域的对象
+            if (eventType == EventType.DragUpdated || eventType == EventType.DragPerform)
+            {
+                DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
+
+                if (eventType == EventType.DragPerform)
+                {
+                    DragAndDrop.AcceptDrag();
+                    foreach (var o in DragAndDrop.objectReferences)
+                    {
+                        AddObject(AllComsProperty, o);
+                    }
+                }
+
+                Event.current.Use();
+            }
+
+
+            serializedObject.ApplyModifiedProperties();
+            serializedObject.UpdateIfRequiredOrScript();
+        }
+
+
+        private void AddObject(SerializedProperty dataProperty, Object obj)
+        {
+            int index = dataProperty.arraySize;
+            dataProperty.InsertArrayElementAtIndex(index);
+            var element = dataProperty.GetArrayElementAtIndex(index);
+            element.objectReferenceValue = obj;
+        }
+
+        private void AddStateData(CustomStateController.UIStateData data)
+        {
+            uIStateController.data.Add(data);
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/Editor/CustomTools/CustomStateControllerEditor.cs.meta

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

+ 2 - 1
Assets/Scripts/GameUI/Editor/GameUIEditor.asmdef

@@ -7,7 +7,8 @@
         "GPUECSAnimationBakerEngine",
         "Kybernetik.Animancer",
         "Fort23.GameLogic",
-        "Unity.Timeline"
+        "Unity.Timeline",
+        "Fort23.Mono"
     ],
     "includePlatforms": [
         "Editor"

+ 8 - 0
Assets/Scripts/GameUI/ScorolList.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: BiwY4yr8Uiqe8yvBLX3OVUjIU+rA+odMvv9ZU7MUdoS+JEkCz0WyTkneMFMJ
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 11 - 0
Assets/Scripts/GameUI/ScorolList/IScorllListWidget.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public interface IScorllListWidget
+{
+    RectTransform Transform { get; }
+    int index { get; set; }
+    Vector2 GetSize();
+    // void SetPos(Vector2 pos);
+}

+ 11 - 0
Assets/Scripts/GameUI/ScorolList/IScorllListWidget.cs.meta

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

+ 10 - 0
Assets/Scripts/GameUI/ScorolList/IScrollListContent.cs

@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using Fort23.Core;
+using UnityEngine;
+
+public interface IScrollListContent
+{
+    CTask<IScorllListWidget> GetIScorllListWidget(int index,RectTransform root);
+    void HindIScorllListWidget(IScorllListWidget widget);
+}

+ 11 - 0
Assets/Scripts/GameUI/ScorolList/IScrollListContent.cs.meta

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

+ 877 - 0
Assets/Scripts/GameUI/ScorolList/ScrollList.cs

@@ -0,0 +1,877 @@
+using System;
+using System.Collections.Generic;
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ScrollList : MonoBehaviour, IScrollListContent
+{
+    public enum LayoutType
+    {
+        Left,
+        Center,
+    }
+
+    // public Camera Camera;
+    public ScrollRect ScrollRect;
+
+    public Vector2 ScrollRectSizedata;
+    public Vector2Int Page = new Vector2Int(1, 1);
+
+    public float bottom;
+
+    public RectTransform wdiget;
+
+
+    public Vector2 sizeData = new Vector2();
+    public List<IScorllListWidget> hindWidget = new List<IScorllListWidget>();
+    public List<IScorllListWidget> showWidget = new List<IScorllListWidget>();
+    protected int currIndex;
+
+    // public Vector2 offSize;
+    public bool isCustomizeHeight;
+    public Vector2 posOff;
+    public bool isDelay;
+    public long delayTime;
+    public bool isAdaptationWidth;
+    private bool _isStartDelay;
+
+    private bool hasAddedOffset = false;
+    protected IScrollListContent m_scrollListContent;
+
+    // private void Awake()
+    // {
+    //     Init(this, 100);
+    // }
+
+    protected RectTransform myRectTransform;
+
+
+    private float addY;
+
+    protected int m_startIndex;
+    private int _maxSize;
+    private Vector3 onePos;
+
+    private CTask isAwaitInitFinis;
+
+    private bool _isBreak;
+
+    private Vector2 _vel;
+
+    public LayoutType layoutType = LayoutType.Left;
+
+    public float overflowDistance;
+
+    private void Awake()
+    {
+        if (myRectTransform == null)
+        {
+            myRectTransform = gameObject.GetComponent<RectTransform>();
+        }
+
+        onePos = myRectTransform.localPosition;
+    }
+
+    public void Break()
+    {
+        _isBreak = true;
+    }
+
+    public void Clear()
+    {
+        currIndex = 0;
+        IScorllListWidget[] listWidgets = showWidget.ToArray();
+        for (int i = 0; i < listWidgets.Length; i++)
+        {
+            HindIWidget(listWidgets[i]);
+        }
+
+        showWidget.Clear();
+        ScrollRect.content.localPosition = onePos;
+        ScrollRect.StopMovement();
+    }
+
+
+    /// <summary>
+    /// 初始化
+    /// </summary>
+    /// <param name="scrollListContent"></param>
+    /// <param name="maxSize"></param>
+    /// <param name="startIndex"></param>
+    public async CTask Init(IScrollListContent scrollListContent, int maxSize, int startIndex = 0)
+    {
+        if (startIndex < 0)
+        {
+            startIndex = 0;
+        }
+
+        if (ScrollRect == null)
+        {
+            ScrollRect = transform.GetComponentInParent<ScrollRect>();
+        }
+
+        RectTransform root = ScrollRect.GetComponent<RectTransform>();
+
+        addY = 0;
+        _isBreak = true;
+        using (await CoroutineLockComponent.Instance.Wait(this.GetInstanceID().ToString()))
+        {
+            if (myRectTransform == null)
+            {
+                myRectTransform = gameObject.GetComponent<RectTransform>();
+            }
+
+            Clear();
+            _maxSize = maxSize;
+            if (isAdaptationWidth)
+            {
+                ScrollRect.SetLayoutHorizontal();
+                await TimerComponent.Instance.WaitAsync(50);
+                float fx = ((root.rect.size.x - posOff.x) / sizeData.x);
+                int c = (int)fx;
+
+
+                if (fx % 1 >= 0.9f)
+                {
+                    c += 1;
+                }
+
+                Page.y = c;
+            }
+
+            if (layoutType == LayoutType.Center)
+            {
+                await TimerComponent.Instance.WaitAsync(30);
+                float w = root.rect.width / 2;
+                posOff = new Vector2(w, posOff.y);
+            }
+
+            await TimerComponent.Instance.WaitAsync(10);
+            Vector2 lasetPos = myRectTransform.anchoredPosition;
+            if (ScrollRect.horizontal)
+            {
+                myRectTransform.sizeDelta = new Vector2(sizeData.x * startIndex, myRectTransform.sizeDelta.y);
+                myRectTransform.anchoredPosition =
+                    new Vector2(sizeData.x * startIndex * -1, myRectTransform.anchoredPosition.y);
+                lasetPos = myRectTransform.anchoredPosition;
+                m_startIndex = 0;
+                currIndex = startIndex;
+            }
+            else if (ScrollRect.vertical)
+            {
+                // m_startIndex = startIndex;
+                currIndex = startIndex;
+
+                // Vector2 targetSizeDelta = CalculateTargetSizeDelta(startIndex);
+                Vector2 targetSizeDelta = CalculateBottomSizeDelta(startIndex);
+                targetSizeDelta += new Vector2(0, bottom);
+                lasetPos = CalculateTargetPosition(startIndex);
+                myRectTransform.sizeDelta = new Vector2(sizeData.x, targetSizeDelta.y);
+            }
+
+            _isBreak = false;
+
+
+            m_scrollListContent = scrollListContent;
+            CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
+            CTask<IScorllListWidget> ctask = Cread(currIndex, false);
+            cTaskAwaitBuffer.AddTask(ctask);
+            currIndex++;
+            if (isDelay)
+            {
+                _isStartDelay = true;
+            }
+
+            await cTaskAwaitBuffer.WaitAll();
+            ScrollRect.SetLayoutVertical();
+            myRectTransform.anchoredPosition = lasetPos;
+            ScrollRect.StopMovement();
+
+            await onValueChanged(Vector2.zero, true);
+            ScrollRect.onValueChanged.RemoveListener(onValueChanged2);
+            ScrollRect.onValueChanged.AddListener(onValueChanged2);
+            _isStartDelay = false;
+        }
+    }
+
+    public void RemoveWidget(IScorllListWidget listWidget)
+    {
+        bool isHide = false;
+        for (int i = 0; i < showWidget.Count; i++)
+        {
+            if (showWidget[i] == listWidget || isHide)
+            {
+                isHide = true;
+                HindIWidget(showWidget[i]);
+                i--;
+            }
+        }
+
+        if (isHide)
+        {
+            if (showWidget.Count <= 0)
+            {
+                currIndex = 0;
+                CTask<IScorllListWidget> ctask = Cread(currIndex, false);
+                currIndex++;
+            }
+
+            onValueChanged(Vector2.zero, false);
+        }
+    }
+
+    protected async CTask<IScorllListWidget> Cread(int index, bool isUp)
+    {
+        int showIndex = index - m_startIndex;
+
+
+        if (showWidget.Count > 100)
+        {
+            return null;
+        }
+
+        IScorllListWidget widget = await GetWidget(index);
+
+        if (widget == null)
+        {
+            return null;
+        }
+
+
+        showWidget.Add(widget);
+        int xoff = 0;
+        int yoff = 0;
+        if (ScrollRect.horizontal)
+        {
+            xoff = showIndex / Page.x;
+            yoff = showIndex % Page.x;
+        }
+        else if (ScrollRect.vertical)
+        {
+            if (showIndex >= 0 || isCustomizeHeight)
+            {
+                yoff = showIndex / Page.y;
+                xoff = showIndex % Page.y;
+            }
+            else
+            {
+                {
+                    xoff = showIndex % (Page.y + 1);
+                    yoff = showIndex / (Page.y + 1);
+                }
+                if (showIndex < 0)
+                {
+                    xoff = Page.y - Math.Abs(xoff);
+                    yoff -= 1;
+                }
+            }
+        }
+
+
+        widget.Transform.gameObject.name = index.ToString();
+        widget.Transform.SetParent(transform);
+        widget.Transform.localScale = Vector3.one;
+        if (!isCustomizeHeight)
+        {
+            widget.Transform.anchoredPosition =
+                new Vector3(xoff * sizeData.x + posOff.x, -yoff * sizeData.y - addY - posOff.y);
+        }
+        else
+        {
+            float y = 0;
+            if (isUp)
+            {
+                y = -5000000;
+            }
+            else
+            {
+                y = 5000000;
+            }
+
+            IScorllListWidget yWidget = null;
+            for (int i = 0; i < showWidget.Count; i++)
+            {
+                IScorllListWidget scorllListWidget = showWidget[i];
+                int c = scorllListWidget.index - m_startIndex;
+                int lastY = c / Page.y;
+                if (isUp)
+                {
+                    if (lastY - yoff == 1)
+                    {
+                        float currY = scorllListWidget.Transform.localPosition.y;
+                        if (y < currY)
+                        {
+                            yWidget = scorllListWidget;
+                            y = currY;
+                        }
+                    }
+                }
+                else
+                {
+                    if (yoff - lastY == 1)
+                    {
+                        float currY = scorllListWidget.Transform.localPosition.y;
+                        if (y > currY)
+                        {
+                            yWidget = scorllListWidget;
+                            y = currY;
+                        }
+                    }
+                }
+            }
+
+            if (yWidget == null)
+            {
+                widget.Transform.localPosition = new Vector3(xoff * sizeData.x, -yoff * sizeData.y);
+            }
+            else
+            {
+                if (isUp)
+                {
+                    Vector3 pos = new Vector3(0, y + widget.GetSize().y + sizeData.y);
+                    widget.Transform.localPosition = pos;
+                }
+                else
+                {
+                    Vector3 pos = new Vector3(0, y - yWidget.GetSize().y - sizeData.y);
+                    widget.Transform.localPosition = pos;
+                }
+            }
+        }
+
+        if (ScrollRect.horizontal)
+        {
+            if (widget.Transform.localPosition.x > 0)
+            {
+                float x = widget.Transform.localPosition.x + sizeData.x;
+                if (x < myRectTransform.sizeDelta.x)
+                {
+                    x = myRectTransform.sizeDelta.x;
+                }
+                else
+                {
+                    myRectTransform.sizeDelta = new Vector2(x + overflowDistance,
+                        myRectTransform.sizeDelta.y);
+                }
+            }
+            // else
+            // {
+            //     m_startIndex--;
+            //     float x = Math.Abs(widget.Transform.localPosition.x);
+            //     myRectTransform.sizeDelta += new Vector2(x,
+            //      0);
+            //     MoveX(x);
+            // }
+        }
+        else
+        {
+            float y = 0;
+            if (isCustomizeHeight)
+            {
+                y = Math.Abs(widget.Transform.localPosition.y) + widget.GetSize().y;
+            }
+            else
+            {
+                y = Math.Abs(widget.Transform.localPosition.y) + sizeData.y;
+            }
+
+
+            if (widget.Transform.localPosition.y > 0)
+            {
+                if (isCustomizeHeight)
+                {
+                    float addY = widget.GetSize().y + sizeData.y;
+                    myRectTransform.sizeDelta += new Vector2(0, addY);
+                    if (index >= _maxSize && !hasAddedOffset)
+                    {
+                        myRectTransform.sizeDelta += new Vector2(0, bottom);
+                        hasAddedOffset = true;
+                    }
+
+                    MoveY(addY);
+                }
+                else
+                {
+                    myRectTransform.sizeDelta += new Vector2(0, sizeData.y);
+                    if (index >= _maxSize && !hasAddedOffset)
+                    {
+                        myRectTransform.sizeDelta += new Vector2(0, bottom);
+                        hasAddedOffset = true;
+                    }
+
+                    MoveY(sizeData.y);
+                }
+            }
+            else
+            {
+                if (y > myRectTransform.sizeDelta.y)
+                {
+                    myRectTransform.sizeDelta = new Vector2(myRectTransform.sizeDelta.x, y);
+                }
+
+                if (index >= _maxSize && !hasAddedOffset)
+                {
+                    myRectTransform.sizeDelta += new Vector2(0, bottom);
+                    hasAddedOffset = true;
+                }
+            }
+        }
+
+
+        widget.Transform.anchorMax = Vector2.up;
+        widget.Transform.anchorMin = Vector2.up;
+        widget.Transform.pivot = Vector2.up;
+
+        return widget;
+    }
+
+
+    protected void MoveY(float y)
+    {
+        ScrollRect.StopMovement();
+        addY += y;
+        ScrollRect.content.localPosition += new Vector3(0, y, 0);
+        for (int i = 0; i < showWidget.Count; i++)
+        {
+            IScorllListWidget scorllListWidget = showWidget[i];
+            Vector3 pos = scorllListWidget.Transform.localPosition;
+            scorllListWidget.Transform.localPosition = new Vector3(pos.x, pos.y - y, pos.z);
+        }
+    }
+
+    protected void MoveX(float x)
+    {
+        ScrollRect.StopMovement();
+        // addY += y;
+        myRectTransform.anchoredPosition -= new Vector2(x, 0);
+        // ScrollRect.content.localPosition += new Vector3(x, 0, 0);
+        for (int i = 0; i < showWidget.Count; i++)
+        {
+            IScorllListWidget scorllListWidget = showWidget[i];
+            Vector3 pos = scorllListWidget.Transform.localPosition;
+            scorllListWidget.Transform.localPosition = new Vector3(pos.x + x, pos.y, pos.z);
+        }
+    }
+
+    protected void HindWidget()
+    {
+        if (showWidget.Count < 2)
+        {
+            return;
+        }
+
+        for (int i = 0; i < showWidget.Count; i++)
+        {
+            bool isShow = false;
+            bool isHind = false;
+            GetIsShow(showWidget[i], ref isShow, ref isHind);
+            if (!isHind) //已经移除到了隐藏区域
+            {
+                HindIWidget(showWidget[i]);
+                i--;
+                if (showWidget.Count < 2)
+                {
+                    return;
+                }
+            }
+        }
+    }
+
+    public async void onValueChanged2(Vector2 pos)
+    {
+        onValueChanged(pos, false);
+    }
+
+    public async CTask onValueChanged(Vector2 pos, bool isInit)
+    {
+        if (_isBreak)
+        {
+            return;
+        }
+
+        if (!isInit && (_isBreak || _isStartDelay))
+        {
+            return;
+        }
+
+
+        // _vel = ScrollRect.velocity;
+        using (await CoroutineLockComponent.Instance.Wait("123"))
+        {
+            if (_isBreak)
+            {
+                return;
+            }
+
+            hasAddedOffset = false;
+
+            // ScrollRect.StopMovement();
+            HindWidget();
+            IScorllListWidget minWidget = null;
+            IScorllListWidget maxWdiget = null;
+            for (int i = 0; i < showWidget.Count; i++)
+            {
+                if (minWidget == null)
+                {
+                    minWidget = showWidget[i];
+                    maxWdiget = showWidget[i];
+                }
+                else
+                {
+                    if (minWidget.index > showWidget[i].index)
+                    {
+                        minWidget = showWidget[i];
+                    }
+
+                    if (maxWdiget.index < showWidget[i].index)
+                    {
+                        maxWdiget = showWidget[i];
+                    }
+                }
+            }
+
+            if (minWidget == null || maxWdiget == null)
+            {
+                //检查是否需要生成第一个
+                return;
+            }
+
+            bool isShow = false;
+            bool isHind = false;
+            GetIsShow(minWidget, ref isShow, ref isHind);
+            bool isShow3 = false;
+            bool isHind3 = false;
+            GetIsShow(maxWdiget, ref isShow3, ref isHind3);
+
+            if (isShow) //最小的在显示区域,需要生成下面的
+            {
+                IScorllListWidget wdiget = await Cread(minWidget.index - 1, true);
+                if (wdiget != null)
+                {
+                    bool isShow2 = true;
+                    bool isHind2 = false;
+                    while (isShow2 && wdiget != null)
+                    {
+                        if (_isBreak)
+                        {
+                            return;
+                        }
+
+                        GetIsShow(wdiget, ref isShow2, ref isHind2);
+
+
+                        if (isShow2)
+                        {
+                            if (_isStartDelay)
+                            {
+                                await TimerComponent.Instance.WaitAsync(delayTime);
+                            }
+
+                            if (_isBreak)
+                            {
+                                return;
+                            }
+
+                            wdiget = await Cread(wdiget.index - 1, true);
+                        }
+                    }
+                }
+            }
+
+
+            if (isShow3) //最小的在显示区域,需要生成下面的
+            {
+                IScorllListWidget wdiget = await Cread(maxWdiget.index + 1, false);
+                if (wdiget != null)
+                {
+                    bool isShow2 = true;
+                    bool isHind2 = false;
+                    while (isShow2 && wdiget != null)
+                    {
+                        if (_isBreak)
+                        {
+                            return;
+                        }
+
+                        GetIsShow(wdiget, ref isShow2, ref isHind2);
+
+
+                        if (isShow2)
+                        {
+                            if (_isStartDelay)
+                            {
+                                await TimerComponent.Instance.WaitAsync(delayTime);
+                            }
+
+                            if (_isBreak)
+                            {
+                                return;
+                            }
+
+                            wdiget = await Cread(wdiget.index + 1, false);
+                        }
+                    }
+                }
+            }
+
+
+            // ScrollRect.velocity = _vel;
+        }
+
+
+        // myRectTransform.sizeDelta=new Vector2(maxWdiget.index*)
+        // Debug.Log(pos);
+    }
+
+
+    public void GetIsShow(IScorllListWidget widget, ref bool isShow, ref bool isHind)
+    {
+        RectTransform root = ScrollRect.GetComponent<RectTransform>();
+        Vector2 posint = root.worldToLocalMatrix.MultiplyPoint3x4(widget.Transform.position);
+
+        Vector2 size = widget.GetSize();
+        isShow = false;
+        isHind = false;
+
+
+        Vector2 pos = Vector2.zero;
+        float minx = pos.x - (root.rect.size.x * root.pivot.x);
+        float miny = pos.y - (root.rect.size.y * root.pivot.y);
+        float maxx = pos.x + (root.rect.size.x * (1 - root.pivot.x));
+        float maxy = pos.y + (root.rect.size.y * (1 - root.pivot.y));
+
+        // UIManager.Instance.Canvas
+
+        // Debug.Log(pos);
+        Vector2 rootPos = posint;
+
+
+        List<Vector2> widgetBox = GetBox(rootPos.x, rootPos.y - size.y, rootPos.x + size.x, rootPos.y);
+        for (int i = 0; i < widgetBox.Count; i++)
+        {
+            Vector2 p = widgetBox[i];
+            if (ScrollRect.vertical)
+            {
+                if (p.y > miny && p.y < maxy)
+                {
+                    isShow = true;
+                }
+
+                if (p.y > miny - size.y - 100 &&
+                    p.y < maxy + size.y + 100)
+                {
+                    isHind = true;
+                }
+            }
+            else
+            {
+                if (p.x > minx && p.x < maxx)
+                {
+                    isShow = true;
+                }
+
+                if (p.x > minx - size.x - 100 && p.x < maxx + size.x + 100)
+                {
+                    isHind = true;
+                }
+            }
+
+            // if (p.x > minx && p.x < maxx && p.y > miny && p.y < maxy)
+            // {
+            //     isShow = true;
+            // }
+
+            // if (p.x > minx - size.x - 100 && p.x < maxx + size.x + 100 && p.y > miny - size.y - 100 &&
+            //     p.y < maxy + size.y + 100)
+            // {
+            //     isHind = true;
+            // }
+        }
+    }
+
+    protected List<Vector2> GetBox(float minx, float miny, float maxx, float maxy)
+    {
+        List<Vector2> s = new List<Vector2>();
+        s.Add(new Vector2(minx, miny));
+        s.Add(new Vector2(minx, maxy));
+        s.Add(new Vector2(maxx, maxy));
+        s.Add(new Vector2(maxx, miny));
+        return s;
+    }
+
+
+    public async CTask<IScorllListWidget> GetWidget(int index)
+    {
+        IScorllListWidget listWidget =
+            await m_scrollListContent.GetIScorllListWidget(index, transform.GetComponent<RectTransform>());
+        if (listWidget == null)
+        {
+            return null;
+        }
+
+        listWidget.Transform.anchorMin = new Vector2(0, 1);
+        listWidget.Transform.anchorMax = new Vector2(0, 1);
+        listWidget.Transform.pivot = new Vector2(0, 1);
+        listWidget.Transform.localScale = Vector3.one;
+        listWidget.index = index;
+        return listWidget;
+    }
+
+    public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
+    {
+        if (hindWidget.Count > 0)
+        {
+            IScorllListWidget listWidget = hindWidget[0];
+            listWidget.Transform.gameObject.SetActive(true);
+            hindWidget.RemoveAt(0);
+            Debug.Log(index + "___" + listWidget.index);
+            listWidget.index = index;
+            return listWidget;
+        }
+
+
+        return null;
+    }
+
+    public void HindIWidget(IScorllListWidget widget)
+    {
+        showWidget.Remove(widget);
+        m_scrollListContent.HindIScorllListWidget(widget);
+    }
+
+    public void HindIScorllListWidget(IScorllListWidget widget)
+    {
+        widget.Transform.gameObject.SetActive(false);
+        Debug.Log("hindWidget___" + widget.index);
+        hindWidget.Add(widget);
+    }
+
+
+    /// <summary>
+    /// 计算目标索引对应的位置
+    /// </summary>
+    /// <param name="targetIndex">目标索引</param>
+    /// <returns>目标位置</returns>
+    private Vector2 CalculateTargetPosition(int targetIndex)
+    {
+        Vector2 targetPos = onePos; // 从初始位置开始计算
+
+        if (ScrollRect.horizontal)
+        {
+            // 水平滚动:计算 X 轴位置
+            int xOffset = (targetIndex - m_startIndex) / Page.x;
+            targetPos.x -= xOffset * sizeData.x + posOff.x;
+        }
+        else if (ScrollRect.vertical)
+        {
+            // 垂直滚动:计算 Y 轴位置
+            int yOffset = (targetIndex - m_startIndex) / Page.y;
+            if (!isCustomizeHeight)
+            {
+                targetPos.y = yOffset * sizeData.y + posOff.y;
+            }
+            else
+            {
+                // 如果是自定义高度,假设高度固定,实际需根据 GetSize() 动态调整
+                targetPos.y -= yOffset * sizeData.y + posOff.y;
+            }
+        }
+
+        return targetPos;
+    }
+
+    /// <summary>
+    /// 计算目标索引对应的 content sizeDelta
+    /// </summary>
+    /// <param name="targetIndex">目标索引</param>
+    /// <returns>目标 sizeDelta</returns>
+    private Vector2 CalculateTargetSizeDelta(int targetIndex)
+    {
+        Vector2 targetSizeDelta = myRectTransform.sizeDelta;
+
+        if (ScrollRect.horizontal)
+        {
+            // 水平滚动:根据目标索引计算总宽度
+            int totalColumns = (targetIndex + Page.y - 1) / Page.y; // 向上取整
+            targetSizeDelta.x = totalColumns * sizeData.x + overflowDistance;
+            targetSizeDelta.y = Page.y * sizeData.y; // 高度基于每列的控件数
+        }
+        else if (ScrollRect.vertical)
+        {
+            // 垂直滚动:根据目标索引计算总高度
+            int totalRows = (targetIndex + Page.y - 1) / Page.y; // 向上取整
+            if (!isCustomizeHeight)
+            {
+                targetSizeDelta.y = totalRows * sizeData.y + overflowDistance;
+                targetSizeDelta.x = Page.y * sizeData.x; // 宽度基于每行的控件数
+            }
+            else
+            {
+                // 如果是自定义高度,简单假设高度固定,实际需根据已有控件动态计算
+                targetSizeDelta.y = totalRows * sizeData.y + overflowDistance;
+                targetSizeDelta.x = Page.y * sizeData.x;
+            }
+        }
+
+        return targetSizeDelta;
+    }
+
+    private Vector2 CalculateBottomSizeDelta(int targetIndex)
+    {
+        Vector2 targetSizeDelta = myRectTransform.sizeDelta;
+        RectTransform root = ScrollRect.GetComponent<RectTransform>();
+        float viewportHeight;
+        if (ScrollRectSizedata.y == 0)
+        {
+            viewportHeight = root.rect.height;
+        }
+        else
+        {
+            viewportHeight = ScrollRectSizedata.y;
+        }
+        // float viewportHeight = root.rect.height;
+
+        if (ScrollRect.vertical)
+        {
+            // 计算可视行数
+            float itemHeight = isCustomizeHeight ? sizeData.y : sizeData.y; // 简化,实际需动态获取
+            int visibleRows = Mathf.CeilToInt(viewportHeight / itemHeight); // 向上取整
+
+            // 计算最低端索引
+            int bottomIndex = Mathf.Min(targetIndex + visibleRows * Page.y, _maxSize - 1);
+            int totalRows = (bottomIndex + Page.y - 1) / Page.y; // 从 0 到 bottomIndex 的行数
+
+            if (!isCustomizeHeight)
+            {
+                targetSizeDelta.y = totalRows * sizeData.y + overflowDistance;
+            }
+            else
+            {
+                // 动态高度简化处理
+                targetSizeDelta.y = totalRows * sizeData.y + overflowDistance;
+                // 实际应为:
+                // float totalHeight = 0f;
+                // for (int i = 0; i <= bottomIndex; i += Page.y)
+                //     totalHeight += (i < showWidget.Count) ? showWidget[i].GetSize().y : sizeData.y;
+                // targetSizeDelta.y = totalHeight + overflowDistance;
+            }
+
+            targetSizeDelta.x = Page.y * sizeData.x;
+
+            // Debug.Log(
+            //     $"最低端 sizeDelta - visibleRows: {visibleRows}, bottomIndex: {bottomIndex}, totalRows: {totalRows}, sizeDelta.y: {targetSizeDelta.y}");
+        }
+        else if (ScrollRect.horizontal)
+        {
+            int visibleColumns = Mathf.CeilToInt(root.rect.width / sizeData.x);
+            int rightIndex = Mathf.Min(targetIndex + visibleColumns * Page.x, _maxSize - 1);
+            int totalColumns = (rightIndex + Page.y - 1) / Page.y;
+            targetSizeDelta.x = totalColumns * sizeData.x + overflowDistance;
+            targetSizeDelta.y = Page.y * sizeData.y;
+        }
+
+        return targetSizeDelta;
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/ScorolList/ScrollList.cs.meta

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

+ 3 - 0
Assets/Scripts/GameUI/UI/Component.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e96c6e5fa1d649c582ae9542c37076df
+timeCreated: 1745562593

+ 78 - 0
Assets/Scripts/GameUI/UI/Component/ItemWidgetBasic.cs

@@ -0,0 +1,78 @@
+using Fort23.Core;
+using Fort23.Mono;
+using UnityEngine;
+
+
+public class ItemWidgetBasic : UIComponent, IScorllListWidget
+{
+
+    
+    protected RectTransform _rectTransform;
+
+
+    public System.Action<ItemWidgetBasic> onClick;
+
+    public System.Action<ItemWidgetBasic> onContinueClick;
+
+
+    public override void AddButtonEvent()
+    {
+        LongPressBtn longPressBtn = own.GetComponent<LongPressBtn>();
+        if(longPressBtn == null)
+            longPressBtn = own.AddComponent<LongPressBtn>();
+        longPressBtn.onClick =() => onClick?.Invoke(this);
+        longPressBtn.longPress =() => onContinueClick?.Invoke(this);
+        base.AddButtonEvent();
+     
+
+    }
+
+    public override CTask<bool> AsyncInit(object[] uiData)
+    {
+        if (_rectTransform == null)
+        {
+            _rectTransform = GObjectPoolInterface.GetComponent<RectTransform>();
+        }
+
+   
+        return base.AsyncInit(uiData);
+    }
+
+
+    
+
+    public RectTransform Transform
+    {
+        get { return _rectTransform; }
+    }
+
+    public int index { get; set; }
+
+    public virtual Vector2 GetSize()
+    {
+        return _rectTransform.sizeDelta;
+    }
+
+    public override void DormancyObj()
+    {
+
+    
+        transform.GetComponent<RectTransform>().anchorMax = Vector2.one * 0.5f;
+        transform.GetComponent<RectTransform>().anchorMin = Vector2.one * 0.5f;
+        base.DormancyObj();
+    }
+    
+    public void OnPointerClick()
+    {
+        onClick?.Invoke(this);
+    }
+
+    public void OnPointerContinueClick()
+    {
+        onContinueClick?.Invoke(this);
+    }
+
+
+
+
+}

+ 3 - 0
Assets/Scripts/GameUI/UI/Component/ItemWidgetBasic.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 78fb487f039b45ea8ee17f9584a8c559
+timeCreated: 1745562603

+ 126 - 0
Assets/Scripts/GameUI/UI/Component/LongPressBtn.cs

@@ -0,0 +1,126 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Fort23.UTool;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class LongPressBtn : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IPointerExitHandler, IPointerClickHandler
+{
+    private float _time;
+
+    public float startTime = 0.5f;
+
+    public float intervalTime = 0.05f;
+
+    public Action onClick;
+
+    /// <summary>
+    /// 连按
+    /// </summary>
+    public Action longPress;
+
+    /// <summary>
+    /// 长按结束
+    /// </summary>
+    public Action longPressEnd;
+
+    /// <summary>
+    /// 是否按下状态
+    /// </summary>
+    [HideInInspector] public bool isPressd;
+
+    private bool _isTriggerLongPress;
+
+    /// <summary>
+    /// 是否触发了长按
+    /// </summary>
+    public bool isTriggerLongPress => _isTriggerLongPress;
+
+    void OnPress(bool pressed)
+    {
+        if (pressed) // 按下
+        {
+            isPressd = true;
+        }
+        else // 松开或离开
+        {
+            if (isPressd)
+            {
+                if (_isTriggerLongPress ) // 触发了长按且不是离开,执行 longPressEnd
+                {
+                    longPressEnd?.Invoke();
+                    _isTriggerLongPress = false;
+                }
+            }
+            isPressd = false;
+            _time = 0;
+        }
+    }
+
+    private void Update()
+    {
+        if (isPressd && !_isTriggerLongPress)
+        {
+            _time += Time.deltaTime;
+            if (_time >= startTime)
+            {
+                _isTriggerLongPress = true;
+                _time -= intervalTime;
+                longPress?.Invoke();
+            }
+        }
+        else if (isPressd && _isTriggerLongPress)
+        {
+            _time += Time.deltaTime;
+            if (_time >= intervalTime)
+            {
+                _time -= intervalTime;
+                longPress?.Invoke();
+            }
+        }
+    }
+
+    /// <summary>
+    /// 终止
+    /// </summary>
+    public void Terminated()
+    {
+        if (isPressd)
+        {
+            isPressd = false;
+            if (_isTriggerLongPress)
+            {
+                longPressEnd?.Invoke();
+            }
+            _isTriggerLongPress = false;
+            _time = 0;
+        }
+    }
+
+    public void OnPointerDown(PointerEventData eventData)
+    {
+        OnPress(true);
+    }
+
+    public void OnPointerUp(PointerEventData eventData)
+    {
+        OnPress(false);
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+ 
+        OnPress(false);
+     
+    }
+
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        if (!_isTriggerLongPress) // 只有未触发长按时才触发点击
+        {
+            onClick?.Invoke();
+        }
+        isPressd = false;
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/UI/Component/LongPressBtn.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b2313d4d59614a4aa1c04a1a07b28213
+timeCreated: 1745564766

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

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

+ 88 - 0
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -0,0 +1,88 @@
+using Fort23.Core;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+		[UIBinding(prefab = "DivineSenceEventPreviewPanel"  )]
+		public partial class DivineSenceEventPreviewPanel : UIPanel,IScrollListContent
+		{
+				private void Init()
+				{
+				}
+				protected override void AddEvent()
+				{
+					EventManager.Instance.AddEventListener(CustomEventType.RemoveEvent, RemoveEvent);
+				}
+
+			
+
+				protected override void DelEvent()
+				{
+					EventManager.Instance.RemoveEventListener(CustomEventType.RemoveEvent, RemoveEvent);
+				}
+				public override void AddButtonEvent()
+				{
+					Btn_Close.onClick.AddListener(() =>
+					{
+						UIManager.Instance.HideUIUIPanel(this);
+					});
+				}
+				
+				private void RemoveEvent(IEventData e)
+				{
+					UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
+					Content.Init(this, AccountFileInfo.Instance.playerData.eventList.Count);
+				}
+
+				public override CTask<bool> AsyncInit(object[] uiData)
+				{
+					Content.Init(this, AccountFileInfo.Instance.playerData.eventList.Count);
+					return base.AsyncInit(uiData);
+				}
+
+
+				public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
+				{
+
+
+					if (index < 0 || index >=AccountFileInfo.Instance.playerData.eventList.Count)
+					{
+						return null;
+					}
+
+					ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
+					shengShiEventWidgetType2.CustomInit(AccountFileInfo.Instance.playerData.eventList[index]);
+					shengShiEventWidgetType2.onClick = OnClick;
+					return shengShiEventWidgetType2;
+				}
+
+				private void OnClick(ItemWidgetBasic obj)
+				{
+					ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
+					
+					if (EventSystemManager.Instance.isTriggerEvent)
+						return;
+					UIManager.Instance.HideUIUIPanel(this);
+					UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
+					EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList);
+				}
+
+				public void HindIScorllListWidget(IScorllListWidget widget)
+				{
+					UIManager.Instance.DormancyGComponent(widget as UIComponent);
+				}
+
+				public async static CTask<DivineSenceEventPreviewPanel> OpenPanel()
+				{
+					DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null);
+					return divineSenceEventPreviewPanel;
+				}
+
+				public override void Close()
+				{
+					UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
+					EventSystemManager.Instance.isOpenUi = false;
+					base.Close();
+				}
+		}
+}

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

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

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

@@ -0,0 +1,84 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class DivineSenceEventPreviewPanel 
+	{
+	  #region 自定义数据 
+	  private Button _myButton;
+	  public Button myButton
+	   {
+	   get{
+	      if (_myButton == null)
+	       {
+	         _myButton  = GetUIUnit<Button>("myButton"); 
+	       }
+	      return _myButton;
+	     }
+	   }
+	  private Object _Massge;
+	  public Object Massge
+	   {
+	   get{
+	      if (_Massge == null)
+	       {
+	         _Massge  = GetUIUnit<Object>("Massge"); 
+	       }
+	      return _Massge;
+	     }
+	   }
+	  private MyImage _bg;
+	  public MyImage bg
+	   {
+	   get{
+	      if (_bg == null)
+	       {
+	         _bg  = GetUIUnit<MyImage>("bg"); 
+	       }
+	      return _bg;
+	     }
+	   }
+	  private ScrollList _Content;
+	  public ScrollList Content
+	   {
+	   get{
+	      if (_Content == null)
+	       {
+	         _Content  = GetUIUnit<ScrollList>("Content"); 
+	       }
+	      return _Content;
+	     }
+	   }
+	  private RectTransform _ContentRoot;
+	  public RectTransform ContentRoot
+	   {
+	   get{
+	      if (_ContentRoot == null)
+	       {
+	         _ContentRoot  = GetUIUnit<RectTransform>("ContentRoot"); 
+	       }
+	      return _ContentRoot;
+	     }
+	   }
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 87 - 0
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanel.cs

@@ -0,0 +1,87 @@
+using System.Collections.Generic;
+using Fort23.Core;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+[UIBinding(prefab = "DivineSenceEventResultPanel"  )]
+	public partial class DivineSenceEventResultPanel : UIPanel , IScrollListContent
+	{
+		
+				List<AccountFileInfo.EventList> eventList = new List<AccountFileInfo.EventList>();
+		
+				private void Init()
+				{
+				}
+
+				protected override void AddEvent()
+				{
+					
+				}
+
+			
+
+				protected override void DelEvent()
+				{
+					
+				}
+				public override void AddButtonEvent()
+				{
+					Btn_Close.onClick.AddListener(() =>
+					{
+						UIManager.Instance.HideUIUIPanel(this);
+					});
+				}
+
+
+				private int count;
+				public override CTask<bool> AsyncInit(object[] uiData)
+				{
+					eventList = uiData[0] as List<AccountFileInfo.EventList>;
+					count = (int)uiData[1];
+					if(eventList != null &&eventList.Count>0)
+						Content.Init(this,eventList.Count);
+					
+					Text_AllEvent.text = $"一共探寻到{count}个事件";
+					Text_Teshu.text = $"{count -eventList.Count }个特殊";
+					Text_Result.text = $"{eventList.Count}个已处理";
+					return base.AsyncInit(uiData);
+				}
+
+
+				public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
+				{
+
+
+					if (index < 0 || index >=eventList.Count)
+					{
+						return null;
+					}
+
+					ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
+					shengShiEventWidgetType2.CustomInit(eventList[index]);
+					return shengShiEventWidgetType2;
+				}
+
+	
+
+				public void HindIScorllListWidget(IScorllListWidget widget)
+				{
+					UIManager.Instance.DormancyGComponent(widget as UIComponent);
+				}
+
+				public async static CTask<DivineSenceEventResultPanel> OpenPanel(List<AccountFileInfo.EventList> eventList,int count)
+				{
+					DivineSenceEventResultPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventResultPanel>(null,uiData: new object[]{eventList,count});
+					return divineSenceEventPreviewPanel;
+				}
+
+				public override void Close()
+				{
+					UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType3>();
+					eventList = null;
+					base.Close();
+				}
+
+	}
+}

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

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

+ 106 - 0
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanelData.cs

@@ -0,0 +1,106 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class DivineSenceEventResultPanel 
+	{
+	  #region 自定义数据 
+	  private Object _myButton;
+	  public Object myButton
+	   {
+	   get{
+	      if (_myButton == null)
+	       {
+	         _myButton  = GetUIUnit<Object>("myButton"); 
+	       }
+	      return _myButton;
+	     }
+	   }
+	  private MyImage _bg;
+	  public MyImage bg
+	   {
+	   get{
+	      if (_bg == null)
+	       {
+	         _bg  = GetUIUnit<MyImage>("bg"); 
+	       }
+	      return _bg;
+	     }
+	   }
+	  private ScrollList _Content;
+	  public ScrollList Content
+	   {
+	   get{
+	      if (_Content == null)
+	       {
+	         _Content  = GetUIUnit<ScrollList>("Content"); 
+	       }
+	      return _Content;
+	     }
+	   }
+	  private RectTransform _ContentRoot;
+	  public RectTransform ContentRoot
+	   {
+	   get{
+	      if (_ContentRoot == null)
+	       {
+	         _ContentRoot  = GetUIUnit<RectTransform>("ContentRoot"); 
+	       }
+	      return _ContentRoot;
+	     }
+	   }
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  private Text _Text_AllEvent;
+	  public Text Text_AllEvent
+	   {
+	   get{
+	      if (_Text_AllEvent == null)
+	       {
+	         _Text_AllEvent  = GetUIUnit<Text>("Text_AllEvent"); 
+	       }
+	      return _Text_AllEvent;
+	     }
+	   }
+	  private Text _Text_Teshu;
+	  public Text Text_Teshu
+	   {
+	   get{
+	      if (_Text_Teshu == null)
+	       {
+	         _Text_Teshu  = GetUIUnit<Text>("Text_Teshu"); 
+	       }
+	      return _Text_Teshu;
+	     }
+	   }
+	  private Text _Text_Result;
+	  public Text Text_Result
+	   {
+	   get{
+	      if (_Text_Result == null)
+	       {
+	         _Text_Result  = GetUIUnit<Text>("Text_Result"); 
+	       }
+	      return _Text_Result;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 48 - 0
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -0,0 +1,48 @@
+using Core.Language;
+using Excel2Json;
+using Fort23.UTool;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+[UIBinding(prefab = "ShengShiEventWidgetType2"  )]
+	public partial class ShengShiEventWidgetType2 : ItemWidgetBasic
+	{
+		private void Init()
+		{
+		}
+		public override void AddEvent()
+		{
+		}
+		public override void DelEvent()
+		{
+		}
+		public override void AddButtonEvent()
+		{
+			base.AddButtonEvent();
+			Btn_RemoveEvent.onClick.AddListener(() =>
+			{
+				EventSystemManager.Instance.RemoveEvent(eventList);
+			});
+		}
+
+		private void Button_onClick()
+		{
+
+		}
+
+		private EventConfig randomEventConfig;
+		public AccountFileInfo.EventList eventList;
+
+		public void CustomInit(AccountFileInfo.EventList eventList)
+		{
+			this.eventList = eventList;
+			randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+			Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.Description);
+			EventConditionConfig conditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(randomEventConfig.EventBeginId);
+			Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
+
+		}
+		
+	}
+}

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

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

+ 62 - 0
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2Data.cs

@@ -0,0 +1,62 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class ShengShiEventWidgetType2 
+	{
+	  #region 自定义数据 
+	  private Object _myButton;
+	  public Object myButton
+	   {
+	   get{
+	      if (_myButton == null)
+	       {
+	         _myButton  = GetUIUnit<Object>("myButton"); 
+	       }
+	      return _myButton;
+	     }
+	   }
+	  private Text _Text_EventDesc;
+	  public Text Text_EventDesc
+	   {
+	   get{
+	      if (_Text_EventDesc == null)
+	       {
+	         _Text_EventDesc  = GetUIUnit<Text>("Text_EventDesc"); 
+	       }
+	      return _Text_EventDesc;
+	     }
+	   }
+	  private Text _Text_EventName;
+	  public Text Text_EventName
+	   {
+	   get{
+	      if (_Text_EventName == null)
+	       {
+	         _Text_EventName  = GetUIUnit<Text>("Text_EventName"); 
+	       }
+	      return _Text_EventName;
+	     }
+	   }
+	  private Button _Btn_RemoveEvent;
+	  public Button Btn_RemoveEvent
+	   {
+	   get{
+	      if (_Btn_RemoveEvent == null)
+	       {
+	         _Btn_RemoveEvent  = GetUIUnit<Button>("Btn_RemoveEvent"); 
+	       }
+	      return _Btn_RemoveEvent;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 87 - 0
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3.cs

@@ -0,0 +1,87 @@
+using System.Collections.Generic;
+using Core.Language;
+using Excel2Json;
+using Fort23.UTool;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "ShengShiEventWidgetType3"  )]
+	public partial class ShengShiEventWidgetType3 : UIComponent , IScorllListWidget
+	{
+		private void Init()
+		{
+		}
+		public override void AddEvent()
+		{
+		}
+		public override void DelEvent()
+		{
+		}	public override void AddButtonEvent()
+		{
+			base.AddButtonEvent();
+			
+		}
+		
+		List<WidgetItem> widgetList = new List<WidgetItem>();
+
+		private void Button_onClick()
+		{
+
+		}
+
+		private EventConfig randomEventConfig;
+		public AccountFileInfo.EventList eventList;
+
+		public async void CustomInit(AccountFileInfo.EventList eventList)
+		{
+			for (var i = 0; i < widgetList.Count; i++)
+			{
+				UIManager.Instance.DormancyGComponent(widgetList[i]);
+			}
+			widgetList.Clear();
+
+			this.eventList = eventList;
+			randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+			Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.Description);
+			EventConditionConfig conditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(randomEventConfig.EventBeginId);
+			Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
+			
+			if (conditionConfig.optionType ==3)
+			{
+				for (var i = 0; i < conditionConfig.PrizeIDs.Length; i++)
+				{
+					WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
+					widgetList.Add(widgetItem);
+				}
+			}
+			
+			
+
+		}
+
+		public override void DormancyObj()
+		{
+			for (var i = 0; i < widgetList.Count; i++)
+			{
+				UIManager.Instance.DormancyGComponent(widgetList[i]);
+			}
+			widgetList.Clear();
+
+			base.DormancyObj();
+		}
+
+
+		public RectTransform Transform
+		{
+			get { return transform; }
+		}
+
+		public int index { get; set; }
+
+		public virtual Vector2 GetSize()
+		{
+			return transform.sizeDelta;
+		}
+	}
+}

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

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

+ 62 - 0
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3Data.cs

@@ -0,0 +1,62 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class ShengShiEventWidgetType3 
+	{
+	  #region 自定义数据 
+	  private Object _myButton;
+	  public Object myButton
+	   {
+	   get{
+	      if (_myButton == null)
+	       {
+	         _myButton  = GetUIUnit<Object>("myButton"); 
+	       }
+	      return _myButton;
+	     }
+	   }
+	  private Text _Text_EventDesc;
+	  public Text Text_EventDesc
+	   {
+	   get{
+	      if (_Text_EventDesc == null)
+	       {
+	         _Text_EventDesc  = GetUIUnit<Text>("Text_EventDesc"); 
+	       }
+	      return _Text_EventDesc;
+	     }
+	   }
+	  private Text _Text_EventName;
+	  public Text Text_EventName
+	   {
+	   get{
+	      if (_Text_EventName == null)
+	       {
+	         _Text_EventName  = GetUIUnit<Text>("Text_EventName"); 
+	       }
+	      return _Text_EventName;
+	     }
+	   }
+	  private RectTransform _ItemRoot;
+	  public RectTransform ItemRoot
+	   {
+	   get{
+	      if (_ItemRoot == null)
+	       {
+	         _ItemRoot  = GetUIUnit<RectTransform>("ItemRoot"); 
+	       }
+	      return _ItemRoot;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 58 - 7
Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -19,35 +20,61 @@ namespace Fort23.Mono
         {
             EventManager.Instance.AddEventListener(CustomEventType.DivineSensePointChange, DivineSensePointChange);
             EventManager.Instance.AddEventListener(CustomEventType.CompleteEvent, CompleteEvent);
+            EventManager.Instance.AddEventListener(CustomEventType.RemoveEvent, RemoveEvent);
+        }
+
+        private void RemoveEvent(IEventData e)
+        {
+            
+            Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
+            CreatShengShiEvent();
+            ChagneShenshiBtnActive();
         }
 
         private void CompleteEvent(IEventData e)
         {
             Text_ExplorationProgress.text = $"火焰山   {AccountFileInfo.Instance.playerData.senceExplorationProgress}%";
+            Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
             CreatShengShiEvent();
+            ChagneShenshiBtnActive();
         }
 
         private void DivineSensePointChange(IEventData e)
         {
             Text_divineSensePoint.text = $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
+           
+        }
+
+        private void ChagneShenshiBtnActive()
+        {
+            Btn_Event.gameObject.SetActive(AccountFileInfo.Instance.playerData.eventList.Count > 0);
         }
 
         protected override void DelEvent()
         {
             EventManager.Instance.RemoveEventListener(CustomEventType.DivineSensePointChange, DivineSensePointChange);
             EventManager.Instance.RemoveEventListener(CustomEventType.CompleteEvent, CompleteEvent);
+            EventManager.Instance.RemoveEventListener(CustomEventType.RemoveEvent, RemoveEvent);
         }
 
         public override void AddButtonEvent()
         {
             bnt_shengShi.onClick.AddListener(Bnt_shengShi_onClick);
             CameraSelect.onValueChanged.AddListener(CameraSelect_onValueChanged);
+            
+            Btn_Event.onClick.AddListener(() =>
+            {
+                EventSystemManager.Instance.isOpenUi = true;
+                DivineSenceEventPreviewPanel.OpenPanel();
+            });
         }
 
         public override CTask<bool> AsyncInit(object[] uiData)
         {
             Text_divineSensePoint.text = $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
             Text_ExplorationProgress.text = $"火焰山   {AccountFileInfo.Instance.playerData.senceExplorationProgress}%";
+            Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
+            ChagneShenshiBtnActive();
             CreatShengShiEvent();
 
             return base.AsyncInit(uiData);
@@ -89,27 +116,51 @@ namespace Fort23.Mono
             CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
                 .CombatHeroController.playerHeroEntity.GameObject.transform);
             List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(1);
-            await TimerComponent.Instance.WaitAsync(500);
-            EventSystemManager.Instance.isTriggerEvent = false;
-            CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+            await TimerComponent.Instance.WaitAsync(800);
             if (eventLists == null || eventLists.Count == 0)
+            {
+                EventSystemManager.Instance.isTriggerEvent = false;
+                CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
                 return;
+            }
+              
 
+            List<AccountFileInfo.EventList> reeultEventLists = new List<AccountFileInfo.EventList>();
+            reeultEventLists = eventLists.Where((el) =>
+            {
+                EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(el.eventID);
+                return eventConfig.EventType == 2;
+            }).ToList();
 
+            int count = eventLists.Count;
+            if (reeultEventLists != null && reeultEventLists.Count > 0)
+            {
+                foreach (var reeultEventList in reeultEventLists)
+                {
+                    EventSystemManager.Instance.CompleteEvent(reeultEventList,true);
+                    eventLists.Remove(reeultEventList);
+                }
+                DivineSenceEventResultPanel divineSenceEventResultPanel = await DivineSenceEventResultPanel.OpenPanel(reeultEventLists,count);
+                await divineSenceEventResultPanel.UIClosed();
+            }
+         
+            EventSystemManager.Instance.isTriggerEvent = false;
+            CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
             AccountFileInfo.Instance.playerData.eventList.AddRange(eventLists);
             AccountFileInfo.Instance.SavePlayerData();
+            Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
+            ChagneShenshiBtnActive();
             CreatShengShiEvent();
         }
 
         public async void CreatShengShiEvent()
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
-            for (var i = 0; i < AccountFileInfo.Instance.playerData.eventList.Count; i++)
+            int count = AccountFileInfo.Instance.playerData.eventList.Count >=1 ? 1 : AccountFileInfo.Instance.playerData.eventList.Count;
+            for (var i = 0; i < count; i++)
             {
                 ShengShiEventWidget shengShiEventWidget =
-                    await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidget>(ShengShiEventWidget, null,
-                        DynamicEvent,
-                        isInstance: true);
+                    await UIManager.Instance.CreateGComponent<ShengShiEventWidget>(null,DynamicEvent);
                 shengShiEventWidget.InitShengShiEventWidget(AccountFileInfo.Instance.playerData.eventList[i]);
             }
         }

+ 22 - 11
Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs

@@ -30,17 +30,6 @@ namespace Fort23.Mono
 	      return _DynamicEvent;
 	     }
 	   }
-	  private GameObject _ShengShiEventWidget;
-	  public GameObject ShengShiEventWidget
-	   {
-	   get{
-	      if (_ShengShiEventWidget == null)
-	       {
-	         _ShengShiEventWidget  = GetUIUnit<GameObject>("ShengShiEventWidget"); 
-	       }
-	      return _ShengShiEventWidget;
-	     }
-	   }
 	  private Text _Text_divineSensePoint;
 	  public Text Text_divineSensePoint
 	   {
@@ -74,6 +63,28 @@ namespace Fort23.Mono
 	      return _CameraSelect;
 	     }
 	   }
+	  private Button _Btn_Event;
+	  public Button Btn_Event
+	   {
+	   get{
+	      if (_Btn_Event == null)
+	       {
+	         _Btn_Event  = GetUIUnit<Button>("Btn_Event"); 
+	       }
+	      return _Btn_Event;
+	     }
+	   }
+	  private Text _Text_EventNum;
+	  public Text Text_EventNum
+	   {
+	   get{
+	      if (_Text_EventNum == null)
+	       {
+	         _Text_EventNum  = GetUIUnit<Text>("Text_EventNum"); 
+	       }
+	      return _Text_EventNum;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 8 - 0
Assets/Scripts/GameUI/UIToggle.meta

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

+ 23 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleBagButtom.cs

@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using Fort23.Mono;
+using UnityEngine.UI;
+
+public class UIToggleBagButtom : UIToggleWidgetBasic
+{
+    public MyImage bag;
+    public string showName;
+    public string hindName;
+
+    public override void Show()
+    {
+        bag.icon_name = showName;
+        bag.SetNativeSize();
+    }
+
+    public override void Hind()
+    {
+        bag.icon_name = hindName;
+        bag.SetNativeSize();
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleBagButtom.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7ee6ffa6eb15421ea142b5beed27a8d7
+timeCreated: 1740365786

+ 68 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleImageSet.cs

@@ -0,0 +1,68 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+    public class UIToggleImageSet : UIToggleWidgetBasic
+    {
+        public bool isNoSize;
+        public MyImage[] alterIamge;
+        public string[] showName;
+        public string[] hindName;
+        public Text[] alterText;
+        public Color[] showColors;
+        public Color[] hindColors;
+        public int[] showSize;
+        public int[] hindSize;
+
+        public override void Show()
+        {
+            for (int i = 0; i < alterIamge.Length; i++)
+            {
+                alterIamge[i].icon_name = showName[i];
+                alterIamge[i].enabled = true;
+                if (!isNoSize)
+                {
+                    alterIamge[i].SetNativeSize();
+                }
+            }
+
+            for (int i = 0; i < alterText.Length; i++)
+            {
+                alterText[i].color = showColors[i];
+                if (showSize.Length > i)
+                {
+                    alterText[i].fontSize = showSize[i];
+                }
+            }
+        }
+
+        public override void Hind()
+        {
+            for (int i = 0; i < alterIamge.Length; i++)
+            {
+                if (hindName.Length <= i)
+                {
+                    alterIamge[i].enabled = false;
+                }
+                else
+                {
+                    alterIamge[i].icon_name = hindName[i];
+                    if (!isNoSize)
+                    {
+                        alterIamge[i].SetNativeSize();
+                    }
+                }
+            }
+
+            for (int i = 0; i < alterText.Length; i++)
+            {
+                alterText[i].color = hindColors[i];
+                if (showSize.Length > i)
+                {
+                    alterText[i].fontSize = showSize[i];
+                }
+            }
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleImageSet.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 56cfaf11572c40b08ccc70591a69551a
+timeCreated: 1740365786

+ 124 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleList.cs

@@ -0,0 +1,124 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+    public class UIToggleList : MonoBehaviour
+    {
+        [HideInInspector] public UIToggleWidgetBasic lastSelectObj;
+        [Header("重复点击时隐藏")] public bool isRepeatHind;
+        [Header("是否默认选择")] public bool isRDefaultShow;
+        public int index=-1;
+        public UIToggleWidgetBasic[] childObj;
+        [HideInInspector] public List<UIToggleWidgetBasic> _allChildObj = new List<UIToggleWidgetBasic>();
+
+        private void Awake()
+        {
+            if (childObj != null && childObj.Length > 0)
+            {
+                for (int i = 0; i < childObj.Length; i++)
+                {
+                    if (childObj[i] == null)
+                    {
+                        continue;
+                    }
+
+                    childObj[i].Init(this);
+                    _allChildObj.Add(childObj[i]);
+                }
+
+                if (isRDefaultShow)
+                    ClickWidget(childObj[0]);
+            }
+        }
+
+        public void AddToggleWidget(UIToggleWidgetBasic toggleWidget)
+        {
+            if (toggleWidget == null)
+            {
+                return;
+            }
+
+            toggleWidget.Init(this);
+            _allChildObj.Add(toggleWidget);
+        }
+
+        public void ClickWidget(UIToggleWidgetBasic widget)
+        {
+            ShowTooge(widget);
+        }
+
+
+        public void ShowTargetIndex(int index)
+        {
+            ClickWidget(_allChildObj[index]);
+        }
+
+        protected void ShowTooge(UIToggleWidgetBasic widget)
+        {
+            if (isRepeatHind && lastSelectObj == widget)
+            {
+                lastSelectObj.Hind();
+                lastSelectObj = null;
+                return;
+            }
+
+            lastSelectObj = widget;
+            for (int i = 0; i < _allChildObj.Count; i++)
+            {
+                if (_allChildObj[i] == null)
+                {
+                    continue;
+                }
+
+                if (_allChildObj[i] != widget)
+                {
+                    _allChildObj[i].Hind();
+                }
+                else
+                {
+                    _allChildObj[i].Show();
+                    index = i;
+                }
+            }
+        }
+
+        public void GetChildObj()
+        {
+            UIToggleWidgetBasic[] uiToggleWidgetBasics = transform.GetComponentsInChildren<UIToggleWidgetBasic>();
+            childObj = uiToggleWidgetBasics;
+            if (childObj != null && childObj.Length > 0)
+            {
+                for (int i = 0; i < childObj.Length; i++)
+                {
+                    if (childObj[i] == null)
+                    {
+                        continue;
+                    }
+
+                    childObj[i].Init(this);
+                    _allChildObj.Add(childObj[i]);
+                }
+
+                if (isRDefaultShow)
+                    ClickWidget(childObj[0]);
+            }
+        }
+
+        public void Hide()
+        {
+            index = -1;
+            foreach (var cUIToggleWidgetBasic in _allChildObj)
+            {
+                cUIToggleWidgetBasic.Hind();
+            }
+           
+        }
+
+        public void Clear()
+        {
+            index = -1;
+            _allChildObj.Clear();
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleList.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: eb5ebcd40411455c96935cb00dbfcf1e
+timeCreated: 1740365786

+ 23 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleObjectActiveWidget.cs

@@ -0,0 +1,23 @@
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+    public class UIToggleObjectActiveWidget : UIToggleWidgetBasic
+    {
+        public GameObject showObj;
+        public GameObject hindObj;
+        public override void Show()
+        {
+            showObj.SetActive(true);
+            // ReSharper disable once Unity.NoNullPropagation
+            hindObj.SetActive(false);
+        }
+
+        public override void Hind()
+        {
+            showObj.SetActive(false);
+            // ReSharper disable once Unity.NoNullPropagation
+            hindObj?.SetActive(true);
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleObjectActiveWidget.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 942296b9b9c24505b7a66d519b8ed047
+timeCreated: 1740365786

+ 33 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleObjectCustomStateWidget.cs

@@ -0,0 +1,33 @@
+using System;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+    public class UIToggleObjectCustomStateWidget : UIToggleWidgetBasic
+    {
+        public CustomStateController CustomStateController;
+       
+        [HideInInspector] public Action showCallback;
+        [HideInInspector] public Action hideCallback;
+
+        private void Awake()
+        {
+            if (CustomStateController == null)
+            {
+                CustomStateController = gameObject.GetComponent<CustomStateController>();
+            }
+        }
+
+        public override void Show()
+        {
+            CustomStateController?.ChangeState(1);
+            showCallback?.Invoke();
+        }
+
+        public override void Hind()
+        {
+            CustomStateController?.ChangeState(0);
+            hideCallback?.Invoke();
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleObjectCustomStateWidget.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 09a9a136688f46fbb2a843418fc53144
+timeCreated: 1740365786

+ 35 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleWidgetBasic.cs

@@ -0,0 +1,35 @@
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+namespace Fort23.Mono
+{
+    public abstract class UIToggleWidgetBasic : MonoBehaviour, IPointerClickHandler
+    {
+        [Header("是否代码控制")] public bool isScriptControl = false;
+        public UIToggleList uiToggleList;
+
+        public void Init(UIToggleList uiToggleList)
+        {
+            this.uiToggleList = uiToggleList;
+            Hind();
+        }
+
+        public abstract void Show();
+
+        public abstract void Hind();
+
+
+        public void OnPointerClick(PointerEventData eventData)
+        {
+            if(isScriptControl)
+                return;
+            // ULockWidget uLockWidget = gameObject.GetComponent<ULockWidget>();
+            //
+            // if ( uLockWidget == null || ULockManager.Instance.IsULock(uLockWidget.uLockFunction))
+            // {
+            //     uiToggleList.ClickWidget(this);
+            // }
+            uiToggleList.ClickWidget(this);
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/UIToggle/UIToggleWidgetBasic.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1ea3e323547d4383aa0dda26055d61dd
+timeCreated: 1740365786

+ 67 - 0
Assets/Scripts/GameUI/UIToggle/UiToggleChangeColor.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Fort23.UTool;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class UiToggleChangeColor : MonoBehaviour
+{
+    public Text Text;
+    public Color SelectColor;
+    public Color NoSelectColor;
+
+    public GameObject hideGam;
+    
+    private Toggle _toggle;
+    private void Awake()
+    {
+        _toggle = GetComponent<Toggle>();
+        if (_toggle != null)
+        {
+            _toggle.onValueChanged.AddListener((ison) =>
+            {
+                if (ison)
+                {
+                    Text.color = SelectColor;
+                }
+                else
+                {
+                    Text.color = NoSelectColor;
+                }
+              
+            });
+        }
+        
+        
+    }
+
+    private void Update()
+    {
+ 
+        Transform parentTransform = this.transform;
+        Transform lastChildTransform = parentTransform.parent.GetChild(parentTransform.parent.childCount- 1);
+        
+        if (lastChildTransform == parentTransform)
+        {
+            hideGam?.SetActive(false);
+        }
+        else
+        {
+            hideGam?.SetActive(true);
+        }
+        // for (int i = 0; i <  parentTransform.parent.childCount ; i++)
+        // {
+        //     if (i == parentTransform.parent.childCount - 1)
+        //     {
+        //         parentTransform.parent.GetChild(i).GetComponent<UiToggleChangeColor>().hideGam?.SetActive(true);
+        //     }
+        //     else
+        //     {
+        //         parentTransform.parent.GetChild(i).GetComponent<UiToggleChangeColor>().hideGam?.SetActive(true);
+        //     }
+        // }
+
+       
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/UIToggle/UiToggleChangeColor.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 397af249578e45ca8bcdb9d866714732
+timeCreated: 1740365786

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Language.xlsx


Diff do ficheiro suprimidas por serem muito extensas
+ 205 - 376
UserSettings/Layouts/default-2022.dwlt


+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -5,6 +5,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fd5_003F42d076c8_003FEnumerable_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff2b6204eed6b41348236173e8a2f539817a880_003F16_003Ff8f742c5_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fd3_003F4533b7c3_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AINotifyCompletion_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F64_003Fbb31faf9_003FINotifyCompletion_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMath_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb18a8b3398e74bca86895881dd02956c573648_003F8b_003F8699ce4e_003FMath_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMesh_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fde_003Fb0e5d275_003FMesh_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMonoBehaviour_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F2d_003F1dd7205f_003FMonoBehaviour_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff