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

Assets/Res/AnimtionCurveLibrary/GameAnimationCurveLibrary.asset

@@ -217,3 +217,27 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+  switchSceneCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 2
+      outSlope: 2
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4

Assets/Res/Config/DivineSenseConfig.json

@@ -3,13 +3,12 @@
     {
       "ID": 1,
       "QualityBonusChance": [
-        645.0,
+        700.0,
         200.0,
         100.0,
-        50.0,
-        5.0,
         0.0,
-        1.0
+        0.0,
+        0.0
       ],
       "exp": 1000,
       "MaxNum": 2
@@ -17,13 +16,12 @@
     {
       "ID": 2,
       "QualityBonusChance": [
-        627.0,
+        685.0,
         210.0,
         105.0,
-        52.0,
-        6.0,
         0.0,
-        2.0
+        0.0,
+        0.0
       ],
       "exp": 3000,
       "MaxNum": 3
@@ -31,13 +29,12 @@
     {
       "ID": 3,
       "QualityBonusChance": [
-        609.0,
+        670.0,
         220.0,
         110.0,
-        54.0,
-        7.0,
         0.0,
-        3.0
+        0.0,
+        0.0
       ],
       "exp": 6000,
       "MaxNum": 4
@@ -45,13 +42,12 @@
     {
       "ID": 4,
       "QualityBonusChance": [
-        591.0,
+        655.0,
         230.0,
         115.0,
-        56.0,
-        8.0,
         0.0,
-        4.0
+        0.0,
+        0.0
       ],
       "exp": 10000,
       "MaxNum": 5
@@ -59,13 +55,12 @@
     {
       "ID": 5,
       "QualityBonusChance": [
-        573.0,
+        635.0,
         240.0,
         120.0,
-        58.0,
-        9.0,
+        5.0,
         0.0,
-        5.0
+        0.0
       ],
       "exp": 15000,
       "MaxNum": 6
@@ -73,13 +68,12 @@
     {
       "ID": 6,
       "QualityBonusChance": [
-        555.0,
+        615.0,
         250.0,
         125.0,
-        60.0,
         10.0,
         0.0,
-        6.0
+        0.0
       ],
       "exp": 21000,
       "MaxNum": 6
@@ -87,13 +81,12 @@
     {
       "ID": 7,
       "QualityBonusChance": [
-        537.0,
+        595.0,
         260.0,
         130.0,
-        62.0,
-        11.0,
+        15.0,
         0.0,
-        7.0
+        0.0
       ],
       "exp": 27000,
       "MaxNum": 6
@@ -101,13 +94,12 @@
     {
       "ID": 8,
       "QualityBonusChance": [
-        519.0,
+        575.0,
         270.0,
         135.0,
-        64.0,
-        12.0,
+        20.0,
         0.0,
-        8.0
+        0.0
       ],
       "exp": 33000,
       "MaxNum": 6
@@ -115,13 +107,12 @@
     {
       "ID": 9,
       "QualityBonusChance": [
-        501.0,
+        555.0,
         280.0,
         140.0,
-        66.0,
-        13.0,
+        25.0,
         0.0,
-        9.0
+        0.0
       ],
       "exp": 39000,
       "MaxNum": 6
@@ -129,11 +120,11 @@
     {
       "ID": 10,
       "QualityBonusChance": [
-        483.0,
+        531.0,
         290.0,
         145.0,
-        68.0,
-        14.0,
+        30.0,
+        4.0,
         0.0
       ],
       "exp": 45000,
@@ -142,11 +133,11 @@
     {
       "ID": 11,
       "QualityBonusChance": [
-        465.0,
+        507.0,
         300.0,
         150.0,
-        70.0,
-        15.0,
+        35.0,
+        8.0,
         0.0
       ],
       "exp": 51000,
@@ -155,11 +146,11 @@
     {
       "ID": 12,
       "QualityBonusChance": [
-        447.0,
+        483.0,
         310.0,
         155.0,
-        72.0,
-        16.0,
+        40.0,
+        12.0,
         0.0
       ],
       "exp": 57000,
@@ -168,11 +159,11 @@
     {
       "ID": 13,
       "QualityBonusChance": [
-        429.0,
+        459.0,
         320.0,
         160.0,
-        74.0,
-        17.0,
+        45.0,
+        16.0,
         0.0
       ],
       "exp": 63000,
@@ -181,11 +172,11 @@
     {
       "ID": 14,
       "QualityBonusChance": [
-        411.0,
+        435.0,
         330.0,
         165.0,
-        76.0,
-        18.0,
+        50.0,
+        20.0,
         0.0
       ],
       "exp": 69000,
@@ -194,11 +185,11 @@
     {
       "ID": 15,
       "QualityBonusChance": [
-        393.0,
+        411.0,
         340.0,
         170.0,
-        78.0,
-        19.0,
+        55.0,
+        24.0,
         0.0
       ],
       "exp": 75000,
@@ -207,11 +198,11 @@
     {
       "ID": 16,
       "QualityBonusChance": [
-        375.0,
+        387.0,
         350.0,
         175.0,
-        80.0,
-        20.0,
+        60.0,
+        28.0,
         0.0
       ],
       "exp": 81000,
@@ -220,11 +211,11 @@
     {
       "ID": 17,
       "QualityBonusChance": [
-        357.0,
+        363.0,
         360.0,
         180.0,
-        82.0,
-        21.0,
+        65.0,
+        32.0,
         0.0
       ],
       "exp": 87000,
@@ -236,8 +227,8 @@
         339.0,
         370.0,
         185.0,
-        84.0,
-        22.0,
+        70.0,
+        36.0,
         0.0
       ],
       "exp": 93000,
@@ -246,11 +237,11 @@
     {
       "ID": 19,
       "QualityBonusChance": [
-        321.0,
+        315.0,
         380.0,
         190.0,
-        86.0,
-        23.0,
+        75.0,
+        40.0,
         0.0
       ],
       "exp": 99000,
@@ -259,11 +250,11 @@
     {
       "ID": 20,
       "QualityBonusChance": [
-        303.0,
+        291.0,
         390.0,
         195.0,
-        88.0,
-        24.0,
+        80.0,
+        44.0,
         0.0
       ],
       "exp": 105000,

Assets/Res/Config/GroupConfig.json

@@ -757,10 +757,10 @@
     {
       "ID": 10001,
       "GroupMonsterLevel": [
-        5
+        205
       ],
       "GroupMonster": [
-        9002
+        9005
       ]
     },
     {

Assets/Res/Config/LevelbattleConfig.json

@@ -543,7 +543,7 @@
     {
       "ID": 10001,
       "Group": [
-        100001
+        10001
       ],
       "combatTime": 120.0,
       "combatType": 1,

Assets/Res/UI/DivineSence/DivineSenceEventResultPanel.prefab

@@ -1,970 +0,0 @@
-%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: 4688522053669353716}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &7897761964867798499
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 650584255987892480}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: bg
-    gameObject: {fileID: 8488195482551738332}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: 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: Btn_Ok
-    gameObject: {fileID: 3169074378938001994}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
---- !u!1 &2132268725135064903
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2569128129379278262}
-  - component: {fileID: 9156533754913033698}
-  - component: {fileID: 8488195482551738332}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: myImage
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2569128129379278262
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2132268725135064903}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8599819629026832582}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 46.5656}
-  m_SizeDelta: {x: 475.8763, y: 777.9515}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &9156533754913033698
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2132268725135064903}
-  m_CullTransparentMesh: 1
---- !u!114 &8488195482551738332
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2132268725135064903}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_dadi_01
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!1 &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: 218}
-  isCustomizeHeight: 0
-  posOff: {x: 13, y: 0}
-  isDelay: 0
-  delayTime: 0
-  isAdaptationWidth: 0
-  layoutType: 0
-  overflowDistance: 0
---- !u!1 &2553589566839113697
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4688522053669353716}
-  - component: {fileID: 2934276402299459566}
-  - component: {fileID: 2433990691951363383}
-  - component: {fileID: 3169074378938001994}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Btn_Ok
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4688522053669353716
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6150498200931894423}
-  m_Father: {fileID: 8599819629026832582}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -9, y: -288.69}
-  m_SizeDelta: {x: 132.3538, y: 50.3799}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2934276402299459566
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
-  m_CullTransparentMesh: 1
---- !u!114 &2433990691951363383
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.6509804, g: 0.6509804, b: 0.6509804, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_23
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!114 &3169074378938001994
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 2433990691951363383}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!1 &3552915526930824737
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6150498200931894423}
-  - component: {fileID: 2944092694878402809}
-  - component: {fileID: 2519922024915380815}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6150498200931894423
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3552915526930824737}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4688522053669353716}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2944092694878402809
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3552915526930824737}
-  m_CullTransparentMesh: 1
---- !u!114 &2519922024915380815
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3552915526930824737}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 21
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u786E\u5B9A"
---- !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: "\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: 52.137726}
-  m_SizeDelta: {x: 471.58, y: 553.7293}
-  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_Tips
-  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: -0.0000021458, y: -248.5}
-  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.5019608, g: 0.5019608, b: 0.5019608, 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: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u53EF\u7A0D\u540E\u5728\u4E3B\u754C\u9762\u7EE7\u7EED\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

Assets/Res/UI/DivineSence/DivineSenceEventResultPanel.prefab.meta

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

Assets/Res/UI/DivineSence/ShengShiEventWidgetType3.prefab

@@ -1,958 +0,0 @@
-%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: 8704413967189924930}
-  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 &2866411676261796578
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8704413967189924930}
-  - component: {fileID: 522430348914269042}
-  - component: {fileID: 9002364251388751492}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Button
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8704413967189924930
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2866411676261796578}
-  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: 712579681456886399}
-  - {fileID: 2581404301119584838}
-  - {fileID: 1928953398721837283}
-  - {fileID: 5700846322996692730}
-  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, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &522430348914269042
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2866411676261796578}
-  m_CullTransparentMesh: 1
---- !u!114 &9002364251388751492
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2866411676261796578}
-  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: 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!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: 8704413967189924930}
-  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: 107.97214, 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: 8704413967189924930}
-  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: 8704413967189924930}
-  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, y: 16.92102}
-  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
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!1 &5621944018372429481
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1928953398721837283}
-  - component: {fileID: 16038596088903780}
-  - component: {fileID: 1460259740163297268}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1928953398721837283
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5621944018372429481}
-  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: 5165619257450353462}
-  m_Father: {fileID: 8704413967189924930}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -166.88393, y: 10.868919}
-  m_SizeDelta: {x: 64.56799, y: 28.462402}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &16038596088903780
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5621944018372429481}
-  m_CullTransparentMesh: 1
---- !u!114 &1460259740163297268
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5621944018372429481}
-  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.9622642, g: 0.5582948, b: 0.5582948, 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
---- !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: 8704413967189924930}
-  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 &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: 8704413967189924930}
-  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: 344, y: -59.433495}
-  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
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!1 &7639731894752679497
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7117316534246028533}
-  - component: {fileID: 415215015298378740}
-  - component: {fileID: 576612968966692761}
-  - component: {fileID: 2910925411919575758}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_Type
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7117316534246028533
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7639731894752679497}
-  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: 5700846322996692730}
-  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 &415215015298378740
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7639731894752679497}
-  m_CullTransparentMesh: 1
---- !u!114 &576612968966692761
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7639731894752679497}
-  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: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u4E8B\u4EF6\u5B8C\u6210"
---- !u!114 &2910925411919575758
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7639731894752679497}
-  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 &8294489962711393459
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5165619257450353462}
-  - component: {fileID: 4151436703718221587}
-  - component: {fileID: 7532727123116377644}
-  - component: {fileID: 6080848297760275183}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_Type
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5165619257450353462
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8294489962711393459}
-  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: 1928953398721837283}
-  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 &4151436703718221587
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8294489962711393459}
-  m_CullTransparentMesh: 1
---- !u!114 &7532727123116377644
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8294489962711393459}
-  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 &6080848297760275183
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8294489962711393459}
-  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 &8558440621453229158
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5700846322996692730}
-  - component: {fileID: 1932774545571088901}
-  - component: {fileID: 6871118366495012920}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Image (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5700846322996692730
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8558440621453229158}
-  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: 7117316534246028533}
-  m_Father: {fileID: 8704413967189924930}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 183.3327, y: 10.868919}
-  m_SizeDelta: {x: 79.4075, y: 28.4624}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &1932774545571088901
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8558440621453229158}
-  m_CullTransparentMesh: 1
---- !u!114 &6871118366495012920
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8558440621453229158}
-  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.9686275, g: 0.9450981, b: 0.6901961, 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

Assets/Res/UI/DivineSence/ShengShiEventWidgetType3.prefab.meta

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

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: 0, g: -5, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scripts/Core/UI/UTool/CTween/AnimationCurveLibrary.cs

@@ -25,4 +25,5 @@ public class AnimationCurveLibrary : ScriptableObject
     [Header("法宝飞上来的速度")]public float fabaoMoveTopSpeed=6f;
     [Header("法宝飞过去打敌人的速度")]public float fabaoMoveTopEnemySpeed=15;
     [Header("加速飞行的加速度曲线")] public AnimationCurve flightSpeedCurve;
+    [Header("切换场景时的飞行曲线")] public AnimationCurve switchSceneCurve;
 }

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs

@@ -4,6 +4,7 @@ using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
 using UnityEngine;
+using Utility.UITool;
 
 namespace GameLogic.Combat.CombatState
 {
@@ -16,6 +17,8 @@ namespace GameLogic.Combat.CombatState
         private int state;
         private Vector3 startPos;
         private Vector3 startEulerAngles;
+        private float speed=0.5f;
+        private float feiXingCurTime;
 
         public CombatSceneSwitchState(CombatController combatController) : base(combatController)
         {
@@ -37,10 +40,12 @@ namespace GameLogic.Combat.CombatState
             startEulerAngles = playerHeroEntity.GameObject.transform.rotation.eulerAngles;
 
             // CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
-            Vector3 target = playerHeroEntity.GameObject.transform.TransformPoint(new Vector3(1, 2, 1));
+            Vector3 target = playerHeroEntity.GameObject.transform.TransformPoint(new Vector3(2, 2, 1));
             moveTargetDir = (target - playerHeroEntity.GameObject.transform.forward).normalized;
+            dir = playerHeroEntity.GameObject.transform.forward;
             currTime = 0;
             state = 0;
+            feiXingCurTime = 0;
         }
 
         protected override void ProUpdate(float t)
@@ -52,7 +57,7 @@ namespace GameLogic.Combat.CombatState
             }
 
             currTime += t;
-            if (currTime > 3 && state == 0)
+            if (currTime > 2 && state == 0)
             {
                 state = 1;
                 EventManager.Instance.Dispatch(CustomEventType.ShowLoadingUI, null);
@@ -65,9 +70,11 @@ namespace GameLogic.Combat.CombatState
                 return;
             }
 
+            feiXingCurTime += t * speed;
+            float dirT = AnimationCurveManager.Instance.AnimationCurveLibrary.switchSceneCurve.Evaluate(feiXingCurTime);
             Vector3 pos = playerHeroEntity.dotPos;
 
-            Vector3 currDir = Vector3.Lerp(playerHeroEntity.GameObject.transform.forward, moveTargetDir, 0.3f);
+            Vector3 currDir = Vector3.Lerp(dir, moveTargetDir, dirT);
 
 
             pos += currDir.normalized * 15 * t;
@@ -79,7 +86,7 @@ namespace GameLogic.Combat.CombatState
 
         private async void InitScenes()
         {
-            await TimerComponent.Instance.WaitAsync(600);
+            await TimerComponent.Instance.WaitAsync(2600);
             state = 2;
             CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
             playerHeroEntity.GameObject.transform.position = startPos;
@@ -90,7 +97,6 @@ namespace GameLogic.Combat.CombatState
             EventManager.Instance.Dispatch(CustomEventType.CloseLoadingUI, null);
             CombatController.CombatCameraControllder.isStop = false;
             CombatController.ChangeState(CombatController.fight);
-         
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/S1401.cs

@@ -57,7 +57,7 @@ namespace GameLogic.Combat.Skill
                 }
             }
 
-            if (SelfSkillConfig.level >= 5) //每个烈焰剑将会对敌人照成爆燃，爆燃额外受到100%伤害
+            if (SelfSkillConfig.level > 5) //每个烈焰剑将会对敌人照成爆燃，爆燃额外受到100%伤害
             {
                 long v2 = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     CombatHeroEntity.CurrCombatHeroInfo.attack.Value,

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -8,6 +8,7 @@ using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Bag;
+using GameLogic.Combat.CombatTool;
 using GameLogic.CombatScenesTool;
 using GameLogic.Hero;
 using GameLogic.Player;
@@ -46,6 +47,7 @@ public class PlayerManager : Singleton<PlayerManager>
         set { playerName = value; }
     }
 
+    private CTask _cTask;
 
     public long serverTime => TimeHelper.ServerNow();
     private AccountFileInfo.SmallPlacesData currentPlaces;
@@ -313,6 +315,13 @@ public class PlayerManager : Singleton<PlayerManager>
 
         StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
+        
+        EventManager.Instance.AddEventListener(CustomEventType.CloseLoadingUI,CloseLoadingUI);
+    }
+
+    private void CloseLoadingUI(IEventData e)
+    {
+        _cTask?.SetResult();
     }
 
     private float timer;
@@ -346,11 +355,9 @@ public class PlayerManager : Singleton<PlayerManager>
         }
 
         return (float)Math.Round(((float)placesData.progress / placesConfig.TotalScore) * 100, 1);
-        // AccountFileInfo.Instance.playerData.completeEvents.Where(ce =>placesConfig.MainTaskID.Contains(ce.eventID) || placesConfig.ZhixianID.Contains(ce.eventID) || placesConfig.ZhixianID.Contains(ce.1001
-        // ))
     }
 
-    // List<long> removeKey = new List<long>();
+
 
     private bool isUpdate = false;
 
@@ -453,7 +460,7 @@ public class PlayerManager : Singleton<PlayerManager>
         }
     }
 
-    public async void ChangeMap(int mapId)
+    public async CTask ChangeMap(int mapId)
     {
         SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
         if (smallPlacesConfig.ID == 0)
@@ -479,7 +486,9 @@ public class PlayerManager : Singleton<PlayerManager>
                 return;
             }
         }
-
+        UIManager.Instance.HindCurrAllShowPanel();
+        _cTask = CTask.Create();
+        
         AccountFileInfo.SmallPlacesData smallPlacesData =
             PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
 
@@ -501,8 +510,11 @@ public class PlayerManager : Singleton<PlayerManager>
 
         PlayerManager.Instance.CurrentsmallPlaces = smallPlacesData;
 
-
+        CombatController.currActiveCombat.ChangeState(CombatController.sceneSwitch);
+        await _cTask;
+        UIManager.Instance.ShowLastHindAllShowPanel();
         EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
+
     }
 
     public void QianKunDaiAward()

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

@@ -185,6 +185,11 @@ namespace Fort23.Mono
                 return;
             }
 
+            if (count == 0)
+            {
+                TipMessagePanel.OpenTipMessagePanel("背包数量不足！");
+            }
+
             EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -146,12 +146,14 @@ namespace Fort23.Mono
                 Text_Tips.gameObject.SetActive(showEventList.Count > 0);
             }
 
-
+            var divineSenseConfig =
+                ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
             int maxCount = PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax /
                            PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+            maxCount = maxCount > divineSenseConfig.MaxNum ? divineSenseConfig.MaxNum : maxCount;
+            Text_ShenShiCount.text =
+                LanguageManager.Instance.Text(10239, EventSystemManager.Instance.GetShenShiCount(), maxCount);
 
-            Text_ShenShiCount.text =   LanguageManager.Instance.Text(10239, EventSystemManager.Instance.GetShenShiCount(), maxCount);
-          
             SaiXuan(saixuanType);
             showEventList.Sort(Sort);
             await Content.Init(this, showEventList.Count);

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanel.cs

@@ -1,155 +0,0 @@
-using System.Collections.Generic;
-using Excel2Json;
-using Fort23.Core;
-using Fort23.UTool;
-using UnityEngine;
-using UnityEngine.Rendering;
-
-namespace Fort23.Mono
-{
-    [UIBinding(prefab = "DivineSenceEventResultPanel")]
-    public partial class DivineSenceEventResultPanel : UIPanel, IScrollListContent
-    {
-        List<AccountFileInfo.EventList> eventList = new List<AccountFileInfo.EventList>();
-
-        private void Init()
-        {
-            // isAddStack = true;
-            // IsShowAppBar = false;
-        }
-
-        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); });
-            Btn_Ok.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
-        }
-
-        private void RemoveEvent(IEventData e)
-        {
-            UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
-            Content.Init(this, eventList.Count);
-        }
-
-        public override CTask<bool> AsyncInit(object[] uiData)
-        {
-            eventList = uiData[0] as List<AccountFileInfo.EventList>;
-
-            if (eventList != null && eventList.Count > 0)
-                Content.Init(this, eventList.Count);
-
-
-            return base.AsyncInit(uiData);
-        }
-
-
-        public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
-        {
-            if (index < 0 || index >= eventList.Count)
-            {
-                return null;
-            }
-
-            EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList[index].eventID);
-            // if (eventConfig.EventType == 2)
-            // {
-            //     ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
-            //     shengShiEventWidgetType2.CustomInit(eventList[index]);
-            //     shengShiEventWidgetType2.OnClick = ShengShiEventWidgetType3OnClick;
-            //     return shengShiEventWidgetType2;
-            // }
-            // else
-            {
-                ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(eventList[index], GoOnClick);
-                shengShiEventWidgetType2.OnClick = OnClick;
-                return shengShiEventWidgetType2;
-            }
-        }
-
-        private void ShengShiEventWidgetType3OnClick(ItemWidgetBasic obj)
-        {
-            if (EventSystemManager.Instance.isTriggerEvent)
-                return;
-
-            ShengShiEventWidgetType3 shengShiEventWidgetType3 = obj as ShengShiEventWidgetType3;
-            //this.GObjectPoolInterface.SetActive(false);
-            EventSystemManager.Instance.isOpenUi = false;
-            EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType3.eventList, () =>
-            {
-                eventList.Remove(shengShiEventWidgetType3.eventList);
-                Content.Init(this, eventList.Count);
-                EventSystemManager.Instance.isOpenUi = true;
-                //this.GObjectPoolInterface.SetActive(true);
-            });
-        }
-
-        private void OnClick(ItemWidgetBasic obj)
-        {
-            ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
-
-            TaskInfoPanel.OpenPanel(shengShiEventWidgetType2.eventList,1);
-
-            // if (EventSystemManager.Instance.isTriggerEvent)
-            //     return;
-            //
-
-            // this.GObjectPoolInterface.SetActive(false);
-            // EventSystemManager.Instance.isOpenUi = false;
-            // EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
-            // {
-            //     eventList.Remove(shengShiEventWidgetType2.eventList);
-            //     Content.Init(this, eventList.Count);
-            //     EventSystemManager.Instance.isOpenUi = true;
-            //     this.GObjectPoolInterface.SetActive(true);
-            //
-            // });
-        }
-
-        private void GoOnClick(ItemWidgetBasic obj)
-        {
-            if (EventSystemManager.Instance.isTriggerEvent)
-                return;
-
-            ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
-            //this.GObjectPoolInterface.SetActive(false);
-            EventSystemManager.Instance.isOpenUi = false;
-            EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
-            {
-                eventList.Remove(shengShiEventWidgetType2.eventList);
-                Content.Init(this, eventList.Count);
-                EventSystemManager.Instance.isOpenUi = true;
-                //this.GObjectPoolInterface.SetActive(true);
-            });
-        }
-
-
-        public void HindIScorllListWidget(IScorllListWidget widget)
-        {
-            UIManager.Instance.DormancyGComponent(widget as UIComponent);
-        }
-
-        public async static CTask<DivineSenceEventResultPanel> OpenPanel(List<AccountFileInfo.EventList> eventList)
-        {
-            DivineSenceEventResultPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventResultPanel>(null, uiData: new object[] { eventList });
-            return divineSenceEventPreviewPanel;
-        }
-
-        public override void Close()
-        {
-            UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType3>();
-            eventList = null;
-            base.Close();
-        }
-    }
-}

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanel.cs.meta

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

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanelData.cs

@@ -1,73 +0,0 @@
-using Fort23.Core;
-using Fort23.UTool;
-using UnityEngine.UI;
-using UnityEngine;
-using System.Collections.Generic;
-namespace Fort23.Mono
-{
-	public partial class DivineSenceEventResultPanel 
-	{
-	  #region 自定义数据 
-	  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 Button _Btn_Ok;
-	  public Button Btn_Ok
-	   {
-	   get{
-	      if (_Btn_Ok == null)
-	       {
-	         _Btn_Ok  = GetUIUnit<Button>("Btn_Ok"); 
-	       }
-	      return _Btn_Ok;
-	     }
-	   }
-	  #endregion 自定义数据结束 
-	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
-	{
-	 await base.SetUIGameObject(gObjectPoolInterface);
-	 Init();
-	}
-	}
-}

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanelData.cs.meta

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

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3.cs

@@ -1,95 +0,0 @@
-using System.Collections.Generic;
-using Core.Language;
-using Excel2Json;
-using Fort23.UTool;
-using GameLogic.Bag;
-using GameLogic.Player;
-using UnityEngine;
-
-namespace Fort23.Mono
-{
-    [UIBinding(prefab = "ShengShiEventWidgetType3")]
-    public partial class ShengShiEventWidgetType3 : ItemWidgetBasic
-    {
-        List<WidgetItem> widgetList = new List<WidgetItem>();
-        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.EventName);
-            EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
-            // Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
-            Text_EventDesc.text = LanguageManager.Instance.Text(randomEventConfig.Description);
-            if (conditionConfig.optionType == 3)
-            {
-                List<ItemInfo> itemInfos = new List<ItemInfo>();
-                for (var i = 0; i < conditionConfig.PrizeIDs.Length; i++)
-                {
-                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(conditionConfig.PrizeIDs[i]);
-                    if (dropConfig.dropType == 3)
-                    {
-                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], conditionConfig.PrizeNums[i]);
-                        itemInfos.Add(itemInfo);
-                    }
-                    else
-                    {
-                        List<ItemInfo> items = DropManager.Instance.DropItem(conditionConfig.PrizeIDs[i]);
-                        itemInfos.AddRange(items);
-                    }
-                }
-
-                for (var i = 0; i < itemInfos.Count; i++)
-                {
-                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
-                    widgetItem.InitWidget(itemInfos[i]);
-                    widgetList.Add(widgetItem);
-                }
-            }
-        }
-
-        public override void DormancyObj()
-        {
-            for (var i = 0; i < widgetList.Count; i++)
-            {
-                UIManager.Instance.DormancyGComponent(widgetList[i]);
-            }
-
-            widgetList.Clear();
-
-            base.DormancyObj();
-        }
-    }
-}

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3.cs.meta

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

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3Data.cs

@@ -1,62 +0,0 @@
-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();
-	}
-	}
-}

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3Data.cs.meta

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

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -189,16 +189,16 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(this);
 
                 //切换下一个地图
-                PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID + 1);
-               
-                UIManager.Instance.HindCurrAllShowPanel();
-                CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
-                CombatController.currActiveCombat.CombatHeroController.Flight(2, -90, 10);
-                UIManager.Instance.SetEventSystemEnable(false);
-                await TimerComponent.Instance.WaitAsync(2 * 1000 + 1200);
-                CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-                UIManager.Instance.SetEventSystemEnable(true);
-                UIManager.Instance.ShowLastHindAllShowPanel();
+                await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID + 1);
+
+
+                // CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+                // CombatController.currActiveCombat.CombatHeroController.Flight(2, -90, 10);
+                // UIManager.Instance.SetEventSystemEnable(false);
+                // await TimerComponent.Instance.WaitAsync(2 * 1000 + 1200);
+                // CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
+                // UIManager.Instance.SetEventSystemEnable(true);
+
                 callBack?.Invoke(true);
                 callBack = null;
             }
@@ -242,19 +242,10 @@ namespace Fort23.Mono
                 }
 
                 isChange = true;
-                PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
-
                 UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
                 UIManager.Instance.HideUIUIPanel(this);
-
-                UIManager.Instance.HindCurrAllShowPanel();
-                CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
-                CombatController.currActiveCombat.CombatHeroController.Flight(2, -90, 10);
-                UIManager.Instance.SetEventSystemEnable(false);
-                await TimerComponent.Instance.WaitAsync(2 * 1000 + 1200);
-                CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-                UIManager.Instance.SetEventSystemEnable(true);
-                UIManager.Instance.ShowLastHindAllShowPanel();
+                await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
+                
                 callBack?.Invoke(true);
                 callBack = null;
             }

XiuXianGame.sln.DotSettings.user

@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAbstractProgressBar_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F40_003Fd60d7bd8_003FAbstractProgressBar_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAction_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Ff4_003Fcb4805bc_003FAction_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAnimationCurve_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F61_003F47acc2d2_003FAnimationCurve_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AApplication_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F69_003F6bd97609_003FApplication_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAppStatusBar_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003Fbc_003F8cd214f9_003FAppStatusBar_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArray_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fd5_003Fcf947ad8_003FArray_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>