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

Assets/Res/Config/EventConfig.json

@@ -882,13 +882,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        -100
-      ],
-      "RefreshProbability": 950,
+      "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,
@@ -911,13 +905,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeIDs": [
-        1005
-      ],
-      "PrizeNums": [
-        -100
-      ],
-      "RefreshProbability": 950,
+      "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,
@@ -941,13 +929,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeIDs": [
-        1006
-      ],
-      "PrizeNums": [
-        -100
-      ],
-      "RefreshProbability": 950,
+      "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,
@@ -970,13 +952,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        -100
-      ],
-      "RefreshProbability": 950,
+      "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,
@@ -1000,13 +976,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeIDs": [
-        1701
-      ],
-      "PrizeNums": [
-        1
-      ],
-      "RefreshProbability": 100,
+      "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,
@@ -1029,13 +999,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeIDs": [
-        1002
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 100,
+      "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,

Assets/Res/Config/GameConstantConfig.json

@@ -43,7 +43,8 @@
       "GuajiCD": [
         6,
         12
-      ]
+      ],
+      "qiankundaiMaxTime": 43200
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -1,28 +1,94 @@
 {
   "configList": [
     {
-      "ID": 100001,
-      "GroupMonster": [
-        9101
-      ]
+      "ID": 100001
     },
     {
-      "ID": 100002,
-      "GroupMonster": [
-        9102
-      ]
+      "ID": 100002
     },
     {
-      "ID": 100003,
-      "GroupMonster": [
-        9103
-      ]
+      "ID": 100003
     },
     {
-      "ID": 100004,
-      "GroupMonster": [
-        9201
-      ]
+      "ID": 100004
+    },
+    {
+      "ID": 100005
+    },
+    {
+      "ID": 100006
+    },
+    {
+      "ID": 100007
+    },
+    {
+      "ID": 100008
+    },
+    {
+      "ID": 100009
+    },
+    {
+      "ID": 100010
+    },
+    {
+      "ID": 100011
+    },
+    {
+      "ID": 100012
+    },
+    {
+      "ID": 100013
+    },
+    {
+      "ID": 100014
+    },
+    {
+      "ID": 100015
+    },
+    {
+      "ID": 100016
+    },
+    {
+      "ID": 100017
+    },
+    {
+      "ID": 100018
+    },
+    {
+      "ID": 100019
+    },
+    {
+      "ID": 100020
+    },
+    {
+      "ID": 100021
+    },
+    {
+      "ID": 100022
+    },
+    {
+      "ID": 100023
+    },
+    {
+      "ID": 100024
+    },
+    {
+      "ID": 100025
+    },
+    {
+      "ID": 100026
+    },
+    {
+      "ID": 100027
+    },
+    {
+      "ID": 100028
+    },
+    {
+      "ID": 100029
+    },
+    {
+      "ID": 100030
     }
   ]
 }

Assets/Res/Config/QiankundaiConfig.json

@@ -0,0 +1,38 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "dropLevel": [
+        1,
+        300
+      ],
+      "dropType": 1,
+      "dropTypePara": 60.0,
+      "dropPara1": 1,
+      "dropPara2": 5,
+      "ChoukaID": [
+        1002
+      ],
+      "DropCount": [
+        -100
+      ]
+    },
+    {
+      "ID": 2,
+      "dropLevel": [
+        1,
+        300
+      ],
+      "dropType": 2,
+      "dropTypePara": 0,
+      "dropPara1": 2,
+      "dropPara2": 1,
+      "ChoukaID": [
+        1003
+      ],
+      "DropCount": [
+        -200
+      ]
+    }
+  ]
+}

Assets/Res/Config/QiankundaiConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D31N5C2vB3imfwazZQn4KH7YjV0oI+8xRLa5o+j4pER+kor3oUMgZCVDuDyV
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/DialoguePanel/DialogueOptionWidget.prefab

@@ -13,7 +13,6 @@ GameObject:
   - component: {fileID: 2934525852061817999}
   - component: {fileID: 6116667400179102108}
   - component: {fileID: 6887871023316888409}
-  - component: {fileID: 1493722273264314552}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_desc
@@ -38,7 +37,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 320.29395, y: -36.5}
+  m_AnchoredPosition: {x: 319.2129, y: -20.5}
   m_SizeDelta: {x: 628.4258, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5086374945530126731
@@ -82,7 +81,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 12321312123213121232131212321312123213121232131212321312
+  m_Text: 3121232131312123213131212
 --- !u!114 &6116667400179102108
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -112,26 +111,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!114 &1493722273264314552
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 250408078146684751}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: 628.4258
-  m_MinHeight: -1
-  m_PreferredWidth: 628.4258
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!1 &1586153670201676115
 GameObject:
   m_ObjectHideFlags: 0
@@ -325,7 +304,7 @@ MonoBehaviour:
     m_Right: 5
     m_Top: 5
     m_Bottom: 5
-  m_ChildAlignment: 1
+  m_ChildAlignment: 0
   m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1

Assets/Res/UI/DivineSence/DivineSenceItemPanel.prefab

@@ -330,7 +330,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 3168022605306893254}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -322,6 +322,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 18
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -410,6 +411,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 2
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -827,6 +829,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 44.6864
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1047,6 +1050,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 40
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1155,6 +1159,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 2
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1247,6 +1252,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 45
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1335,6 +1341,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 2
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1728,6 +1735,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 102.0355
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1862,6 +1870,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 51
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2260,6 +2269,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 102.0355
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2393,6 +2403,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 32
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2757,6 +2768,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 40
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2890,6 +2902,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3127,6 +3140,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 76
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3168,8 +3182,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 7.8, y: -33.5}
-  m_SizeDelta: {x: 92.8701, y: 22}
+  m_AnchoredPosition: {x: 5.6, y: -78.9}
+  m_SizeDelta: {x: 124, y: 51}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7693095724154891268
 CanvasRenderer:
@@ -3200,7 +3214,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -3209,14 +3223,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_dadi_02
+  _icon_name: dec_xiulianXinmoAnniu
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 22
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3371,7 +3386,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 0, y: 43.2862}
+  m_SizeDelta: {x: 210, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:
@@ -3513,6 +3528,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 18
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3576,7 +3592,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.9725491, g: 0.93725497, b: 0.8000001, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3584,8 +3600,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 29
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -130,6 +130,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -263,6 +264,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -388,6 +390,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -640,6 +643,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 96
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -951,6 +955,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 47
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1235,6 +1240,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 56.963665
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1368,6 +1374,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
+  imageH: 66
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1502,6 +1509,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1765,6 +1773,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2025,6 +2034,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
     packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
     lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2470,6 +2480,21 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
+  - key: Sv
+    gameObject: {fileID: 568048317168539034}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 0
 --- !u!1 &3415559647474066940
 GameObject:
@@ -2606,6 +2631,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2799,6 +2825,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 89
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3012,6 +3039,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 79270f649120427f1177de011e54987e
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3377,6 +3405,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3616,6 +3645,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
+  imageH: 66
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3875,6 +3905,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 0.098039225, g: 0.16862746, b: 0.18431373, a: 1}
   bottomOrRightColor: {r: 0.5568628, g: 0.76470596, b: 0.74509805, a: 1}
@@ -3964,6 +3995,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
+  imageH: 67
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4097,6 +4129,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
     packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
     lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
+  imageH: 110.8501
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4265,6 +4298,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
+  imageH: 332.12408
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4354,6 +4388,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
+  imageH: 68
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4736,6 +4771,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 96
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4929,6 +4965,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
+  imageH: 39.2303
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -5178,6 +5215,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
+  imageH: 67
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -5314,6 +5352,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 96
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -5632,6 +5671,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Scenes/testCombat.scene

@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -110,6 +110,12 @@ public float[] shenshiRecoverSpeed;
 public int[] GuajiCD;
 
 
+		/// <summary>
+		///乾坤袋最大追溯时间（秒）
+		/// </summary>
+public int qiankundaiMaxTime;
+
+
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/QiankundaiConfig.cs

@@ -0,0 +1,68 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\QiankundaiConfig.xlsx. SheetName: QiankundaiConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "QiankundaiConfig.json")]
+	public partial class QiankundaiConfigHolder : ConfigHolder<QiankundaiConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct QiankundaiConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///可掉落的指定境界区间 10;100=[10,100]
+		/// </summary>
+public int[] dropLevel;
+
+
+		/// <summary>
+		///掉落间隔类型 1=固定间隔掉落 2=每日刷新时间掉落
+		/// </summary>
+public int dropType;
+
+
+		/// <summary>
+		///根据dropType 1：填固定的间隔秒数
+		/// </summary>
+public float dropTypePara;
+
+
+		/// <summary>
+		///固定时间区间内 1=每小时 2=每日 3=每周
+		/// </summary>
+public int dropPara1;
+
+
+		/// <summary>
+		///固定时间内最多掉落多少次 -1=无限次
+		/// </summary>
+public int dropPara2;
+
+
+		/// <summary>
+		///掉落ID
+		/// </summary>
+public int[] ChoukaID;
+
+
+		/// <summary>
+		///掉落数量
+		/// </summary>
+public int[] DropCount;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/QiankundaiConfig.cs.meta

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

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

@@ -46,7 +46,7 @@ namespace GameLogic.Combat.Skill
             {
                 float bl = CombatHeroEntity.CurrCombatHeroInfo.hp.Value * 1.0f /
                            CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
-                // if (bl * 100 < effectValue[0])
+                if (bl * 100 < effectValue[0])
                 {
                     addHp = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                         CombatHeroEntity.MaxCombatHeroInfo.hp.Value, 10);
@@ -74,7 +74,7 @@ namespace GameLogic.Combat.Skill
             }
 
             _currTime += time;
-            if (_currTime > 2)
+            if (_currTime > 0.5f)
             {
                 Recover(CombatHeroEntity, CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(), addHp, AttType.Skill);
                 if (CombatHeroEntity.CurrCombatHeroInfo.hp.Value >= CombatHeroEntity.MaxCombatHeroInfo.hp.Value)

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

@@ -19,7 +19,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProActiveSkill()
         {
-            // isActive = false;
+            isActive = false;
         }
 
         protected override void ProUseSkill()

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -115,8 +115,22 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
         //塔数据
         public List<TowerData> TowerDatas = new List<TowerData>();
+        
+        //掉落数据
+        public List<QiankundaiData> QiankundaiDatas = new List<QiankundaiData>();
+        
+        public List<ItemData> QiankundaiItemDatas = new List<ItemData>();
     }
 
+    
+    public class QiankundaiData
+    {
+        public int id;
+        public long refenceTime;
+        public int dropCount;
+        public int dropTime;
+
+    }
 
     /// <summary>
     /// 塔数据

Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -237,5 +237,36 @@ namespace GameLogic.Player
 
             return itemInfos;
         }
+
+
+        public ItemInfo DropResourceLevel(int itemID, int count)
+        {
+            ResourceLevelConfig resourceLevelConfig = ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero.powerUpConfig.ID);
+            ItemInfo itemInfo = null;
+            float c = Math.Abs(count / (float)1000);
+            switch (itemID)
+            {
+                case 1001:
+                    itemInfo = new ItemInfo(1001, (int)(resourceLevelConfig.value1 * c));
+                    break;
+                case 1002:
+                    itemInfo = new ItemInfo(1002, (int)(resourceLevelConfig.value2 * c));
+                    break;
+                case 1003:
+                    itemInfo = new ItemInfo(1003, (int)(resourceLevelConfig.value3 * c));
+                    break;
+                case 1004:
+                    itemInfo = new ItemInfo(1004, (int)(resourceLevelConfig.value4 * c));
+                    break;
+                case 1005:
+                    itemInfo = new ItemInfo(1005, (int)(resourceLevelConfig.value5 * c));
+                    break;
+                case 1006:
+                    itemInfo = new ItemInfo(1006, (int)(resourceLevelConfig.value6 * c));
+                    break;
+            }
+
+            return itemInfo;
+        }
     }
 }

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -53,6 +53,31 @@ public class PlayerManager : Singleton<PlayerManager>
 
         // int m = Random.Range(0, 4 * 60 * 1000);
         RandownDaoYou(gameConstantConfig.Daoyoushowuptime + 1000);
+        QiankundaiConfig[] qiankundaiConfigs = ConfigComponent.Instance.GetAll<QiankundaiConfig>();
+        foreach (var qiankundaiConfig in qiankundaiConfigs)
+        {
+            AccountFileInfo.QiankundaiData qiankundaiData = AccountFileInfo.Instance.playerData.QiankundaiDatas.FirstOrDefault(q => q.id == qiankundaiConfig.ID);
+            if (qiankundaiData == null)
+            {
+                qiankundaiData = new AccountFileInfo.QiankundaiData();
+                qiankundaiData.id = qiankundaiConfig.ID;
+                if (qiankundaiConfig.dropPara1 == 1)
+                {
+                    qiankundaiData.refenceTime = TimeHelper.ClientNow() + 60 * 60 * 1000;
+                }
+                else if (qiankundaiConfig.dropPara1 == 2)
+                {
+                    qiankundaiData.refenceTime = TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
+                }
+                else if (qiankundaiConfig.dropPara1 == 3)
+                {
+                }
+
+                AccountFileInfo.Instance.playerData.QiankundaiDatas.Add(qiankundaiData);
+            }
+        }
+
+        AccountFileInfo.Instance.SavePlayerData();
     }
 
     //添加心境
@@ -241,6 +266,52 @@ public class PlayerManager : Singleton<PlayerManager>
             timer = 0;
             // PlayerManager.Instance.myHero.heroData.exp += myHero.powerUpConfig.AutoXiuwei;
             // AccountFileInfo.Instance.SavePlayerData();
+
+            foreach (var playerDataQiankundaiData in AccountFileInfo.Instance.playerData.QiankundaiDatas)
+            {
+                //重置掉落次数
+                QiankundaiConfig qiankundaiConfig = ConfigComponent.Instance.Get<QiankundaiConfig>(playerDataQiankundaiData.id);
+                if (qiankundaiConfig.dropType != 2 && TimeHelper.ClientNow() >= playerDataQiankundaiData.refenceTime)
+                {
+                    if (qiankundaiConfig.dropPara1 == 1)
+                    {
+                        playerDataQiankundaiData.refenceTime = TimeHelper.ClientNow() + 60 * 60 * 1000;
+                    }
+                    else if (qiankundaiConfig.dropPara1 == 2)
+                    {
+                        playerDataQiankundaiData.refenceTime = TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
+                    }
+                    else if (qiankundaiConfig.dropPara1 == 3)
+                    {
+                    }
+
+                    playerDataQiankundaiData.dropCount = 0;
+                }
+
+
+                if (myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] && myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
+                {
+                    if (playerDataQiankundaiData.dropCount < qiankundaiConfig.dropPara2 || qiankundaiConfig.dropPara2 == -1)
+                    {
+                        playerDataQiankundaiData.dropTime++;
+                        if (playerDataQiankundaiData.dropTime >= qiankundaiConfig.dropTypePara)
+                        {
+                            //发放奖励
+                            for (var i = 0; i < qiankundaiConfig.ChoukaID.Length; i++)
+                            {
+                                ItemInfo itemInfo = DropManager.Instance.DropResourceLevel(qiankundaiConfig.ChoukaID[i], qiankundaiConfig.DropCount[i]);
+                                AccountFileInfo.ItemData itemData = itemInfo.ToItemData();
+                                AccountFileInfo.Instance.playerData.QiankundaiItemDatas.Add(itemData);
+                            }
+
+                            playerDataQiankundaiData.dropCount = 0;
+                            playerDataQiankundaiData.dropTime = 0;
+                        }
+                    }
+                }
+
+                AccountFileInfo.Instance.SavePlayerData();
+            }
         }
 
         //每天刷新

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -216,9 +216,10 @@ public class EventSystemManager : Singleton<EventSystemManager>
         int count = 0;
         foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
         {
-            if (eventList == null || eventList.eventID == 0)
-                continue;
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+            if (eventList == null || eventList.eventID == 0 || eventList.isCompleted || eventConfig.EventTriggerType == 4)
+                continue;
+
             if (eventConfig.EventTriggerType != 5)
             {
                 count++;
@@ -932,7 +933,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         {
             AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
             AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
-            TaskInfoPanel taskInfoPanel = await TaskInfoPanel.OpenPanel(eventList,2);
+            TaskInfoPanel taskInfoPanel = await TaskInfoPanel.OpenPanel(eventList, 2);
             await taskInfoPanel.UIClosed();
         }
         else

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -327,6 +327,15 @@ namespace Fort23.Mono
                 UpdateSkillWidget();
                 CloseSelect();
             });
+            
+            Sv.onValueChanged.AddListener((s) =>
+            {
+                if (currentSelectedSkill == null)
+                {
+                    return;
+                }
+                Btn_Info.transform.SetAsLastSibling();
+            });
         }
 
         private void UpdateRoad()
@@ -498,6 +507,7 @@ namespace Fort23.Mono
         {
             if (infoType == 1)
                 return;
+            Btn_Info.transform.SetParent(transform);
             Btn_Info.gameObject.SetActive(false);
             currentSelectedSkill = null;
 
@@ -647,7 +657,7 @@ namespace Fort23.Mono
             dianjiSkillKongWidget = null;
             Btn_RemoveGongFa.gameObject.SetActive(false);
 
-
+            Btn_Info.transform.SetParent(transform);
             Btn_Info.gameObject.SetActive(false);
             currentSelectedSkill = null;
 
@@ -717,6 +727,7 @@ namespace Fort23.Mono
             else if (infoType == 2)
             {
                 CloseSelect();
+                Btn_Info.transform.SetParent(ContentRoot);
                 Btn_Info.transform.position = skillWidget.InfoPos.position;
                 Btn_Info.gameObject.SetActive(true);
                 currentSelectedSkill = skillWidget;

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanelData.cs

@@ -294,6 +294,17 @@ namespace Fort23.Mono
 	      return _Icon_Select;
 	     }
 	   }
+	  private ScrollRect _Sv;
+	  public ScrollRect Sv
+	   {
+	   get{
+	      if (_Sv == null)
+	       {
+	         _Sv  = GetUIUnit<ScrollRect>("Sv"); 
+	       }
+	      return _Sv;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -43,20 +43,7 @@ namespace Fort23.Mono
             // int index = mainEventConditionConfig.optionPara1.ToList().IndexOf(eventConditionConfig.ID);
             Text_desc.text = LanguageManager.Instance.Text(mainEventConditionConfig.optionPara2[selectIndex]);
             this.callback = callback;
-
-            // bool isUlock = true;
-            // foreach (var eventConditionData in eventLinkData.eventConditions)
-            // {
-            //     if (!EventSystemManager.Instance.CeekEventGroupComplete(eventLinkData.eventConditions))
-            //     {
-            //         onCancel?.Invoke();
-            //         return;
-            //     }
-            //     if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionData))
-            //     {
-            //         isUlock = false;
-            //     }
-            // }
+            
 
             if (!EventSystemManager.Instance.CeekEventGroupComplete(eventLinkData.eventConditions))
             {

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

@@ -300,6 +300,7 @@ namespace Fort23.Mono
 
             if (eventConditionConfig.optionType == 1 && eventConditionConfig.optionPara1 != null)
             {
+                OptionMarsk.SetActive(true);
                 for (var i = 0; i < eventConditionConfig.optionPara1.Length; i++)
                 {
                     DialogueOptionWidget dialogueOptionWidget =
@@ -310,7 +311,7 @@ namespace Fort23.Mono
 
                 LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
 
-                OptionMarsk.SetActive(true);
+              
             }
         }
 

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

@@ -22,9 +22,9 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            isPopUi = true;
-            // isAddStack = true;
-            // IsShowAppBar = false;
+            // isPopUi = true;
+            isAddStack = true;
+            IsShowAppBar = false;
         }
 
         protected override void AddEvent()
@@ -110,9 +110,18 @@ namespace Fort23.Mono
 
             Text_ShenShiCount.text = $"神识{EventSystemManager.Instance.GetShenShiCount()}/{maxCount}";
             SaiXuan(saixuanType);
+            showEventList.Sort(Sort);
             await Content.Init(this, showEventList.Count);
         }
 
+        public int Sort(AccountFileInfo.EventList a, AccountFileInfo.EventList b)
+        {
+            if (a.isCompleted && !b.isCompleted)
+                return 1;
+            if (!a.isCompleted && b.isCompleted)
+                return -11;
+            return 0;
+        }
 
         public void SaiXuan(int type)
         {
@@ -202,7 +211,7 @@ namespace Fort23.Mono
 
         public async static CTask<DivineSenceEventPreviewPanel> OpenPanel()
         {
-            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null, UILayer.Top);
+            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null, UILayer.Middle);
             return divineSenceEventPreviewPanel;
         }
 

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

@@ -26,7 +26,9 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            isPopUi = true;
+            // isPopUi = true;
+            isAddStack = true;
+            IsShowAppBar = false;
         }
 
         protected override void AddEvent()
@@ -171,7 +173,7 @@ namespace Fort23.Mono
 
         public async static CTask OpenPanel(Action<int,List<ItemInfo>> callback)
         {
-            DivineSenceInfoPanel divineSenceInfoPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Top);
+            DivineSenceInfoPanel divineSenceInfoPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Middle);
             divineSenceInfoPanel.CustomInit(callback);
         }
     }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -494,7 +494,7 @@ namespace Fort23.Mono
                     }
                     else
                     {
-                        Text_HeroHp.color = Color.black;
+                        Text_HeroHp.color = new Color32(249,240,204,255);
                     }
                 }
                 else

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughSuccessPanel.cs

@@ -42,14 +42,14 @@ namespace Fort23.Mono
         {
             // HeroInfo heroInfo = new HeroInfo();
             HeroInfo heroInfo = PlayerManager.Instance.myHero.CopyHero();
-            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId, PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
-            Text_CurretnJIngjie.text = LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
-                                       LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                                       LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId, PlayerManager.Instance.myHero.heroData.heroPowerId - 1);
+            Text_NextJIngjie.text = LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                                                       LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
+                                                       LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
 
-            Text_NextJIngjie.text = LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[0]) +
-                                    LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[1]) +
-                                    LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[2]);
+            Text_CurretnJIngjie.text = LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[0]) +
+                                       LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[1]) +
+                                       LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[2]);
             if (type == 1 || type == 2)
             {
                 Icon_Tu.gameObject.SetActive(true);

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -102,8 +102,8 @@ namespace Fort23.Mono
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
                     {
                         var heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, heroInfo);
-                        HeroBreakthroughSuccessPanel.OpenPanel(1, heroAttributData);
                         PlayerManager.Instance.myHero.Upgrade();
+                        HeroBreakthroughSuccessPanel.OpenPanel(1, heroAttributData);
                         CustomInit();
                     }
                     //大突破
@@ -131,7 +131,7 @@ namespace Fort23.Mono
 
 
             heroInfo = PlayerManager.Instance.myHero.CopyHero();
-            heroInfo.InitHero( PlayerManager.Instance.myHero.heroData.heroModelId, PlayerManager.Instance.myHero.heroData.heroPowerId+1);
+            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId, PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
 
             HeroAttributeWidget heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             heroAttributeWidget.CustomInit(new HeroAttributeData("生命", PlayerManager.Instance.myHero.hp.Value.ToString(), "+" + (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToString()));

UserSettings/Layouts/default-2022.dwlt

@@ -19,8 +19,8 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Game
-  m_RootView: {fileID: 9}
+  m_Title: Inspector
+  m_RootView: {fileID: 10}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
@@ -34,23 +34,49 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectSettingsWindow
+  m_Name: TimelineWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 0
-    width: 566
-    height: 476
-  m_MinSize: {x: 310, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    y: 656
+    width: 1075
+    height: 318
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ProjectSettingsWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 631
+    height: 325
+  m_MinSize: {x: 312, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 18}
+  m_Panes:
+  - {fileID: 18}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -63,20 +89,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 2}
-  - {fileID: 4}
+  - {fileID: 3}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 823
-    width: 805
-    height: 476
+    y: 974
+    width: 1075
+    height: 325
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 125
+  controlID: 115
   draggingID: 0
---- !u!114 &4
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -91,18 +117,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 566
+    x: 631
     y: 0
-    width: 239
-    height: 476
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 18}
+    width: 444
+    height: 325
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &5
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -115,20 +141,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 15}
-  - {fileID: 3}
+  - {fileID: 16}
+  - {fileID: 2}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
-    x: 871
+    x: 518
     y: 0
-    width: 805
+    width: 1075
     height: 1299
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
+  m_MinSize: {x: 200, y: 150}
+  m_MaxSize: {x: 16192, y: 24288}
   vertical: 1
-  controlID: 124
+  controlID: 114
   draggingID: 0
---- !u!114 &6
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -145,16 +172,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 672
-    width: 418
+    width: 516
     height: 627
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 22}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -167,20 +194,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 13}
-  - {fileID: 6}
+  - {fileID: 14}
+  - {fileID: 7}
   m_Position:
     serializedVersion: 2
-    x: 1676
+    x: 1593
     y: 0
-    width: 418
+    width: 516
     height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 157
+  controlID: 147
   draggingID: 0
---- !u!114 &8
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -197,16 +224,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 871
+    width: 518
     height: 1299
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 23}
+  m_ActualView: {fileID: 24}
   m_Panes:
-  - {fileID: 23}
+  - {fileID: 24}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -219,9 +246,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 10}
   - {fileID: 11}
   - {fileID: 12}
+  - {fileID: 13}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -234,7 +261,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &10
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -256,7 +283,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &11
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -269,22 +296,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 9}
+  - {fileID: 6}
   - {fileID: 8}
-  - {fileID: 5}
-  - {fileID: 7}
-  - {fileID: 14}
+  - {fileID: 15}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
     width: 2560
     height: 1299
-  m_MinSize: {x: 500, y: 100}
-  m_MaxSize: {x: 40480, y: 16192}
+  m_MinSize: {x: 500, y: 150}
+  m_MaxSize: {x: 40480, y: 24288}
   vertical: 0
-  controlID: 284
+  controlID: 272
   draggingID: 0
---- !u!114 &12
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -305,7 +332,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &13
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -322,16 +349,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 418
+    width: 516
     height: 672
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 20}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -346,18 +373,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2094
+    x: 2109
     y: 0
-    width: 466
+    width: 451
     height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 21}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &15
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -367,25 +394,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TimelineWindow
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 805
-    height: 823
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 16}
+    width: 1075
+    height: 656
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 25}
   m_Panes:
-  - {fileID: 24}
-  - {fileID: 19}
-  - {fileID: 16}
-  m_Selected: 2
+  - {fileID: 25}
+  - {fileID: 20}
+  m_Selected: 0
   m_LastSelected: 1
---- !u!114 &16
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -405,10 +431,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 871
-    y: 73
-    width: 803
-    height: 802
+    x: 518
+    y: 729
+    width: 1073
+    height: 297
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -428,7 +454,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &17
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -448,10 +474,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 871
-    y: 896
-    width: 564
-    height: 455
+    x: 518
+    y: 1047
+    width: 629
+    height: 304
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -466,7 +492,7 @@ MonoBehaviour:
   m_PosRight: {x: 0, y: 0}
   m_Scope: 1
   m_SplitterFlex: 0.50980395
-  m_SearchText: 
+  m_SearchText: Boss_fenghuang
   m_TreeViewState:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 23e57dba
@@ -488,8 +514,8 @@ MonoBehaviour:
       m_OriginalEventType: 11
       m_IsRenamingFilename: 0
       m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
---- !u!114 &18
+    m_SearchString: Boss_fenghuang
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -509,10 +535,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1437
-    y: 896
-    width: 237
-    height: 455
+    x: 1149
+    y: 1047
+    width: 442
+    height: 304
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -523,7 +549,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &19
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -543,10 +569,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 871
+    x: 518
     y: 73
-    width: 803
-    height: 802
+    width: 1073
+    height: 315
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -557,61 +583,123 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  _SourceObject: {fileID: 11400000, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
+  _SourceObject: {fileID: 11400000, guid: cd317cd740f2b4446b7dcebc566590d3, type: 2}
   _Data:
     _Transitions:
-    - {fileID: 8413550133293145741, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
-    - {fileID: -822125633454001215, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
-    - {fileID: 4545472588857971225, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
-    - {fileID: -6135444481631302940, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
+    - {fileID: -6524117960266706350, guid: cd317cd740f2b4446b7dcebc566590d3, type: 2}
+    - {fileID: -1697680965667021841, guid: cd317cd740f2b4446b7dcebc566590d3, type: 2}
+    - {fileID: -8995815991680609226, guid: cd317cd740f2b4446b7dcebc566590d3, type: 2}
+    - {fileID: -5290662871289165410, guid: cd317cd740f2b4446b7dcebc566590d3, type: 2}
+    - {fileID: -975459192650883753, guid: cd317cd740f2b4446b7dcebc566590d3, type: 2}
+    - {fileID: -6027268528056596803, guid: cd317cd740f2b4446b7dcebc566590d3, type: 2}
     _Modifiers:
     - _From: 0
       _To: 0
       _Fade: 0
-    - _From: 1
+    - _From: 0
+      _To: 1
+      _Fade: 0
+    - _From: 0
+      _To: 2
+      _Fade: 0
+    - _From: 0
+      _To: 3
+      _Fade: 0
+    - _From: 0
+      _To: 4
+      _Fade: 0
+    - _From: 4
+      _To: 0
+      _Fade: 0
+    - _From: 3
+      _To: 0
+      _Fade: 0
+    - _From: 2
       _To: 0
       _Fade: 0
     - _From: 1
+      _To: 0
+      _Fade: 0
+    - _From: 4
       _To: 1
       _Fade: 0
-    - _From: 2
+    - _From: 3
       _To: 1
       _Fade: 0
     - _From: 2
-      _To: 2
+      _To: 1
       _Fade: 0
     - _From: 1
+      _To: 1
+      _Fade: 0
+    - _From: 4
       _To: 2
       _Fade: 0
-    - _From: 0
+    - _From: 3
       _To: 2
       _Fade: 0
-    - _From: 0
-      _To: 1
+    - _From: 2
+      _To: 2
+      _Fade: 0
+    - _From: 1
+      _To: 2
+      _Fade: 0
+    - _From: 1
+      _To: 3
       _Fade: 0
     - _From: 2
-      _To: 0
+      _To: 3
       _Fade: 0
     - _From: 3
-      _To: 0
+      _To: 3
+      _Fade: 0
+    - _From: 4
+      _To: 3
+      _Fade: 0
+    - _From: 4
+      _To: 4
       _Fade: 0
     - _From: 3
+      _To: 4
+      _Fade: 0
+    - _From: 2
+      _To: 4
+      _Fade: 0
+    - _From: 1
+      _To: 4
+      _Fade: 0
+    - _From: 5
+      _To: 0
+      _Fade: 0
+    - _From: 5
       _To: 1
       _Fade: 0
-    - _From: 3
+    - _From: 5
       _To: 2
       _Fade: 0
-    - _From: 3
+    - _From: 5
       _To: 3
       _Fade: 0
+    - _From: 5
+      _To: 4
+      _Fade: 0
+    - _From: 4
+      _To: 5
+      _Fade: 0
+    - _From: 3
+      _To: 5
+      _Fade: 0
     - _From: 2
-      _To: 3
+      _To: 5
       _Fade: 0
     - _From: 1
-      _To: 3
+      _To: 5
       _Fade: 0
     - _From: 0
-      _To: 3
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 5
       _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
@@ -633,7 +721,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &20
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -653,9 +741,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1676
+    x: 1593
     y: 73
-    width: 416
+    width: 514
     height: 651
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -672,23 +760,23 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 78faffff72bf0000
+      m_ExpandedIDs: 702cf1ff04b2fbffda7efcfff0e5fdffc2ebfdff12ecfdff6cf2fdff72f2fdff54f3fdffb6f3fdff1cb3feff3ee9feff44e9feff12eafeff5ceafeff1e40ffff82d8ffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Global Volume
-        m_OriginalName: Global Volume
+        m_Name: Boss_fenghuang
+        m_OriginalName: Boss_fenghuang
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 49216
+        m_UserData: 431436
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 13}
+        m_ClientGUIView: {fileID: 14}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -696,7 +784,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &21
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -716,9 +804,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2094
+    x: 2109
     y: 73
-    width: 465
+    width: 450
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -743,7 +831,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &22
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -763,9 +851,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1676
+    x: 1593
     y: 745
-    width: 416
+    width: 514
     height: 606
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -788,7 +876,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/HeroTimeLine
+    - Assets/Scripts/GameLogic/Paritcle/ParitcleLogic
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -796,32 +884,32 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/HeroTimeLine
+  - Assets/Scripts/GameLogic/Paritcle/ParitcleLogic
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 335}
-    m_SelectedIDs: 54ef0000
-    m_LastClickedID: 61268
-    m_ExpandedIDs: 0000000022ea000024ea000026ea000028ea00002aea00002cea00002eea000030ea000032ea000034ea000036ea000038ea00003aea00003cea00003eea000040ea000042ea000044ea000046ea000048ea00004aea00004cea00004eea000050ea000052ea000054ea000090ed0000aeed000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 1702}
+    m_SelectedIDs: 80f00000
+    m_LastClickedID: 61568
+    m_ExpandedIDs: 000000004eea000050ea000052ea000054ea000056ea000058ea00005aea00005cea00005eea000060ea000062ea000064ea000066ea000068ea00006aea00006cea00006eea000070ea000072ea000074ea000076ea000078ea00007aea00007cea00007eea0000beed0000dced0000e4ed000066ee000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: Scripts
+      m_OriginalName: Scripts
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 60900
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 6}
+      m_ClientGUIView: {fileID: 7}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -833,7 +921,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000022ea000024ea000026ea000028ea00002aea00002cea00002eea000030ea000032ea000034ea000036ea000038ea00003aea00003cea00003eea000040ea000042ea000044ea000046ea000048ea00004aea00004cea00004eea000050ea000052ea000054ea0000
+    m_ExpandedIDs: 000000004eea000050ea000052ea000054ea000056ea000058ea00005aea00005cea00005eea000060ea000062ea000064ea000066ea000068ea00006aea00006cea00006eea000070ea000072ea000074ea000076ea000078ea00007aea00007cea00007eea0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -861,23 +949,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb0300
+    m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb03000000000046860100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: Boss_fenghuang
+      m_OriginalName: Boss_fenghuang
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 103304
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 6}
+      m_ClientGUIView: {fileID: 7}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -885,11 +973,11 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 40.5}
+    m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 200
---- !u!114 &23
+  m_DirectoriesAreaWidth: 210
+--- !u!114 &24
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -911,7 +999,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 870
+    width: 517
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -965,29 +1053,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 870
+      width: 517
       height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 435, y: 628.5}
+    m_Scale: {x: 0.6893333, y: 0.6893333}
+    m_Translation: {x: 258.5, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -562.00476
-      y: -812
-      width: 1124.0095
-      height: 1624
+      x: -375
+      y: -911.7505
+      width: 750
+      height: 1823.501
     m_MinimalGUI: 1
-  m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 870, y: 1278}
+  m_defaultScale: 0.6893333
+  m_LastWindowPixelSize: {x: 517, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &24
+--- !u!114 &25
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1007,10 +1095,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 871
+    x: 518
     y: 73
-    width: 803
-    height: 802
+    width: 1073
+    height: 635
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1065,7 +1153,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -1103,9 +1191,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 86}
+      snapOffset: {x: 67.5, y: -191}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 2
       id: Orientation
       index: 0
       layout: 4
@@ -1117,7 +1205,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 2
@@ -1143,7 +1231,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -1156,7 +1244,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -1208,7 +1296,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -1221,7 +1309,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -1234,7 +1322,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -1390,14 +1478,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0, y: 0, z: 0}
+    m_Target: {x: -2.0023205, y: 18.871317, z: 29.95851}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0}
+    m_Value: {x: -2.0023205, y: 18.871317, z: 29.95851}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1443,17 +1531,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: 0.507794, y: -0.4313827, z: 0.32677522, w: 0.6703074}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: 0.5077839, y: -0.4313741, z: 0.32676873, w: 0.67029405}
   m_Size:
-    m_Target: 4.1305876
+    m_Target: 7.2793784
     speed: 2
-    m_Value: 4.1305876
+    m_Value: 7.2793784
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -1469,7 +1557,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.008581961, y: 0.15743524, z: 0.0013698555, w: -0.98749524}
+  m_LastSceneViewRotation: {x: 0.057611905, y: -0.9313831, z: -0.16918601, w: -0.31715888}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 

XiuXianGame.sln.DotSettings.user

@@ -27,6 +27,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIStyle_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F0f_003F32e1f086_003FIStyle_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ALayerMask_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F6c_003F2226b399_003FLayerMask_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ALinkedList_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb6b3a0ee69ba4fd1a67ca69a688cb6bb284000_003Fb0_003F81563a42_003FLinkedList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F5e_003F7396f990_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fc2_003Ff2299255_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMathf_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fec_003F349cf977_003FMathf_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMath_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb18a8b3398e74bca86895881dd02956c573648_003F8b_003F8699ce4e_003FMath_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>