修改bug

Assets/Art/Character/Guaiwu/xianhe/he gj2.FBX.meta

@@ -15,7 +15,7 @@ ModelImporter:
     resampleCurves: 1
     optimizeGameObjects: 0
     removeConstantScaleCurves: 0
-    motionNodeName: 
+    motionNodeName: 000/Bip01
     rigImportErrors: 
     rigImportWarnings: 
     animationImportErrors: 

Assets/Art/VFX/FXAnimation/1103dg.controller

@@ -59,7 +59,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 3422551065621703623}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 310, y: 60, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Res/Config/BuffConfig.json

@@ -43,7 +43,7 @@
     {
       "ID": 10031,
       "nameTest": "毒",
-      "decTest": "每层毒对敌人每秒照成{0}%木属性伤害，{1}层毒后毒气会入侵五脏对敌人对敌人施加噬魂",
+      "decTest": "每层毒对敌人每秒照成{0}%木属性伤害，{1}层毒时毒气会入侵五脏,敌人每使用一次功法对应功法的伤势增加1",
       "icon": "icon_b1003",
       "buffName": 500003,
       "buffEffectDes": 500044,
@@ -51,7 +51,8 @@
       "overlayCount": 15,
       "effectValue": [
         1.5,
-        15.0
+        15.0,
+        1.0
       ],
       "timeType": 2,
       "buffTime": 15.0,
@@ -61,37 +62,18 @@
       "IsHideIcon": 0,
       "scriptsName": "b_1003"
     },
-    {
-      "ID": 10041,
-      "nameTest": "噬魂",
-      "decTest": "敌人每使用一次功法对应功法的伤势增加{0}",
-      "icon": "icon_b1004",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
-      "buffGroup": 1004,
-      "overlayCount": 1,
-      "effectValue": [
-        1.0
-      ],
-      "timeType": 2,
-      "buffTime": 10.0,
-      "buffType": 2,
-      "dispelType": 1,
-      "IsControlBuff": 0,
-      "IsHideIcon": 0,
-      "scriptsName": "b_1004"
-    },
     {
       "ID": 10051,
       "nameTest": "灼热",
-      "decTest": "对敌人照成{0}火属性灼烧伤害，满层后敌人获得灼痛，有灼痛时不在获得",
+      "decTest": "对敌人照成{0}火属性灼烧伤害，满层时敌人会受到痛苦，敌人使用功法时自身受到当前生命{1}%伤害",
       "icon": "icon_b1005",
       "buffName": 500003,
       "buffEffectDes": 500044,
       "buffGroup": 1005,
       "overlayCount": 15,
       "effectValue": [
-        2.0
+        2.0,
+        1.0
       ],
       "timeType": 2,
       "buffTime": 15.0,
@@ -149,7 +131,7 @@
       "buffName": 500003,
       "buffEffectDes": 500044,
       "buffGroup": 1008,
-      "overlayCount": 20,
+      "overlayCount": 1,
       "effectValue": [
         0.0
       ],
@@ -181,37 +163,18 @@
       "IsHideIcon": 0,
       "scriptsName": "b_1009"
     },
-    {
-      "ID": 10101,
-      "nameTest": "痛苦",
-      "decTest": "敌人皮肤和静脉被火焰灼烧溃烂，使用功法时自身受到当前生命{0}%伤",
-      "icon": "icon_b1010",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
-      "buffGroup": 1010,
-      "overlayCount": 1,
-      "effectValue": [
-        5.0
-      ],
-      "timeType": 2,
-      "buffTime": 10.0,
-      "buffType": 2,
-      "dispelType": 1,
-      "IsControlBuff": 0,
-      "IsHideIcon": 0,
-      "scriptsName": "b_1010"
-    },
     {
       "ID": 10111,
       "nameTest": "流血",
-      "decTest": "敌人持续流血{0}金属性伤害，满层后照成流血，并清除层数",
+      "decTest": "敌人持续流血{0}金属性伤害，满层后每隔{1}秒放血一次",
       "icon": "icon_b1011",
       "buffName": 500003,
       "buffEffectDes": 500044,
       "buffGroup": 1011,
       "overlayCount": 15,
       "effectValue": [
-        2.0
+        2.0,
+        10.0
       ],
       "timeType": 2,
       "buffTime": 15.0,
@@ -224,7 +187,7 @@
     {
       "ID": 10121,
       "nameTest": "放血",
-      "decTest": "敌人受到一次大量{0}%金属性命值伤害，后续流血伤害提升{1}%，持续秒。持续期间不在受到流血带来的放血",
+      "decTest": "敌人受到一次大量{0}%金属性命值伤害，后续流血伤害提升{1}%",
       "icon": "icon_b1012",
       "buffName": 500003,
       "buffEffectDes": 500044,
@@ -232,7 +195,7 @@
       "overlayCount": 1,
       "effectValue": [
         100.0,
-        10.0
+        30.0
       ],
       "timeType": 2,
       "buffTime": 10.0,
@@ -543,6 +506,106 @@
       "IsControlBuff": 0,
       "IsHideIcon": 0,
       "scriptsName": "b_1028"
+    },
+    {
+      "ID": 10291,
+      "nameTest": "金伤势",
+      "decTest": "影响金的灵根",
+      "icon": "icon_b1029",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1029,
+      "overlayCount": 15,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 30.0,
+      "buffType": 2,
+      "dispelType": 2,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1029"
+    },
+    {
+      "ID": 10301,
+      "nameTest": "木伤势",
+      "decTest": "影响木的灵根",
+      "icon": "icon_b1030",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1030,
+      "overlayCount": 15,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 30.0,
+      "buffType": 2,
+      "dispelType": 2,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1030"
+    },
+    {
+      "ID": 10311,
+      "nameTest": "水伤势",
+      "decTest": "影响水的灵根",
+      "icon": "icon_b1031",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1031,
+      "overlayCount": 15,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 30.0,
+      "buffType": 2,
+      "dispelType": 2,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1031"
+    },
+    {
+      "ID": 10321,
+      "nameTest": "火伤势",
+      "decTest": "影响火的灵根",
+      "icon": "icon_b1032",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1032,
+      "overlayCount": 15,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 30.0,
+      "buffType": 2,
+      "dispelType": 2,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1032"
+    },
+    {
+      "ID": 10331,
+      "nameTest": "土伤势",
+      "decTest": "影响土的灵根",
+      "icon": "icon_b1033",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1033,
+      "overlayCount": 15,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 30.0,
+      "buffType": 2,
+      "dispelType": 2,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1033"
     }
   ]
 }

Assets/Res/Config/HeroModelConfig.json

@@ -1052,7 +1052,7 @@
       "model": "Boss_BeiHaiGui",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 35,
+      "attack": 60,
       "hp": 150,
       "def": 50,
       "shield": 0,

Assets/Res/Config/ItemConfig.json

@@ -2403,8 +2403,8 @@
       "stack_1": 0,
       "associateID": 3,
       "associateVlaue": [
-        13507,
-        2007
+        13509,
+        2009
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2432,8 +2432,269 @@
       "stack_1": 0,
       "associateID": 3,
       "associateVlaue": [
-        13508,
-        2008
+        13510,
+        2010
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 12511,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_12511",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13511,
+        2011
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 12512,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_12512",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13512,
+        2012
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 12513,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_12513",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13513,
+        2013
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 12514,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_12514",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13514,
+        2014
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 12515,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_12515",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13515,
+        2015
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 12516,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_12516",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13516,
+        2016
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 12517,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_12517",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13517,
+        2017
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 12518,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_12518",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13518,
+        2018
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 12519,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_12519",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13519,
+        2019
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -3313,6 +3574,231 @@
       "sort": 0,
       "itemDesc2": 0
     },
+    {
+      "ID": 13511,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_13511",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 13512,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_13512",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 13513,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_13513",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 13514,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_13514",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 13515,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_13515",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 13516,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_13516",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 13517,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_13517",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 13518,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_13518",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 13519,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_13519",
+      "itemTag": 14,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
     {
       "ID": 20001,
       "itemName": 3013,

Assets/Resources/Shader/ShengShiShader.shadergraph

@@ -112,6 +112,20 @@
                 "m_SlotId": 0
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "241ce69db5d7406ba03d830454413377"
+                },
+                "m_SlotId": 4
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "47d0c1fce2c44540a88b9a279f0985b5"
+                },
+                "m_SlotId": 0
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -210,20 +224,6 @@
                 "m_SlotId": 1
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "6d3d8508a9464eeabee9864e8a60741e"
-                },
-                "m_SlotId": 2
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "47d0c1fce2c44540a88b9a279f0985b5"
-                },
-                "m_SlotId": 0
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -374,10 +374,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -1645.9998779296875,
-            "y": 770.9999389648438,
-            "width": 207.9998779296875,
-            "height": 326.00006103515627
+            "x": -1695.0,
+            "y": 702.0,
+            "width": 208.0,
+            "height": 326.0
         }
     },
     "m_Slots": [
@@ -732,10 +732,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -395.0,
-            "y": 806.0,
+            "x": -440.0000305175781,
+            "y": 769.0,
             "width": 117.0,
-            "height": 34.00006103515625
+            "height": 34.0
         }
     },
     "m_Slots": [
@@ -1178,9 +1178,9 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -936.0,
+            "x": -955.0,
             "y": 467.0,
-            "width": 208.00006103515626,
+            "width": 208.0,
             "height": 278.0
         }
     },
@@ -1282,9 +1282,9 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -21.99994659423828,
-            "y": 504.0,
-            "width": 207.9998779296875,
+            "x": -35.0000114440918,
+            "y": 467.0,
+            "width": 207.99996948242188,
             "height": 302.0
         }
     },
@@ -1641,10 +1641,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": 284.9999694824219,
-            "y": 553.0000610351563,
-            "width": 120.00003051757813,
-            "height": 148.99993896484376
+            "x": 202.9999542236328,
+            "y": 557.0,
+            "width": 120.00001525878906,
+            "height": 149.0
         }
     },
     "m_Slots": [
@@ -1830,8 +1830,8 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -1847.9998779296875,
-            "y": 633.0,
+            "x": -1974.0,
+            "y": 637.0,
             "width": 121.0,
             "height": 34.0
         }
@@ -1915,10 +1915,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -243.99998474121095,
-            "y": 436.0,
-            "width": 207.99996948242188,
-            "height": 302.00006103515627
+            "x": -303.0000305175781,
+            "y": 443.0000305175781,
+            "width": 208.00001525878907,
+            "height": 301.9999694824219
         }
     },
     "m_Slots": [
@@ -2252,9 +2252,9 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -602.9999389648438,
-            "y": 467.0,
-            "width": 207.99996948242188,
+            "x": -636.0,
+            "y": 419.0,
+            "width": 208.0,
             "height": 326.0
         }
     },

Assets/Scenes/testCombat.scene

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

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/Buff/BuffControl.cs

@@ -108,6 +108,7 @@ namespace GameLogic.Combat.Buff
             }
         }
 
+        
         public T GetBuffBasicForType<T>() where T : BuffBasic
         {
             for (int i = 0; i < _allBuff.Count; i++)

Assets/Scripts/GameLogic/Combat/Buff/b_1005.cs

@@ -6,7 +6,7 @@ using GameLogic.Player;
 namespace GameLogic.Combat.Buff
 {
     /// <summary>
-    /// 灼热：每秒对敌人照成火属性灼烧伤害,满层后敌人获得灼痛,有灼痛时不在获得
+    /// 灼热：对敌人照成{0}火属性灼烧伤害，满层后敌人获得灼痛，有灼痛时不在获得,满层时敌人会受到痛苦，敌人使用功法时自身受到当前生命{1}%伤
     /// </summary>
     public class b_1005 : BuffBasic
     {
@@ -14,8 +14,27 @@ namespace GameLogic.Combat.Buff
 
         protected override void ProInit()
         {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+        }
+        private void AddUseGongFa(IEventData eventData)
+        {
+            AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
+            if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
+            {
+                if (buffCount < buffInf.BuffConfig.overlayCount)
+                {
+                    return;
+                }
+
+                float harmbl =  buffInf.BuffConfig.effectValue[1];
+                long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
+                    source.CurrCombatHeroInfo.hp.Value, harmbl);
+                CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
+                    WuXingType.Fire,null,HarmType.Buff);
+            }
         }
 
+     
 
         protected override void ProUpdate(float t)
         {
@@ -33,25 +52,26 @@ namespace GameLogic.Combat.Buff
             }
         }
 
-        protected override void ProUpdateEffect()
-        {
-            if (buffCount >= buffInf.BuffConfig.overlayCount) //最大叠加数量
-            {
-                b_1010 b1010 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1010>();
-                if (b1010 != null)
-                {
-                    return;
-                }
-
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10101, 1,this);
-                combatHeroEntity.BuffControl.AddBuff(source, buffInfo);
-                // combatHeroEntity.BuffControl.RemoveBuff(this);
-            }
-        }
+        // protected override void ProUpdateEffect()
+        // {
+        //     if (buffCount >= buffInf.BuffConfig.overlayCount) //最大叠加数量
+        //     {
+        //         b_1010 b1010 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1010>();
+        //         if (b1010 != null)
+        //         {
+        //             return;
+        //         }
+        //
+        //         BuffInfo buffInfo = BuffInfo.GetBuffInfo(10101, 1,this);
+        //         combatHeroEntity.BuffControl.AddBuff(source, buffInfo);
+        //         // combatHeroEntity.BuffControl.RemoveBuff(this);
+        //     }
+        // }
 
 
         protected override void ProDormancyObj()
         {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Buff/b_1010.cs

@@ -10,28 +10,28 @@ namespace GameLogic.Combat.Buff
     /// </summary>
     public class b_1010 : BuffBasic
     {
-        protected override void ProInit()
-        {
-            CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
-        }
-
-
-        private void AddUseGongFa(IEventData eventData)
-        {
-            AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
-            if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
-            {
-                float harmbl = buffCount * buffInf.BuffConfig.effectValue[0];
-                long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
-                    source.CurrCombatHeroInfo.hp.Value, harmbl);
-                CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                    WuXingType.Fire,null,HarmType.Buff);
-            }
-        }
-
-        protected override void ProDormancyObj()
-        {
-            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
-        }
+        // protected override void ProInit()
+        // {
+        //     CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+        // }
+        //
+        //
+        // private void AddUseGongFa(IEventData eventData)
+        // {
+        //     AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
+        //     if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
+        //     {
+        //         float harmbl = buffCount * buffInf.BuffConfig.effectValue[0];
+        //         long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
+        //             source.CurrCombatHeroInfo.hp.Value, harmbl);
+        //         CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
+        //             WuXingType.Fire,null,HarmType.Buff);
+        //     }
+        // }
+        //
+        // protected override void ProDormancyObj()
+        // {
+        //     CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+        // }
     }
 }

Assets/Scripts/GameLogic/Combat/Buff/b_1011.cs

@@ -5,13 +5,19 @@ using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 namespace GameLogic.Combat.Buff
 {
     /// <summary>
-    /// 敌人持续流血{0}金属性伤害，满层后照成流血，并清除层数
+    /// 敌人持续流血{0}金属性伤害，满层后每隔{0}秒放血一次
     /// </summary>
     public class b_1011 : BuffBasic
     {
+        /// <summary>
+        /// 上次添加buff时间
+        /// </summary>
+        private float lasetAddBuffTime;
+
         protected override void ProInit()
         {
             _jianGe = 1;
+            lasetAddBuffTime = 0;
         }
 
         protected override void UpdateJumping()
@@ -29,22 +35,27 @@ namespace GameLogic.Combat.Buff
             harm += CombatCalculateTool.Instance.GetVlaueRatioForLong(
                 harm, source.CurrCombatHeroInfo.Metal_Proficient);
             CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                WuXingType.Gold,null);
+                WuXingType.Gold, null);
         }
 
-        protected override void ProUpdateEffect()
+        protected override void ProUpdate(float t)
         {
-            if (buffCount >= buffInf.BuffConfig.overlayCount) //最大叠加数量
+            if (buffCount >= buffInf.BuffConfig.overlayCount)
             {
-                b_1012 b1012 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1012>();
-                if (b1012 != null)
+                float currTime = CombatController.currActiveCombat.combatTime;
+                if (currTime - lasetAddBuffTime >= buffInf.BuffConfig.effectValue[1])
                 {
-                    return;
-                }
+                    lasetAddBuffTime = currTime;
+                    b_1012 b1012 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1012>();
+                    if (b1012 != null)
+                    {
+                        b1012.FangXue();
+                        return;
+                    }
 
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10121, 1,this);
-                combatHeroEntity.BuffControl.AddBuff(source, buffInfo);
-                combatHeroEntity.BuffControl.RemoveBuff(this);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10121, 1, this);
+                    combatHeroEntity.BuffControl.AddBuff(source, buffInfo);
+                }
             }
         }
     }

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

@@ -58,7 +58,8 @@ namespace GameLogic.Combat.Skill
         {
             HeroInjuredEventData heroInjuredEventData = ieventData as HeroInjuredEventData;
             b_1011 b1011 = heroInjuredEventData.HarmReturnInfo.triggerData.Source as b_1011;
-            if (b1011 == null || b1011.Source != CombatHeroEntity)
+            b_1012 b1012 = heroInjuredEventData.HarmReturnInfo.triggerData.Source as b_1012;
+            if ((b1011 == null && b1012 == null) || b1011.Source != CombatHeroEntity)
             {
                 return;
             }

UserSettings/Layouts/default-2022.dwlt

@@ -19,12 +19,38 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Timeline
-  m_RootView: {fileID: 4}
+  m_Title: Inspector
+  m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 371}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !u!114 &2
+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: AnimatorControllerTool
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 486
+    width: 967
+    height: 243
+  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}
@@ -42,15 +68,15 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 525
-    height: 713
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 16}
+    height: 570
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !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: 11}
+  - {fileID: 3}
+  - {fileID: 12}
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 586
+    y: 729
     width: 967
-    height: 713
+    height: 570
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 2493
+  controlID: 53
   draggingID: 0
---- !u!114 &4
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -89,9 +115,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 5}
-  - {fileID: 7}
   - {fileID: 6}
+  - {fileID: 8}
+  - {fileID: 7}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -104,7 +130,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &5
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -126,7 +152,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &6
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -147,7 +173,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &7
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -160,22 +186,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
   - {fileID: 9}
-  - {fileID: 12}
-  - {fileID: 15}
+  - {fileID: 10}
+  - {fileID: 13}
+  - {fileID: 16}
   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: 2491
+  controlID: 51
   draggingID: 0
---- !u!114 &8
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -194,14 +220,14 @@ MonoBehaviour:
     y: 0
     width: 561
     height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -214,20 +240,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 10}
-  - {fileID: 3}
+  - {fileID: 11}
+  - {fileID: 2}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
     x: 561
     y: 0
     width: 967
     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: 2492
+  controlID: 52
   draggingID: 0
---- !u!114 &10
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -245,16 +272,16 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 967
-    height: 586
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 18}
+    height: 486
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 18}
-  - {fileID: 19}
+  - {fileID: 20}
+  - {fileID: 21}
   m_Selected: 0
-  m_LastSelected: 1
---- !u!114 &11
+  m_LastSelected: 0
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -272,15 +299,15 @@ MonoBehaviour:
     x: 525
     y: 0
     width: 442
-    height: 713
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 20}
+    height: 570
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -293,8 +320,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 13}
   - {fileID: 14}
+  - {fileID: 15}
   m_Position:
     serializedVersion: 2
     x: 1528
@@ -304,9 +331,9 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 70
+  controlID: 77
   draggingID: 0
---- !u!114 &13
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -325,14 +352,14 @@ MonoBehaviour:
     y: 0
     width: 514
     height: 464
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 21}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -353,12 +380,12 @@ MonoBehaviour:
     height: 835
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 22}
+  m_ActualView: {fileID: 24}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 24}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &15
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -377,14 +404,101 @@ MonoBehaviour:
     y: 0
     width: 518
     height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 23}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 25}
   m_Panes:
-  - {fileID: 23}
+  - {fileID: 25}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &16
+--- !u!114 &17
+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: 12914, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Animator
+    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 561
+    y: 559
+    width: 965
+    height: 222
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_ViewTransforms:
+    m_KeySerializationHelper:
+    - {fileID: 3620410648612663393, guid: 03730cdc18b747b4f94e190603366ca0, type: 2}
+    - {fileID: -3762019650762183174, guid: 1f1acde438411764b9a270adca5b2246, type: 2}
+    m_ValueSerializationHelper:
+    - e00: 0.80881315
+      e01: 0
+      e02: 0
+      e03: -108.3757
+      e10: 0
+      e11: 0.80881315
+      e12: 0
+      e13: 248.1596
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    - e00: 0.7408218
+      e01: 0
+      e02: 0
+      e03: -119.00844
+      e10: 0
+      e11: 0.7408218
+      e12: 0
+      e13: -106.6522
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+  m_PreviewAnimator: {fileID: 0}
+  m_AnimatorController: {fileID: 9100000, guid: 1f1acde438411764b9a270adca5b2246, type: 2}
+  m_BreadCrumbs:
+  - m_Target: {fileID: -3762019650762183174, guid: 1f1acde438411764b9a270adca5b2246, type: 2}
+    m_ScrollPosition: {x: 0, y: 0}
+  stateMachineGraph: {fileID: 0}
+  stateMachineGraphGUI: {fileID: 0}
+  blendTreeGraph: {fileID: 0}
+  blendTreeGraphGUI: {fileID: 0}
+  m_AutoLiveLink: 1
+  m_MiniTool: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_CurrentEditor: 0
+  m_LayerEditor:
+    m_SelectedLayerIndex: 0
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -405,9 +519,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 561
-    y: 659
+    y: 802
     width: 523
-    height: 692
+    height: 549
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -419,7 +533,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   visualTreeAsset: {fileID: 9197481963319205126, guid: 2a82c8ee6f9fbf94ea67777b3002caf7, type: 3}
---- !u!114 &17
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -517,7 +631,7 @@ MonoBehaviour:
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &18
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -540,7 +654,7 @@ MonoBehaviour:
     x: 561
     y: 73
     width: 965
-    height: 565
+    height: 465
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -925,9 +1039,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.3388918, y: 0.7093575, z: 0.0158391}
+    m_Target: {x: -0.591262, y: 20.239126, z: 15.228993}
     speed: 2
-    m_Value: {x: 0.3388918, y: 0.7093575, z: 0.0158391}
+    m_Value: {x: -0.20099896, y: 20.274967, z: 15.00996}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -977,9 +1091,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0.10542676, y: 0.30800733, z: -0.03498707, w: 0.9448771}
   m_Size:
-    m_Target: 2.6455293
+    m_Target: 3.3696237
     speed: 2
-    m_Value: 2.6455293
+    m_Value: 3.2245202
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1006,7 +1120,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &19
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1026,10 +1140,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 622
+    x: 561
     y: 73
-    width: 904
-    height: 591
+    width: 965
+    height: 708
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1040,14 +1154,14 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  _SourceObject: {fileID: 11400000, guid: 1e2f42b2ece70ee41a53fbffb44604e8, type: 2}
+  _SourceObject: {fileID: 11400000, guid: b0354796cabb02b45bba9173282447a8, type: 2}
   _Data:
     _Transitions:
-    - {fileID: 6956748510189031586, guid: 1e2f42b2ece70ee41a53fbffb44604e8, type: 2}
-    - {fileID: -4702057062356222694, guid: 1e2f42b2ece70ee41a53fbffb44604e8, type: 2}
-    - {fileID: 5118473012858537750, guid: 1e2f42b2ece70ee41a53fbffb44604e8, type: 2}
-    - {fileID: 8801049826529970461, guid: 1e2f42b2ece70ee41a53fbffb44604e8, type: 2}
-    - {fileID: -473734351341930196, guid: 1e2f42b2ece70ee41a53fbffb44604e8, type: 2}
+    - {fileID: 1141331696658887017, guid: b0354796cabb02b45bba9173282447a8, type: 2}
+    - {fileID: 5486772169272369730, guid: b0354796cabb02b45bba9173282447a8, type: 2}
+    - {fileID: -473161328745261242, guid: b0354796cabb02b45bba9173282447a8, type: 2}
+    - {fileID: -141391069886742074, guid: b0354796cabb02b45bba9173282447a8, type: 2}
+    - {fileID: 3982470027397128666, guid: b0354796cabb02b45bba9173282447a8, type: 2}
     _Modifiers:
     - _From: 0
       _To: 0
@@ -1061,6 +1175,9 @@ MonoBehaviour:
     - _From: 3
       _To: 0
       _Fade: 0
+    - _From: 4
+      _To: 0
+      _Fade: 0
     - _From: 0
       _To: 1
       _Fade: 0
@@ -1073,6 +1190,9 @@ MonoBehaviour:
     - _From: 3
       _To: 1
       _Fade: 0
+    - _From: 4
+      _To: 1
+      _Fade: 0
     - _From: 0
       _To: 2
       _Fade: 0
@@ -1085,6 +1205,9 @@ MonoBehaviour:
     - _From: 3
       _To: 2
       _Fade: 0
+    - _From: 4
+      _To: 2
+      _Fade: 0
     - _From: 0
       _To: 3
       _Fade: 0
@@ -1097,31 +1220,22 @@ MonoBehaviour:
     - _From: 3
       _To: 3
       _Fade: 0
-    - _From: 4
-      _To: 0
-      _Fade: 0
-    - _From: 4
-      _To: 1
-      _Fade: 0
-    - _From: 4
-      _To: 2
-      _Fade: 0
     - _From: 4
       _To: 3
       _Fade: 0
-    - _From: 4
+    - _From: 0
       _To: 4
       _Fade: 0
-    - _From: 3
+    - _From: 1
       _To: 4
       _Fade: 0
     - _From: 2
       _To: 4
       _Fade: 0
-    - _From: 1
+    - _From: 3
       _To: 4
       _Fade: 0
-    - _From: 0
+    - _From: 4
       _To: 4
       _Fade: 0
     _Aliases: []
@@ -1144,7 +1258,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &20
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1165,9 +1279,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 1086
-    y: 659
+    y: 802
     width: 440
-    height: 692
+    height: 549
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1185,9 +1299,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_SequenceHierarchy: {fileID: 0}
   m_SequencePath:
-    m_SelectionRoot: 0
+    m_SelectionRoot: -59790
     m_SubElements: []
---- !u!114 &21
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1224,9 +1338,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: 2a74ffff3074ffff92e8ffff
+      m_SelectedIDs: 7216ffff
+      m_LastClickedID: -59790
+      m_ExpandedIDs: 7615ffff7a15ffff8015ffff8415ffff5616ffff7e16ffff1817ffffcc5affff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1242,7 +1356,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 13}
+        m_ClientGUIView: {fileID: 14}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -1250,7 +1364,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &22
+--- !u!114 &24
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1295,7 +1409,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scenes
+    - Assets/Art/Character/Guaiwu/xianhe
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1303,16 +1417,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scenes
+  - Assets/Art/Character/Guaiwu/xianhe
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 1190}
-    m_SelectedIDs: cc1e0100
-    m_LastClickedID: 73420
-    m_ExpandedIDs: 00000000a61d0100a81d0100aa1d0100ac1d0100ae1d0100b01d0100b21d0100b41d0100b61d0100b81d0100ba1d0100bc1d0100be1d0100c01d0100c21d0100c41d0100c61d0100c81d0100ca1d0100cc1d0100ce1d0100d01d0100d21d0100d41d0100d61d0100d81d0100da1d0100dc1d0100de1d0100e01d0100e21d0100e41d0100861e010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 399}
+    m_SelectedIDs: e2470100
+    m_LastClickedID: 83938
+    m_ExpandedIDs: 0000000018ee00001aee00001cee00001eee000020ee000022ee000024ee000026ee000028ee00002aee00002cee00002eee000030ee000032ee000034ee000036ee000038ee00003aee00003cee00003eee000040ee000042ee000044ee000046ee000048ee00004aee00004cee00004eee000050ee000052ee000054ee000056ee00007af100002c48010000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1328,7 +1442,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 14}
+      m_ClientGUIView: {fileID: 15}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -1340,7 +1454,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000a61d0100a81d0100aa1d0100ac1d0100ae1d0100b01d0100b21d0100b41d0100b61d0100b81d0100ba1d0100bc1d0100be1d0100c01d0100c21d0100c41d0100c61d0100c81d0100ca1d0100cc1d0100ce1d0100d01d0100d21d0100d41d0100d61d0100d81d0100da1d0100dc1d0100de1d0100e01d0100e21d0100e41d0100
+    m_ExpandedIDs: 0000000018ee00001aee00001cee00001eee000020ee000022ee000024ee000026ee000028ee00002aee00002cee00002eee000030ee000032ee000034ee000036ee000038ee00003aee00003cee00003eee000040ee000042ee000044ee000046ee000048ee00004aee00004cee00004eee000050ee000052ee000054ee000056ee0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1368,23 +1482,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb03000000000046860100ae5a010094b001004e610100a2d1010038890300a6aa0000feaa0000d2530400a4530400aa890100b68f0100c28f0100c88f0100bc8f010096f50100baf8010096f7010038f20100e2ab0000bc37010084ab00001e3a01003edf0000263a010088ab0000e4ab000070ac0000d8ab0000e0ab0000
+    m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb03000000000046860100ae5a010094b001004e610100a2d1010038890300a6aa0000feaa0000d2530400a4530400aa890100b68f0100c28f0100c88f0100bc8f010096f50100baf8010096f7010038f20100e2ab0000bc37010084ab00001e3a01003edf0000263a010088ab0000e4ab000070ac0000d8ab0000e0ab000082270100442701004227010056480100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: gw_xianhe
+      m_OriginalName: gw_xianhe
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 48382
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 14}
+      m_ClientGUIView: {fileID: 15}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1396,7 +1510,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 210
---- !u!114 &23
+--- !u!114 &25
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1433,7 +1547,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 284.5
+    m_CachedPref: 442
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1

XiuXianGame.sln.DotSettings.user

@@ -11,6 +11,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollider_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2193ba18cb0546b2832917f7674384cf20000_003F3a_003Fa0da6a1e_003FCollider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F23_003Fdf7b38e0_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003Fc9_003Fe80e9cbf_003FDictionary_00602_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fad_003Fcb4b4f1f_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fc8_003F6520f62d_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fc8_003F6520f62d_003FDictionary_00602_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>