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

Assets/Res/Config/DropItemConfig.json

@@ -93,16 +93,10 @@
         1005,
         1006,
         1001,
-        1001,
-        1001,
-        1001,
-        1001,
-        1001,
-        1001,
         1001
       ],
-      "dropMinV": -100,
-      "dropMaxV": -100,
+      "dropMinV": -300,
+      "dropMaxV": -300,
       "dropCountGoupID": -1
     },
     {

Assets/Res/Config/EventConfig.json

@@ -121,10 +121,10 @@
       ],
       "PrizeNums": [
         -6000,
-        -3000,
+        -6000,
         -2000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -154,10 +154,10 @@
       ],
       "PrizeNums": [
         -6000,
-        -3000,
+        -6000,
         -2000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -418,10 +418,10 @@
       ],
       "PrizeNums": [
         -9000,
-        -4000,
+        -8000,
         -3000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -451,10 +451,10 @@
       ],
       "PrizeNums": [
         -9000,
-        -4000,
+        -8000,
         -3000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -715,10 +715,10 @@
       ],
       "PrizeNums": [
         -12000,
-        -5000,
+        -10000,
         -4000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -748,10 +748,10 @@
       ],
       "PrizeNums": [
         -12000,
-        -5000,
+        -10000,
         -4000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1012,10 +1012,10 @@
       ],
       "PrizeNums": [
         -20000,
-        -6000,
+        -12000,
         -5000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1045,10 +1045,10 @@
       ],
       "PrizeNums": [
         -20000,
-        -6000,
+        -12000,
         -5000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1309,10 +1309,10 @@
       ],
       "PrizeNums": [
         -30000,
-        -7500,
+        -15000,
         -6000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1342,10 +1342,10 @@
       ],
       "PrizeNums": [
         -30000,
-        -7500,
+        -15000,
         -6000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6706,12 +6706,12 @@
       "EventQuality": 1,
       "PrizeIDs": [
         1401,
-        1001,
+        1005,
         1003
       ],
       "PrizeNums": [
         1,
-        -2000,
+        -6000,
         -6000
       ],
       "RefreshProbability": 100,
@@ -6755,7 +6755,7 @@
       ],
       "RefreshProbability": 100,
       "RefreshCount": 1,
-      "placeID": 2,
+      "placeID": 0,
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
@@ -6800,7 +6800,7 @@
       ],
       "RefreshProbability": 100,
       "RefreshCount": 1,
-      "placeID": 2,
+      "placeID": 0,
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
@@ -6849,7 +6849,7 @@
       ],
       "RefreshProbability": 100,
       "RefreshCount": 1,
-      "placeID": 2,
+      "placeID": 0,
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
@@ -6893,7 +6893,7 @@
       ],
       "RefreshProbability": 100,
       "RefreshCount": 1,
-      "placeID": 2,
+      "placeID": 0,
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
@@ -6928,12 +6928,12 @@
       "EventQuality": 2,
       "PrizeIDs": [
         1402,
-        1001,
+        1005,
         1003
       ],
       "PrizeNums": [
         1,
-        -3000,
+        -8000,
         -9000
       ],
       "RefreshProbability": 100,
@@ -6970,12 +6970,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         1403,
-        1001,
+        1005,
         1003
       ],
       "PrizeNums": [
         1,
-        -4000,
+        -10000,
         -12000
       ],
       "RefreshProbability": 100,
@@ -7003,12 +7003,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1403,
-        1001,
+        1005,
         1003
       ],
       "PrizeNums": [
         1,
-        -5000,
+        -12000,
         -20000
       ],
       "RefreshProbability": 100,
@@ -7036,12 +7036,12 @@
       "EventQuality": 1,
       "PrizeIDs": [
         1401,
-        1001,
+        1006,
         1003
       ],
       "PrizeNums": [
         1,
-        -2000,
+        -6000,
         -6000
       ],
       "RefreshProbability": 100,
@@ -7069,12 +7069,12 @@
       "EventQuality": 2,
       "PrizeIDs": [
         1402,
-        1001,
+        1006,
         1003
       ],
       "PrizeNums": [
         1,
-        -3000,
+        -8000,
         -9000
       ],
       "RefreshProbability": 100,
@@ -7103,12 +7103,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         1403,
-        1001,
+        1006,
         1003
       ],
       "PrizeNums": [
         1,
-        -4000,
+        -10000,
         -12000
       ],
       "RefreshProbability": 100,
@@ -7137,12 +7137,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1403,
-        1001,
+        1006,
         1003
       ],
       "PrizeNums": [
         1,
-        -5000,
+        -12000,
         -20000
       ],
       "RefreshProbability": 100,

Assets/Res/Config/SkillConfig.json

@@ -5762,7 +5762,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        120.0
+        80.0
       ],
       "intensifierIndex": [
         2
@@ -5791,7 +5791,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        130.0
+        90.0
       ],
       "intensifierIndex": [
         2
@@ -5829,7 +5829,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        140.0
+        100.0
       ],
       "intensifierIndex": [
         2
@@ -5867,7 +5867,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        150.0
+        110.0
       ],
       "intensifierIndex": [
         2
@@ -5905,7 +5905,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        160.0
+        120.0
       ],
       "intensifierIndex": [
         2
@@ -5943,7 +5943,7 @@
       "effectUpK": 100,
       "effectValue": [
         2.0,
-        170.0,
+        130.0,
         1.0
       ],
       "intensifierIndex": [
@@ -14757,7 +14757,7 @@
       "level": 1,
       "effectUpK": 100,
       "effectValue": [
-        300.0
+        100.0
       ],
       "intensifierIndex": [
         1
@@ -14781,7 +14781,7 @@
       "level": 2,
       "effectUpK": 100,
       "effectValue": [
-        400.0
+        120.0
       ],
       "intensifierIndex": [
         1
@@ -14805,7 +14805,7 @@
       "level": 3,
       "effectUpK": 100,
       "effectValue": [
-        500.0
+        140.0
       ],
       "intensifierIndex": [
         1
@@ -14829,7 +14829,7 @@
       "level": 4,
       "effectUpK": 100,
       "effectValue": [
-        600.0
+        160.0
       ],
       "intensifierIndex": [
         1
@@ -14853,7 +14853,7 @@
       "level": 5,
       "effectUpK": 100,
       "effectValue": [
-        700.0
+        180.0
       ],
       "intensifierIndex": [
         1
@@ -14877,7 +14877,7 @@
       "level": 6,
       "effectUpK": 100,
       "effectValue": [
-        800.0
+        200.0
       ],
       "intensifierIndex": [
         1

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/Skill/SkillBasic.cs

@@ -583,7 +583,7 @@ namespace GameLogic.Combat.Skill
         public void TimeLineTrigger(string groupName, ILifetCycleHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic, TriggerData triggerData, ISkillFeatures skillFeatures)
         {
-            if (targetEntity == null || _isDis)
+            if (targetEntity == null || _isDis||CombatHeroEntity==null||CombatHeroEntity.CurrCombatHeroInfo==null)
             {
                 return;
             }