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

Assets/Res/Config/GroupConfig.json

@@ -391,7 +391,7 @@
         126
       ],
       "GroupMonster": [
-        9001
+        7004
       ]
     },
     {
@@ -400,7 +400,7 @@
         46
       ],
       "GroupMonster": [
-        9001
+        5007
       ]
     },
     {

Assets/Res/Config/LanguageChineseConfig_skill.json

@@ -4710,7 +4710,7 @@
     },
     {
       "ID": 1220085,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "额外对敌人施加流血"
     },
     {
       "ID": 1220091,
@@ -4730,7 +4730,7 @@
     },
     {
       "ID": 1220095,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220101,
@@ -4750,7 +4750,7 @@
     },
     {
       "ID": 1220105,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "贫血时提升恢复量"
     },
     {
       "ID": 1220111,
@@ -4770,7 +4770,7 @@
     },
     {
       "ID": 1220115,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220121,
@@ -4790,7 +4790,7 @@
     },
     {
       "ID": 1220125,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220131,
@@ -4810,7 +4810,7 @@
     },
     {
       "ID": 1220135,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220141,
@@ -4830,7 +4830,7 @@
     },
     {
       "ID": 1220145,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220151,
@@ -4850,7 +4850,7 @@
     },
     {
       "ID": 1220155,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220161,
@@ -4870,7 +4870,7 @@
     },
     {
       "ID": 1220165,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220171,
@@ -4890,7 +4890,7 @@
     },
     {
       "ID": 1220175,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220181,
@@ -4910,7 +4910,7 @@
     },
     {
       "ID": 1220185,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220191,
@@ -4930,7 +4930,7 @@
     },
     {
       "ID": 1220195,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1231011,

Assets/Res/Config/SkillConfig.json

@@ -6170,9 +6170,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220095,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0,
         -1.0
@@ -6557,9 +6560,12 @@
         101
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
-      "PromoteLan": 1220115
+      "PromoteLan": 1220115,
+      "PromoteLanPara": [
+        3.0
+      ]
     },
     {
       "ID": 20120,
@@ -6740,9 +6746,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220125,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -6926,9 +6935,12 @@
         103
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220135,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -7147,9 +7159,12 @@
         101
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220145,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         0.0,
         -1.0
@@ -7369,9 +7384,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220155,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         0.0,
         -1.0,
@@ -7587,9 +7605,12 @@
         103
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220165,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -7791,9 +7812,12 @@
         101
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220175,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -7998,9 +8022,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
-      "PromoteLan": 1220185
+      "PromoteLan": 1220185,
+      "PromoteLanPara": [
+        3.0
+      ]
     },
     {
       "ID": 20190,
@@ -8199,9 +8226,12 @@
         103
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220195,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]