diff --git a/bin/json/game_activereward.json b/bin/json/game_activereward.json
index db71032fc..978315ff4 100644
--- a/bin/json/game_activereward.json
+++ b/bin/json/game_activereward.json
@@ -9,6 +9,11 @@
"t": "diamond",
"n": 150
},
+ {
+ "a": "item",
+ "t": "14020000",
+ "n": 50
+ },
{
"a": "attr",
"t": "gold",
@@ -28,6 +33,11 @@
"t": "diamond",
"n": 150
},
+ {
+ "a": "item",
+ "t": "14020000",
+ "n": 100
+ },
{
"a": "attr",
"t": "gold",
@@ -47,6 +57,11 @@
"t": "diamond",
"n": 150
},
+ {
+ "a": "item",
+ "t": "14020000",
+ "n": 100
+ },
{
"a": "attr",
"t": "gold",
@@ -66,6 +81,11 @@
"t": "diamond",
"n": 150
},
+ {
+ "a": "item",
+ "t": "14020000",
+ "n": 100
+ },
{
"a": "attr",
"t": "gold",
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index b6adecad8..e2987e70d 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -18097,7 +18097,7 @@
},
"type": 43,
"valid": 0,
- "NPC": 10474,
+ "NPC": -102,
"value": 6,
"filter": [
6
@@ -18385,7 +18385,7 @@
},
"type": 43,
"valid": 0,
- "NPC": 10594,
+ "NPC": -102,
"value": 9,
"filter": [
6
@@ -18530,7 +18530,7 @@
},
"type": 43,
"valid": 0,
- "NPC": 10654,
+ "NPC": -102,
"value": 12,
"filter": [
6
@@ -18672,7 +18672,7 @@
},
"type": 93,
"valid": 0,
- "NPC": 10714,
+ "NPC": -102,
"value": 1,
"filter": [
1,
@@ -18837,7 +18837,7 @@
},
"type": 43,
"valid": 0,
- "NPC": 10784,
+ "NPC": -102,
"value": 12,
"filter": [
9
@@ -19051,7 +19051,7 @@
},
"type": 43,
"valid": 0,
- "NPC": 10874,
+ "NPC": -102,
"value": 18,
"filter": [
9
@@ -19170,7 +19170,7 @@
},
"type": 43,
"valid": 0,
- "NPC": 10924,
+ "NPC": -102,
"value": 8,
"filter": [
12
diff --git a/bin/json/game_cardpool.json b/bin/json/game_cardpool.json
new file mode 100644
index 000000000..8ed3a8d37
--- /dev/null
+++ b/bin/json/game_cardpool.json
@@ -0,0 +1,608 @@
+[
+ {
+ "key": 1,
+ "card_pool_type": "base_pool1",
+ "id": "24004",
+ "weight": 1000
+ },
+ {
+ "key": 2,
+ "card_pool_type": "base_pool1",
+ "id": "24004",
+ "weight": 1000
+ },
+ {
+ "key": 3,
+ "card_pool_type": "base_pool1",
+ "id": "24004",
+ "weight": 1000
+ },
+ {
+ "key": 4,
+ "card_pool_type": "base_pool2",
+ "id": "25001",
+ "weight": 1000
+ },
+ {
+ "key": 5,
+ "card_pool_type": "base_pool2",
+ "id": "25001",
+ "weight": 1000
+ },
+ {
+ "key": 6,
+ "card_pool_type": "base_pool2",
+ "id": "25001",
+ "weight": 1000
+ },
+ {
+ "key": 7,
+ "card_pool_type": "base_pool3",
+ "id": "25004",
+ "weight": 1000
+ },
+ {
+ "key": 8,
+ "card_pool_type": "base_pool3",
+ "id": "25004",
+ "weight": 1000
+ },
+ {
+ "key": 9,
+ "card_pool_type": "base_pool3",
+ "id": "25004",
+ "weight": 1000
+ },
+ {
+ "key": 10,
+ "card_pool_type": "base_pool4",
+ "id": "24008",
+ "weight": 1000
+ },
+ {
+ "key": 11,
+ "card_pool_type": "base_pool4",
+ "id": "24008",
+ "weight": 1000
+ },
+ {
+ "key": 12,
+ "card_pool_type": "base_pool4",
+ "id": "24008",
+ "weight": 1000
+ },
+ {
+ "key": 13,
+ "card_pool_type": "base_pool5",
+ "id": "24003",
+ "weight": 1000
+ },
+ {
+ "key": 14,
+ "card_pool_type": "base_pool5",
+ "id": "24003",
+ "weight": 1000
+ },
+ {
+ "key": 15,
+ "card_pool_type": "base_pool5",
+ "id": "24003",
+ "weight": 1000
+ },
+ {
+ "key": 16,
+ "card_pool_type": "base_pool6",
+ "id": "15005",
+ "weight": 1000
+ },
+ {
+ "key": 17,
+ "card_pool_type": "base_pool6",
+ "id": "15005",
+ "weight": 1000
+ },
+ {
+ "key": 18,
+ "card_pool_type": "base_pool6",
+ "id": "15005",
+ "weight": 1000
+ },
+ {
+ "key": 19,
+ "card_pool_type": "base_pool7",
+ "id": "24004",
+ "weight": 1000
+ },
+ {
+ "key": 20,
+ "card_pool_type": "base_pool7",
+ "id": "25001",
+ "weight": 1000
+ },
+ {
+ "key": 21,
+ "card_pool_type": "base_pool7",
+ "id": "25004",
+ "weight": 1000
+ },
+ {
+ "key": 22,
+ "card_pool_type": "base_pool7",
+ "id": "24008",
+ "weight": 1000
+ },
+ {
+ "key": 23,
+ "card_pool_type": "base_pool7",
+ "id": "24003",
+ "weight": 1000
+ },
+ {
+ "key": 24,
+ "card_pool_type": "base_pool7",
+ "id": "15005",
+ "weight": 1000
+ },
+ {
+ "key": 25,
+ "card_pool_type": "base_pool7",
+ "id": "14001",
+ "weight": 1000
+ },
+ {
+ "key": 26,
+ "card_pool_type": "base_pool7",
+ "id": "14003",
+ "weight": 1000
+ },
+ {
+ "key": 27,
+ "card_pool_type": "base_pool7",
+ "id": "34006",
+ "weight": 1000
+ },
+ {
+ "key": 28,
+ "card_pool_type": "base_pool7",
+ "id": "34002",
+ "weight": 1000
+ },
+ {
+ "key": 29,
+ "card_pool_type": "base_pool7",
+ "id": "24002",
+ "weight": 1000
+ },
+ {
+ "key": 30,
+ "card_pool_type": "base_pool7",
+ "id": "35001",
+ "weight": 1000
+ },
+ {
+ "key": 31,
+ "card_pool_type": "base_pool7",
+ "id": "15004",
+ "weight": 1000
+ },
+ {
+ "key": 32,
+ "card_pool_type": "base_pool7",
+ "id": "44005",
+ "weight": 1000
+ },
+ {
+ "key": 33,
+ "card_pool_type": "base_pool7",
+ "id": "44006",
+ "weight": 1000
+ },
+ {
+ "key": 54,
+ "card_pool_type": "camp1_pool",
+ "id": "13001",
+ "weight": 1000
+ },
+ {
+ "key": 55,
+ "card_pool_type": "camp1_pool",
+ "id": "13002",
+ "weight": 1000
+ },
+ {
+ "key": 56,
+ "card_pool_type": "camp1_pool",
+ "id": "13003",
+ "weight": 1000
+ },
+ {
+ "key": 57,
+ "card_pool_type": "camp1_pool",
+ "id": "13004",
+ "weight": 1000
+ },
+ {
+ "key": 58,
+ "card_pool_type": "camp1_pool",
+ "id": "13005",
+ "weight": 1000
+ },
+ {
+ "key": 59,
+ "card_pool_type": "camp1_pool",
+ "id": "14001",
+ "weight": 1000
+ },
+ {
+ "key": 60,
+ "card_pool_type": "camp1_pool",
+ "id": "14002",
+ "weight": 1000
+ },
+ {
+ "key": 61,
+ "card_pool_type": "camp1_pool",
+ "id": "14003",
+ "weight": 1000
+ },
+ {
+ "key": 62,
+ "card_pool_type": "camp1_pool",
+ "id": "14004",
+ "weight": 1000
+ },
+ {
+ "key": 63,
+ "card_pool_type": "camp1_pool",
+ "id": "14005",
+ "weight": 1000
+ },
+ {
+ "key": 64,
+ "card_pool_type": "camp1_pool",
+ "id": "14006",
+ "weight": 1000
+ },
+ {
+ "key": 65,
+ "card_pool_type": "camp1_pool",
+ "id": "14007",
+ "weight": 1000
+ },
+ {
+ "key": 66,
+ "card_pool_type": "camp1_pool",
+ "id": "15001",
+ "weight": 1000
+ },
+ {
+ "key": 67,
+ "card_pool_type": "camp1_pool",
+ "id": "15002",
+ "weight": 1000
+ },
+ {
+ "key": 68,
+ "card_pool_type": "camp1_pool",
+ "id": "15003",
+ "weight": 1000
+ },
+ {
+ "key": 69,
+ "card_pool_type": "camp1_pool",
+ "id": "15004",
+ "weight": 1000
+ },
+ {
+ "key": 70,
+ "card_pool_type": "camp2_pool",
+ "id": "23001",
+ "weight": 1000
+ },
+ {
+ "key": 71,
+ "card_pool_type": "camp2_pool",
+ "id": "23002",
+ "weight": 1000
+ },
+ {
+ "key": 72,
+ "card_pool_type": "camp2_pool",
+ "id": "23003",
+ "weight": 1000
+ },
+ {
+ "key": 73,
+ "card_pool_type": "camp2_pool",
+ "id": "23004",
+ "weight": 1000
+ },
+ {
+ "key": 74,
+ "card_pool_type": "camp2_pool",
+ "id": "24001",
+ "weight": 1000
+ },
+ {
+ "key": 75,
+ "card_pool_type": "camp2_pool",
+ "id": "24002",
+ "weight": 1000
+ },
+ {
+ "key": 76,
+ "card_pool_type": "camp2_pool",
+ "id": "24003",
+ "weight": 1000
+ },
+ {
+ "key": 77,
+ "card_pool_type": "camp2_pool",
+ "id": "24004",
+ "weight": 1000
+ },
+ {
+ "key": 78,
+ "card_pool_type": "camp2_pool",
+ "id": "24005",
+ "weight": 1000
+ },
+ {
+ "key": 79,
+ "card_pool_type": "camp2_pool",
+ "id": "24006",
+ "weight": 1000
+ },
+ {
+ "key": 80,
+ "card_pool_type": "camp2_pool",
+ "id": "24007",
+ "weight": 1000
+ },
+ {
+ "key": 81,
+ "card_pool_type": "camp2_pool",
+ "id": "24008",
+ "weight": 1000
+ },
+ {
+ "key": 82,
+ "card_pool_type": "camp2_pool",
+ "id": "24009",
+ "weight": 1000
+ },
+ {
+ "key": 83,
+ "card_pool_type": "camp2_pool",
+ "id": "25001",
+ "weight": 1000
+ },
+ {
+ "key": 84,
+ "card_pool_type": "camp2_pool",
+ "id": "25002",
+ "weight": 1000
+ },
+ {
+ "key": 85,
+ "card_pool_type": "camp2_pool",
+ "id": "25003",
+ "weight": 1000
+ },
+ {
+ "key": 86,
+ "card_pool_type": "camp2_pool",
+ "id": "25004",
+ "weight": 1000
+ },
+ {
+ "key": 87,
+ "card_pool_type": "camp3_pool",
+ "id": "33001",
+ "weight": 1000
+ },
+ {
+ "key": 88,
+ "card_pool_type": "camp3_pool",
+ "id": "33002",
+ "weight": 1000
+ },
+ {
+ "key": 89,
+ "card_pool_type": "camp3_pool",
+ "id": "33003",
+ "weight": 1000
+ },
+ {
+ "key": 90,
+ "card_pool_type": "camp3_pool",
+ "id": "33004",
+ "weight": 1000
+ },
+ {
+ "key": 91,
+ "card_pool_type": "camp3_pool",
+ "id": "33005",
+ "weight": 1000
+ },
+ {
+ "key": 92,
+ "card_pool_type": "camp3_pool",
+ "id": "33006",
+ "weight": 1000
+ },
+ {
+ "key": 93,
+ "card_pool_type": "camp3_pool",
+ "id": "34001",
+ "weight": 1000
+ },
+ {
+ "key": 94,
+ "card_pool_type": "camp3_pool",
+ "id": "34002",
+ "weight": 1000
+ },
+ {
+ "key": 95,
+ "card_pool_type": "camp3_pool",
+ "id": "34003",
+ "weight": 1000
+ },
+ {
+ "key": 96,
+ "card_pool_type": "camp3_pool",
+ "id": "34004",
+ "weight": 1000
+ },
+ {
+ "key": 97,
+ "card_pool_type": "camp3_pool",
+ "id": "34005",
+ "weight": 1000
+ },
+ {
+ "key": 98,
+ "card_pool_type": "camp3_pool",
+ "id": "34006",
+ "weight": 1000
+ },
+ {
+ "key": 99,
+ "card_pool_type": "camp3_pool",
+ "id": "34007",
+ "weight": 1000
+ },
+ {
+ "key": 100,
+ "card_pool_type": "camp3_pool",
+ "id": "34008",
+ "weight": 1000
+ },
+ {
+ "key": 101,
+ "card_pool_type": "camp3_pool",
+ "id": "35002",
+ "weight": 1000
+ },
+ {
+ "key": 102,
+ "card_pool_type": "camp3_pool",
+ "id": "35003",
+ "weight": 1000
+ },
+ {
+ "key": 103,
+ "card_pool_type": "camp3_pool",
+ "id": "35004",
+ "weight": 1000
+ },
+ {
+ "key": 104,
+ "card_pool_type": "camp3_pool",
+ "id": "35005",
+ "weight": 1000
+ },
+ {
+ "key": 105,
+ "card_pool_type": "camp3_pool",
+ "id": "35006",
+ "weight": 1000
+ },
+ {
+ "key": 106,
+ "card_pool_type": "camp4_pool",
+ "id": "43001",
+ "weight": 1000
+ },
+ {
+ "key": 107,
+ "card_pool_type": "camp4_pool",
+ "id": "43002",
+ "weight": 1000
+ },
+ {
+ "key": 108,
+ "card_pool_type": "camp4_pool",
+ "id": "43003",
+ "weight": 1000
+ },
+ {
+ "key": 109,
+ "card_pool_type": "camp4_pool",
+ "id": "43004",
+ "weight": 1000
+ },
+ {
+ "key": 110,
+ "card_pool_type": "camp4_pool",
+ "id": "43005",
+ "weight": 1000
+ },
+ {
+ "key": 111,
+ "card_pool_type": "camp4_pool",
+ "id": "43006",
+ "weight": 1000
+ },
+ {
+ "key": 112,
+ "card_pool_type": "camp4_pool",
+ "id": "43007",
+ "weight": 1000
+ },
+ {
+ "key": 113,
+ "card_pool_type": "camp4_pool",
+ "id": "44001",
+ "weight": 1000
+ },
+ {
+ "key": 114,
+ "card_pool_type": "camp4_pool",
+ "id": "44002",
+ "weight": 1000
+ },
+ {
+ "key": 115,
+ "card_pool_type": "camp4_pool",
+ "id": "44003",
+ "weight": 1000
+ },
+ {
+ "key": 116,
+ "card_pool_type": "camp4_pool",
+ "id": "44004",
+ "weight": 1000
+ },
+ {
+ "key": 117,
+ "card_pool_type": "camp4_pool",
+ "id": "44006",
+ "weight": 1000
+ },
+ {
+ "key": 118,
+ "card_pool_type": "camp4_pool",
+ "id": "45001",
+ "weight": 1000
+ },
+ {
+ "key": 119,
+ "card_pool_type": "camp4_pool",
+ "id": "45002",
+ "weight": 1000
+ },
+ {
+ "key": 120,
+ "card_pool_type": "camp4_pool",
+ "id": "45003",
+ "weight": 1000
+ },
+ {
+ "key": 121,
+ "card_pool_type": "camp4_pool",
+ "id": "45004",
+ "weight": 1000
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json
index 5dd14b575..77c51eb0c 100644
--- a/bin/json/game_drawcard.json
+++ b/bin/json/game_drawcard.json
@@ -2,1931 +2,356 @@
{
"key": 1,
"recruitment_type": 1,
- "card_pool_type": "inevitable_20001",
+ "card_pool_type": "base_pool1",
"star": 3,
- "rece": 1,
- "id": "24001",
+ "rece": 2,
+ "id": "24004",
"weight": 1000
},
{
"key": 2,
"recruitment_type": 1,
- "card_pool_type": "inevitable_20010",
- "star": 3,
- "rece": 1,
- "id": "24001",
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "rece": 2,
+ "id": "24004",
"weight": 1000
},
{
"key": 3,
"recruitment_type": 1,
- "card_pool_type": "inevitable_20010",
- "star": 3,
- "rece": 1,
- "id": "24001",
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "rece": 2,
+ "id": "24004",
"weight": 1000
},
{
"key": 4,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
+ "card_pool_type": "base_pool2",
"star": 3,
"rece": 2,
- "id": "24002",
- "weight": 36
+ "id": "25001",
+ "weight": 1000
},
{
"key": 5,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
- "star": 3,
- "rece": 1,
- "id": "13003",
- "weight": 36
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "rece": 2,
+ "id": "25001",
+ "weight": 1000
},
{
"key": 6,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
- "star": 3,
- "rece": 4,
- "id": "43006",
- "weight": 9
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "rece": 2,
+ "id": "25001",
+ "weight": 1000
},
{
"key": 7,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
+ "card_pool_type": "base_pool3",
"star": 3,
- "rece": 4,
- "id": "43001",
- "weight": 9
+ "rece": 2,
+ "id": "25004",
+ "weight": 1000
},
{
"key": 8,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
- "star": 3,
- "rece": 1,
- "id": "13001",
- "weight": 36
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "rece": 2,
+ "id": "25004",
+ "weight": 1000
},
{
"key": 9,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
- "star": 3,
- "rece": 3,
- "id": "33002",
- "weight": 36
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "rece": 2,
+ "id": "25004",
+ "weight": 1000
},
{
"key": 10,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
+ "card_pool_type": "base_pool4",
"star": 3,
- "rece": 1,
- "id": "13005",
- "weight": 36
+ "rece": 2,
+ "id": "24008",
+ "weight": 1000
},
{
"key": 11,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
- "star": 3,
+ "card_pool_type": "base_pool4",
+ "star": 4,
"rece": 2,
- "id": "23004",
- "weight": 36
+ "id": "24008",
+ "weight": 1000
},
{
"key": 12,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
- "star": 3,
- "rece": 1,
- "id": "13004",
- "weight": 36
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "rece": 2,
+ "id": "24008",
+ "weight": 1000
},
{
"key": 13,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
+ "card_pool_type": "base_pool5",
"star": 3,
- "rece": 4,
- "id": "43003",
- "weight": 9
+ "rece": 2,
+ "id": "24003",
+ "weight": 1000
},
{
"key": 14,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
- "star": 3,
- "rece": 1,
- "id": "13002",
- "weight": 36
+ "card_pool_type": "base_pool5",
+ "star": 4,
+ "rece": 2,
+ "id": "24003",
+ "weight": 1000
},
{
"key": 15,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
- "star": 3,
- "rece": 3,
- "id": "33003",
- "weight": 36
+ "card_pool_type": "base_pool5",
+ "star": 5,
+ "rece": 2,
+ "id": "24003",
+ "weight": 1000
},
{
"key": 16,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20003",
+ "card_pool_type": "base_pool6",
"star": 3,
- "rece": 4,
- "id": "43002",
- "weight": 9
+ "rece": 1,
+ "id": "15005",
+ "weight": 1000
},
{
"key": 17,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
+ "card_pool_type": "base_pool6",
"star": 4,
- "rece": 2,
- "id": "24004",
- "weight": 27
+ "rece": 1,
+ "id": "15005",
+ "weight": 1000
},
{
"key": 18,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
- "star": 4,
- "rece": 2,
- "id": "24008",
- "weight": 27
+ "card_pool_type": "base_pool6",
+ "star": 5,
+ "rece": 1,
+ "id": "15005",
+ "weight": 1000
},
{
"key": 19,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
+ "card_pool_type": "base_pool7",
"star": 4,
"rece": 2,
- "id": "24003",
- "weight": 27
+ "id": "24004",
+ "weight": 1000
},
{
"key": 20,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
- "star": 4,
+ "card_pool_type": "base_pool7",
+ "star": 5,
"rece": 2,
- "id": "24005",
- "weight": 27
+ "id": "25001",
+ "weight": 1000
},
{
"key": 21,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
- "star": 4,
- "rece": 1,
- "id": "14001",
- "weight": 27
+ "card_pool_type": "base_pool7",
+ "star": 5,
+ "rece": 2,
+ "id": "25004",
+ "weight": 1000
},
{
"key": 22,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
+ "card_pool_type": "base_pool7",
"star": 4,
- "rece": 3,
- "id": "34007",
- "weight": 27
+ "rece": 2,
+ "id": "24008",
+ "weight": 1000
},
{
"key": 23,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
+ "card_pool_type": "base_pool7",
"star": 4,
- "rece": 1,
- "id": "14003",
- "weight": 27
+ "rece": 2,
+ "id": "24003",
+ "weight": 1000
},
{
"key": 24,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
- "star": 4,
+ "card_pool_type": "base_pool7",
+ "star": 5,
"rece": 1,
- "id": "14007",
- "weight": 27
+ "id": "15005",
+ "weight": 1000
},
{
"key": 25,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
+ "card_pool_type": "base_pool7",
"star": 4,
- "rece": 3,
- "id": "34006",
- "weight": 27
+ "rece": 1,
+ "id": "14001",
+ "weight": 1000
},
{
"key": 26,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
+ "card_pool_type": "base_pool7",
"star": 4,
- "rece": 3,
- "id": "34002",
- "weight": 27
+ "rece": 1,
+ "id": "14003",
+ "weight": 1000
},
{
"key": 27,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
+ "card_pool_type": "base_pool7",
"star": 4,
- "rece": 4,
- "id": "44005",
- "weight": 16
+ "rece": 3,
+ "id": "34006",
+ "weight": 1000
},
{
"key": 28,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
+ "card_pool_type": "base_pool7",
"star": 4,
- "rece": 4,
- "id": "44006",
- "weight": 16
+ "rece": 3,
+ "id": "34002",
+ "weight": 1000
},
{
"key": 29,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
- "star": 4,
- "rece": 1,
- "id": "14005",
- "weight": 27
+ "card_pool_type": "base_pool7",
+ "star": 3,
+ "rece": 2,
+ "id": "24002",
+ "weight": 1000
},
{
"key": 30,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
- "star": 4,
+ "card_pool_type": "base_pool7",
+ "star": 5,
"rece": 2,
- "id": "24001",
- "weight": 27
+ "id": "35001",
+ "weight": 1000
},
{
"key": 31,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
- "star": 4,
- "rece": 3,
- "id": "34008",
- "weight": 27
+ "card_pool_type": "base_pool7",
+ "star": 5,
+ "rece": 1,
+ "id": "15004",
+ "weight": 1000
},
{
"key": 32,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
+ "card_pool_type": "base_pool7",
"star": 4,
- "rece": 3,
- "id": "34003",
- "weight": 27
+ "rece": 4,
+ "id": "44005",
+ "weight": 1000
},
{
"key": 33,
"recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
- "star": 4,
- "rece": 2,
- "id": "24009",
- "weight": 27
- },
- {
- "key": 34,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
- "star": 4,
- "rece": 3,
- "id": "34005",
- "weight": 27
- },
- {
- "key": 35,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20004",
+ "card_pool_type": "base_pool7",
"star": 4,
"rece": 4,
- "id": "44004",
- "weight": 16
- },
- {
- "key": 36,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 2,
- "id": "25001",
- "weight": 100
- },
- {
- "key": 37,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 2,
- "id": "25004",
- "weight": 100
- },
- {
- "key": 38,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 1,
- "id": "15005",
- "weight": 100
- },
- {
- "key": 39,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 3,
- "id": "35006",
- "weight": 100
- },
- {
- "key": 40,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 4,
- "id": "45003",
- "weight": 0
- },
- {
- "key": 41,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 3,
- "id": "35001",
- "weight": 100
- },
- {
- "key": 42,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 1,
- "id": "15004",
- "weight": 100
- },
- {
- "key": 43,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 4,
- "id": "45001",
- "weight": 0
- },
- {
- "key": 44,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 3,
- "id": "35005",
- "weight": 100
- },
- {
- "key": 45,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 1,
- "id": "15002",
- "weight": 100
- },
- {
- "key": 46,
- "recruitment_type": 1,
- "card_pool_type": "pro_pool20005",
- "star": 5,
- "rece": 1,
- "id": "15003",
- "weight": 100
- },
- {
- "key": 47,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
- "star": 3,
- "rece": 2,
- "id": "24002",
- "weight": 36
- },
- {
- "key": 48,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
- "star": 3,
- "rece": 1,
- "id": "13003",
- "weight": 36
- },
- {
- "key": 49,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
- "star": 3,
- "rece": 4,
- "id": "43006",
- "weight": 9
- },
- {
- "key": 50,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
- "star": 3,
- "rece": 4,
- "id": "43001",
- "weight": 9
- },
- {
- "key": 51,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
- "star": 3,
- "rece": 1,
- "id": "13001",
- "weight": 36
- },
- {
- "key": 52,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
- "star": 3,
- "rece": 3,
- "id": "33002",
- "weight": 36
- },
- {
- "key": 53,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
- "star": 3,
- "rece": 1,
- "id": "13005",
- "weight": 36
+ "id": "44006",
+ "weight": 1000
},
{
"key": 54,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
"star": 3,
- "rece": 2,
- "id": "23004",
- "weight": 36
+ "rece": 1,
+ "id": "13001",
+ "weight": 1000
},
{
"key": 55,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
"star": 3,
"rece": 1,
- "id": "13004",
- "weight": 36
+ "id": "13002",
+ "weight": 1000
},
{
"key": 56,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
"star": 3,
- "rece": 4,
- "id": "43003",
- "weight": 9
+ "rece": 1,
+ "id": "13003",
+ "weight": 1000
},
{
"key": 57,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
"star": 3,
"rece": 1,
- "id": "13002",
- "weight": 36
+ "id": "13004",
+ "weight": 1000
},
{
"key": 58,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
"star": 3,
- "rece": 3,
- "id": "33003",
- "weight": 36
+ "rece": 1,
+ "id": "13005",
+ "weight": 1000
},
{
"key": 59,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20003",
- "star": 3,
- "rece": 4,
- "id": "43002",
- "weight": 9
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 4,
+ "rece": 1,
+ "id": "14001",
+ "weight": 1000
},
{
"key": 60,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 2,
- "id": "24004",
- "weight": 27
- },
- {
- "key": 61,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 2,
- "id": "24008",
- "weight": 27
- },
- {
- "key": 62,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 2,
- "id": "24003",
- "weight": 27
- },
- {
- "key": 63,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 2,
- "id": "24005",
- "weight": 27
- },
- {
- "key": 64,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 1,
- "id": "14001",
- "weight": 27
- },
- {
- "key": 65,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 3,
- "id": "34007",
- "weight": 27
- },
- {
- "key": 66,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 1,
- "id": "14003",
- "weight": 27
- },
- {
- "key": 67,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 1,
- "id": "14007",
- "weight": 27
- },
- {
- "key": 68,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 3,
- "id": "34006",
- "weight": 27
- },
- {
- "key": 69,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 3,
- "id": "34002",
- "weight": 27
- },
- {
- "key": 70,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 4,
- "id": "44005",
- "weight": 16
- },
- {
- "key": 71,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 4,
- "id": "44006",
- "weight": 16
- },
- {
- "key": 72,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 1,
- "id": "14005",
- "weight": 27
- },
- {
- "key": 73,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 2,
- "id": "24001",
- "weight": 27
- },
- {
- "key": 74,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 3,
- "id": "34008",
- "weight": 27
- },
- {
- "key": 75,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 3,
- "id": "34003",
- "weight": 27
- },
- {
- "key": 76,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 2,
- "id": "24009",
- "weight": 27
- },
- {
- "key": 77,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 3,
- "id": "34005",
- "weight": 27
- },
- {
- "key": 78,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20004",
- "star": 4,
- "rece": 4,
- "id": "44004",
- "weight": 16
- },
- {
- "key": 79,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 2,
- "id": "25001",
- "weight": 18
- },
- {
- "key": 80,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 2,
- "id": "25004",
- "weight": 18
- },
- {
- "key": 81,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 1,
- "id": "15005",
- "weight": 18
- },
- {
- "key": 82,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 3,
- "id": "35006",
- "weight": 18
- },
- {
- "key": 83,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 4,
- "id": "45003",
- "weight": 9
- },
- {
- "key": 84,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 3,
- "id": "35001",
- "weight": 18
- },
- {
- "key": 85,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 1,
- "id": "15004",
- "weight": 18
- },
- {
- "key": 86,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 4,
- "id": "45001",
- "weight": 9
- },
- {
- "key": 87,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 3,
- "id": "35005",
- "weight": 18
- },
- {
- "key": 88,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 1,
- "id": "15002",
- "weight": 18
- },
- {
- "key": 89,
- "recruitment_type": 1,
- "card_pool_type": "base_pool20005",
- "star": 5,
- "rece": 1,
- "id": "15003",
- "weight": 18
- },
- {
- "key": 90,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30003",
- "star": 3,
- "rece": 1,
- "id": "13003",
- "weight": 100
- },
- {
- "key": 91,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30003",
- "star": 3,
- "rece": 1,
- "id": "13001",
- "weight": 100
- },
- {
- "key": 92,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30003",
- "star": 3,
- "rece": 1,
- "id": "13005",
- "weight": 100
- },
- {
- "key": 93,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30003",
- "star": 3,
- "rece": 1,
- "id": "13004",
- "weight": 100
- },
- {
- "key": 94,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30003",
- "star": 3,
- "rece": 1,
- "id": "13002",
- "weight": 100
- },
- {
- "key": 95,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30004",
- "star": 4,
- "rece": 1,
- "id": "14001",
- "weight": 100
- },
- {
- "key": 96,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30004",
- "star": 4,
- "rece": 1,
- "id": "14003",
- "weight": 100
- },
- {
- "key": 97,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30004",
- "star": 4,
- "rece": 1,
- "id": "14007",
- "weight": 100
- },
- {
- "key": 98,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30004",
- "star": 4,
- "rece": 1,
- "id": "14005",
- "weight": 100
- },
- {
- "key": 99,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30005",
- "star": 5,
- "rece": 1,
- "id": "15005",
- "weight": 100
- },
- {
- "key": 100,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30005",
- "star": 5,
- "rece": 1,
- "id": "15004",
- "weight": 100
- },
- {
- "key": 101,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30005",
- "star": 5,
- "rece": 1,
- "id": "15002",
- "weight": 100
- },
- {
- "key": 102,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool30005",
- "star": 5,
- "rece": 1,
- "id": "15003",
- "weight": 100
- },
- {
- "key": 103,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool40003",
- "star": 3,
- "rece": 2,
- "id": "24002",
- "weight": 100
- },
- {
- "key": 104,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool40003",
- "star": 3,
- "rece": 2,
- "id": "23004",
- "weight": 100
- },
- {
- "key": 105,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24004",
- "weight": 100
- },
- {
- "key": 106,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24008",
- "weight": 100
- },
- {
- "key": 107,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24003",
- "weight": 100
- },
- {
- "key": 108,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24005",
- "weight": 100
- },
- {
- "key": 109,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24001",
- "weight": 100
- },
- {
- "key": 110,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24009",
- "weight": 100
- },
- {
- "key": 111,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool40005",
- "star": 5,
- "rece": 2,
- "id": "25001",
- "weight": 100
- },
- {
- "key": 112,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool40005",
- "star": 5,
- "rece": 2,
- "id": "25004",
- "weight": 100
- },
- {
- "key": 113,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50003",
- "star": 3,
- "rece": 3,
- "id": "33002",
- "weight": 100
- },
- {
- "key": 114,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50003",
- "star": 3,
- "rece": 3,
- "id": "33003",
- "weight": 100
- },
- {
- "key": 115,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34007",
- "weight": 100
- },
- {
- "key": 116,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34006",
- "weight": 100
- },
- {
- "key": 117,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34002",
- "weight": 100
- },
- {
- "key": 118,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34008",
- "weight": 100
- },
- {
- "key": 119,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34003",
- "weight": 100
- },
- {
- "key": 120,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34005",
- "weight": 100
- },
- {
- "key": 121,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50005",
- "star": 5,
- "rece": 3,
- "id": "35006",
- "weight": 100
- },
- {
- "key": 122,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50005",
- "star": 5,
- "rece": 3,
- "id": "35001",
- "weight": 100
- },
- {
- "key": 123,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool50005",
- "star": 5,
- "rece": 3,
- "id": "35005",
- "weight": 100
- },
- {
- "key": 124,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool60003",
- "star": 3,
- "rece": 4,
- "id": "43006",
- "weight": 100
- },
- {
- "key": 125,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool60003",
- "star": 3,
- "rece": 4,
- "id": "43001",
- "weight": 100
- },
- {
- "key": 126,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool60003",
- "star": 3,
- "rece": 4,
- "id": "43003",
- "weight": 100
- },
- {
- "key": 127,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool60003",
- "star": 3,
- "rece": 4,
- "id": "43002",
- "weight": 100
- },
- {
- "key": 128,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool60004",
- "star": 4,
- "rece": 4,
- "id": "44005",
- "weight": 100
- },
- {
- "key": 129,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool60004",
- "star": 4,
- "rece": 4,
- "id": "44006",
- "weight": 100
- },
- {
- "key": 130,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool60004",
- "star": 4,
- "rece": 4,
- "id": "44004",
- "weight": 100
- },
- {
- "key": 131,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool60005",
- "star": 5,
- "rece": 4,
- "id": "45003",
- "weight": 100
- },
- {
- "key": 132,
- "recruitment_type": 2,
- "card_pool_type": "pro_pool60005",
- "star": 5,
- "rece": 4,
- "id": "45001",
- "weight": 100
- },
- {
- "key": 133,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30003",
- "star": 3,
- "rece": 1,
- "id": "13003",
- "weight": 100
- },
- {
- "key": 134,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30003",
- "star": 3,
- "rece": 1,
- "id": "13001",
- "weight": 100
- },
- {
- "key": 135,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30003",
- "star": 3,
- "rece": 1,
- "id": "13005",
- "weight": 100
- },
- {
- "key": 136,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30003",
- "star": 3,
- "rece": 1,
- "id": "13004",
- "weight": 100
- },
- {
- "key": 137,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30003",
- "star": 3,
- "rece": 1,
- "id": "13002",
- "weight": 100
- },
- {
- "key": 138,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30004",
- "star": 4,
- "rece": 1,
- "id": "14001",
- "weight": 100
- },
- {
- "key": 139,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30004",
- "star": 4,
- "rece": 1,
- "id": "14003",
- "weight": 100
- },
- {
- "key": 140,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30004",
- "star": 4,
- "rece": 1,
- "id": "14007",
- "weight": 100
- },
- {
- "key": 141,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30004",
- "star": 4,
- "rece": 1,
- "id": "14005",
- "weight": 100
- },
- {
- "key": 142,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30005",
- "star": 5,
- "rece": 1,
- "id": "15005",
- "weight": 100
- },
- {
- "key": 143,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30005",
- "star": 5,
- "rece": 1,
- "id": "15004",
- "weight": 100
- },
- {
- "key": 144,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30005",
- "star": 5,
- "rece": 1,
- "id": "15002",
- "weight": 100
- },
- {
- "key": 145,
- "recruitment_type": 2,
- "card_pool_type": "base_pool30005",
- "star": 5,
- "rece": 1,
- "id": "15003",
- "weight": 100
- },
- {
- "key": 146,
- "recruitment_type": 2,
- "card_pool_type": "base_pool40003",
- "star": 3,
- "rece": 2,
- "id": "24002",
- "weight": 100
- },
- {
- "key": 147,
- "recruitment_type": 2,
- "card_pool_type": "base_pool40003",
- "star": 3,
- "rece": 2,
- "id": "23004",
- "weight": 100
- },
- {
- "key": 148,
- "recruitment_type": 2,
- "card_pool_type": "base_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24004",
- "weight": 100
- },
- {
- "key": 149,
- "recruitment_type": 2,
- "card_pool_type": "base_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24008",
- "weight": 100
- },
- {
- "key": 150,
- "recruitment_type": 2,
- "card_pool_type": "base_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24003",
- "weight": 100
- },
- {
- "key": 151,
- "recruitment_type": 2,
- "card_pool_type": "base_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24005",
- "weight": 100
- },
- {
- "key": 152,
- "recruitment_type": 2,
- "card_pool_type": "base_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24001",
- "weight": 100
- },
- {
- "key": 153,
- "recruitment_type": 2,
- "card_pool_type": "base_pool40004",
- "star": 4,
- "rece": 2,
- "id": "24009",
- "weight": 100
- },
- {
- "key": 154,
- "recruitment_type": 2,
- "card_pool_type": "base_pool40005",
- "star": 5,
- "rece": 2,
- "id": "25001",
- "weight": 100
- },
- {
- "key": 155,
- "recruitment_type": 2,
- "card_pool_type": "base_pool40005",
- "star": 5,
- "rece": 2,
- "id": "25004",
- "weight": 100
- },
- {
- "key": 156,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50003",
- "star": 3,
- "rece": 3,
- "id": "33002",
- "weight": 100
- },
- {
- "key": 157,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50003",
- "star": 3,
- "rece": 3,
- "id": "33003",
- "weight": 100
- },
- {
- "key": 158,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34007",
- "weight": 100
- },
- {
- "key": 159,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34006",
- "weight": 100
- },
- {
- "key": 160,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34002",
- "weight": 100
- },
- {
- "key": 161,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34008",
- "weight": 100
- },
- {
- "key": 162,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34003",
- "weight": 100
- },
- {
- "key": 163,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50004",
- "star": 4,
- "rece": 3,
- "id": "34005",
- "weight": 100
- },
- {
- "key": 164,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50005",
- "star": 5,
- "rece": 3,
- "id": "35006",
- "weight": 100
- },
- {
- "key": 165,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50005",
- "star": 5,
- "rece": 3,
- "id": "35001",
- "weight": 100
- },
- {
- "key": 166,
- "recruitment_type": 2,
- "card_pool_type": "base_pool50005",
- "star": 5,
- "rece": 3,
- "id": "35005",
- "weight": 100
- },
- {
- "key": 167,
- "recruitment_type": 2,
- "card_pool_type": "base_pool60003",
- "star": 3,
- "rece": 4,
- "id": "43006",
- "weight": 100
- },
- {
- "key": 168,
- "recruitment_type": 2,
- "card_pool_type": "base_pool60003",
- "star": 3,
- "rece": 4,
- "id": "43001",
- "weight": 100
- },
- {
- "key": 169,
- "recruitment_type": 2,
- "card_pool_type": "base_pool60003",
- "star": 3,
- "rece": 4,
- "id": "43003",
- "weight": 100
- },
- {
- "key": 170,
- "recruitment_type": 2,
- "card_pool_type": "base_pool60003",
- "star": 3,
- "rece": 4,
- "id": "43002",
- "weight": 100
- },
- {
- "key": 171,
- "recruitment_type": 2,
- "card_pool_type": "base_pool60004",
- "star": 4,
- "rece": 4,
- "id": "44005",
- "weight": 100
- },
- {
- "key": 172,
- "recruitment_type": 2,
- "card_pool_type": "base_pool60004",
- "star": 4,
- "rece": 4,
- "id": "44006",
- "weight": 100
- },
- {
- "key": 173,
- "recruitment_type": 2,
- "card_pool_type": "base_pool60004",
- "star": 4,
- "rece": 4,
- "id": "44004",
- "weight": 100
- },
- {
- "key": 174,
- "recruitment_type": 2,
- "card_pool_type": "base_pool60005",
- "star": 5,
- "rece": 4,
- "id": "45003",
- "weight": 100
- },
- {
- "key": 175,
- "recruitment_type": 2,
- "card_pool_type": "base_pool60005",
- "star": 5,
- "rece": 4,
- "id": "45001",
- "weight": 100
- },
- {
- "key": 176,
- "recruitment_type": 1,
- "card_pool_type": "base_pool1",
- "star": 3,
- "rece": 2,
- "id": "13002",
- "weight": 1000
- },
- {
- "key": 177,
- "recruitment_type": 1,
- "card_pool_type": "base_pool1",
- "star": 4,
- "rece": 2,
- "id": "13002",
- "weight": 1000
- },
- {
- "key": 178,
- "recruitment_type": 1,
- "card_pool_type": "base_pool1",
- "star": 5,
- "rece": 2,
- "id": "13002",
- "weight": 1000
- },
- {
- "key": 179,
- "recruitment_type": 1,
- "card_pool_type": "base_pool2",
- "star": 3,
- "rece": 2,
- "id": "25001",
- "weight": 1000
- },
- {
- "key": 180,
- "recruitment_type": 1,
- "card_pool_type": "base_pool2",
- "star": 4,
- "rece": 2,
- "id": "25001",
- "weight": 1000
- },
- {
- "key": 181,
- "recruitment_type": 1,
- "card_pool_type": "base_pool2",
- "star": 5,
- "rece": 2,
- "id": "25001",
- "weight": 1000
- },
- {
- "key": 182,
- "recruitment_type": 1,
- "card_pool_type": "base_pool3",
- "star": 3,
- "rece": 2,
- "id": "25004",
- "weight": 1000
- },
- {
- "key": 183,
- "recruitment_type": 1,
- "card_pool_type": "base_pool3",
- "star": 4,
- "rece": 2,
- "id": "25004",
- "weight": 1000
- },
- {
- "key": 184,
- "recruitment_type": 1,
- "card_pool_type": "base_pool3",
- "star": 5,
- "rece": 2,
- "id": "25004",
- "weight": 1000
- },
- {
- "key": 185,
- "recruitment_type": 1,
- "card_pool_type": "base_pool4",
- "star": 3,
- "rece": 2,
- "id": "24008",
- "weight": 1000
- },
- {
- "key": 186,
- "recruitment_type": 1,
- "card_pool_type": "base_pool4",
- "star": 4,
- "rece": 2,
- "id": "24008",
- "weight": 1000
- },
- {
- "key": 187,
- "recruitment_type": 1,
- "card_pool_type": "base_pool4",
- "star": 5,
- "rece": 2,
- "id": "24008",
- "weight": 1000
- },
- {
- "key": 188,
- "recruitment_type": 1,
- "card_pool_type": "base_pool5",
- "star": 3,
- "rece": 2,
- "id": "24003",
- "weight": 1000
- },
- {
- "key": 189,
- "recruitment_type": 1,
- "card_pool_type": "base_pool5",
- "star": 4,
- "rece": 2,
- "id": "24003",
- "weight": 1000
- },
- {
- "key": 190,
- "recruitment_type": 1,
- "card_pool_type": "base_pool5",
- "star": 5,
- "rece": 2,
- "id": "24003",
- "weight": 1000
- },
- {
- "key": 191,
- "recruitment_type": 1,
- "card_pool_type": "base_pool6",
- "star": 3,
- "rece": 1,
- "id": "34006",
- "weight": 1000
- },
- {
- "key": 192,
- "recruitment_type": 1,
- "card_pool_type": "base_pool6",
- "star": 4,
- "rece": 1,
- "id": "34006",
- "weight": 1000
- },
- {
- "key": 193,
- "recruitment_type": 1,
- "card_pool_type": "base_pool6",
- "star": 5,
- "rece": 1,
- "id": "34006",
- "weight": 1000
- },
- {
- "key": 194,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 4,
- "rece": 2,
- "id": "24004",
- "weight": 1000
- },
- {
- "key": 195,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 5,
- "rece": 2,
- "id": "25001",
- "weight": 1000
- },
- {
- "key": 196,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 5,
- "rece": 2,
- "id": "25004",
- "weight": 1000
- },
- {
- "key": 197,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 4,
- "rece": 2,
- "id": "24008",
- "weight": 1000
- },
- {
- "key": 198,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 4,
- "rece": 2,
- "id": "24003",
- "weight": 1000
- },
- {
- "key": 199,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 5,
- "rece": 1,
- "id": "15005",
- "weight": 1000
- },
- {
- "key": 200,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 4,
- "rece": 1,
- "id": "14001",
- "weight": 1000
- },
- {
- "key": 201,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 4,
- "rece": 1,
- "id": "14003",
- "weight": 1000
- },
- {
- "key": 202,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 4,
- "rece": 3,
- "id": "34006",
- "weight": 1000
- },
- {
- "key": 203,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 4,
- "rece": 3,
- "id": "34002",
- "weight": 1000
- },
- {
- "key": 204,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 3,
- "rece": 2,
- "id": "24002",
- "weight": 1000
- },
- {
- "key": 205,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 5,
- "rece": 2,
- "id": "35001",
- "weight": 1000
- },
- {
- "key": 206,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 5,
- "rece": 1,
- "id": "15004",
- "weight": 1000
- },
- {
- "key": 207,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 4,
- "rece": 4,
- "id": "44005",
- "weight": 1000
- },
- {
- "key": 208,
- "recruitment_type": 1,
- "card_pool_type": "base_pool7",
- "star": 4,
- "rece": 4,
- "id": "44006",
- "weight": 1000
- },
- {
- "key": 209,
- "recruitment_type": 2,
- "card_pool_type": "camp1_pool",
- "star": 3,
- "rece": 1,
- "id": "13001",
- "weight": 1000
- },
- {
- "key": 210,
- "recruitment_type": 2,
- "card_pool_type": "camp1_pool",
- "star": 3,
- "rece": 1,
- "id": "13002",
- "weight": 1000
- },
- {
- "key": 211,
- "recruitment_type": 2,
- "card_pool_type": "camp1_pool",
- "star": 3,
- "rece": 1,
- "id": "13003",
- "weight": 1000
- },
- {
- "key": 212,
- "recruitment_type": 2,
- "card_pool_type": "camp1_pool",
- "star": 3,
- "rece": 1,
- "id": "13004",
- "weight": 1000
- },
- {
- "key": 213,
- "recruitment_type": 2,
- "card_pool_type": "camp1_pool",
- "star": 3,
- "rece": 1,
- "id": "13005",
- "weight": 1000
- },
- {
- "key": 214,
- "recruitment_type": 2,
- "card_pool_type": "camp1_pool",
- "star": 4,
- "rece": 1,
- "id": "14001",
- "weight": 1000
- },
- {
- "key": 215,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@@ -1935,7 +360,7 @@
"weight": 1000
},
{
- "key": 216,
+ "key": 61,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@@ -1944,7 +369,7 @@
"weight": 1000
},
{
- "key": 217,
+ "key": 62,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@@ -1953,7 +378,7 @@
"weight": 1000
},
{
- "key": 218,
+ "key": 63,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@@ -1962,7 +387,7 @@
"weight": 1000
},
{
- "key": 219,
+ "key": 64,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@@ -1971,7 +396,7 @@
"weight": 1000
},
{
- "key": 220,
+ "key": 65,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 4,
@@ -1980,7 +405,7 @@
"weight": 1000
},
{
- "key": 221,
+ "key": 66,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 5,
@@ -1989,7 +414,7 @@
"weight": 1000
},
{
- "key": 222,
+ "key": 67,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 5,
@@ -1998,7 +423,7 @@
"weight": 1000
},
{
- "key": 223,
+ "key": 68,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 5,
@@ -2007,7 +432,7 @@
"weight": 1000
},
{
- "key": 224,
+ "key": 69,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
"star": 5,
@@ -2016,7 +441,7 @@
"weight": 1000
},
{
- "key": 225,
+ "key": 70,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 3,
@@ -2025,7 +450,7 @@
"weight": 1000
},
{
- "key": 226,
+ "key": 71,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 3,
@@ -2034,7 +459,7 @@
"weight": 1000
},
{
- "key": 227,
+ "key": 72,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 3,
@@ -2043,7 +468,7 @@
"weight": 1000
},
{
- "key": 228,
+ "key": 73,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 3,
@@ -2052,7 +477,7 @@
"weight": 1000
},
{
- "key": 229,
+ "key": 74,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@@ -2061,7 +486,7 @@
"weight": 1000
},
{
- "key": 230,
+ "key": 75,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 3,
@@ -2070,7 +495,7 @@
"weight": 1000
},
{
- "key": 231,
+ "key": 76,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@@ -2079,7 +504,7 @@
"weight": 1000
},
{
- "key": 232,
+ "key": 77,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@@ -2088,7 +513,7 @@
"weight": 1000
},
{
- "key": 233,
+ "key": 78,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@@ -2097,7 +522,7 @@
"weight": 1000
},
{
- "key": 234,
+ "key": 79,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@@ -2106,7 +531,7 @@
"weight": 1000
},
{
- "key": 235,
+ "key": 80,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@@ -2115,7 +540,7 @@
"weight": 1000
},
{
- "key": 236,
+ "key": 81,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@@ -2124,7 +549,7 @@
"weight": 1000
},
{
- "key": 237,
+ "key": 82,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 4,
@@ -2133,7 +558,7 @@
"weight": 1000
},
{
- "key": 238,
+ "key": 83,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 5,
@@ -2142,7 +567,7 @@
"weight": 1000
},
{
- "key": 239,
+ "key": 84,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 5,
@@ -2151,7 +576,7 @@
"weight": 1000
},
{
- "key": 240,
+ "key": 85,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 5,
@@ -2160,7 +585,7 @@
"weight": 1000
},
{
- "key": 241,
+ "key": 86,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
"star": 5,
@@ -2169,7 +594,7 @@
"weight": 1000
},
{
- "key": 242,
+ "key": 87,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@@ -2178,7 +603,7 @@
"weight": 1000
},
{
- "key": 243,
+ "key": 88,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@@ -2187,7 +612,7 @@
"weight": 1000
},
{
- "key": 244,
+ "key": 89,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@@ -2196,7 +621,7 @@
"weight": 1000
},
{
- "key": 245,
+ "key": 90,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@@ -2205,7 +630,7 @@
"weight": 1000
},
{
- "key": 246,
+ "key": 91,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@@ -2214,7 +639,7 @@
"weight": 1000
},
{
- "key": 247,
+ "key": 92,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 3,
@@ -2223,7 +648,7 @@
"weight": 1000
},
{
- "key": 248,
+ "key": 93,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@@ -2232,7 +657,7 @@
"weight": 1000
},
{
- "key": 249,
+ "key": 94,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@@ -2241,7 +666,7 @@
"weight": 1000
},
{
- "key": 250,
+ "key": 95,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@@ -2250,7 +675,7 @@
"weight": 1000
},
{
- "key": 251,
+ "key": 96,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@@ -2259,7 +684,7 @@
"weight": 1000
},
{
- "key": 252,
+ "key": 97,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@@ -2268,7 +693,7 @@
"weight": 1000
},
{
- "key": 253,
+ "key": 98,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@@ -2277,7 +702,7 @@
"weight": 1000
},
{
- "key": 254,
+ "key": 99,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@@ -2286,7 +711,7 @@
"weight": 1000
},
{
- "key": 255,
+ "key": 100,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 4,
@@ -2295,7 +720,7 @@
"weight": 1000
},
{
- "key": 256,
+ "key": 101,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 5,
@@ -2304,7 +729,7 @@
"weight": 1000
},
{
- "key": 257,
+ "key": 102,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 5,
@@ -2313,7 +738,7 @@
"weight": 1000
},
{
- "key": 258,
+ "key": 103,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 5,
@@ -2322,7 +747,7 @@
"weight": 1000
},
{
- "key": 259,
+ "key": 104,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 5,
@@ -2331,7 +756,7 @@
"weight": 1000
},
{
- "key": 260,
+ "key": 105,
"recruitment_type": 2,
"card_pool_type": "camp3_pool",
"star": 5,
@@ -2340,7 +765,7 @@
"weight": 1000
},
{
- "key": 261,
+ "key": 106,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@@ -2349,7 +774,7 @@
"weight": 1000
},
{
- "key": 262,
+ "key": 107,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@@ -2358,7 +783,7 @@
"weight": 1000
},
{
- "key": 263,
+ "key": 108,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@@ -2367,7 +792,7 @@
"weight": 1000
},
{
- "key": 264,
+ "key": 109,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@@ -2376,7 +801,7 @@
"weight": 1000
},
{
- "key": 265,
+ "key": 110,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@@ -2385,7 +810,7 @@
"weight": 1000
},
{
- "key": 266,
+ "key": 111,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@@ -2394,7 +819,7 @@
"weight": 1000
},
{
- "key": 267,
+ "key": 112,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 3,
@@ -2403,7 +828,7 @@
"weight": 1000
},
{
- "key": 268,
+ "key": 113,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@@ -2412,7 +837,7 @@
"weight": 1000
},
{
- "key": 269,
+ "key": 114,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@@ -2421,7 +846,7 @@
"weight": 1000
},
{
- "key": 270,
+ "key": 115,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@@ -2430,7 +855,7 @@
"weight": 1000
},
{
- "key": 271,
+ "key": 116,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@@ -2439,7 +864,7 @@
"weight": 1000
},
{
- "key": 272,
+ "key": 117,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@@ -2448,7 +873,7 @@
"weight": 1000
},
{
- "key": 273,
+ "key": 118,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@@ -2457,7 +882,7 @@
"weight": 1000
},
{
- "key": 274,
+ "key": 119,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@@ -2466,7 +891,7 @@
"weight": 1000
},
{
- "key": 275,
+ "key": 120,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
@@ -2475,7 +900,7 @@
"weight": 1000
},
{
- "key": 276,
+ "key": 121,
"recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 4,
diff --git a/bin/json/game_drawpool.json b/bin/json/game_drawpool.json
index 94641b9b4..22a156da4 100644
--- a/bin/json/game_drawpool.json
+++ b/bin/json/game_drawpool.json
@@ -1,19 +1,32 @@
[
{
"key": 1,
- "recruitment_type": [],
- "star3w": 940,
- "star4w": 52,
- "star5w": 8,
- "protect": 100,
- "p3pool": "pro_pool20003",
- "p4pool": "pro_pool20004",
- "p5pool": "pro_pool20005",
- "n3pool": "base_pool20003",
- "n4pool": "base_pool20004",
- "n5pool": "base_pool20005",
+ "recruitment_type": [
+ {
+ "k": 3,
+ "s": "base_pool1"
+ },
+ {
+ "k": 6,
+ "s": "base_pool1"
+ },
+ {
+ "k": 9,
+ "s": "base_pool1"
+ }
+ ],
+ "star3w": 900,
+ "star4w": 94,
+ "star5w": 6,
+ "protect": 0,
+ "p3pool": "base_pool7",
+ "p4pool": "base_pool8",
+ "p5pool": "base_pool9",
+ "n3pool": "base_pool10",
+ "n4pool": "base_pool11",
+ "n5pool": "base_pool12",
"baodi4": 10,
- "baidi5": 100,
+ "baidi5": 90,
"etime": -1,
"permission": 1,
"consumeA": [
@@ -23,181 +36,162 @@
"n": 1
}
],
- "consumeB": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 200
- }
- ]
+ "consumeB": []
},
{
"key": 2,
"recruitment_type": [
{
- "k": 1,
- "s": "inevitable_10001"
+ "k": 3,
+ "s": "base_pool1"
},
{
- "k": 10,
- "s": "inevitable_10010"
+ "k": 6,
+ "s": "base_pool1"
+ },
+ {
+ "k": 9,
+ "s": "base_pool1"
}
],
- "star3w": 940,
- "star4w": 52,
- "star5w": 8,
- "protect": 100,
- "p3pool": "pro_pool20003",
- "p4pool": "pro_pool20004",
- "p5pool": "pro_pool20005",
- "n3pool": "base_pool20003",
- "n4pool": "base_pool20004",
- "n5pool": "base_pool20005",
+ "star3w": 900,
+ "star4w": 94,
+ "star5w": 6,
+ "protect": 50,
+ "p3pool": "base_pool7",
+ "p4pool": "base_pool8",
+ "p5pool": "base_pool9",
+ "n3pool": "base_pool10",
+ "n4pool": "base_pool11",
+ "n5pool": "base_pool12",
"baodi4": 10,
- "baidi5": 100,
+ "baidi5": 0,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
"t": "10000001",
- "n": 1
+ "n": 2
}
],
- "consumeB": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 200
- }
- ]
+ "consumeB": []
},
{
"key": 3,
- "recruitment_type": [],
- "star3w": 940,
- "star4w": 52,
- "star5w": 8,
- "protect": 100,
- "p3pool": "pro_pool30003",
- "p4pool": "pro_pool30004",
- "p5pool": "pro_pool30005",
- "n3pool": "base_pool30003",
- "n4pool": "base_pool30004",
- "n5pool": "base_pool30005",
+ "recruitment_type": [
+ {
+ "k": 3,
+ "s": "base_pool1"
+ },
+ {
+ "k": 6,
+ "s": "base_pool1"
+ },
+ {
+ "k": 9,
+ "s": "base_pool1"
+ }
+ ],
+ "star3w": 900,
+ "star4w": 94,
+ "star5w": 6,
+ "protect": 50,
+ "p3pool": "base_pool7",
+ "p4pool": "base_pool8",
+ "p5pool": "base_pool9",
+ "n3pool": "base_pool10",
+ "n4pool": "base_pool11",
+ "n5pool": "base_pool12",
"baodi4": 10,
- "baidi5": 100,
+ "baidi5": 0,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
- "t": "10000021",
- "n": 1
+ "t": "10000001",
+ "n": 3
}
],
- "consumeB": [
- {
- "a": "item",
- "t": "10000031",
- "n": 10
- }
- ]
+ "consumeB": []
},
{
"key": 4,
- "recruitment_type": [],
- "star3w": 940,
- "star4w": 52,
- "star5w": 8,
- "protect": 100,
- "p3pool": "pro_pool40003",
- "p4pool": "pro_pool40004",
- "p5pool": "pro_pool40005",
- "n3pool": "base_pool40003",
- "n4pool": "base_pool40004",
- "n5pool": "base_pool40005",
+ "recruitment_type": [
+ {
+ "k": 3,
+ "s": "base_pool1"
+ },
+ {
+ "k": 6,
+ "s": "base_pool1"
+ },
+ {
+ "k": 9,
+ "s": "base_pool1"
+ }
+ ],
+ "star3w": 900,
+ "star4w": 94,
+ "star5w": 6,
+ "protect": 50,
+ "p3pool": "base_pool7",
+ "p4pool": "base_pool8",
+ "p5pool": "base_pool9",
+ "n3pool": "base_pool10",
+ "n4pool": "base_pool11",
+ "n5pool": "base_pool12",
"baodi4": 10,
- "baidi5": 100,
+ "baidi5": 0,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
- "t": "10000022",
- "n": 1
+ "t": "10000001",
+ "n": 4
}
],
- "consumeB": [
- {
- "a": "item",
- "t": "10000032",
- "n": 10
- }
- ]
+ "consumeB": []
},
{
"key": 5,
- "recruitment_type": [],
- "star3w": 940,
- "star4w": 52,
- "star5w": 8,
- "protect": 100,
- "p3pool": "pro_pool50003",
- "p4pool": "pro_pool50004",
- "p5pool": "pro_pool50005",
- "n3pool": "base_pool50003",
- "n4pool": "base_pool50004",
- "n5pool": "base_pool50005",
+ "recruitment_type": [
+ {
+ "k": 3,
+ "s": "base_pool1"
+ },
+ {
+ "k": 6,
+ "s": "base_pool1"
+ },
+ {
+ "k": 9,
+ "s": "base_pool1"
+ }
+ ],
+ "star3w": 900,
+ "star4w": 94,
+ "star5w": 6,
+ "protect": 50,
+ "p3pool": "base_pool7",
+ "p4pool": "base_pool8",
+ "p5pool": "base_pool9",
+ "n3pool": "base_pool10",
+ "n4pool": "base_pool11",
+ "n5pool": "base_pool12",
"baodi4": 10,
- "baidi5": 100,
+ "baidi5": 0,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
- "t": "10000023",
- "n": 1
+ "t": "10000001",
+ "n": 5
}
],
- "consumeB": [
- {
- "a": "item",
- "t": "10000033",
- "n": 10
- }
- ]
- },
- {
- "key": 6,
- "recruitment_type": [],
- "star3w": 940,
- "star4w": 52,
- "star5w": 8,
- "protect": 100,
- "p3pool": "pro_pool50003",
- "p4pool": "pro_pool50004",
- "p5pool": "pro_pool50005",
- "n3pool": "base_pool50003",
- "n4pool": "base_pool50004",
- "n5pool": "base_pool50005",
- "baodi4": 10,
- "baidi5": 100,
- "etime": -1,
- "permission": 1,
- "consumeA": [
- {
- "a": "item",
- "t": "10000024",
- "n": 1
- }
- ],
- "consumeB": [
- {
- "a": "item",
- "t": "10000034",
- "n": 10
- }
- ]
+ "consumeB": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_drawweight.json b/bin/json/game_drawweight.json
index 7384d5a93..7b7c0e259 100644
--- a/bin/json/game_drawweight.json
+++ b/bin/json/game_drawweight.json
@@ -1,402 +1,542 @@
[
{
+ "id": 1,
+ "dtype": 1,
"key": 1,
"weight": 0
},
{
+ "id": 2,
+ "dtype": 1,
"key": 2,
"weight": 0
},
{
+ "id": 3,
+ "dtype": 1,
"key": 3,
"weight": 0
},
{
+ "id": 4,
+ "dtype": 1,
"key": 4,
"weight": 0
},
{
+ "id": 5,
+ "dtype": 1,
"key": 5,
"weight": 0
},
{
+ "id": 6,
+ "dtype": 1,
"key": 6,
"weight": 0
},
{
+ "id": 7,
+ "dtype": 1,
"key": 7,
"weight": 0
},
{
+ "id": 8,
+ "dtype": 1,
"key": 8,
"weight": 0
},
{
+ "id": 9,
+ "dtype": 1,
"key": 9,
"weight": 0
},
{
+ "id": 10,
+ "dtype": 1,
"key": 10,
"weight": 0
},
{
+ "id": 11,
+ "dtype": 1,
"key": 11,
"weight": 0
},
{
+ "id": 12,
+ "dtype": 1,
"key": 12,
"weight": 0
},
{
+ "id": 13,
+ "dtype": 1,
"key": 13,
"weight": 0
},
{
+ "id": 14,
+ "dtype": 1,
"key": 14,
"weight": 0
},
{
+ "id": 15,
+ "dtype": 1,
"key": 15,
"weight": 0
},
{
+ "id": 16,
+ "dtype": 1,
"key": 16,
"weight": 0
},
{
+ "id": 17,
+ "dtype": 1,
"key": 17,
"weight": 0
},
{
+ "id": 18,
+ "dtype": 1,
"key": 18,
"weight": 0
},
{
+ "id": 19,
+ "dtype": 1,
"key": 19,
"weight": 0
},
{
+ "id": 20,
+ "dtype": 1,
"key": 20,
"weight": 0
},
{
+ "id": 21,
+ "dtype": 1,
"key": 21,
"weight": 0
},
{
+ "id": 22,
+ "dtype": 1,
"key": 22,
"weight": 0
},
{
+ "id": 23,
+ "dtype": 1,
"key": 23,
"weight": 0
},
{
+ "id": 24,
+ "dtype": 1,
"key": 24,
"weight": 0
},
{
+ "id": 25,
+ "dtype": 1,
"key": 25,
"weight": 0
},
{
+ "id": 26,
+ "dtype": 1,
"key": 26,
"weight": 0
},
{
+ "id": 27,
+ "dtype": 1,
"key": 27,
"weight": 0
},
{
+ "id": 28,
+ "dtype": 1,
"key": 28,
"weight": 0
},
{
+ "id": 29,
+ "dtype": 1,
"key": 29,
"weight": 0
},
{
+ "id": 30,
+ "dtype": 1,
"key": 30,
"weight": 0
},
{
+ "id": 31,
+ "dtype": 1,
"key": 31,
"weight": 0
},
{
+ "id": 32,
+ "dtype": 1,
"key": 32,
"weight": 0
},
{
+ "id": 33,
+ "dtype": 1,
"key": 33,
"weight": 0
},
{
+ "id": 34,
+ "dtype": 1,
"key": 34,
"weight": 0
},
{
+ "id": 35,
+ "dtype": 1,
"key": 35,
"weight": 0
},
{
+ "id": 36,
+ "dtype": 1,
"key": 36,
"weight": 0
},
{
+ "id": 37,
+ "dtype": 1,
"key": 37,
"weight": 0
},
{
+ "id": 38,
+ "dtype": 1,
"key": 38,
"weight": 0
},
{
+ "id": 39,
+ "dtype": 1,
"key": 39,
"weight": 0
},
{
+ "id": 40,
+ "dtype": 1,
"key": 40,
"weight": 0
},
{
+ "id": 41,
+ "dtype": 1,
"key": 41,
"weight": 0
},
{
+ "id": 42,
+ "dtype": 1,
"key": 42,
"weight": 0
},
{
+ "id": 43,
+ "dtype": 1,
"key": 43,
"weight": 0
},
{
+ "id": 44,
+ "dtype": 1,
"key": 44,
"weight": 0
},
{
+ "id": 45,
+ "dtype": 1,
"key": 45,
"weight": 0
},
{
+ "id": 46,
+ "dtype": 1,
"key": 46,
"weight": 0
},
{
+ "id": 47,
+ "dtype": 1,
"key": 47,
"weight": 0
},
{
+ "id": 48,
+ "dtype": 1,
"key": 48,
"weight": 0
},
{
+ "id": 49,
+ "dtype": 1,
"key": 49,
"weight": 0
},
{
+ "id": 50,
+ "dtype": 1,
"key": 50,
"weight": 0
},
{
+ "id": 51,
+ "dtype": 1,
"key": 51,
"weight": 0
},
{
+ "id": 52,
+ "dtype": 1,
"key": 52,
"weight": 0
},
{
+ "id": 53,
+ "dtype": 1,
"key": 53,
"weight": 0
},
{
+ "id": 54,
+ "dtype": 1,
"key": 54,
"weight": 0
},
{
+ "id": 55,
+ "dtype": 1,
"key": 55,
"weight": 0
},
{
+ "id": 56,
+ "dtype": 1,
"key": 56,
"weight": 0
},
{
+ "id": 57,
+ "dtype": 1,
"key": 57,
"weight": 0
},
{
+ "id": 58,
+ "dtype": 1,
"key": 58,
"weight": 0
},
{
+ "id": 59,
+ "dtype": 1,
"key": 59,
"weight": 0
},
{
+ "id": 60,
+ "dtype": 1,
"key": 60,
"weight": 0
},
{
+ "id": 61,
+ "dtype": 1,
"key": 61,
- "weight": 0
+ "weight": 10
},
{
+ "id": 62,
+ "dtype": 1,
"key": 62,
- "weight": 0
+ "weight": 20
},
{
+ "id": 63,
+ "dtype": 1,
"key": 63,
- "weight": 0
+ "weight": 30
},
{
+ "id": 64,
+ "dtype": 1,
"key": 64,
- "weight": 0
+ "weight": 40
},
{
+ "id": 65,
+ "dtype": 1,
"key": 65,
- "weight": 0
+ "weight": 50
},
{
+ "id": 66,
+ "dtype": 1,
"key": 66,
- "weight": 0
+ "weight": 60
},
{
+ "id": 67,
+ "dtype": 1,
"key": 67,
- "weight": 0
+ "weight": 70
},
{
+ "id": 68,
+ "dtype": 1,
"key": 68,
- "weight": 0
+ "weight": 80
},
{
+ "id": 69,
+ "dtype": 1,
"key": 69,
- "weight": 0
+ "weight": 90
},
{
+ "id": 70,
+ "dtype": 1,
"key": 70,
- "weight": 0
+ "weight": 100
},
{
+ "id": 71,
+ "dtype": 1,
"key": 71,
- "weight": 0
+ "weight": 110
},
{
+ "id": 72,
+ "dtype": 1,
"key": 72,
- "weight": 0
+ "weight": 120
},
{
+ "id": 73,
+ "dtype": 1,
"key": 73,
- "weight": 0
+ "weight": 130
},
{
+ "id": 74,
+ "dtype": 1,
"key": 74,
- "weight": 0
+ "weight": 140
},
{
+ "id": 75,
+ "dtype": 1,
"key": 75,
- "weight": 0
+ "weight": 150
},
{
+ "id": 76,
+ "dtype": 1,
"key": 76,
- "weight": 0
+ "weight": 160
},
{
+ "id": 77,
+ "dtype": 1,
"key": 77,
- "weight": 0
+ "weight": 170
},
{
+ "id": 78,
+ "dtype": 1,
"key": 78,
- "weight": 0
+ "weight": 180
},
{
+ "id": 79,
+ "dtype": 1,
"key": 79,
- "weight": 0
+ "weight": 190
},
{
+ "id": 80,
+ "dtype": 1,
"key": 80,
- "weight": 0
+ "weight": 200
},
{
+ "id": 81,
+ "dtype": 1,
"key": 81,
- "weight": 2
+ "weight": 210
},
{
+ "id": 82,
+ "dtype": 1,
"key": 82,
- "weight": 12
+ "weight": 220
},
{
+ "id": 83,
+ "dtype": 1,
"key": 83,
- "weight": 23
+ "weight": 230
},
{
+ "id": 84,
+ "dtype": 1,
"key": 84,
- "weight": 55
+ "weight": 240
},
{
+ "id": 85,
+ "dtype": 1,
"key": 85,
- "weight": 127
+ "weight": 250
},
{
+ "id": 86,
+ "dtype": 1,
"key": 86,
- "weight": 208
+ "weight": 260
},
{
+ "id": 87,
+ "dtype": 1,
"key": 87,
- "weight": 303
+ "weight": 270
},
{
+ "id": 88,
+ "dtype": 1,
"key": 88,
- "weight": 414
+ "weight": 280
},
{
+ "id": 89,
+ "dtype": 1,
"key": 89,
- "weight": 546
+ "weight": 290
},
{
+ "id": 90,
+ "dtype": 1,
"key": 90,
- "weight": 705
- },
- {
- "key": 91,
- "weight": 901
- },
- {
- "key": 92,
- "weight": 1148
- },
- {
- "key": 93,
- "weight": 1468
- },
- {
- "key": 94,
- "weight": 1903
- },
- {
- "key": 95,
- "weight": 2523
- },
- {
- "key": 96,
- "weight": 3481
- },
- {
- "key": 97,
- "weight": 5158
- },
- {
- "key": 98,
- "weight": 8848
- },
- {
- "key": 99,
- "weight": 23608
- },
- {
- "key": 100,
- "weight": 999999
+ "weight": 300
}
]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index e001d8ba6..255a324c8 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -46,104 +46,7 @@
"draw_toplimit": 9999,
"draw10_star4_max": 8,
"draw10_star5_max": 2,
- "draw_floor_star4": 20,
- "draw_floor_star5": 100,
"duplicate_removal": 1,
- "base_pool_cost": {
- "a": "item",
- "t": "10000001",
- "n": 1
- },
- "camp1_pool_cost": {
- "a": "item",
- "t": "10000001",
- "n": 1
- },
- "camp2_pool_cost": {
- "a": "item",
- "t": "10000001",
- "n": 1
- },
- "camp3_pool_cost": {
- "a": "item",
- "t": "10000001",
- "n": 1
- },
- "camp4_pool_cost": {
- "a": "item",
- "t": "10000001",
- "n": 1
- },
- "base_pool_10cost": {
- "a": "item",
- "t": "10000001",
- "n": 10
- },
- "camp1_pool_10cost": {
- "a": "item",
- "t": "10000001",
- "n": 10
- },
- "camp2_pool_10cost": {
- "a": "item",
- "t": "10000001",
- "n": 10
- },
- "camp3_pool_10cost": {
- "a": "item",
- "t": "10000001",
- "n": 10
- },
- "camp4_pool_10cost": {
- "a": "item",
- "t": "10000001",
- "n": 10
- },
- "camp1_pool1": "camp1_pool",
- "camp2_pool1": "camp2_pool",
- "camp3_pool1": "camp3_pool",
- "camp4_pool1": "camp4_pool",
- "base_pool1": {
- "s": 1,
- "e": 1,
- "p": "base_pool1"
- },
- "base_pool2": {
- "s": 2,
- "e": 2,
- "p": "base_pool2"
- },
- "base_pool3": {
- "s": 3,
- "e": 3,
- "p": "base_pool3"
- },
- "base_pool4": {
- "s": 4,
- "e": 4,
- "p": "base_pool4"
- },
- "base_pool5": {
- "s": 5,
- "e": 5,
- "p": "base_pool5"
- },
- "base_pool6": {
- "s": 6,
- "e": 6,
- "p": "base_pool6"
- },
- "base_pool7": {
- "s": 7,
- "e": 999999999,
- "p": "base_pool7"
- },
- "base_pool_star3": 333,
- "base_pool_star4": 333,
- "base_pool_star5": 334,
- "camp_pool_star3": 9500,
- "camp_pool_star4": 900,
- "camp_pool_star5": 100,
"gourmet": 36000,
"smithy_maxplayer": 20,
"smithy_maxtime": 36000,
@@ -390,17 +293,6 @@
7,
10
],
- "DrawCard_5StarsInRange": [
- 1,
- 29,
- 5
- ],
- "DrawCard_5StarsInRange1": [
- 30,
- 49,
- 5
- ],
- "DrawCard_5StarsInRange1_pool": "base_pool7",
"DrawCard_ContinuousRestriction_Star5": 20,
"DrawCard_ContinuousRestriction_Camp": 2,
"EquipmentConsumption": [
diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json
index c1cd901c0..e0ffb1df3 100644
--- a/bin/json/game_initial.json
+++ b/bin/json/game_initial.json
@@ -1618,5 +1618,165 @@
"n": 500
}
]
+ },
+ {
+ "index": "357",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010001",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "358",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010002",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "359",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010003",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "360",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010004",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "361",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010005",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "362",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010006",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "363",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010007",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "364",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010008",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "365",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010009",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "366",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010010",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "367",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010011",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "368",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010012",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "369",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010013",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "370",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010014",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "371",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010015",
+ "n": 50
+ }
+ ]
+ },
+ {
+ "index": "372",
+ "var": [
+ {
+ "a": "item",
+ "t": "14010016",
+ "n": 50
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index ed9fef189..2cd0dcf2c 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -12597,5 +12597,38 @@
"text": "熊猫武馆升级木桩所需道具"
},
"sale": []
+ },
+ {
+ "id": "14010000",
+ "name": {
+ "key": "item_item_name_346",
+ "text": "食材大礼包"
+ },
+ "usetype": 5,
+ "color": 3,
+ "bagtype": 1,
+ "index": 1,
+ "special_type": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 14010000,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [
+ 904
+ ],
+ "use_skip": 140,
+ "upper_limit": 999,
+ "img": "icon_mcs",
+ "intr": {
+ "key": "item_item_intr_354",
+ "text": "打开后可以随机获得烹饪的食材，可以去找平先生用食材来制作各种美食"
+ },
+ "sale": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json
index e850555ed..83482f20d 100644
--- a/bin/json/game_lottery.json
+++ b/bin/json/game_lottery.json
@@ -22881,7 +22881,7 @@
"subtype": 1,
"groupnum": 1,
"itemid": {
- "a": "attr",
+ "a": "item",
"t": "gold",
"n": 1
},
@@ -22894,5 +22894,389 @@
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
+ },
+ {
+ "id": 955,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010001",
+ "n": 1
+ },
+ "itemdes": "小麦",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 956,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010002",
+ "n": 1
+ },
+ "itemdes": "苹果",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 957,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010003",
+ "n": 1
+ },
+ "itemdes": "香蕉",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 958,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010004",
+ "n": 1
+ },
+ "itemdes": "玉米",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 959,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010005",
+ "n": 1
+ },
+ "itemdes": "土豆",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 960,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010006",
+ "n": 1
+ },
+ "itemdes": "萝卜",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 961,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010007",
+ "n": 1
+ },
+ "itemdes": "蘑菇",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 962,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010008",
+ "n": 1
+ },
+ "itemdes": "牛奶",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 963,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010009",
+ "n": 1
+ },
+ "itemdes": "南瓜",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 964,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010010",
+ "n": 1
+ },
+ "itemdes": "番茄",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 965,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010011",
+ "n": 1
+ },
+ "itemdes": "蜂蜜",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 966,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010012",
+ "n": 1
+ },
+ "itemdes": "杏仁",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 967,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010013",
+ "n": 1
+ },
+ "itemdes": "鸡蛋",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 968,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010014",
+ "n": 1
+ },
+ "itemdes": "鸡肉",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 969,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010015",
+ "n": 1
+ },
+ "itemdes": "猪肉",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 970,
+ "lotteryid": 14010000,
+ "description": "食材大礼包随机食材",
+ "type": 1,
+ "groupwt": 1000,
+ "groupid": 10001,
+ "subtype": 1,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "14010016",
+ "n": 1
+ },
+ "itemdes": "鱼肉",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json
index 71bd02617..69c6165c5 100644
--- a/bin/json/game_navigation.json
+++ b/bin/json/game_navigation.json
@@ -231,7 +231,7 @@
"木桩"
],
"functionicon": "ty_qp_mz",
- "jumpId": 137
+ "jumpId": 10001
},
{
"Id": 14,
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
index 247efc8fd..8f078da4a 100644
--- a/bin/json/game_rdtasknpc.json
+++ b/bin/json/game_rdtasknpc.json
@@ -3020,11 +3020,13 @@
"id": 10664,
"heroid": 25001,
"datas": [
- "GameMain",
- "901"
+ "WuGuanScene",
+ "木桩3",
+ "137"
],
"event": [
- 0
+ 2,
+ 10200
],
"goto": 0
},
@@ -3713,10 +3715,12 @@
"heroid": 25001,
"datas": [
"SmithyScene",
+ "功能入口-商人",
"139"
],
"event": [
- 0
+ 10,
+ 122
],
"goto": 0
},
diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json
index 8f6746177..9dba02a61 100644
--- a/bin/json/game_ruledesc.json
+++ b/bin/json/game_ruledesc.json
@@ -62,7 +62,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_6",
- "text": "这里可以选择守护者去完成陪练任务，每个陪练任务有不同的等级与阵容要求，完成任务可以获得高额奖励。"
+ "text": "这里可以选择守护者去完成陪练任务，每个陪练任务有不同的等级与阵容要求，满足格外需求还可以获得格外的道具奖励，完成任务可以获得高额奖励。"
}
},
{
@@ -84,7 +84,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_8",
- "text": "这里可以与其他玩家的阵容进行对决，也可以挑战npc获取奖励。挑战玩家获得积分，在每周结算时根据积分排名来获得奖励。"
+ "text": "这里可以与其他玩家的阵容进行对决，也可以挑战电脑阵容来获取奖励。
挑战电脑阵容难度随等级解锁，挑战需要消耗竞技场挑战卷。
挑战玩家也需消耗竞技场挑战卷，战胜玩家获得积分，在每周结算时根据积分排名来获得奖励。"
}
},
{
@@ -157,11 +157,11 @@
"id": 10015,
"title": {
"key": "ruledesc_ruledesc_title_15",
- "text": "守护者图鉴说明"
+ "text": "守护者说明"
},
"content": {
"key": "ruledesc_ruledesc_content_15",
- "text": "这里可以查看你获得的所有守护者们，选择守护者可以查看详细界面并且强化他们。"
+ "text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。
在强化界面，可以有各种方式强化守护者。
守护者等级强化：
点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。
守护者升星：
当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星
守护者技能等级强化：
点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。
守护者觉醒：
使用觉醒强化你的守护者。觉醒道具守护之心主要为招募重复守护者解锁。
守护者共鸣：
使用共鸣强化你的守护者。共鸣强化道具可以再狩猎与宝箱中获得。"
}
},
{
@@ -194,7 +194,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_18",
- "text": "这里可以使用圣桃枝招募新的守护者们
（圣桃枝可以用200钻石购买一个）
招募概率公示：
史诗守护者获得概率：1.2%
完美守护者获得概率：10.8%
稀有守护者获得概率：88%"
+ "text": "这里可以使用圣桃枝招募新的守护者们。
（圣桃枝可以用200钻石购买一个）
招募概率公示：
史诗守护者获得概率：1.2%
完美守护者获得概率：10.8%
稀有守护者获得概率：88%"
}
},
{
@@ -271,7 +271,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_25",
- "text": "这里可以使用共鸣强化你的守护者（每个守护者共鸣独立）。"
+ "text": "这里可以使用共鸣强化你的守护者。
共鸣强化道具可在狩猎与宝箱中获得。"
}
},
{
@@ -293,7 +293,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_27",
- "text": "这里可以使用抽取过重复的守护者们加强该守护者。"
+ "text": "这里可以使用觉醒强化你的守护者。
觉醒道具守护之心主要为招募重复守护者获得。"
}
},
{
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index acb4c2fa9..269075afb 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -26773,7 +26773,7 @@
"Argu": [
1,
4,
- 3900
+ 3500
],
"FollowSK": [],
"SucFollowSK": [],
@@ -26838,7 +26838,7 @@
"Argu": [
1,
4,
- 4000
+ 3600
],
"FollowSK": [],
"SucFollowSK": [],
@@ -26861,7 +26861,7 @@
"Argu": [
1,
4,
- 4100
+ 3700
],
"FollowSK": [],
"SucFollowSK": [],
@@ -26884,7 +26884,7 @@
"Argu": [
1,
4,
- 4200
+ 3800
],
"FollowSK": [],
"SucFollowSK": [],
@@ -26907,7 +26907,7 @@
"Argu": [
1,
4,
- 4300
+ 3900
],
"FollowSK": [],
"SucFollowSK": [],
@@ -28413,7 +28413,7 @@
"Argu": [
1,
4,
- 4000
+ 2000
],
"FollowSK": [
255003312
@@ -29129,7 +29129,7 @@
"Argu": [
1,
4,
- 4000
+ 2000
],
"FollowSK": [],
"SucFollowSK": [
@@ -29231,7 +29231,7 @@
"Argu": [
1,
4,
- 1000
+ 500
],
"FollowSK": [],
"SucFollowSK": [],
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index a9abdd236..e2dd80a3b 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -23,7 +23,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004011_1",
- "text": "己方效果抵抗增加40%"
+ "text": "己方效果抵抗增加40%。"
},
"buffid": [],
"map": ""
@@ -83,7 +83,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004111_2",
- "text": "伤害提升至35%"
+ "text": "伤害提升至35%。"
},
"buffid": [
390001111
@@ -114,7 +114,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004111_3",
- "text": "概率触发概率提升至50%"
+ "text": "概率触发概率提升至50%。"
},
"buffid": [
390001111
@@ -145,7 +145,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004111_4",
- "text": "伤害提升至40%"
+ "text": "伤害提升至40%。"
},
"buffid": [
390001111
@@ -176,7 +176,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004111_5",
- "text": "概率触发概率提升至60%"
+ "text": "概率触发概率提升至60%。"
},
"buffid": [
390001111
@@ -207,7 +207,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004111_6",
- "text": "伤害提升至45%"
+ "text": "伤害提升至45%。"
},
"buffid": [
390001111
@@ -273,7 +273,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004211_2",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001001
@@ -306,7 +306,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004211_3",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001001
@@ -368,7 +368,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004311_2",
- "text": "恢复量提升至22%"
+ "text": "恢复量提升至22%。"
},
"buffid": [
390001208
@@ -399,7 +399,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004311_3",
- "text": "恢复量提升至24%"
+ "text": "恢复量提升至24%。"
},
"buffid": [
390001208
@@ -430,7 +430,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004311_4",
- "text": "恢复量提升至26%"
+ "text": "恢复量提升至26%。"
},
"buffid": [
390001208
@@ -461,7 +461,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004311_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001208
@@ -492,7 +492,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002011_1",
- "text": "己方效果命中增加40%"
+ "text": "己方效果命中增加40%。"
},
"buffid": [],
"map": ""
@@ -522,7 +522,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002111_1",
- "text": "攻击一个敌方2次，伤害分别为自身攻击力30%和80%，每次向目标转嫁自身1个减益；转嫁成功时有50%的概率为目标附加1回合[color=#c84a32]眩晕[/color]。"
+ "text": "攻击一个敌方2次，伤害分别为自身攻击力30%和80%，每次向目标转嫁自身1个减益；转嫁成功时有50%的概率为目标附加1回合[color=#e5621b]眩晕[/color]。"
},
"buffid": [
390001105
@@ -554,7 +554,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002111_2",
- "text": "第二段伤害提升至90%"
+ "text": "第二段伤害提升至90%。"
},
"buffid": [
390001105
@@ -586,7 +586,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002111_3",
- "text": "效果触发几率提升至60%"
+ "text": "效果触发几率提升至60%。"
},
"buffid": [
390001105
@@ -618,7 +618,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002111_4",
- "text": "第二段伤害提升至100%"
+ "text": "第二段伤害提升至100%。"
},
"buffid": [
390001105
@@ -650,7 +650,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002111_5",
- "text": "效果触发几率提升至70%"
+ "text": "效果触发几率提升至70%。"
},
"buffid": [
390001105
@@ -682,7 +682,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002111_6",
- "text": "第二段伤害提升至110%"
+ "text": "第二段伤害提升至110%。"
},
"buffid": [
390001105
@@ -714,7 +714,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002211_1",
- "text": "自身[color=#37d8a9]不会失手[/color]。敌方使其友方减益提前结束时，扣除其当前生命值30%，驱散其全部增益，为其附加1回合[color=#c84a32]石化[/color] [/color]。"
+ "text": "自身[color=#37d8a9]不会失手[/color]。"
},
"buffid": [],
"map": ""
@@ -743,7 +743,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002311_1",
- "text": "攻击敌方3次，每次伤害为自身攻击力35%。每次有80%概率驱散目标1个增益，为目标附加2回合[color=#c84a32]失手率提升[/color]。"
+ "text": "攻击敌方3次，每次伤害为自身攻击力35%。"
},
"buffid": [],
"map": ""
@@ -772,7 +772,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002311_2",
- "text": "伤害提升至37%"
+ "text": "伤害提升至37%。"
},
"buffid": [],
"map": ""
@@ -801,7 +801,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002311_3",
- "text": "效果触发几率提升至90%"
+ "text": "效果触发几率提升至90%。"
},
"buffid": [],
"map": ""
@@ -830,7 +830,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002311_4",
- "text": "伤害提升至40%"
+ "text": "伤害提升至40%。"
},
"buffid": [],
"map": ""
@@ -859,7 +859,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002311_5",
- "text": "效果触发几率提升至100%"
+ "text": "效果触发几率提升至100%。"
},
"buffid": [],
"map": ""
@@ -888,7 +888,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002311_6",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [],
"map": ""
@@ -917,7 +917,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935002411_1",
- "text": "攻击敌方3次，每次伤害为自身攻击力35%。每次有80%概率驱散目标1个增益，为目标附加2回合[color=#c84a32]失手率提升[/color]。延迟目标减益状态1回合。"
+ "text": "攻击敌方3次，每次伤害为自身攻击力35%。"
},
"buffid": [],
"map": ""
@@ -946,7 +946,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935002411_2",
- "text": "伤害提升至37%"
+ "text": "伤害提升至37%。"
},
"buffid": [],
"map": ""
@@ -975,7 +975,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935002411_3",
- "text": "效果触发几率提升至90%"
+ "text": "效果触发几率提升至90%。"
},
"buffid": [],
"map": ""
@@ -1004,7 +1004,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935002411_4",
- "text": "伤害提升至40%"
+ "text": "伤害提升至40%。"
},
"buffid": [],
"map": ""
@@ -1033,7 +1033,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935002411_5",
- "text": "效果触发几率提升至100%"
+ "text": "效果触发几率提升至100%。"
},
"buffid": [],
"map": ""
@@ -1062,7 +1062,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935002411_6",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [],
"map": ""
@@ -1091,7 +1091,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003011_1",
- "text": "己方效果抵抗增加40%"
+ "text": "己方效果抵抗增加40%。"
},
"buffid": [],
"map": ""
@@ -1153,7 +1153,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001118
@@ -1185,7 +1185,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003111_3",
- "text": "效果触发几率提升至60%"
+ "text": "效果触发几率提升至60%。"
},
"buffid": [
390001118
@@ -1217,7 +1217,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001118
@@ -1249,7 +1249,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003111_5",
- "text": "效果触发几率提升至70%"
+ "text": "效果触发几率提升至70%。"
},
"buffid": [
390001118
@@ -1313,7 +1313,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003211_2",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001003
@@ -1347,7 +1347,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003311_1",
- "text": "对敌方造成攻击力80%的伤害，使敌方目标各减少30%行动值，并有100%概率附加1回合[color=#37d8a9]睡眠[/color][color=#c84a32]禁疗[/color]状态。"
+ "text": "对敌方造成攻击力80%的伤害，使敌方目标各减少30%行动值，并有100%概率附加1回合[color=#37d8a9]睡眠[/color][color=#e5621b]禁疗[/color]状态。"
},
"buffid": [
390001118
@@ -1381,7 +1381,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003311_2",
- "text": "降低的行动值提升至25%"
+ "text": "降低的行动值提升至25%。"
},
"buffid": [
390001118
@@ -1415,7 +1415,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003311_3",
- "text": "效果触发几率提升至90%"
+ "text": "效果触发几率提升至90%。"
},
"buffid": [
390001118
@@ -1449,7 +1449,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003311_4",
- "text": "降低的行动值提升至30%"
+ "text": "降低的行动值提升至30%。"
},
"buffid": [
390001118
@@ -1483,7 +1483,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003311_5",
- "text": "效果触发几率提升至100%"
+ "text": "效果触发几率提升至100%。"
},
"buffid": [
390001118
@@ -1514,7 +1514,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003311_6",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001118
@@ -1581,7 +1581,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_924003411_2",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001003,
@@ -1613,7 +1613,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006011_1",
- "text": "己方速度提升25%"
+ "text": "己方速度提升25%。"
},
"buffid": [],
"map": ""
@@ -1642,7 +1642,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006111_1",
- "text": "对敌方1个目标造成2次攻击力50%的伤害,有60%概率为目标附加2回合[color=#c84a32]速度下降[/color]"
+ "text": "对敌方1个目标造成2次攻击力50%的伤害，有60%概率为目标附加2回合[color=#e5621b]速度下降[/color]。"
},
"buffid": [
390001008
@@ -1673,7 +1673,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006111_2",
- "text": "伤害提升至55%"
+ "text": "伤害提升至55%。"
},
"buffid": [
390001008
@@ -1704,7 +1704,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006111_3",
- "text": "效果触发几率提升至70%"
+ "text": "效果触发几率提升至70%。"
},
"buffid": [
390001008
@@ -1735,7 +1735,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006111_4",
- "text": "伤害提升至60%"
+ "text": "伤害提升至60%。"
},
"buffid": [
390001008
@@ -1766,7 +1766,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006111_5",
- "text": "效果触发几率提升至80%"
+ "text": "效果触发几率提升至80%。"
},
"buffid": [
390001008
@@ -1797,7 +1797,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006211_1",
- "text": "攻击敌方，伤害为自身攻击力210%，70%概率降低目标30%行动值；"
+ "text": "攻击敌方，伤害为自身攻击力210%，70%概率降低目标30%行动值；。"
},
"buffid": [],
"map": ""
@@ -1826,7 +1826,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006211_2",
- "text": "伤害提升至75%"
+ "text": "伤害提升至75%。"
},
"buffid": [],
"map": ""
@@ -1855,7 +1855,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006211_3",
- "text": "效果触发几率提升至80%"
+ "text": "效果触发几率提升至80%。"
},
"buffid": [],
"map": ""
@@ -1884,7 +1884,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006211_4",
- "text": "伤害提升至80%"
+ "text": "伤害提升至80%。"
},
"buffid": [],
"map": ""
@@ -1913,7 +1913,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006211_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [],
"map": ""
@@ -1942,7 +1942,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006311_1",
- "text": "攻击敌方，伤害为自身攻击力300%，90%概率为目标附加2回合[color=#c84a32]速度下降[/color]和1回合[color=#c84a32]冰冻[/color]"
+ "text": "攻击敌方，伤害为自身攻击力300%，90%概率为目标附加2回合[color=#e5621b]速度下降[/color]和1回合[color=#e5621b]冰冻[/color]。"
},
"buffid": [
390001008,
@@ -1974,7 +1974,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006311_2",
- "text": "伤害提升至105%"
+ "text": "伤害提升至105%。"
},
"buffid": [
390001008,
@@ -2006,7 +2006,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006311_3",
- "text": "效果触发几率提升至100%"
+ "text": "效果触发几率提升至100%。"
},
"buffid": [
390001008,
@@ -2038,7 +2038,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006311_4",
- "text": "伤害提升至110%"
+ "text": "伤害提升至110%。"
},
"buffid": [
390001008,
@@ -2070,7 +2070,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006311_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001008,
@@ -2102,7 +2102,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_934006411_1",
- "text": "攻击敌方，伤害为自身攻击力400%，70%概率降低目标30%行动值；目标有[color=#c84a32]速度下降[/color]时，降低行动值翻倍。"
+ "text": "攻击敌方，伤害为自身攻击力400%，70%概率降低目标30%行动值；目标有[color=#e5621b]速度下降[/color]时，降低行动值翻倍。"
},
"buffid": [
390001008
@@ -2133,7 +2133,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_934006411_2",
- "text": "伤害提升至75%"
+ "text": "伤害提升至75%。"
},
"buffid": [
390001008
@@ -2164,7 +2164,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_934006411_3",
- "text": "效果触发几率提升至80%"
+ "text": "效果触发几率提升至80%。"
},
"buffid": [
390001008
@@ -2195,7 +2195,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_934006411_4",
- "text": "伤害提升至80%"
+ "text": "伤害提升至80%。"
},
"buffid": [
390001008
@@ -2226,7 +2226,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_934006411_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001008
@@ -2257,7 +2257,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001011_1",
- "text": "己方防御增加30%"
+ "text": "己方防御增加30%。"
},
"buffid": [
390001008
@@ -2288,7 +2288,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001111_1",
- "text": "对敌方1个目标造成2次攻击力30%及防御力150%的伤害,有50%概率为目标附加2回合[color=#c84a32]攻击下降[/color]"
+ "text": "对敌方1个目标造成2次攻击力30%及防御力150%的伤害，有50%概率为目标附加2回合[color=#e5621b]攻击下降[/color]。"
},
"buffid": [
390001006
@@ -2319,7 +2319,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001111_2",
- "text": "防御伤害比例提升至60%"
+ "text": "防御伤害比例提升至60%。"
},
"buffid": [
390001006
@@ -2350,7 +2350,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001111_3",
- "text": "效果触发几率提升至60%"
+ "text": "效果触发几率提升至60%。"
},
"buffid": [
390001006
@@ -2381,7 +2381,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001111_4",
- "text": "防御伤害比例提升至70%"
+ "text": "防御伤害比例提升至70%。"
},
"buffid": [
390001006
@@ -2412,7 +2412,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001111_5",
- "text": "效果触发几率提升至75%"
+ "text": "效果触发几率提升至75%。"
},
"buffid": [
390001006
@@ -2476,7 +2476,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001211_2",
- "text": "防御伤害比例提升至95%"
+ "text": "防御伤害比例提升至95%。"
},
"buffid": [
390001211
@@ -2508,7 +2508,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001211_3",
- "text": "防御伤害比例提升至100%"
+ "text": "防御伤害比例提升至100%。"
},
"buffid": [
390001212
@@ -2540,7 +2540,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001211_4",
- "text": "防御伤害比例提升至110%"
+ "text": "防御伤害比例提升至110%。"
},
"buffid": [
390001213
@@ -2572,7 +2572,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001211_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001214
@@ -2784,7 +2784,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001311_2",
- "text": "防御伤害比例提升至110%"
+ "text": "防御伤害比例提升至110%。"
},
"buffid": [
390001002,
@@ -2818,7 +2818,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001311_3",
- "text": "防御伤害比例提升至120%"
+ "text": "防御伤害比例提升至120%。"
},
"buffid": [
390001002,
@@ -2852,7 +2852,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001311_4",
- "text": "防御伤害比例提升至140%"
+ "text": "防御伤害比例提升至140%。"
},
"buffid": [
390001002,
@@ -2886,7 +2886,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001311_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001002,
@@ -2919,7 +2919,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_925001411_1",
- "text": "回合结束时获得1回合[color=#37d8a9]玄御[/color]，效果期间回合开始时攻击敌方，伤害为自身防御力90%。任一技能暴击时减少此技能1回合冷却。"
+ "text": "回合结束时获得1回合[color=#37d8a9]玄御[/color]，效果期间回合开始时攻击敌方，伤害为自身防御力90%。"
},
"buffid": [
390001210
@@ -2951,7 +2951,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_925001411_2",
- "text": "防御伤害比例提升至95%"
+ "text": "防御伤害比例提升至95%。"
},
"buffid": [
390001210
@@ -2983,7 +2983,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_925001411_3",
- "text": "防御伤害比例提升至100%"
+ "text": "防御伤害比例提升至100%。"
},
"buffid": [
390001210
@@ -3015,7 +3015,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_925001411_4",
- "text": "防御伤害比例提升至110%"
+ "text": "防御伤害比例提升至110%。"
},
"buffid": [
390001210
@@ -3047,7 +3047,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_925001411_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001210
@@ -3078,7 +3078,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005011_1",
- "text": "己方攻击增加30%"
+ "text": "己方攻击增加30%。"
},
"buffid": [],
"map": ""
@@ -3136,7 +3136,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005111_2",
- "text": "伤害提升至55%"
+ "text": "伤害提升至55%。"
},
"buffid": [],
"map": ""
@@ -3165,7 +3165,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005111_3",
- "text": "效果触发几率提升至40%"
+ "text": "效果触发几率提升至40%。"
},
"buffid": [],
"map": ""
@@ -3194,7 +3194,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005111_4",
- "text": "伤害提升至60%"
+ "text": "伤害提升至60%。"
},
"buffid": [],
"map": ""
@@ -3223,7 +3223,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005111_5",
- "text": "效果触发几率提升至50%"
+ "text": "效果触发几率提升至50%。"
},
"buffid": [],
"map": ""
@@ -3252,7 +3252,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005211_1",
- "text": "攻击1个敌方4次，每次伤害为自身攻击力125%，每次有30%概率为目标附加1回合[color=#c84a32]眩晕[/color]。"
+ "text": "攻击1个敌方4次，每次伤害为自身攻击力125%，每次有30%概率为目标附加1回合[color=#e5621b]眩晕[/color]。"
},
"buffid": [
390001105
@@ -3283,7 +3283,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005211_2",
- "text": "伤害提升至47%"
+ "text": "伤害提升至47%。"
},
"buffid": [
390001105
@@ -3314,7 +3314,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005211_3",
- "text": "效果触发几率提升至40%"
+ "text": "效果触发几率提升至40%。"
},
"buffid": [
390001105
@@ -3345,7 +3345,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005211_4",
- "text": "伤害提升至50%"
+ "text": "伤害提升至50%。"
},
"buffid": [
390001105
@@ -3376,7 +3376,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005211_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001105
@@ -3440,7 +3440,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005311_2",
- "text": "伤害提升至90%"
+ "text": "伤害提升至90%。"
},
"buffid": [],
"map": ""
@@ -3471,7 +3471,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005311_3",
- "text": "效果触发几率提升至100%"
+ "text": "效果触发几率提升至100%。"
},
"buffid": [],
"map": ""
@@ -3502,7 +3502,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005311_4",
- "text": "伤害提升至100%"
+ "text": "伤害提升至100%。"
},
"buffid": [],
"map": ""
@@ -3533,7 +3533,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005311_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [],
"map": ""
@@ -3565,7 +3565,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944005411_1",
- "text": "攻击敌方，伤害为自身攻击力400%，75%概率驱散目标1个增益，每个驱散的增益提升友方5%行动值。增加目标所有技能1回合冷却。"
+ "text": "攻击敌方，伤害为自身攻击力400%，75%概率驱散目标1个增益，每个驱散的增益提升友方5%行动值。"
},
"buffid": [],
"map": ""
@@ -3597,7 +3597,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944005411_2",
- "text": "伤害提升至90%"
+ "text": "伤害提升至90%。"
},
"buffid": [],
"map": ""
@@ -3629,7 +3629,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944005411_3",
- "text": "效果触发几率提升至100%"
+ "text": "效果触发几率提升至100%。"
},
"buffid": [],
"map": ""
@@ -3661,7 +3661,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944005411_4",
- "text": "伤害提升至100%"
+ "text": "伤害提升至100%。"
},
"buffid": [],
"map": ""
@@ -3693,7 +3693,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944005411_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [],
"map": ""
@@ -3722,7 +3722,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001011_1",
- "text": "己方攻击增加30%"
+ "text": "己方攻击增加30%。"
},
"buffid": [],
"map": ""
@@ -3753,7 +3753,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001111_1",
- "text": "攻击1个敌方，伤害为自身攻击力360%,攻击溅射随机2个敌方，伤害为自身攻击力180%。攻击前随机获得一种神力，持续1回合；神力包含[color=#37d8a9]气[/color]、[color=#37d8a9]劲[/color]、[color=#37d8a9]法[/color]。"
+ "text": "攻击1个敌方，伤害为自身攻击力360%，攻击溅射随机2个敌方，伤害为自身攻击力180%。"
},
"buffid": [
390001119,
@@ -3789,7 +3789,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001111_2",
- "text": "造成的伤害提升10%"
+ "text": "造成的伤害提升10%。"
},
"buffid": [
390001119,
@@ -3825,7 +3825,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001111_3",
- "text": "对额外目标的伤害提升10%"
+ "text": "对额外目标的伤害提升10%。"
},
"buffid": [
390001119,
@@ -3861,7 +3861,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001111_4",
- "text": "造成的伤害提升10%"
+ "text": "造成的伤害提升10%。"
},
"buffid": [
390001119,
@@ -3897,7 +3897,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001111_5",
- "text": "对额外目标的伤害提升10%"
+ "text": "对额外目标的伤害提升10%。"
},
"buffid": [
390001119,
@@ -3933,7 +3933,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001111_6",
- "text": "造成的伤害提升10%"
+ "text": "造成的伤害提升10%。"
},
"buffid": [
390001119,
@@ -3968,7 +3968,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001211_1",
- "text": "攻击1个敌方，伤害为自身攻击力170%。吸收所有神力恢复自身生命，每个神力提供自身最大生命值10%恢复量。"
+ "text": "攻击1个敌方，伤害为自身攻击力170%。"
},
"buffid": [],
"map": ""
@@ -3998,7 +3998,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001211_2",
- "text": "伤害提升至180%"
+ "text": "伤害提升至180%。"
},
"buffid": [],
"map": ""
@@ -4028,7 +4028,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001211_3",
- "text": "伤害提升至190%"
+ "text": "伤害提升至190%。"
},
"buffid": [],
"map": ""
@@ -4058,7 +4058,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001211_4",
- "text": "伤害提升至200%"
+ "text": "伤害提升至200%。"
},
"buffid": [],
"map": ""
@@ -4088,7 +4088,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001211_5",
- "text": "冷却时间减少至1回合"
+ "text": "冷却时间减少至1回合。"
},
"buffid": [],
"map": ""
@@ -4120,7 +4120,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001311_1",
- "text": "攻击敌方2次，每次伤害为自身攻击360%。攻击前获得全部神力，持续2回合；神力包含[color=#37d8a9]气[/color]、[color=#37d8a9]劲[/color]、[color=#37d8a9]法[/color]。"
+ "text": "攻击敌方2次，每次伤害为自身攻击360%。"
},
"buffid": [
390001119,
@@ -4157,7 +4157,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001311_2",
- "text": "伤害提升至55%"
+ "text": "伤害提升至55%。"
},
"buffid": [
390001119,
@@ -4194,7 +4194,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001311_3",
- "text": "伤害提升至60%"
+ "text": "伤害提升至60%。"
},
"buffid": [
390001119,
@@ -4231,7 +4231,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001311_4",
- "text": "冷却减少1回合"
+ "text": "冷却减少1回合。"
},
"buffid": [
390001119,
@@ -4268,7 +4268,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935001411_1",
- "text": "攻击1个敌方，伤害为自身攻击力510%。为自身附加2回合[color=#37d8a9]护盾[/color]，[color=#37d8a9]护盾[/color]量为自身最大生命值10%。吸收所有神力恢复自身生命，每个神力提供自身最大生命值10%恢复量、最大生命值5%[color=#37d8a9]护盾[/color]量和10%额外伤害。"
+ "text": "攻击1个敌方，伤害为自身攻击力510%。"
},
"buffid": [
390001112
@@ -4302,7 +4302,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935001411_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001112
@@ -4336,7 +4336,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935001411_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001112
@@ -4370,7 +4370,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935001411_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001112
@@ -4402,7 +4402,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_935001411_5",
- "text": "冷却时间减少至1回合"
+ "text": "冷却时间减少至1回合。"
},
"buffid": [
390001112
@@ -4433,7 +4433,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004011_1",
- "text": "己方效果命中增加40%"
+ "text": "己方效果命中增加40%。"
},
"buffid": [],
"map": ""
@@ -4462,7 +4462,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004111_1",
- "text": "攻击1个敌方，伤害为自身攻击力300%，60%概率为目标附加2回合[color=#c84a32]禁疗[/color]"
+ "text": "攻击1个敌方，伤害为自身攻击力300%，60%概率为目标附加2回合[color=#e5621b]禁疗[/color]。"
},
"buffid": [
390001107
@@ -4493,7 +4493,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001107
@@ -4524,7 +4524,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004111_3",
- "text": "效果触发几率提升至70%"
+ "text": "效果触发几率提升至70%。"
},
"buffid": [
390001107
@@ -4555,7 +4555,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004111_4",
- "text": "伤害提升20%"
+ "text": "伤害提升20%。"
},
"buffid": [
390001107
@@ -4586,7 +4586,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004111_5",
- "text": "效果触发几率提升至80%"
+ "text": "效果触发几率提升至80%。"
},
"buffid": [
390001107
@@ -4617,7 +4617,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004211_1",
- "text": "攻击时为目标附加2回合[color=#c84a32]中毒[/color]。"
+ "text": "攻击时为目标附加2回合[color=#e5621b]中毒[/color]。"
},
"buffid": [
390001401
@@ -4650,7 +4650,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004311_1",
- "text": "攻击敌方，伤害为自身攻击力600%，为目标附加2回合[color=#c84a32]速度下降[/color]和[color=#c84a32]中毒[/color]。"
+ "text": "攻击敌方，伤害为自身攻击力600%，为目标附加2回合[color=#e5621b]速度下降[/color]和[color=#e5621b]中毒[/color]。"
},
"buffid": [
390001008,
@@ -4684,7 +4684,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004311_2",
- "text": "伤害提升至105%"
+ "text": "伤害提升至105%。"
},
"buffid": [
390001008,
@@ -4718,7 +4718,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004311_3",
- "text": "伤害提升至110%"
+ "text": "伤害提升至110%。"
},
"buffid": [
390001008,
@@ -4752,7 +4752,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004311_4",
- "text": "伤害提升至115%"
+ "text": "伤害提升至115%。"
},
"buffid": [
390001008,
@@ -4786,7 +4786,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004311_5",
- "text": "伤害提升至120%"
+ "text": "伤害提升至120%。"
},
"buffid": [
390001008,
@@ -4820,7 +4820,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004311_6",
- "text": "伤害提升至130%"
+ "text": "伤害提升至130%。"
},
"buffid": [
390001008,
@@ -4854,7 +4854,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004311_7",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001008,
@@ -4886,7 +4886,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_924004411_1",
- "text": "攻击时为目标附加2回合[color=#c84a32]中毒[/color]。附加[color=#c84a32]中毒[/color]成功时，额外附加1回合[color=#c84a32]中毒[/color]；每回合对每个目标仅触发1次。"
+ "text": "攻击时为目标附加2回合[color=#e5621b]中毒[/color]。"
},
"buffid": [
390001401
@@ -4917,7 +4917,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006011_1",
- "text": "己方生命值增加30%"
+ "text": "己方生命值增加30%。"
},
"buffid": [],
"map": ""
@@ -4946,7 +4946,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006111_1",
- "text": "对敌方1个目标造成攻击力480%的伤害，自身每损失10%的生命，伤害提升5%"
+ "text": "对敌方1个目标造成攻击力480%的伤害，自身每损失10%的生命，伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -4975,7 +4975,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006111_2",
- "text": "伤害提升至105%"
+ "text": "伤害提升至105%。"
},
"buffid": [],
"map": ""
@@ -5004,7 +5004,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006111_3",
- "text": "伤害提升至110%"
+ "text": "伤害提升至110%。"
},
"buffid": [],
"map": ""
@@ -5033,7 +5033,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006111_4",
- "text": "伤害提升至115%"
+ "text": "伤害提升至115%。"
},
"buffid": [],
"map": ""
@@ -5062,7 +5062,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006111_5",
- "text": "伤害提升至120%"
+ "text": "伤害提升至120%。"
},
"buffid": [],
"map": ""
@@ -5091,7 +5091,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006111_6",
- "text": "伤害提升至130%"
+ "text": "伤害提升至130%。"
},
"buffid": [],
"map": ""
@@ -5120,7 +5120,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006211_1",
- "text": "自身造成击杀时，将获得额外回合，且被自身击杀的敌人将无法复活"
+ "text": "自身造成击杀时，将获得额外回合，且被自身击杀的敌人将无法复活。"
},
"buffid": [],
"map": ""
@@ -5153,7 +5153,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006311_1",
- "text": "驱散敌方1个目标的全部增益效果，随后对其造成攻击力230%的伤害，同时自身受到此伤害30%的效果附加伤害，但是自身不会因为该伤害死亡。自身获得[color=#37d8a9]攻击提升[/color][color=#37d8a9]暴击提升[/color]效果，持续3回合"
+ "text": "驱散敌方1个目标的全部增益效果，随后对其造成攻击力230%的伤害，同时自身受到此伤害30%的效果附加伤害，但是自身不会因为该伤害死亡。"
},
"buffid": [
390001001,
@@ -5189,7 +5189,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006311_2",
- "text": "伤害提升至240%"
+ "text": "伤害提升至240%。"
},
"buffid": [
390001001,
@@ -5225,7 +5225,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006311_3",
- "text": "伤害提升至250%"
+ "text": "伤害提升至250%。"
},
"buffid": [
390001001,
@@ -5261,7 +5261,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006311_4",
- "text": "伤害提升至260%"
+ "text": "伤害提升至260%。"
},
"buffid": [
390001001,
@@ -5297,7 +5297,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006311_5",
- "text": "伤害提升至270%"
+ "text": "伤害提升至270%。"
},
"buffid": [
390001001,
@@ -5333,7 +5333,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006311_6",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001001,
@@ -5373,7 +5373,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944006411_1",
- "text": "驱散敌方1个目标的全部增益效果，随后对其造成攻击力270%的伤害，同时自身受到此伤害30%的效果附加伤害，但是自身不会因为该伤害死亡。成功击杀敌人时，自身获得[color=#37d8a9]攻击提升[/color][color=#37d8a9]暴击提升[/color]效果，持续3回合"
+ "text": "驱散敌方1个目标的全部增益效果，随后对其造成攻击力270%的伤害，同时自身受到此伤害30%的效果附加伤害，但是自身不会因为该伤害死亡。"
},
"buffid": [
390001001,
@@ -5413,7 +5413,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944006411_2",
- "text": "伤害提升至240%"
+ "text": "伤害提升至240%。"
},
"buffid": [
390001001,
@@ -5453,7 +5453,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944006411_3",
- "text": "伤害提升至250%"
+ "text": "伤害提升至250%。"
},
"buffid": [
390001001,
@@ -5493,7 +5493,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944006411_4",
- "text": "伤害提升至260%"
+ "text": "伤害提升至260%。"
},
"buffid": [
390001001,
@@ -5533,7 +5533,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944006411_5",
- "text": "伤害提升至270%"
+ "text": "伤害提升至270%。"
},
"buffid": [
390001001,
@@ -5573,7 +5573,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_944006411_6",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001001,
@@ -5605,7 +5605,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005011_1",
- "text": "己方防御增加40%"
+ "text": "己方防御增加40%。"
},
"buffid": [],
"map": ""
@@ -5665,7 +5665,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005111_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -5695,7 +5695,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005111_3",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -5725,7 +5725,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005111_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -5755,7 +5755,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005111_5",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -5816,7 +5816,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005311_1",
- "text": "提升友方20%行动值。治疗友方，治疗量为目标最大生命值35%。净化友方各1个减益，为无减益的目标附加1回合[color=#37d8a9]免疫[/color]。"
+ "text": "提升友方20%行动值。"
},
"buffid": [
390001111
@@ -5850,7 +5850,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005311_2",
- "text": "治疗量提升至28%"
+ "text": "治疗量提升至28%。"
},
"buffid": [
390001111
@@ -5884,7 +5884,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005311_3",
- "text": "治疗量提升至31%"
+ "text": "治疗量提升至31%。"
},
"buffid": [
390001111
@@ -5918,7 +5918,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005311_4",
- "text": "治疗量提升至35%"
+ "text": "治疗量提升至35%。"
},
"buffid": [
390001111
@@ -5952,7 +5952,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005311_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001111
@@ -5983,7 +5983,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004011_1",
- "text": "己方效果命中增加40%"
+ "text": "己方效果命中增加40%。"
},
"buffid": [],
"map": ""
@@ -6041,7 +6041,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004111_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -6070,7 +6070,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004111_3",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -6099,7 +6099,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004111_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -6128,7 +6128,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004211_1",
- "text": "攻击敌方，伤害为自身攻击力170%，85%概率为目标附加1回合[color=#c84a32]眩晕[/color]。"
+ "text": "攻击敌方，伤害为自身攻击力170%，85%概率为目标附加1回合[color=#e5621b]眩晕[/color]。"
},
"buffid": [
390001105
@@ -6159,7 +6159,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004211_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001105
@@ -6190,7 +6190,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004211_3",
- "text": "效果触发几率提升至85%"
+ "text": "效果触发几率提升至85%。"
},
"buffid": [
390001105
@@ -6221,7 +6221,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004211_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001105
@@ -6252,7 +6252,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004211_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001105
@@ -6283,7 +6283,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004311_1",
- "text": "攻击敌方3次，总伤害为自身攻击力180%。每次有50%概率驱散目标1个增益，降低目标10%行动值。"
+ "text": "攻击敌方3次，伤害是攻击力180%。"
},
"buffid": [],
"map": ""
@@ -6312,7 +6312,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004311_2",
- "text": "伤害提升至95%"
+ "text": "伤害提升至95%。"
},
"buffid": [],
"map": ""
@@ -6341,7 +6341,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004311_3",
- "text": "效果触发几率提升至50%"
+ "text": "效果触发几率提升至50%。"
},
"buffid": [],
"map": ""
@@ -6370,7 +6370,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004311_4",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [],
"map": ""
@@ -6399,7 +6399,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004311_5",
- "text": "伤害提升至100%"
+ "text": "伤害提升至100%。"
},
"buffid": [],
"map": ""
@@ -6428,7 +6428,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004311_6",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [],
"map": ""
@@ -6458,7 +6458,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_915004211_1",
- "text": "攻击敌方，伤害为自身攻击力170%，每次有85%概率为目标附加1回合[color=#c84a32]眩晕[/color]。每个被[color=#c84a32]眩晕[/color]的目标提升自身15%行动值。"
+ "text": "攻击敌方，伤害为自身攻击力170%，每次有85%概率为目标附加1回合[color=#e5621b]眩晕[/color]。"
},
"buffid": [
390001105
@@ -6490,7 +6490,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_915004211_2",
- "text": "伤害提升至75%"
+ "text": "伤害提升至75%。"
},
"buffid": [
390001105
@@ -6522,7 +6522,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_915004211_3",
- "text": "效果触发几率提升至85%"
+ "text": "效果触发几率提升至85%。"
},
"buffid": [
390001105
@@ -6554,7 +6554,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_915004211_4",
- "text": "伤害提升至80%"
+ "text": "伤害提升至80%。"
},
"buffid": [
390001105
@@ -6586,7 +6586,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_915004211_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001105
@@ -6617,7 +6617,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002011_1",
- "text": "己方效果命中提升30%"
+ "text": "己方效果命中提升30%。"
},
"buffid": [],
"map": ""
@@ -6646,7 +6646,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002111_1",
- "text": "攻击随机2个敌方，伤害为自身攻击力200%，为目标附加[color=#c84a32]童真[/color] 。"
+ "text": "攻击随机2个敌方，伤害为自身攻击力200%，为目标附加[color=#e5621b]童真[/color] 。"
},
"buffid": [
390001211
@@ -6677,7 +6677,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002111_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001211
@@ -6708,7 +6708,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002111_3",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001211
@@ -6739,7 +6739,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002111_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001211
@@ -6770,7 +6770,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002111_5",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001211
@@ -6801,7 +6801,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002111_6",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001211
@@ -6833,7 +6833,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002211_1",
- "text": "攻击时，若目标有[color=#c84a32]童真[/color] ，附加2回合[color=#c84a32]速度下降[/color]。受击时，若攻击者有[color=#37d8a9]童真[/color]，50%概率反击。"
+ "text": "攻击时，若目标有[color=#e5621b]童真[/color] ，附加2回合[color=#e5621b]速度下降[/color]。"
},
"buffid": [
390001211,
@@ -6866,7 +6866,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002311_1",
- "text": "攻击敌方3次，总伤害为自身攻击力600%。为目标附加[color=#37d8a9]童真[/color]"
+ "text": "攻击敌方3次，伤害是攻击力600%。并为目标附加童真状态。"
},
"buffid": [
390001211,
@@ -6899,7 +6899,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002311_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001211,
@@ -6932,7 +6932,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002311_3",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001211,
@@ -6965,7 +6965,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002311_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001211,
@@ -6998,7 +6998,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002311_5",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001211,
@@ -7031,7 +7031,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002311_6",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001211,
@@ -7063,7 +7063,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007011_1",
- "text": "己方防御增加24%"
+ "text": "己方防御增加24%。"
},
"buffid": [],
"map": ""
@@ -7092,7 +7092,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007111_1",
- "text": "攻击1个敌方，伤害为自身攻击力30%及防御力150%，50%概率为目标附加2回合[color=#c84a32]防御下降[/color][/color]。"
+ "text": "攻击1个敌方，伤害为自身攻击力30%及防御力150%，50%概率为目标附加2回合[color=#e5621b]防御下降[/color]。"
},
"buffid": [
390001007
@@ -7123,7 +7123,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007111_2",
- "text": "防御比例伤害提升至60%"
+ "text": "防御比例伤害提升至60%。"
},
"buffid": [
390001007
@@ -7154,7 +7154,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007111_3",
- "text": "效果触发几率提升至60%"
+ "text": "效果触发几率提升至60%。"
},
"buffid": [
390001007
@@ -7185,7 +7185,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007111_4",
- "text": "防御比例伤害提升至70%"
+ "text": "防御比例伤害提升至70%。"
},
"buffid": [
390001007
@@ -7216,7 +7216,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007111_5",
- "text": "效果触发几率提升至70%"
+ "text": "效果触发几率提升至70%。"
},
"buffid": [
390001007
@@ -7247,7 +7247,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007111_6",
- "text": "防御比例伤害提升至80%"
+ "text": "防御比例伤害提升至80%。"
},
"buffid": [
390001007
@@ -7311,7 +7311,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007211_2",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001104
@@ -7343,7 +7343,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007211_3",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001104
@@ -7377,7 +7377,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007311_1",
- "text": "攻击敌方，伤害为自身防御力80%，30%概率为目标附加1回合[color=#c84a32]挑衅[/color]；目标防御比自身低时，概率翻倍。"
+ "text": "攻击敌方，伤害为自身防御力80%，30%概率为目标附加1回合[color=#e5621b]挑衅[/color]；目标防御比自身低时，概率翻倍。"
},
"buffid": [
390001110
@@ -7411,7 +7411,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007311_2",
- "text": "防御比例伤害提升至85%"
+ "text": "防御比例伤害提升至85%。"
},
"buffid": [
390001110
@@ -7445,7 +7445,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007311_3",
- "text": "效果触发几率提升至40%"
+ "text": "效果触发几率提升至40%。"
},
"buffid": [
390001110
@@ -7479,7 +7479,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007311_4",
- "text": "防御比例伤害提升至90%"
+ "text": "防御比例伤害提升至90%。"
},
"buffid": [
390001110
@@ -7513,7 +7513,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007311_5",
- "text": "效果触发几率提升至50%"
+ "text": "效果触发几率提升至50%。"
},
"buffid": [
390001110
@@ -7547,7 +7547,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007311_6",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001110
@@ -7578,7 +7578,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003011_1",
- "text": "己方速度增加25%"
+ "text": "己方速度增加25%。"
},
"buffid": [],
"map": ""
@@ -7607,7 +7607,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003111_1",
- "text": "攻击1个敌方，伤害为自身攻击力150%，50%概率降低目标30%行动值。每点速度提供攻击力0.33%额外伤害。"
+ "text": "攻击1个敌方，伤害为自身攻击力150%，50%概率降低目标30%行动值。"
},
"buffid": [],
"map": ""
@@ -7636,7 +7636,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003111_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -7665,7 +7665,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003111_3",
- "text": "效果触发几率提升至75%"
+ "text": "效果触发几率提升至75%。"
},
"buffid": [],
"map": ""
@@ -7694,7 +7694,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003111_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -7723,7 +7723,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003111_5",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -7753,7 +7753,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003211_1",
- "text": "攻击1个敌方，伤害为自身攻击225%，80%概率为目标附加2回合[color=#c84a32]速度下降[/color]。暴击时为自身附加2回合[color=#37d8a9]速度提升[/color]。每点速度提供攻击0.33%。"
+ "text": "攻击1个敌方，伤害为自身攻击225%，80%概率为目标附加2回合[color=#e5621b]速度下降[/color]。"
},
"buffid": [
390001008,
@@ -7786,7 +7786,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003211_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001008,
@@ -7819,7 +7819,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003211_3",
- "text": "效果触发几率提升至100%"
+ "text": "效果触发几率提升至100%。"
},
"buffid": [
390001008,
@@ -7852,7 +7852,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003211_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001008,
@@ -7885,7 +7885,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003211_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [
390001008,
@@ -7917,7 +7917,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003311_1",
- "text": "攻击1个敌方3次，每次伤害为自身攻击力265%，每次有40%概率降低目标30%行动值。每点速度提供0.33%额外伤害。"
+ "text": "攻击1个敌方3次，每次伤害为自身攻击力265%，每次有40%概率降低目标30%行动值。"
},
"buffid": [],
"map": ""
@@ -7946,7 +7946,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003311_2",
- "text": "伤害提升至55%"
+ "text": "伤害提升至55%。"
},
"buffid": [],
"map": ""
@@ -7975,7 +7975,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003311_3",
- "text": "效果触发几率提升至50%"
+ "text": "效果触发几率提升至50%。"
},
"buffid": [],
"map": ""
@@ -8004,7 +8004,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003311_4",
- "text": "伤害提升至60%"
+ "text": "伤害提升至60%。"
},
"buffid": [],
"map": ""
@@ -8033,7 +8033,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003311_5",
- "text": "冷却时间减少1回合"
+ "text": "冷却时间减少1回合。"
},
"buffid": [],
"map": ""
@@ -8062,7 +8062,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003011_1",
- "text": "己方生命值增加40%"
+ "text": "己方生命值增加40%。"
},
"buffid": [],
"map": ""
@@ -8091,7 +8091,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003111_1",
- "text": "对敌方1个目标造成攻击力90%的伤害，附加自身最大生命在5.5%的伤害，并为自身回复本次伤害100%的生命值"
+ "text": "对敌方1个目标造成攻击力90%的伤害，附加自身最大生命在5。"
},
"buffid": [],
"map": ""
@@ -8120,7 +8120,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003111_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -8149,7 +8149,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003111_3",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -8178,7 +8178,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003111_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -8207,7 +8207,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003111_5",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -8236,7 +8236,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003211_1",
- "text": "自身死亡时，以15%最大生命值的状态复活全部已阵亡的队友，并为己方施加其最大生命值50%的[color=#37d8a9]护盾[/color]，持续1回合。随后提升己方目标50%的行动值。该被动效果一场战斗仅能触发一次"
+ "text": "自身死亡时，以15%最大生命值的状态复活全部已阵亡的队友，并为己方施加其最大生命值50%的[color=#37d8a9]护盾[/color]，持续1回合。"
},
"buffid": [
390001112
@@ -8269,7 +8269,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003311_1",
- "text": "净化己方全部减益状态，并为己方目标回复30%最大生命值的生命，随后施加1回合[color=#37d8a9]免疫[/color]效果"
+ "text": "净化己方全部减益状态，并为己方目标回复30%最大生命值的生命，随后施加1回合[color=#37d8a9]免疫[/color]效果。"
},
"buffid": [
390001111
@@ -8302,7 +8302,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003311_2",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [
390001111
@@ -8335,7 +8335,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003311_3",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [
390001111
@@ -8368,7 +8368,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003311_4",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [
390001111
@@ -8401,7 +8401,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003311_5",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [
390001111
@@ -8433,7 +8433,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_153001111_1",
- "text": "对敌方随机3名目标发起攻击，每次攻击可造成攻击力150%的伤害"
+ "text": "对敌方随机3名目标发起攻击，每次攻击可造成攻击力150%的伤害。"
},
"buffid": [],
"map": ""
@@ -8491,7 +8491,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_153001311_1",
- "text": "对敌方发起3段攻击，每段攻击可造成攻击力的伤害，并附加3回合[color=#c84a32]速度下降[/color]状态。"
+ "text": "对敌方发起3段攻击，每段攻击可造成攻击力的伤害，并附加3回合[color=#e5621b]速度下降[/color]状态。"
},
"buffid": [
390001008
@@ -8522,7 +8522,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135003011_1",
- "text": "己方效果抵抗增加50%"
+ "text": "己方效果抵抗增加50%。"
},
"buffid": [],
"map": ""
@@ -8551,7 +8551,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135003111_1",
- "text": "对敌方1个目标造成2次攻击力65%的伤害，同时偷取目标2个增益状态，并降低目标本次伤害100%的生命值上限"
+ "text": "对敌方1个目标造成2次攻击力65%的伤害，同时偷取目标2个增益状态，并降低目标本次伤害100%的生命值上限。"
},
"buffid": [],
"map": ""
@@ -8584,7 +8584,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135003211_1",
- "text": "无法获得任意增益和减益状态，受到的所有伤害降低10%。同时，每次被施加增益或减益状态时，自身获得1层[color=#37d8a9]梦魇之惧[/color]；每有1个队友死亡时，自身获得10层[color=#37d8a9]梦魇之惧[/color]。最多可叠加50层。每次战斗中首次受到致命伤害时，免除本次死亡，并根据当前[color=#37d8a9]梦魇之惧[/color]层数回复自身生命值状态，每层回复自身1%最大生命值状态。"
+ "text": "无法获得任意增益和减益状态，受到的所有伤害降低10%。"
},
"buffid": [],
"map": ""
@@ -8643,7 +8643,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151002111_1",
- "text": "对敌方一个目标发起攻击，造成攻击力100%的伤害"
+ "text": "对敌方一个目标发起攻击，造成攻击力100%的伤害。"
},
"buffid": [],
"map": ""
@@ -8672,7 +8672,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151002211_1",
- "text": "对敌方一个目标发起攻击，造成攻击力120%的伤害。并有50%概率附加2回合[color=#c84a32]防御下降[/color][/color]状态。"
+ "text": "对敌方一个目标发起攻击，造成攻击力120%的伤害。"
},
"buffid": [
390001007
@@ -8703,7 +8703,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151003111_1",
- "text": "对敌方一个目标发起攻击，造成攻击力100%的伤害"
+ "text": "对敌方一个目标发起攻击，造成攻击力100%的伤害。"
},
"buffid": [],
"map": ""
@@ -8732,7 +8732,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151003211_1",
- "text": "对敌方一个目标发起攻击，造成攻击力120%的伤害。并有25%概率附加1回合[color=#c84a32]眩晕[/color]状态。"
+ "text": "对敌方一个目标发起攻击，造成攻击力120%的伤害。"
},
"buffid": [
390001105
@@ -8821,7 +8821,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151005111_1",
- "text": "对敌方一个目标发起两段攻击，每段造成攻击力75%的伤害"
+ "text": "对敌方一个目标发起两段攻击，每段造成攻击力75%的伤害。"
},
"buffid": [],
"map": ""
@@ -8850,7 +8850,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151005211_1",
- "text": "对敌方1个目标发起攻击，造成攻击力180%的伤害，并附加2回合[color=#c84a32]攻击下降[/color]状态。"
+ "text": "对敌方1个目标发起攻击，造成攻击力180%的伤害，并附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@@ -8881,7 +8881,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003011_1",
- "text": "己方速度提升25%"
+ "text": "己方速度提升25%。"
},
"buffid": [],
"map": ""
@@ -8910,7 +8910,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003111_1",
- "text": "啊啊对敌方1个目标造成攻击力250%的伤害，并有60%概率附加1回合[color=#c84a32]挑衅[/color]状态。"
+ "text": "啊啊对敌方1个目标造成攻击力250%的伤害，并有60%概率附加1回合[color=#e5621b]挑衅[/color]状态。"
},
"buffid": [
390001110
@@ -8941,7 +8941,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003111_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001110
@@ -8972,7 +8972,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003111_3",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001110
@@ -9003,7 +9003,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003111_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001110
@@ -9034,7 +9034,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003111_5",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001110
@@ -9100,7 +9100,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003211_2",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [],
"map": ""
@@ -9132,7 +9132,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003211_3",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [],
"map": ""
@@ -9164,7 +9164,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003211_4",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [],
"map": ""
@@ -9196,7 +9196,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003211_5",
- "text": "伤害提升7%"
+ "text": "伤害提升7%。"
},
"buffid": [],
"map": ""
@@ -9225,7 +9225,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003311_1",
- "text": "啊啊对敌方1个目标造成自身最大生命值18%的伤害，并附加1回合[color=#c84a32]吞噬[/color]状态。目标当前生命值大于50%，则附加2回合[color=#c84a32]吞噬[/color]状态。效果持续期间若自身被击败或场上只剩自己一人，则提前释放目标。"
+ "text": "啊啊对敌方1个目标造成自身最大生命值18%的伤害，并附加1回合[color=#e5621b]吞噬[/color]状态。"
},
"buffid": [
390001113
@@ -9256,7 +9256,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003311_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001113
@@ -9287,7 +9287,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003311_3",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001113
@@ -9318,7 +9318,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003311_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001113
@@ -9349,7 +9349,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003311_5",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001113
@@ -9380,7 +9380,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005011_1",
- "text": "己方生命增加30%"
+ "text": "己方生命增加30%。"
},
"buffid": [],
"map": ""
@@ -9409,7 +9409,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005111_1",
- "text": "幸运·普雷斯科特对敌方1个目标造成攻击力140%的伤害，每点速度可额外造成攻击力0.45%的伤害"
+ "text": "幸运·普雷斯科特对敌方1个目标造成攻击力140%的伤害，每点速度可额外造成攻击力0。"
},
"buffid": [],
"map": ""
@@ -9438,7 +9438,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005111_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -9467,7 +9467,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005111_3",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -9496,7 +9496,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005111_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -9525,7 +9525,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005111_5",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -9554,7 +9554,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005211_1",
- "text": "幸运·普雷斯科特对敌方目标造成200%伤害"
+ "text": "幸运·普雷斯科特对敌方目标造成200%伤害。"
},
"buffid": [],
"map": ""
@@ -9583,7 +9583,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -9612,7 +9612,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -9641,7 +9641,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -9670,7 +9670,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -9701,7 +9701,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005311_1",
- "text": "幸运·普雷斯科特为己方附加2回合[color=#37d8a9]免疫[/color]和[color=#37d8a9]防御提升[/color]状态，并对敌方目标造成攻击力500%的伤害，并附加2回合[color=#c84a32]攻击下降[/color]状态"
+ "text": "幸运·普雷斯科特为己方附加2回合[color=#37d8a9]免疫[/color]和[color=#37d8a9]防御提升[/color]状态，并对敌方目标造成攻击力500%的伤害，并附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001111,
@@ -9736,7 +9736,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001111,
@@ -9771,7 +9771,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001111,
@@ -9806,7 +9806,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001111,
@@ -9841,7 +9841,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001111,
@@ -9874,7 +9874,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115001011_1",
- "text": "己方暴击率增加25%"
+ "text": "己方暴击率增加25%。"
},
"buffid": [
390001111,
@@ -9908,7 +9908,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115001111_1",
- "text": "吉姆·莱克对敌方1个目标造成攻击力130%的伤害，并未自身回复本次伤害50%的生命，若发生暴击，则增加自身20%的行动值"
+ "text": "吉姆·莱克对敌方1个目标造成攻击力130%的伤害，并未自身回复本次伤害50%的生命，若发生暴击，则增加自身20%的行动值。"
},
"buffid": [],
"map": ""
@@ -9971,7 +9971,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115001311_1",
- "text": "吉姆·莱克对敌方1个目标发起3连击，共造成攻击力260%的伤害。自身每损失10%的生命，伤害增加6%；若成功击杀目标，所有技能冷却时间减少1回合。"
+ "text": "吉姆·莱克对敌方1个目标发起3连击，共造成攻击力260%的伤害。"
},
"buffid": [],
"map": ""
@@ -10000,7 +10000,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001011_1",
- "text": "己方攻击增加30%"
+ "text": "己方攻击增加30%。"
},
"buffid": [],
"map": ""
@@ -10029,7 +10029,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001111_1",
- "text": "乌龟大师对敌方1个目标发起2段攻击，每段可造成攻击力150%的伤害，对目标附加2回合[color=#c84a32]烙印[/color]状态，并有70%概率夺取目标1个增益状态。"
+ "text": "乌龟大师对敌方1个目标发起2段攻击，每段可造成攻击力150%的伤害，对目标附加2回合[color=#e5621b]烙印[/color]状态，并有70%概率夺取目标1个增益状态。"
},
"buffid": [
390001101
@@ -10060,7 +10060,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001111_2",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [
390001101
@@ -10091,7 +10091,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001111_3",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [
390001101
@@ -10122,7 +10122,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001111_4",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [
390001101
@@ -10153,7 +10153,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001111_5",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [
390001101
@@ -10185,7 +10185,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001211_1",
- "text": "乌龟大师对敌方发起2段攻击，分别造成攻击力200%的伤害，第一段攻击附加2回合[color=#c84a32]无法获得增益[/color] [/color]效果状态，第二段攻击造成与伤害量等值的生命最大值下降。"
+ "text": "乌龟大师对敌方发起2段攻击，分别造成攻击力200%的伤害，第一段攻击附加2回合[color=#e5621b]无法获得增益[/color] [/color]效果状态，第二段攻击造成与伤害量等值的生命最大值下降。"
},
"buffid": [
390001115
@@ -10217,7 +10217,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001211_2",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [
390001115
@@ -10249,7 +10249,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001211_3",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [
390001115
@@ -10281,7 +10281,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001211_4",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [
390001115
@@ -10313,7 +10313,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001211_5",
- "text": "伤害提升1%"
+ "text": "伤害提升1%。"
},
"buffid": [
390001115
@@ -10346,7 +10346,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001311_1",
- "text": "乌龟大师净化自身所有减益状态，同时驱散敌方所有增益状态，随后对敌方造成攻击力600%的伤害，共附加2回合[color=#c84a32]防御下降[/color][/color]状态"
+ "text": "乌龟大师净化自身所有减益状态，同时驱散敌方所有增益状态，随后对敌方造成攻击力600%的伤害，共附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
},
"buffid": [
390001007
@@ -10379,7 +10379,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001311_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001007
@@ -10412,7 +10412,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001311_3",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001007
@@ -10445,7 +10445,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001311_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001007
@@ -10478,7 +10478,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001311_5",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [
390001007
@@ -10509,7 +10509,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001111_1",
- "text": "史图依克对敌方1个目标造成攻击力80%以及防御力165%的伤害，并有60%概率附加2回合[color=#c84a32]防御下降[/color][/color]效果。"
+ "text": "史图依克对敌方1个目标造成攻击力80%以及防御力165%的伤害，并有60%概率附加2回合[color=#e5621b]防御下降[/color][/color]效果。"
},
"buffid": [
390001007
@@ -10540,7 +10540,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -10571,7 +10571,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -10602,7 +10602,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -10633,7 +10633,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -10665,7 +10665,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001211_1",
- "text": "史图依克每次受到攻击时，自身获得1层[color=#37d8a9]酋长之怒[/color]，每层可提升自身10%的基础防御力和5%的效果抵抗，最多可叠加10层。自身获得10层[color=#37d8a9]酋长之怒[/color]时将立即获得回合"
+ "text": "史图依克每次受到攻击时，自身获得1层[color=#37d8a9]酋长之怒[/color]，每层可提升自身10%的基础防御力和5%的效果抵抗，最多可叠加10层。"
},
"buffid": [
390001202
@@ -10699,7 +10699,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001311_1",
- "text": "史图依克对敌方1个目标造成攻击力80%以及防御力120%的伤害，并[color=#c84a32]挑衅[/color]1名敌人2回合。若有10层[color=#37d8a9]酋长之怒[/color]，伤害提升50%。恢复自身生命，每层[color=#37d8a9]酋长之怒[/color]提供自身最大生命值4%恢复量；之后消耗全部[color=#37d8a9]酋长之怒[/color]"
+ "text": "史图依克对敌方1个目标造成攻击力80%以及防御力120%的伤害，并[color=#e5621b]挑衅[/color]1名敌人2回合。"
},
"buffid": [
390001202,
@@ -10734,7 +10734,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001202,
@@ -10769,7 +10769,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001202,
@@ -10804,7 +10804,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001202,
@@ -10839,7 +10839,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001202,
@@ -10871,7 +10871,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008011_1",
- "text": "己方攻击增加30%"
+ "text": "己方攻击增加30%。"
},
"buffid": [],
"map": ""
@@ -10901,7 +10901,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008111_1",
- "text": "暴芙那特对敌方1个目标造成2次自身攻击力180%的伤害，并有40%概率附加2回合[color=#c84a32]烙印[/color]效果。若悍夫那特在场，则本次攻击额外附加目标最大生命值5%的伤害，但最高无法超过自身攻击力的60%。"
+ "text": "暴芙那特对敌方1个目标造成2次自身攻击力180%的伤害，并有40%概率附加2回合[color=#e5621b]烙印[/color]效果。"
},
"buffid": [
390001101
@@ -10933,7 +10933,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001101
@@ -10965,7 +10965,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001101
@@ -10997,7 +10997,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001101
@@ -11029,7 +11029,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001101
@@ -11061,7 +11061,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008211_1",
- "text": "暴芙那特对敌方造成2次自身攻击力180%的伤害，并有40%概率附加2回合[color=#c84a32]速度下降[/color]效果。若悍夫那特在场，则本次攻击额外造成两段伤害并附加同样效果"
+ "text": "暴芙那特对敌方造成2次自身攻击力180%的伤害，并有40%概率附加2回合[color=#e5621b]速度下降[/color]效果。"
},
"buffid": [
390001008
@@ -11093,7 +11093,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -11125,7 +11125,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -11157,7 +11157,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -11189,7 +11189,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -11222,7 +11222,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008311_1",
- "text": "暴芙那特先为自身施加2回合[color=#37d8a9]暴击提升[/color]效果，之后对敌方1个目标造成3次自身攻击力200%的伤害，并附加2回合[color=#c84a32]防御下降[/color][/color]效果"
+ "text": "暴芙那特先为自身施加2回合[color=#37d8a9]暴击提升[/color]效果，之后对敌方1个目标造成3次自身攻击力200%的伤害，并附加2回合[color=#e5621b]防御下降[/color][/color]效果。"
},
"buffid": [
390001004,
@@ -11256,7 +11256,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004,
@@ -11290,7 +11290,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004,
@@ -11324,7 +11324,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004,
@@ -11358,7 +11358,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004,
@@ -11390,7 +11390,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008011_1",
- "text": "己方生命增加40%"
+ "text": "己方生命增加40%。"
},
"buffid": [],
"map": ""
@@ -11420,7 +11420,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008111_1",
- "text": "悍夫那特对敌方一个目标造成1次自身攻击力300%的伤害，并有40%概率击退目标10%行动值。若暴芙那特在场，则本次攻击额外随机攻击2个目标，造成同样伤害和效果"
+ "text": "悍夫那特对敌方一个目标造成1次自身攻击力300%的伤害，并有40%概率击退目标10%行动值。"
},
"buffid": [],
"map": ""
@@ -11450,7 +11450,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -11480,7 +11480,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -11510,7 +11510,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -11540,7 +11540,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -11570,7 +11570,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008211_1",
- "text": "悍夫那特对敌方造成2次自身攻击力135%的伤害，并有40%概率附加1回合[color=#c84a32]眩晕[/color]效果。若暴芙那特在场，则本次攻击额外造成2段伤害并附加同一效果"
+ "text": "悍夫那特对敌方造成2次自身攻击力135%的伤害，并有40%概率附加1回合[color=#e5621b]眩晕[/color]效果。"
},
"buffid": [
390001105
@@ -11602,7 +11602,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -11634,7 +11634,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -11666,7 +11666,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -11698,7 +11698,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -11730,7 +11730,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008311_1",
- "text": "悍夫那特先为自身施加2回合[color=#37d8a9]速度提升[/color]效果，之后对敌方1个目标造成4次自身攻击力200%的伤害，并吸收目标10行动值"
+ "text": "悍夫那特先为自身施加2回合[color=#37d8a9]速度提升[/color]效果，之后对敌方1个目标造成4次自身攻击力200%的伤害，并吸收目标10行动值。"
},
"buffid": [
390001003
@@ -11762,7 +11762,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001003
@@ -11794,7 +11794,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001003
@@ -11826,7 +11826,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001003
@@ -11858,7 +11858,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001003
@@ -11890,7 +11890,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002111_1",
- "text": "食人鱼先生对敌方1个目标造成攻击力400%的伤害；若发生暴击，生化武器冷却时间减少1回合"
+ "text": "食人鱼先生对敌方1个目标造成攻击力400%的伤害；若发生暴击，生化武器冷却时间减少1回合。"
},
"buffid": [],
"map": ""
@@ -11920,7 +11920,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -11950,7 +11950,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -11980,7 +11980,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12010,7 +12010,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12039,7 +12039,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002211_1",
- "text": "食人鱼先生对敌方1个目标造成攻击力450%的伤害，有85%概率附加2回合[color=#c84a32]防御下降[/color][/color]状态。"
+ "text": "食人鱼先生对敌方1个目标造成攻击力450%的伤害，有85%概率附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
},
"buffid": [
390001007
@@ -12070,7 +12070,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -12101,7 +12101,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001009
@@ -12132,7 +12132,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001010
@@ -12163,7 +12163,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001011
@@ -12196,7 +12196,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002311_1",
- "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。追加伤害每回合最多触发2次。"
+ "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。"
},
"buffid": [],
"map": ""
@@ -12227,7 +12227,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12258,7 +12258,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12289,7 +12289,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12320,7 +12320,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12349,7 +12349,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002312_1",
- "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力150%的伤害，本次攻击无视防御。追加伤害每回合最多触发2次。"
+ "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力150%的伤害，本次攻击无视防御。"
},
"buffid": [],
"map": ""
@@ -12378,7 +12378,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002312_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12407,7 +12407,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002312_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12436,7 +12436,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002312_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12465,7 +12465,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002312_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12494,7 +12494,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002011_1",
- "text": "己方速度增加15%"
+ "text": "己方速度增加15%。"
},
"buffid": [],
"map": ""
@@ -12523,7 +12523,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002111_1",
- "text": "果酱教授对敌方1个目标造成攻击力360%的伤害，有75%概率对其施加2回合[color=#c84a32]速度下降[/color]状态，并有75%概率将自身1个减益状态转移给目标"
+ "text": "果酱教授对敌方1个目标造成攻击力360%的伤害，有75%概率对其施加2回合[color=#e5621b]速度下降[/color]状态，并有75%概率将自身1个减益状态转移给目标。"
},
"buffid": [
390001008
@@ -12554,7 +12554,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12583,7 +12583,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12612,7 +12612,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12641,7 +12641,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12671,7 +12671,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002211_1",
- "text": "果酱教授每次攻击可减少目标15%行动值。若目标行动值低于30%，附加1回合[color=#c84a32]石化[/color] [/color]状态"
+ "text": "果酱教授每次攻击可减少目标15%行动值。"
},
"buffid": [
390001108
@@ -12733,7 +12733,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12763,7 +12763,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12793,7 +12793,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12823,7 +12823,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -12852,7 +12852,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114006011_1",
- "text": "己方速度增加25%"
+ "text": "己方速度增加25%。"
},
"buffid": [],
"map": ""
@@ -12882,7 +12882,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114006111_1",
- "text": "布兰奇对敌方1个目标造成攻击力110%的伤害，并有80%概率吸收目标30%行动值。若该目标身上存在减益状态，则附加1回合[color=#c84a32]眩晕[/color]状态。"
+ "text": "布兰奇对敌方1个目标造成攻击力110%的伤害，并有80%概率吸收目标30%行动值。"
},
"buffid": [],
"map": ""
@@ -12942,7 +12942,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114006311_1",
- "text": "布兰奇对敌方攻击3次，共造成攻击力110%的伤害，每次有60%概率附加1回合[color=#c84a32]眩晕[/color]状态。"
+ "text": "布兰奇对敌方攻击3次，共造成攻击力110%的伤害，每次有60%概率附加1回合[color=#e5621b]眩晕[/color]状态。"
},
"buffid": [],
"map": ""
@@ -12971,7 +12971,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006011_1",
- "text": "己方效果抵抗增加40%"
+ "text": "己方效果抵抗增加40%。"
},
"buffid": [],
"map": ""
@@ -13029,7 +13029,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006111_2",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -13058,7 +13058,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006111_3",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -13087,7 +13087,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006111_4",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -13116,7 +13116,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006111_5",
- "text": "伤害提升5%"
+ "text": "伤害提升5%。"
},
"buffid": [],
"map": ""
@@ -13179,7 +13179,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006211_2",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001001,
@@ -13212,7 +13212,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006211_3",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001001,
@@ -13244,7 +13244,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006311_1",
- "text": "平先生恢复友方15%生命值并恢复30%行动值"
+ "text": "平先生恢复友方15%生命值并恢复30%行动值。"
},
"buffid": [],
"map": ""
@@ -13273,7 +13273,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006311_2",
- "text": "增加5%恢复量"
+ "text": "增加5%恢复量。"
},
"buffid": [],
"map": ""
@@ -13302,7 +13302,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006311_3",
- "text": "增加5%恢复量"
+ "text": "增加5%恢复量。"
},
"buffid": [],
"map": ""
@@ -13331,7 +13331,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006311_4",
- "text": "增加5%恢复量"
+ "text": "增加5%恢复量。"
},
"buffid": [],
"map": ""
@@ -13360,7 +13360,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006311_5",
- "text": "增加5%恢复量"
+ "text": "增加5%恢复量。"
},
"buffid": [],
"map": ""
@@ -13389,7 +13389,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134002011_1",
- "text": "己方效果抵抗增加30%"
+ "text": "己方效果抵抗增加30%。"
},
"buffid": [],
"map": ""
@@ -13451,7 +13451,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134002111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001127
@@ -13483,7 +13483,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134002111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001127
@@ -13515,7 +13515,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134002111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001127
@@ -13547,7 +13547,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134002111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001127
@@ -13611,7 +13611,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134002211_2",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001001
@@ -13643,7 +13643,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134002211_3",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001001
@@ -13708,7 +13708,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134002311_2",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001103,
@@ -13741,7 +13741,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134002311_3",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001103,
@@ -13773,7 +13773,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005011_1",
- "text": "己方攻击增加24%"
+ "text": "己方攻击增加24%。"
},
"buffid": [],
"map": ""
@@ -13802,7 +13802,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005111_1",
- "text": "金猴对敌方1个目标造成攻击力200%的伤害，并有70%概率对自身附加2回合[color=#37d8a9]速度提升[/color]"
+ "text": "金猴对敌方1个目标造成攻击力200%的伤害，并有70%概率对自身附加2回合[color=#37d8a9]速度提升[/color]。"
},
"buffid": [
390001003
@@ -13833,7 +13833,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005111_2",
- "text": "增加10%伤害"
+ "text": "增加10%伤害。"
},
"buffid": [
390001003
@@ -13864,7 +13864,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005111_3",
- "text": "增加10%伤害"
+ "text": "增加10%伤害。"
},
"buffid": [
390001003
@@ -13895,7 +13895,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005111_4",
- "text": "增加10%伤害"
+ "text": "增加10%伤害。"
},
"buffid": [
390001003
@@ -13926,7 +13926,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005111_5",
- "text": "增加10%伤害"
+ "text": "增加10%伤害。"
},
"buffid": [
390001003
@@ -13957,7 +13957,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005211_1",
- "text": "金猴净化1名队友所有减益状态，并为其标记2回合[color=#37d8a9]不败金身[/color]"
+ "text": "金猴净化1名队友所有减益状态，并为其标记2回合[color=#37d8a9]不败金身[/color]。"
},
"buffid": [
390001215
@@ -13988,7 +13988,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005211_2",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001215
@@ -14019,7 +14019,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005211_3",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001215
@@ -14050,7 +14050,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005311_1",
- "text": "金猴对敌方造成攻击力300%的伤害，并附加2回合[color=#c84a32]速度下降[/color]状态；同时能减少敌方30%行动值，并重置水中取月的冷却时间"
+ "text": "金猴对敌方造成攻击力300%的伤害，并附加2回合[color=#e5621b]速度下降[/color]状态；同时能减少敌方30%行动值，并重置水中取月的冷却时间。"
},
"buffid": [
390001008
@@ -14081,7 +14081,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005311_2",
- "text": "伤害增加10%"
+ "text": "伤害增加10%。"
},
"buffid": [
390001008
@@ -14112,7 +14112,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005311_3",
- "text": "伤害增加10%"
+ "text": "伤害增加10%。"
},
"buffid": [
390001008
@@ -14143,7 +14143,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005311_4",
- "text": "伤害增加10%"
+ "text": "伤害增加10%。"
},
"buffid": [
390001008
@@ -14174,7 +14174,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005311_5",
- "text": "伤害增加10%"
+ "text": "伤害增加10%。"
},
"buffid": [
390001008
@@ -14205,7 +14205,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125003011_1",
- "text": "己方速度增加25%"
+ "text": "己方速度增加25%。"
},
"buffid": [],
"map": ""
@@ -14234,7 +14234,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125003111_1",
- "text": "羊仙姑对敌方1个目标造成攻击力110%的伤害，并有80%的概率西区目标20%的行动值"
+ "text": "羊仙姑对敌方1个目标造成攻击力110%的伤害，并有80%的概率西区目标20%的行动值。"
},
"buffid": [],
"map": ""
@@ -14263,7 +14263,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125003211_1",
- "text": "羊仙姑对敌方目标造成攻击力80%的伤害，并对目标附加2回合[color=#c84a32]速度下降[/color]效果，且有60%的概率对目标附加1回合[color=#c84a32]眩晕[/color]效果"
+ "text": "羊仙姑对敌方目标造成攻击力80%的伤害，并对目标附加2回合[color=#e5621b]速度下降[/color]效果，且有60%的概率对目标附加1回合[color=#e5621b]眩晕[/color]效果。"
},
"buffid": [],
"map": ""
@@ -14322,7 +14322,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004111_1",
- "text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力360%的伤害；若自身当前生命比例低于50%，则提升30%的暴击率"
+ "text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力360%的伤害；若自身当前生命比例低于50%，则提升30%的暴击率。"
},
"buffid": [],
"map": ""
@@ -14352,7 +14352,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -14382,7 +14382,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -14412,7 +14412,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -14442,7 +14442,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -14507,7 +14507,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001001,
@@ -14541,7 +14541,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001001,
@@ -14575,7 +14575,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001001,
@@ -14609,7 +14609,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001001,
@@ -14670,7 +14670,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -14699,7 +14699,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -14728,7 +14728,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -14757,7 +14757,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -14786,7 +14786,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003011_1",
- "text": "己方暴击率增加20%"
+ "text": "己方暴击率增加20%。"
},
"buffid": [],
"map": ""
@@ -14815,7 +14815,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003111_1",
- "text": "胡德先生对敌方1个目标造成攻击力330%的伤害，并有40%概率附加2回合[color=#c84a32]攻击下降[/color]状态"
+ "text": "胡德先生对敌方1个目标造成攻击力330%的伤害，并有40%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@@ -14846,7 +14846,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -14877,7 +14877,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -14908,7 +14908,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -14939,7 +14939,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -14970,7 +14970,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003211_1",
- "text": "胡德先生当队友向敌方任意1个目标发起攻击时，都会跟随队友对目标造成攻击，并附加1回合[color=#c84a32]中毒[/color]状态"
+ "text": "胡德先生当队友向敌方任意1个目标发起攻击时，都会跟随队友对目标造成攻击，并附加1回合[color=#e5621b]中毒[/color]状态。"
},
"buffid": [
390001401,
@@ -15002,7 +15002,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003311_1",
- "text": "胡德先生对敌方随机2个目标造成攻击力660%的伤害，并有80%概率附加2回合[color=#c84a32]防御下降[/color][/color][color=#c84a32]中毒[/color]"
+ "text": "胡德先生对敌方随机2个目标造成攻击力660%的伤害，并有80%概率附加2回合[color=#e5621b]防御下降[/color][/color][color=#e5621b]中毒[/color]。"
},
"buffid": [
390001401,
@@ -15034,7 +15034,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401,
@@ -15066,7 +15066,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401,
@@ -15098,7 +15098,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401,
@@ -15130,7 +15130,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401,
@@ -15162,7 +15162,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001111_1",
- "text": "阿比盖尔·斯通对敌方1个目标造成攻击力220%的伤害，并有75%概率附加2回合[color=#c84a32]防御下降[/color][/color]状态。"
+ "text": "阿比盖尔·斯通对敌方1个目标造成攻击力220%的伤害，并有75%概率附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
},
"buffid": [
390001007
@@ -15193,7 +15193,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -15224,7 +15224,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -15255,7 +15255,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -15286,7 +15286,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -15317,7 +15317,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001211_1",
- "text": "阿比盖尔·斯通对敌方攻击力200%的伤害，有75%概率附加2回合[color=#c84a32]攻击下降[/color]状态。"
+ "text": "阿比盖尔·斯通对敌方攻击力200%的伤害，有75%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@@ -15348,7 +15348,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -15379,7 +15379,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -15410,7 +15410,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -15441,7 +15441,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -15473,7 +15473,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001311_1",
- "text": "阿比盖尔·斯通选定敌方1个目标，随后另外随机挑选敌方1个目标，对2个目标同时发起攻击，分别造成攻击力360%的伤害，并附加3回合[color=#c84a32]链接[/color]状态。"
+ "text": "阿比盖尔·斯通选定敌方1个目标，随后另外随机挑选敌方1个目标，对2个目标同时发起攻击，分别造成攻击力360%的伤害，并附加3回合[color=#e5621b]链接[/color]状态。"
},
"buffid": [
390001213
@@ -15505,7 +15505,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001213
@@ -15537,7 +15537,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001213
@@ -15569,7 +15569,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001213
@@ -15601,7 +15601,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001213
@@ -15632,7 +15632,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003011_1",
- "text": "己方攻击增加30%"
+ "text": "己方攻击增加30%。"
},
"buffid": [],
"map": ""
@@ -15661,7 +15661,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003111_1",
- "text": "圣诞老人对敌方1个目标造成攻击力310%的伤害，并有75%概率附加2回合[color=#c84a32]失手率提升[/color]状态"
+ "text": "圣诞老人对敌方1个目标造成攻击力310%的伤害，并有75%概率附加2回合[color=#e5621b]失手率提升[/color]状态。"
},
"buffid": [
390001102
@@ -15692,7 +15692,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001102
@@ -15723,7 +15723,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001102
@@ -15754,7 +15754,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001102
@@ -15785,7 +15785,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001102
@@ -15816,7 +15816,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003211_1",
- "text": "圣诞老人对敌方群体发起攻击，造成攻击力200%的伤害，有75%概率附加1回合[color=#c84a32]眩晕[/color]状态，并偷取目标25%行动值并平均分配给己方"
+ "text": "圣诞老人对敌方群体发起攻击，造成攻击力200%的伤害，有75%概率附加1回合[color=#e5621b]眩晕[/color]状态，并偷取目标25%行动值并平均分配给己方。"
},
"buffid": [
390001105
@@ -15847,7 +15847,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -15878,7 +15878,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -15909,7 +15909,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -15940,7 +15940,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -15971,7 +15971,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003311_1",
- "text": "圣诞老人对目标体造成攻击力600%的伤害，同时夺取敌方目标各1个增益状态。每成功夺取1个增益状态，可为自身增加30%行动值。"
+ "text": "圣诞老人对目标体造成攻击力600%的伤害，同时夺取敌方目标各1个增益状态。"
},
"buffid": [],
"map": ""
@@ -16000,7 +16000,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -16029,7 +16029,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -16058,7 +16058,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -16087,7 +16087,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -16116,7 +16116,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004011_1",
- "text": "己方效果命中增加40%"
+ "text": "己方效果命中增加40%。"
},
"buffid": [],
"map": ""
@@ -16145,7 +16145,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004111_1",
- "text": "骇客蛛对敌方1个目标造成攻击力30%及自身最大生命值8%的伤害，并有50%概率附加2回合[color=#c84a32]攻击下降[/color]状态"
+ "text": "骇客蛛对敌方1个目标造成攻击力30%及自身最大生命值8%的伤害，并有50%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@@ -16176,7 +16176,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -16207,7 +16207,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -16238,7 +16238,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -16269,7 +16269,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -16301,7 +16301,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004211_1",
- "text": "骇客蛛对敌方1个目标造成1次攻击力100%及自身最大生命值6%的伤害，每段有60%概率驱散目标1个增益状态，同时立刻触发目标身上的[color=#c84a32]黑客前瞻[/color]效果。"
+ "text": "骇客蛛对敌方1个目标造成1次攻击力100%及自身最大生命值6%的伤害，每段有60%概率驱散目标1个增益状态，同时立刻触发目标身上的[color=#e5621b]黑客前瞻[/color]效果。"
},
"buffid": [
390001216
@@ -16333,7 +16333,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001216
@@ -16365,7 +16365,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001216
@@ -16397,7 +16397,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001216
@@ -16429,7 +16429,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001216
@@ -16460,7 +16460,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004311_1",
- "text": "骇客蛛为己方全体附加2回合[color=#37d8a9]速度提升[/color]状态，对所有敌方造成自身攻击力400%的伤害并附带2回合[color=#c84a32]黑客前瞻[/color]"
+ "text": "骇客蛛为己方全体附加2回合[color=#37d8a9]速度提升[/color]状态，对所有敌方造成自身攻击力400%的伤害并附带2回合[color=#e5621b]黑客前瞻[/color]。"
},
"buffid": [
390001216,
@@ -16492,7 +16492,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004311_2",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001216,
@@ -16524,7 +16524,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004311_3",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001216,
@@ -16556,7 +16556,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007011_1",
- "text": "己方攻击增加30%"
+ "text": "己方攻击增加30%。"
},
"buffid": [],
"map": ""
@@ -16586,7 +16586,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007111_1",
- "text": "菲奥娜对敌方1个目标造成2次攻击力160%的伤害，若发生暴击，则为自身附加1回合[color=#37d8a9]免疫[/color]状态"
+ "text": "菲奥娜对敌方1个目标造成2次攻击力160%的伤害，若发生暴击，则为自身附加1回合[color=#37d8a9]免疫[/color]状态。"
},
"buffid": [
390001111
@@ -16618,7 +16618,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001111
@@ -16650,7 +16650,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001111
@@ -16682,7 +16682,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001111
@@ -16714,7 +16714,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001111
@@ -16747,7 +16747,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007211_1",
- "text": "菲奥娜对敌方1个目标发起3连击，共造成攻击力300%的伤害，每次攻击有60%概率驱散目标1个增益状态；若驱散成功，则对目标附加2回合[color=#c84a32]攻击下降[/color]状态"
+ "text": "菲奥娜对敌方1个目标发起3连击，共造成攻击力300%的伤害，每次攻击有60%概率驱散目标1个增益状态；若驱散成功，则对目标附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@@ -16780,7 +16780,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007211_2",
- "text": "伤害提升20%"
+ "text": "伤害提升20%。"
},
"buffid": [
390001006
@@ -16813,7 +16813,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007211_3",
- "text": "伤害提升20%"
+ "text": "伤害提升20%。"
},
"buffid": [
390001006
@@ -16846,7 +16846,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007211_4",
- "text": "伤害提升20%"
+ "text": "伤害提升20%。"
},
"buffid": [
390001006
@@ -16879,7 +16879,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007211_5",
- "text": "伤害提升20%"
+ "text": "伤害提升20%。"
},
"buffid": [
390001006
@@ -16911,7 +16911,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007311_1",
- "text": "菲奥娜对敌方1个目标造成攻击力580%的伤害，并为自身附加2回合生命值上限35%的[color=#37d8a9]护盾[/color]；若发生暴击，则次数伤害提升30%，并额外提升50%[color=#37d8a9]护盾[/color]"
+ "text": "菲奥娜对敌方1个目标造成攻击力580%的伤害，并为自身附加2回合生命值上限35%的[color=#37d8a9]护盾[/color]；若发生暴击，则次数伤害提升30%，并额外提升50%[color=#37d8a9]护盾[/color]。"
},
"buffid": [
390001112
@@ -16943,7 +16943,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001112
@@ -16975,7 +16975,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001112
@@ -17007,7 +17007,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001112
@@ -17039,7 +17039,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001112
@@ -17070,7 +17070,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006111_1",
- "text": "布里奇特对敌方1个目标造成攻击力130%的伤害，并有70%概率为目标附加2回合[color=#c84a32]攻击下降[/color]状态"
+ "text": "布里奇特对敌方1个目标造成攻击力130%的伤害，并有70%概率为目标附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@@ -17101,7 +17101,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -17132,7 +17132,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -17163,7 +17163,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -17194,7 +17194,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001006
@@ -17225,7 +17225,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006211_1",
- "text": "布里奇特为己方1个目标恢复其最大生命值10%的生命，并附加1回合[color=#37d8a9]无敌[/color]、[color=#37d8a9]复苏[/color]状态。若目标生命值低于50%，则额外附加1回合[color=#37d8a9]复苏[/color]状态"
+ "text": "布里奇特为己方1个目标恢复其最大生命值10%的生命，并附加1回合[color=#37d8a9]无敌[/color]、[color=#37d8a9]复苏[/color]状态。"
},
"buffid": [
390001103,
@@ -17257,7 +17257,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006211_2",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [
390001103,
@@ -17289,7 +17289,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006211_3",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [
390001103,
@@ -17321,7 +17321,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006211_4",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [
390001103,
@@ -17353,7 +17353,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006211_5",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [
390001103,
@@ -17386,7 +17386,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006311_1",
- "text": "布里奇特为己方附加2回合[color=#37d8a9]攻击提升[/color]和[color=#37d8a9]防御提升[/color]状态"
+ "text": "布里奇特为己方附加2回合[color=#37d8a9]攻击提升[/color]和[color=#37d8a9]防御提升[/color]状态。"
},
"buffid": [
390001001,
@@ -17419,7 +17419,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006311_2",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001001,
@@ -17452,7 +17452,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006311_3",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001001,
@@ -17484,7 +17484,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001011_1",
- "text": "己方防御增加24%"
+ "text": "己方防御增加24%。"
},
"buffid": [
390001001,
@@ -17516,7 +17516,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001111_1",
- "text": "闪闪对敌方1个目标造成攻击力250%的伤害，攻击时产生的光球能量有50%的概率对目标附加1回合[color=#c84a32]眩晕[/color]状态"
+ "text": "闪闪对敌方1个目标造成攻击力250%的伤害，攻击时产生的光球能量有50%的概率对目标附加1回合[color=#e5621b]眩晕[/color]状态。"
},
"buffid": [
390001105
@@ -17547,7 +17547,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -17578,7 +17578,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -17609,7 +17609,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -17640,7 +17640,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -17671,7 +17671,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001211_1",
- "text": "闪闪对敌方所有人造成攻击力200%的伤害"
+ "text": "闪闪对敌方所有人造成攻击力200%的伤害。"
},
"buffid": [],
"map": ""
@@ -17700,7 +17700,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -17729,7 +17729,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -17758,7 +17758,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -17787,7 +17787,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -17816,7 +17816,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001311_1",
- "text": "闪闪对敌方所有目标造成攻击力350%的伤害，并为己方附加2回合[color=#37d8a9]防御提升[/color]状态"
+ "text": "闪闪对敌方所有目标造成攻击力350%的伤害，并为己方附加2回合[color=#37d8a9]防御提升[/color]状态。"
},
"buffid": [
390001002
@@ -17847,7 +17847,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001002
@@ -17878,7 +17878,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001002
@@ -17909,7 +17909,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001002
@@ -17940,7 +17940,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001002
@@ -17971,7 +17971,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005011_1",
- "text": "己方效果命中增加30%"
+ "text": "己方效果命中增加30%。"
},
"buffid": [],
"map": ""
@@ -18029,7 +18029,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18058,7 +18058,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18087,7 +18087,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18116,7 +18116,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18147,7 +18147,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005211_1",
- "text": "鹤大师对敌方目标发起3次攻击，每次攻击造成攻击力225%的伤害，并延长自身全部增益状态1回合。若目标未存在增益状态，则对目标附加2回合[color=#c84a32]无法获得增益[/color] [/color]效果状态。"
+ "text": "鹤大师对敌方目标发起3次攻击，每次攻击造成攻击力225%的伤害，并延长自身全部增益状态1回合。"
},
"buffid": [],
"map": ""
@@ -18178,7 +18178,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18209,7 +18209,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18240,7 +18240,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18271,7 +18271,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18302,7 +18302,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005311_1",
- "text": "鹤大师对敌方目标发起1次攻击，造成攻击力500%伤害并偷取目标身上存在的2个增益效果。自身每个强化效果可提升10%伤害。"
+ "text": "鹤大师对敌方目标发起1次攻击，造成攻击力500%伤害并偷取目标身上存在的2个增益效果。"
},
"buffid": [],
"map": ""
@@ -18333,7 +18333,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18364,7 +18364,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18395,7 +18395,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18426,7 +18426,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -18456,7 +18456,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133001111_1",
- "text": "巫嘎对敌方1个目标发起2段攻击，每段可造成攻击力60%的伤害，并有50%概率附加2回合[color=#c84a32]速度下降[/color]状态"
+ "text": "巫嘎对敌方1个目标发起2段攻击，每段可造成攻击力60%的伤害，并有50%概率附加2回合[color=#e5621b]速度下降[/color]状态。"
},
"buffid": [],
"map": ""
@@ -18485,7 +18485,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133001211_1",
- "text": "巫嘎为己方附加2回合[color=#37d8a9]攻击提升[/color]状态"
+ "text": "巫嘎为己方附加2回合[color=#37d8a9]攻击提升[/color]状态。"
},
"buffid": [],
"map": ""
@@ -18514,7 +18514,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133001311_1",
- "text": "巫嘎对敌方1个目标造成攻击力300%的伤害，并附加1回合[color=#c84a32]冰冻[/color]以及2回合[color=#c84a32]防御下降[/color][/color]状态"
+ "text": "巫嘎对敌方1个目标造成攻击力300%的伤害，并附加1回合[color=#e5621b]冰冻[/color]以及2回合[color=#e5621b]防御下降[/color][/color]状态。"
},
"buffid": [],
"map": ""
@@ -18543,7 +18543,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003011_1",
- "text": "己方防御增加18%"
+ "text": "己方防御增加18%。"
},
"buffid": [],
"map": ""
@@ -18572,7 +18572,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003111_1",
- "text": "史蒂夫·帕丘克对敌方1个目标造成攻击力120%的伤害，并有40%概率附加2回合[color=#c84a32]速度下降[/color]状态"
+ "text": "史蒂夫·帕丘克对敌方1个目标造成攻击力120%的伤害，并有40%概率附加2回合[color=#e5621b]速度下降[/color]状态。"
},
"buffid": [
390001008
@@ -18603,7 +18603,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -18634,7 +18634,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -18665,7 +18665,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -18696,7 +18696,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -18729,7 +18729,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003211_1",
- "text": "史蒂夫·帕丘克消耗自身20%生命值，为友方1个目标恢复20%的最大生命值，并为目标增加50%行动值"
+ "text": "史蒂夫·帕丘克消耗自身20%生命值，为友方1个目标恢复20%的最大生命值，并为目标增加50%行动值。"
},
"buffid": [],
"map": ""
@@ -18760,7 +18760,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003211_2",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [],
"map": ""
@@ -18791,7 +18791,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003211_3",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [],
"map": ""
@@ -18822,7 +18822,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003211_4",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [],
"map": ""
@@ -18853,7 +18853,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003211_5",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [],
"map": ""
@@ -18882,7 +18882,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003311_1",
- "text": "史蒂夫·帕丘克为己方1个目标恢复其最大生命值20%的生命，若目标队友处于死亡状态，则将其复活并恢复其最大生命值20%的生命，随后自身获得额外回合"
+ "text": "史蒂夫·帕丘克为己方1个目标恢复其最大生命值20%的生命，若目标队友处于死亡状态，则将其复活并恢复其最大生命值20%的生命，随后自身获得额外回合。"
},
"buffid": [],
"map": ""
@@ -18911,7 +18911,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003311_2",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [],
"map": ""
@@ -18940,7 +18940,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003311_3",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [],
"map": ""
@@ -18969,7 +18969,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003311_4",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [],
"map": ""
@@ -18998,7 +18998,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003311_5",
- "text": "恢复量增加5%"
+ "text": "恢复量增加5%。"
},
"buffid": [],
"map": ""
@@ -19027,7 +19027,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143005111_1",
- "text": "瓦希尔指挥官对敌方1个目标造成攻击力120%的伤害，有40%概率为目标附加1回合[color=#c84a32]眩晕[/color]状态"
+ "text": "瓦希尔指挥官对敌方1个目标造成攻击力120%的伤害，有40%概率为目标附加1回合[color=#e5621b]眩晕[/color]状态。"
},
"buffid": [],
"map": ""
@@ -19058,7 +19058,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143005211_1",
- "text": "瓦希尔指挥官将己方各1个减益状态转嫁给敌方1个目标，并对其造成攻击力200%的伤害，有75%概率为目标处于[color=#c84a32]禁疗[/color]状态。若目标处于[color=#c84a32]中毒[/color]状态，则本次伤害提升100%"
+ "text": "瓦希尔指挥官将己方各1个减益状态转嫁给敌方1个目标，并对其造成攻击力200%的伤害，有75%概率为目标处于[color=#e5621b]禁疗[/color]状态。"
},
"buffid": [],
"map": ""
@@ -19087,7 +19087,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143005311_1",
- "text": "瓦希尔指挥官对敌方目标造成2次攻击力55%的伤害，有100%概率为目标附加3回合[color=#c84a32]中毒[/color]状态"
+ "text": "瓦希尔指挥官对敌方目标造成2次攻击力55%的伤害，有100%概率为目标附加3回合[color=#e5621b]中毒[/color]状态。"
},
"buffid": [],
"map": ""
@@ -19116,7 +19116,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002011_1",
- "text": "己方攻击增加40%"
+ "text": "己方攻击增加40%。"
},
"buffid": [],
"map": ""
@@ -19145,7 +19145,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002111_1",
- "text": "船长对敌方1个目标造成390%伤害，夺取该目标1个增益状态，并有100%概率为自身附加2回合[color=#37d8a9]攻击提升[/color]状态"
+ "text": "船长对敌方1个目标造成390%伤害，夺取该目标1个增益状态，并有100%概率为自身附加2回合[color=#37d8a9]攻击提升[/color]状态。"
},
"buffid": [],
"map": ""
@@ -19174,7 +19174,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19203,7 +19203,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19232,7 +19232,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19261,7 +19261,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19291,7 +19291,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002211_1",
- "text": "每回合开始时，船长自动获得2层[color=#37d8a9]算术[/color]；自身每次获得增益状态时，都会额外叠加1层[color=#37d8a9]算术[/color]，最多可叠加8层"
+ "text": "每回合开始时，船长自动获得2层[color=#37d8a9]算术[/color]；自身每次获得增益状态时，都会额外叠加1层[color=#37d8a9]算术[/color]，最多可叠加8层。"
},
"buffid": [],
"map": ""
@@ -19323,7 +19323,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002311_1",
- "text": "船长随机扔出三张盟友牌，随机选中一张发动不同的效果。选中牌1对敌方造成120%攻击力的伤害，选中牌2恢复友方30%体力。选中牌3减少敌方30%行动值"
+ "text": "船长随机扔出三张盟友牌，随机选中一张发动不同的效果。"
},
"buffid": [],
"map": ""
@@ -19355,7 +19355,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19387,7 +19387,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19419,7 +19419,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19451,7 +19451,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19480,7 +19480,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113005011_1",
- "text": "己方生命增加18%"
+ "text": "己方生命增加18%。"
},
"buffid": [],
"map": ""
@@ -19540,7 +19540,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113005111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19570,7 +19570,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113005111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19600,7 +19600,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113005111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19630,7 +19630,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113005111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -19660,7 +19660,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113005211_1",
- "text": "回合开始时若自身可行动，为随机2名友方附加2回合[color=#37d8a9]暴击提升[/color]和1回合[color=#37d8a9]攻击提升[/color]。减少已有[color=#37d8a9]攻击提升[/color]的目标所有技能1回合冷却。"
+ "text": "回合开始时若自身可行动，为随机2名友方附加2回合[color=#37d8a9]暴击提升[/color]和1回合[color=#37d8a9]攻击提升[/color]。"
},
"buffid": [
390001001
@@ -19692,7 +19692,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113005311_1",
- "text": "为友方附加2回合[color=#37d8a9]攻击提升[/color];目标已有[color=#37d8a9]攻击提升[/color]时，减少目标所有技能1回合冷却。此技能冷却时间不会被任何技能影响。"
+ "text": "为友方附加2回合[color=#37d8a9]攻击提升[/color];目标已有[color=#37d8a9]攻击提升[/color]时，减少目标所有技能1回合冷却。"
},
"buffid": [
390001001
@@ -19724,7 +19724,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113005311_2",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001001
@@ -19756,7 +19756,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113005311_3",
- "text": "技能冷却减少1回合"
+ "text": "技能冷却减少1回合。"
},
"buffid": [
390001001
@@ -19787,7 +19787,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009011_1",
- "text": "己方暴击率增加20%"
+ "text": "己方暴击率增加20%。"
},
"buffid": [],
"map": ""
@@ -19849,7 +19849,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004
@@ -19881,7 +19881,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004
@@ -19913,7 +19913,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004
@@ -19945,7 +19945,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004
@@ -19977,7 +19977,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009211_1",
- "text": "云朵先生对敌方1个目标造成3次自身攻击力165%的伤害，并有50%的概率降低目标15%的行动值。若此次伤害触发了暴击，则为目标额外附加2回合[color=#c84a32]速度下降[/color]效果。"
+ "text": "云朵先生对敌方1个目标造成3次自身攻击力165%的伤害，并有50%的概率降低目标15%的行动值。"
},
"buffid": [
390001008
@@ -20009,7 +20009,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -20041,7 +20041,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -20073,7 +20073,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -20105,7 +20105,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001008
@@ -20138,7 +20138,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009311_1",
- "text": "云朵先生为自身附加2回合[color=#37d8a9]暴击提升[/color]效果，之后对敌方目标造成3次自身攻击力135%的伤害，若此次伤害触发了暴击，则有40%的概率[color=#c84a32]冰冻[/color]目标，持续1回合"
+ "text": "云朵先生为自身附加2回合[color=#37d8a9]暴击提升[/color]效果，之后对敌方目标造成3次自身攻击力135%的伤害，若此次伤害触发了暴击，则有40%的概率[color=#e5621b]冰冻[/color]目标，持续1回合。"
},
"buffid": [
390001004,
@@ -20172,7 +20172,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004,
@@ -20206,7 +20206,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004,
@@ -20240,7 +20240,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004,
@@ -20274,7 +20274,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124009311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001004,
@@ -20306,7 +20306,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001011_1",
- "text": "己方攻击增加24%"
+ "text": "己方攻击增加24%。"
},
"buffid": [],
"map": ""
@@ -20336,7 +20336,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001111_1",
- "text": "警长对敌方1个目标进行射击，造成攻击力390%的伤害，若成功击杀目标，则获得额外回合"
+ "text": "警长对敌方1个目标进行射击，造成攻击力390%的伤害，若成功击杀目标，则获得额外回合。"
},
"buffid": [],
"map": ""
@@ -20366,7 +20366,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20396,7 +20396,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20426,7 +20426,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20456,7 +20456,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20485,7 +20485,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001211_1",
- "text": "警长对敌方所有目标造成攻击力210%的伤害，为自身回复本次总伤害30%的生命，并各吸收目标10%的行动值"
+ "text": "警长对敌方所有目标造成攻击力210%的伤害，为自身回复本次总伤害30%的生命，并各吸收目标10%的行动值。"
},
"buffid": [],
"map": ""
@@ -20514,7 +20514,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20543,7 +20543,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20572,7 +20572,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20601,7 +20601,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20631,7 +20631,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001311_1",
- "text": "警长对敌方攻击4次，共造成攻击力420%的伤害；发生暴击时，本次伤害将额外提升30%"
+ "text": "警长对敌方攻击4次，共造成攻击力420%的伤害；发生暴击时，本次伤害将额外提升30%。"
},
"buffid": [],
"map": ""
@@ -20661,7 +20661,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20691,7 +20691,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20721,7 +20721,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20751,7 +20751,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -20780,7 +20780,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151006111_1",
- "text": "对敌方1个目标发起攻击，造成攻击力100%的伤害，并有40%概率附加1回合[color=#c84a32]禁疗[/color]状态"
+ "text": "对敌方1个目标发起攻击，造成攻击力100%的伤害，并有40%概率附加1回合[color=#e5621b]禁疗[/color]状态。"
},
"buffid": [],
"map": ""
@@ -20809,7 +20809,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151006211_1",
- "text": "对敌方发起3次攻击，每次造成攻击力30%的伤害"
+ "text": "对敌方发起3次攻击，每次造成攻击力30%的伤害。"
},
"buffid": [],
"map": ""
@@ -20838,7 +20838,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151007111_1",
- "text": "对敌方1个目标发起攻击，造成攻击力100%的伤害"
+ "text": "对敌方1个目标发起攻击，造成攻击力100%的伤害。"
},
"buffid": [],
"map": ""
@@ -20867,7 +20867,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151007211_1",
- "text": "对敌方1个目标发起攻击，造成攻击力120%的伤害，并有50%概率附加2回合[color=#c84a32]攻击下降[/color]状态"
+ "text": "对敌方1个目标发起攻击，造成攻击力120%的伤害，并有50%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [],
"map": ""
@@ -20896,7 +20896,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002111_1",
- "text": "坦克对敌方1个目标发起2段攻击，每段造成攻击力180%的伤害，并有35%概率附加2回合[color=#c84a32]防御下降[/color][/color]状态"
+ "text": "坦克对敌方1个目标发起2段攻击，每段造成攻击力180%的伤害，并有35%概率附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
},
"buffid": [
390001007
@@ -20927,7 +20927,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -20958,7 +20958,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -20989,7 +20989,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -21020,7 +21020,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001007
@@ -21052,7 +21052,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002211_1",
- "text": "坦克对敌方1个目标发起3段攻击，每段可造成攻击力180%的伤害，有30%概率将自身1个减益状态转移给目标。若造成暴击，则附加2回合[color=#c84a32]流血[/color]状态"
+ "text": "坦克对敌方1个目标发起3段攻击，每段可造成攻击力180%的伤害，有30%概率将自身1个减益状态转移给目标。"
},
"buffid": [
390001430
@@ -21084,7 +21084,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001431
@@ -21116,7 +21116,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001432
@@ -21148,7 +21148,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001433
@@ -21180,7 +21180,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001434
@@ -21211,7 +21211,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002311_1",
- "text": "坦克对敌方所有目标造成攻击力750%的伤害；若目标身上存在减益状态，每一个减益状态，额外造成20%的伤害"
+ "text": "坦克对敌方所有目标造成攻击力750%的伤害；若目标身上存在减益状态，每一个减益状态，额外造成20%的伤害。"
},
"buffid": [],
"map": ""
@@ -21240,7 +21240,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -21269,7 +21269,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -21298,7 +21298,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -21327,7 +21327,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -21356,7 +21356,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155004111_1",
- "text": "对敌方发起一次攻击，并造成1次伤害"
+ "text": "对敌方发起一次攻击，并造成1次伤害。"
},
"buffid": [],
"map": ""
@@ -21386,7 +21386,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155004211_1",
- "text": "对存在[color=#c84a32]中毒[/color]状态的目标造成的伤害提升"
+ "text": "对存在[color=#e5621b]中毒[/color]状态的目标造成的伤害提升。"
},
"buffid": [],
"map": ""
@@ -21416,7 +21416,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155004311_1",
- "text": "对敌方造成1次伤害，并附带2回合[color=#c84a32]中毒[/color]状态"
+ "text": "对敌方造成1次伤害，并附带2回合[color=#e5621b]中毒[/color]状态。"
},
"buffid": [],
"map": ""
@@ -21445,7 +21445,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145004111_1",
- "text": "攻击1个敌方，伤害为自身攻击力130%，为目标附加2回合[color=#c84a32]烙印[/color]。"
+ "text": "攻击1个敌方，伤害为自身攻击力130%，为目标附加2回合[color=#e5621b]烙印[/color]。"
},
"buffid": [],
"map": ""
@@ -21476,7 +21476,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145004211_1",
- "text": "攻击后，目标生命值比例高于50%时，对目标重复释放本次攻击所用技能;否则自身获得1层[color=#37d8a9]猫猫推理[/color]。每回合触发1次。战斗开始时获得2层[color=#37d8a9]猫猫推理[/color]"
+ "text": "攻击后，目标生命值比例高于50%时，对目标重复释放本次攻击所用技能;否则自身获得1层[color=#37d8a9]猫猫推理[/color]。"
},
"buffid": [],
"map": ""
@@ -21534,7 +21534,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155003111_1",
- "text": "对敌方发起一次攻击，并造成1次伤害"
+ "text": "对敌方发起一次攻击，并造成1次伤害。"
},
"buffid": [],
"map": ""
@@ -21564,7 +21564,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155003211_1",
- "text": "自身身上有[color=#37d8a9]护盾[/color]状态时，造成伤害提升，受到伤害降低"
+ "text": "自身身上有[color=#37d8a9]护盾[/color]状态时，造成伤害提升，受到伤害降低。"
},
"buffid": [],
"map": ""
@@ -21593,7 +21593,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155003311_1",
- "text": "对敌方目标造成1次伤害，并获得以自身最大生命值为一定比例的[color=#37d8a9]护盾[/color]"
+ "text": "对敌方目标造成1次伤害，并获得以自身最大生命值为一定比例的[color=#37d8a9]护盾[/color]。"
},
"buffid": [],
"map": ""
@@ -21622,7 +21622,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155001111_1",
- "text": "对敌方发起一次攻击，并造成1次伤害"
+ "text": "对敌方发起一次攻击，并造成1次伤害。"
},
"buffid": [],
"map": ""
@@ -21652,7 +21652,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155001211_1",
- "text": "（被动）自身生命值越低，造成的伤害越高"
+ "text": "（被动）自身生命值越低，造成的伤害越高。"
},
"buffid": [],
"map": ""
@@ -21681,7 +21681,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155001311_1",
- "text": "对敌方目标造成1次伤害."
+ "text": "对敌方目标造成1次伤害。"
},
"buffid": [],
"map": ""
@@ -21710,7 +21710,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155002111_1",
- "text": "对敌方单体目标发起一次攻击，并造成1次伤害"
+ "text": "对敌方单体目标发起一次攻击，并造成1次伤害。"
},
"buffid": [],
"map": ""
@@ -21742,7 +21742,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155002211_1",
- "text": "（被动）自身造成伤害时，回复造成伤害一定比例的生命值，自身行动次数越多，造成伤害越高"
+ "text": "（被动）自身造成伤害时，回复造成伤害一定比例的生命值，自身行动次数越多，造成伤害越高。"
},
"buffid": [],
"map": ""
@@ -21771,7 +21771,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155002311_1",
- "text": "对敌方造成1次伤害."
+ "text": "对敌方造成1次伤害。"
},
"buffid": [],
"map": ""
@@ -21800,7 +21800,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155005111_1",
- "text": "对敌方造成1次伤害"
+ "text": "对敌方造成1次伤害。"
},
"buffid": [],
"map": ""
@@ -21831,7 +21831,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155005211_1",
- "text": "造成伤害时，目标生命值越低，此次伤害越高；成功击杀敌人时，可获得额外回合"
+ "text": "造成伤害时，目标生命值越低，此次伤害越高；成功击杀敌人时，可获得额外回合。"
},
"buffid": [],
"map": ""
@@ -21860,7 +21860,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155005311_1",
- "text": "积蓄全身力量，对敌方造成1次伤害，随后对生命比例最低的1个目标造成1次高额伤害，并附加1回合[color=#c84a32]眩晕[/color]状态。"
+ "text": "积蓄全身力量，对敌方造成1次伤害，随后对生命比例最低的1个目标造成1次高额伤害，并附加1回合[color=#e5621b]眩晕[/color]状态。"
},
"buffid": [],
"map": ""
@@ -21889,7 +21889,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155006111_1",
- "text": "攻击敌方目标，并施加2个持续2回合的[color=#c84a32]中毒[/color]状态。"
+ "text": "攻击敌方目标，并施加2个持续2回合的[color=#e5621b]中毒[/color]状态。"
},
"buffid": [],
"map": ""
@@ -21920,7 +21920,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155006211_1",
- "text": "攻击敌方目标，引爆全部[color=#c84a32]中毒[/color]状态，并根据目标身上的减益效果数量大幅提升伤害"
+ "text": "攻击敌方目标，引爆全部[color=#e5621b]中毒[/color]状态，并根据目标身上的减益效果数量大幅提升伤害。"
},
"buffid": [],
"map": ""
@@ -21950,7 +21950,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155006311_1",
- "text": "被动，每受到一次攻击，为攻击者施加1个[color=#c84a32]中毒[/color]状态，持续3回合，累积受到一定次数攻击后，立刻对目标释放致命毒爆"
+ "text": "被动，每受到一次攻击，为攻击者施加1个[color=#e5621b]中毒[/color]状态，持续3回合，累积受到一定次数攻击后，立刻对目标释放致命毒爆。"
},
"buffid": [],
"map": ""
@@ -21980,7 +21980,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155007111_1",
- "text": "攻击敌方，对敌方附加2回合[color=#c84a32]速度下降[/color]状态，若自身拥有增益状态，则额外有50%概率对其施加1回合[color=#c84a32]眩晕[/color]效果。敌方数量越少，此次攻击造成的伤害越高"
+ "text": "攻击敌方，对敌方附加2回合[color=#e5621b]速度下降[/color]状态，若自身拥有增益状态，则额外有50%概率对其施加1回合[color=#e5621b]眩晕[/color]效果。"
},
"buffid": [],
"map": ""
@@ -22013,7 +22013,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155007211_1",
- "text": "冰霜泰坦拥有[color=#37d8a9]冰霜宝石[/color]时释放，驱散锁定目标身上的全部增益效果，并造成大量伤害，成功击败目标时，自身获得伤害提升"
+ "text": "冰霜泰坦拥有[color=#37d8a9]冰霜宝石[/color]时释放，驱散锁定目标身上的全部增益效果，并造成大量伤害，成功击败目标时，自身获得伤害提升。"
},
"buffid": [],
"map": ""
@@ -22045,7 +22045,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155007311_1",
- "text": "冰霜泰坦拥有多层生命值，且免疫行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的25%。并且冰霜泰坦损失一层生命值时，会获得[color=#37d8a9]冰霜宝石[/color]，同时锁定最后一次对自身造成伤害的目标，对其施加[color=#c84a32]灾祸冰原[/color]状态，随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时，自身拥有增益状态，则降低目标25%生命上限。"
+ "text": "冰霜泰坦拥有多层生命值，且免疫行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的25%。"
},
"buffid": [],
"map": ""
@@ -22074,7 +22074,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155007312_1",
- "text": "冰霜泰坦拥有多层生命值，且免疫行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的35%[/color]。并且冰霜泰坦损失一层生命值时，会获得[color=#37d8a9]冰霜宝石[/color]，同时锁定最后一次对自身造成伤害的目标，对其施加[color=#c84a32]灾祸冰原[/color]状态，随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时，自身拥有增益状态，则降低目标25%生命上限。"
+ "text": "冰霜泰坦拥有多层生命值，且免疫行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的35%[/color]。"
},
"buffid": [],
"map": ""
@@ -22103,7 +22103,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_153003111_1",
- "text": "对敌方1个目标发起两段攻击力50%的伤害，并有20%概率为自身附加2回合[color=#37d8a9]免疫[/color] 状态"
+ "text": "对敌方1个目标发起两段攻击力50%的伤害，并有20%概率为自身附加2回合[color=#37d8a9]免疫[/color] 状态。"
},
"buffid": [],
"map": ""
@@ -22161,7 +22161,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_100003001_1",
- "text": "受到伤害时，有25%的概率[color=#c84a32]冰冻[/color] 目标1回合"
+ "text": "受到伤害时，有25%的概率[color=#e5621b]冰冻[/color] 目标1回合。"
},
"buffid": [],
"map": ""
@@ -22191,7 +22191,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_100006001_1",
- "text": "回合开始时，有35%概率令自身所有技能冷却时间-1回合"
+ "text": "回合开始时，有35%概率令自身所有技能冷却时间-1回合。"
},
"buffid": [],
"map": ""
@@ -22221,7 +22221,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_100007001_1",
- "text": "造成伤害时，有20%概率[color=#c84a32]眩晕[/color] 目标1回合"
+ "text": "造成伤害时，有20%概率[color=#e5621b]眩晕[/color] 目标1回合。"
},
"buffid": [],
"map": ""
@@ -22250,7 +22250,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_100001401_1",
- "text": "受到伤害时，有25%几率使用技能一反击"
+ "text": "受到伤害时，有25%几率使用技能一反击。"
},
"buffid": [],
"map": ""
@@ -22280,7 +22280,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_100001501_1",
- "text": "己方在战斗开始的时候获得2回合[color=#37d8a9]护盾[/color] "
+ "text": "己方在战斗开始的时候获得2回合[color=#37d8a9]护盾[/color] 。"
},
"buffid": [],
"map": ""
@@ -22310,7 +22310,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_100001001_1",
- "text": "己方被施加控制效果的角色速度提高50点"
+ "text": "己方被施加控制效果的角色速度提高50点。"
},
"buffid": [],
"map": ""
@@ -22340,7 +22340,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_100009001_1",
- "text": "自身可行动时，有20%概率额外行动一次（仅触发一次，额外行动不会恢复技能冷却时间）"
+ "text": "自身可行动时，有20%概率额外行动一次（仅触发一次，额外行动不会恢复技能冷却时间）。"
},
"buffid": [],
"map": ""
@@ -22370,7 +22370,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_100001701_1",
- "text": "施加[color=#c84a32]中毒[/color]、[color=#c84a32]流血[/color]效果时，有30%几率令其持续时间增加1回合"
+ "text": "施加[color=#e5621b]中毒[/color]、[color=#e5621b]流血[/color]效果时，有30%几率令其持续时间增加1回合。"
},
"buffid": [],
"map": ""
@@ -22400,7 +22400,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_100001901_1",
- "text": "战斗开始时获得1回合[color=#37d8a9]免疫[/color] "
+ "text": "战斗开始时获得1回合[color=#37d8a9]免疫[/color] 。"
},
"buffid": [],
"map": ""
@@ -22429,7 +22429,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_100002001_1",
- "text": "免疫控制"
+ "text": "免疫控制。"
},
"buffid": [],
"map": ""
@@ -22458,7 +22458,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134004111_1",
- "text": "攻击1个敌方，伤害为自身攻击力100%。治疗生命值比例最低的友方，治疗量为本次伤害30%。"
+ "text": "攻击1个敌方，伤害为自身攻击力100%。"
},
"buffid": [],
"map": ""
@@ -22487,7 +22487,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134004211_1",
- "text": "为1个友方附加2回合[color=#37d8a9]生死簿[/color] 记录当前生命值，2回合后，回溯其生命值至记录值。为目标附加2回合[color=#37d8a9]复苏[/color] 和[color=#37d8a9]攻击提升[/color]。"
+ "text": "为1个友方附加2回合[color=#37d8a9]生死簿[/color] 记录当前生命值，2回合后，回溯其生命值至记录值。"
},
"buffid": [],
"map": ""
@@ -22516,7 +22516,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134004311_1",
- "text": "攻击敌方，伤害为自身攻击100%，降低目标30%最大生命值上限，50%概率为目标附加2回合[color=#c84a32]禁疗[/color]"
+ "text": "攻击敌方，伤害为自身攻击100%，降低目标30%最大生命值上限，50%概率为目标附加2回合[color=#e5621b]禁疗[/color]。"
},
"buffid": [],
"map": ""
@@ -22545,7 +22545,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114002111_1",
- "text": "攻击1个敌方，伤害为自身攻击力30%和最大生命值4.5%，30%概率为目标附加1回合[color=#c84a32]挑衅[/color]。"
+ "text": "攻击1个敌方，伤害为自身攻击力30%和最大生命值4。"
},
"buffid": [],
"map": ""
@@ -22575,7 +22575,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114002211_1",
- "text": "攻击时为目标附加1回合[color=#37d8a9]荷鲁斯之眼[/color] 。,受击时，若攻击者[color=#37d8a9]荷鲁斯之眼[/color] ，15%概率使用苍鹰之主反击;其他友方受击时，若攻击者有[color=#37d8a9]荷鲁斯之眼[/color] ，60%概率反击"
+ "text": "攻击时为目标附加1回合[color=#37d8a9]荷鲁斯之眼[/color] 。"
},
"buffid": [],
"map": ""
@@ -22604,7 +22604,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114002311_1",
- "text": "攻击敌方，伤害为自身攻击力90%和已损失生命值15%，70%概率为目标附加2回合[color=#c84a32]攻击下降[/color]"
+ "text": "攻击敌方，伤害为自身攻击力90%和已损失生命值15%，70%概率为目标附加2回合[color=#e5621b]攻击下降[/color]。"
},
"buffid": [],
"map": ""
@@ -22633,7 +22633,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143007111_1",
- "text": "攻击1个敌方，伤害为自身攻击力100%，30%概率为目标附加1回合[color=#c84a32]沉默[/color]。"
+ "text": "攻击1个敌方，伤害为自身攻击力100%，30%概率为目标附加1回合[color=#e5621b]沉默[/color]。"
},
"buffid": [],
"map": ""
@@ -22691,7 +22691,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143007311_1",
- "text": "攻击随机敌方5次，每次伤害为自身攻击力90%。每次有50%概率偷取目标1个增益，为目标附加2回合[color=#c84a32]烙印[/color]。优先攻击不重复的敌方，对重复目标的伤害依次衰减15%"
+ "text": "攻击随机敌方5次，每次伤害为自身攻击力90%。"
},
"buffid": [],
"map": ""
@@ -22720,7 +22720,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134001111_1",
- "text": "攻击1个敌方3次，每次伤害为自身攻击力35%，每次有40%概率为目标附加2回合[color=#c84a32]烙印[/color]。"
+ "text": "攻击1个敌方3次，每次伤害为自身攻击力35%，每次有40%概率为目标附加2回合[color=#e5621b]烙印[/color]。"
},
"buffid": [],
"map": ""
@@ -22778,7 +22778,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134001311_1",
- "text": "攻击随机敌方9次，每次伤害为自身攻击力35%，每次有40%概率为目标附加1回合[color=#c84a32]流血[/color]。"
+ "text": "攻击随机敌方9次，每次伤害为自身攻击力35%，每次有40%概率为目标附加1回合[color=#e5621b]流血[/color]。"
},
"buffid": [],
"map": ""
@@ -22836,7 +22836,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123001211_1",
- "text": "治疗1个友方，治疗量为目标最大生命值15%和自身攻击力150%。目标每损失最大生命值10%，治疗量增加10%"
+ "text": "治疗1个友方，治疗量为目标最大生命值15%和自身攻击力150%。"
},
"buffid": [],
"map": ""
@@ -22894,7 +22894,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124007011_1",
- "text": "己方生命增加30%"
+ "text": "己方生命增加30%。"
},
"buffid": [],
"map": ""
@@ -22923,7 +22923,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124007111_1",
- "text": "攻击1个敌方，伤害为自身攻击力110%,50%概率为目标附加1回合[color=#c84a32]眩晕[/color] 。"
+ "text": "攻击1个敌方，伤害为自身攻击力110%，50%概率为目标附加1回合[color=#e5621b]眩晕[/color] 。"
},
"buffid": [],
"map": ""
@@ -22954,7 +22954,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124007211_1",
- "text": "攻击1个敌方3次，每次伤害为自身攻击力50%70%概率为目标附加2回合速度下降。为已有速度下降的目标附加1回合[color=#c84a32]冰冻[/color] "
+ "text": "攻击1个敌方3次，每次伤害为自身攻击力50%70%概率为目标附加2回合速度下降。"
},
"buffid": [],
"map": ""
@@ -22985,7 +22985,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124007311_1",
- "text": "提升友方25%行动值，为目标附加2回合[color=#37d8a9]暴击提升[/color] 和[color=#37d8a9]攻击提升[/color]"
+ "text": "提升友方25%行动值，为目标附加2回合[color=#37d8a9]暴击提升[/color] 和[color=#37d8a9]攻击提升[/color]。"
},
"buffid": [],
"map": ""
@@ -23014,7 +23014,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123002011_1",
- "text": "己方暴击率增加15%"
+ "text": "己方暴击率增加15%。"
},
"buffid": [],
"map": ""
@@ -23044,7 +23044,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123002111_1",
- "text": "攻击1个敌方，伤害为自身攻击力120%，60%概率为目标附加2回合[color=#c84a32]禁疗[/color]"
+ "text": "攻击1个敌方，伤害为自身攻击力120%，60%概率为目标附加2回合[color=#e5621b]禁疗[/color]。"
},
"buffid": [],
"map": ""
@@ -23103,7 +23103,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123002311_1",
- "text": "攻击1个敌方，伤害为自身攻击力250%，为目标附加2回合[color=#c84a32]烙印[/color]"
+ "text": "攻击1个敌方，伤害为自身攻击力250%，为目标附加2回合[color=#e5621b]烙印[/color]。"
},
"buffid": [],
"map": ""
@@ -23132,7 +23132,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004011_1",
- "text": "己方效果命中增加20%"
+ "text": "己方效果命中增加20%。"
},
"buffid": [],
"map": ""
@@ -23161,7 +23161,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004111_1",
- "text": "攻击1个敌方3次，每次伤害为自身攻击力90%，每次有15%概率为目标附加1回合[color=#c84a32]眩晕[/color] "
+ "text": "攻击1个敌方3次，每次伤害为自身攻击力90%，每次有15%概率为目标附加1回合[color=#e5621b]眩晕[/color] 。"
},
"buffid": [
390001105
@@ -23192,7 +23192,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23223,7 +23223,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23254,7 +23254,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23285,7 +23285,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23316,7 +23316,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004211_1",
- "text": "攻击随机3个敌方，伤害为自身造成攻击力240%，75%概率为目标附加1回合[color=#c84a32]眩晕[/color] "
+ "text": "攻击随机3个敌方，伤害为自身造成攻击力240%，75%概率为目标附加1回合[color=#e5621b]眩晕[/color] 。"
},
"buffid": [
390001105
@@ -23347,7 +23347,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23378,7 +23378,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23409,7 +23409,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23440,7 +23440,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23471,7 +23471,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004311_1",
- "text": "攻击全体敌方并驱散全体增益附带一回合[color=#c84a32]眩晕[/color] "
+ "text": "攻击全体敌方并驱散全体增益附带一回合[color=#e5621b]眩晕[/color] 。"
},
"buffid": [
390001105
@@ -23502,7 +23502,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23533,7 +23533,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23564,7 +23564,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23595,7 +23595,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001105
@@ -23626,7 +23626,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133005111_1",
- "text": "攻击1个敌方，伤害为自身攻击力100%，50%概率为目标附加2回合[color=#c84a32]攻击下降[/color] 。"
+ "text": "攻击1个敌方，伤害为自身攻击力100%，50%概率为目标附加2回合[color=#e5621b]攻击下降[/color] 。"
},
"buffid": [],
"map": ""
@@ -23656,7 +23656,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133005211_1",
- "text": "回合开始时若自身可行动，净化自身1个减益，为随机1个敌方附加1回合[color=#c84a32]挑衅[/color]。"
+ "text": "回合开始时若自身可行动，净化自身1个减益，为随机1个敌方附加1回合[color=#e5621b]挑衅[/color]。"
},
"buffid": [],
"map": ""
@@ -23686,7 +23686,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133005311_1",
- "text": "攻击1个敌方4次，前三段伤害为自身攻击力60%，第四段为自身攻击力55%。前三段偷取目标1个增益;第四段为目标附加1回合[color=#c84a32]眩晕[/color] 。前三段偷取的每个增益，使第四段降低目标30%行动值。"
+ "text": "攻击1个敌方4次，前三段伤害为自身攻击力60%，第四段为自身攻击力55%。"
},
"buffid": [],
"map": ""
@@ -23715,7 +23715,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151001111_1",
- "text": "对敌方1个目标发起攻击，造成攻击力100%的伤害"
+ "text": "对敌方1个目标发起攻击，造成攻击力100%的伤害。"
},
"buffid": [],
"map": ""
@@ -23744,7 +23744,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151012111_1",
- "text": "对敌方1个目标发起攻击造成攻击力100%的伤害"
+ "text": "对敌方1个目标发起攻击造成攻击力100%的伤害。"
},
"buffid": [],
"map": ""
@@ -23773,7 +23773,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151012211_1",
- "text": "对敌方发起攻击，造成攻击力80%的伤害，有15%概率附加2回合[color=#c84a32]无法获得增益[/color] 效果的状态"
+ "text": "对敌方发起攻击，造成攻击力80%的伤害，有15%概率附加2回合[color=#e5621b]无法获得增益[/color] 效果的状态。"
},
"buffid": [],
"map": ""
@@ -23802,7 +23802,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151013111_1",
- "text": "对敌方1个目标造成攻击力100%的伤害，有15%概率附加1回合[color=#c84a32]眩晕[/color] 状态"
+ "text": "对敌方1个目标造成攻击力100%的伤害，有15%概率附加1回合[color=#e5621b]眩晕[/color] 状态。"
},
"buffid": [],
"map": ""
@@ -23832,7 +23832,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151013211_1",
- "text": "对敌方1个目标造成攻击力180%的伤害，目标身上有负面效果时，有100%的概率附加1回合[color=#c84a32]眩晕[/color] 状态"
+ "text": "对敌方1个目标造成攻击力180%的伤害，目标身上有负面效果时，有100%的概率附加1回合[color=#e5621b]眩晕[/color] 状态。"
},
"buffid": [],
"map": ""
@@ -23861,7 +23861,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151014111_1",
- "text": "对敌方1个目标发起攻击，造成攻击力100%的伤害，并有50%概率使其行动值减少10%"
+ "text": "对敌方1个目标发起攻击，造成攻击力100%的伤害，并有50%概率使其行动值减少10%。"
},
"buffid": [],
"map": ""
@@ -23890,7 +23890,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151014211_1",
- "text": "为己方提升15%行动值"
+ "text": "为己方提升15%行动值。"
},
"buffid": [],
"map": ""
@@ -23920,7 +23920,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151010111_1",
- "text": "对敌方一个目标造成100%攻击力的伤害，触发暴击时位自身回复30%基于伤害的生命值"
+ "text": "对敌方一个目标造成100%攻击力的伤害，触发暴击时位自身回复30%基于伤害的生命值。"
},
"buffid": [],
"map": ""
@@ -23978,7 +23978,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151011111_1",
- "text": "对敌方一个目标造成100%攻击力的伤害，并有20%概率附加1回合[color=#c84a32]沉默[/color]状态"
+ "text": "对敌方一个目标造成100%攻击力的伤害，并有20%概率附加1回合[color=#e5621b]沉默[/color]状态。"
},
"buffid": [],
"map": ""
@@ -24037,7 +24037,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144003111_1",
- "text": "对敌方1个目标发起2段攻击，每段攻击会造成攻击力65%的伤害，并有50%概率附加2回合[color=#c84a32]失手率提升[/color] [/color] 状态"
+ "text": "对敌方1个目标发起2段攻击，每段攻击会造成攻击力65%的伤害，并有50%概率附加2回合[color=#e5621b]失手率提升[/color] [/color] 状态。"
},
"buffid": [],
"map": ""
@@ -24067,7 +24067,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144003211_1",
- "text": "每回合开始时，可吸收己方各1个减益状态，每吸收1个减益状态可增加己方5%的行动值"
+ "text": "每回合开始时，可吸收己方各1个减益状态，每吸收1个减益状态可增加己方5%的行动值。"
},
"buffid": [],
"map": ""
@@ -24097,7 +24097,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144003311_1",
- "text": "对敌方造成攻击力110%的伤害，并为己方附加1回合[color=#37d8a9]对峙[/color] 状态；技能冷却期间，若友方队友死亡，将重置技能冷却时间"
+ "text": "对敌方造成攻击力110%的伤害，并为己方附加1回合[color=#37d8a9]对峙[/color] 状态；技能冷却期间，若友方队友死亡，将重置技能冷却时间。"
},
"buffid": [],
"map": ""
@@ -24126,7 +24126,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003011_1",
- "text": "己方攻击增加30%"
+ "text": "己方攻击增加30%。"
},
"buffid": [],
"map": ""
@@ -24155,7 +24155,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003111_1",
- "text": "希沙窦斯对敌方1个目标造成攻击力300%的伤害，并吸收目标15%的行动值"
+ "text": "希沙窦斯对敌方1个目标造成攻击力300%的伤害，并吸收目标15%的行动值。"
},
"buffid": [],
"map": ""
@@ -24184,7 +24184,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24213,7 +24213,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24242,7 +24242,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24271,7 +24271,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24300,7 +24300,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003211_1",
- "text": "希沙窦斯对敌方1个目标发起5段攻击，每段造成自身攻击力150%的伤害，回复此次伤害50%的生命值，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%"
+ "text": "希沙窦斯对敌方1个目标发起5段攻击，每段造成自身攻击力150%的伤害，回复此次伤害50%的生命值，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%。"
},
"buffid": [],
"map": ""
@@ -24329,7 +24329,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003211_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24358,7 +24358,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003211_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24387,7 +24387,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003211_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24416,7 +24416,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003211_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24446,7 +24446,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003311_1",
- "text": "希沙窦斯对敌方发起4段攻击，每段造成自身攻击力300%的伤害，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%，最后一段攻击将吸收目标10%的行动值"
+ "text": "希沙窦斯对敌方发起4段攻击，每段造成自身攻击力300%的伤害，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%，最后一段攻击将吸收目标10%的行动值。"
},
"buffid": [],
"map": ""
@@ -24476,7 +24476,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24506,7 +24506,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24536,7 +24536,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24566,7 +24566,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [],
"map": ""
@@ -24595,7 +24595,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143004011_1",
- "text": "己方攻击增加18%"
+ "text": "己方攻击增加18%。"
},
"buffid": [],
"map": ""
@@ -24624,7 +24624,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143004111_1",
- "text": "姜饼人对敌方1个目标造成攻击力120%的伤害并追加目标最大生命值3%的伤害（追加伤害最高不超过自身攻击力的100%）。自身损失当前生命值5%的生命。"
+ "text": "姜饼人对敌方1个目标造成攻击力120%的伤害并追加目标最大生命值3%的伤害（追加伤害最高不超过自身攻击力的100%）。"
},
"buffid": [],
"map": ""
@@ -24653,7 +24653,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143004211_1",
- "text": "姜饼人对敌方1个目标造成2次攻击力75%的伤害，并有60%概率为目标附加2回合[color=#c84a32]禁疗[/color]状态。若目标最大生命值高于自身，则每次攻击额外追加目标最大生命值3%的伤害（额外伤害最高不超过自身攻击力的100%）。"
+ "text": "姜饼人对敌方1个目标造成2次攻击力75%的伤害，并有60%概率为目标附加2回合[color=#e5621b]禁疗[/color]状态。"
},
"buffid": [],
"map": ""
@@ -24682,7 +24682,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143004311_1",
- "text": "姜饼人消耗自身当前生命值40%的生命，对敌方1个目标造成自身攻击力120%的伤害，追加目标最大生命值10%的伤害（追加伤害最高不超过自身攻击力的300%），并为目标附加2回合[color=#c84a32]无法获得增益[/color] 效果状态。"
+ "text": "姜饼人消耗自身当前生命值40%的生命，对敌方1个目标造成自身攻击力120%的伤害，追加目标最大生命值10%的伤害（追加伤害最高不超过自身攻击力的300%），并为目标附加2回合[color=#e5621b]无法获得增益[/color] 效果状态。"
},
"buffid": [],
"map": ""
@@ -24711,7 +24711,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123003111_1",
- "text": "黛塔黛恩对敌方1个目标造成攻击力120%的伤害，并有100%概率驱散目标身上存在的1个增益状态"
+ "text": "黛塔黛恩对敌方1个目标造成攻击力120%的伤害，并有100%概率驱散目标身上存在的1个增益状态。"
},
"buffid": [],
"map": ""
@@ -24740,7 +24740,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123003211_1",
- "text": "黛塔黛恩对敌方1个目标造成2次攻击力90%的伤害，每次降低目标15%行动值"
+ "text": "黛塔黛恩对敌方1个目标造成2次攻击力90%的伤害，每次降低目标15%行动值。"
},
"buffid": [],
"map": ""
@@ -24770,7 +24770,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123003311_1",
- "text": "黛塔黛恩为己方1个目标恢复其最大生命值30%的生命，为其他友方目标恢复其最大生命值15%的生命，并为己方目标附加2回合[color=#37d8a9]暴击提升[/color] 状态。目标每损失10%的最大生命值，治疗量增加10%"
+ "text": "黛塔黛恩为己方1个目标恢复其最大生命值30%的生命，为其他友方目标恢复其最大生命值15%的生命，并为己方目标附加2回合[color=#37d8a9]暴击提升[/color] 状态。"
},
"buffid": [],
"map": ""
@@ -24800,7 +24800,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144001111_1",
- "text": "美肚鲨对敌方1个目标造成攻击力140%的伤害，有80%概率为目标附加2回合[color=#c84a32]禁疗[/color]状态，触发暴击时，使目标行动值减少30%"
+ "text": "美肚鲨对敌方1个目标造成攻击力140%的伤害，有80%概率为目标附加2回合[color=#e5621b]禁疗[/color]状态，触发暴击时，使目标行动值减少30%。"
},
"buffid": [],
"map": ""
@@ -24830,7 +24830,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144001211_1",
- "text": "美肚鲨对敌方1个目标造成攻击力230%的伤害，并为目标附加2个持续2回合的[color=#c84a32]流血[/color]状态。触发暴击时将额外为目标附加2个持续2回合的[color=#c84a32]流血[/color]状态"
+ "text": "美肚鲨对敌方1个目标造成攻击力230%的伤害，并为目标附加2个持续2回合的[color=#e5621b]流血[/color]状态。"
},
"buffid": [],
"map": ""
@@ -24860,7 +24860,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144001311_1",
- "text": "美肚鲨为自身附加3层狂暴状态，并对敌方目标造成攻击力100%的伤害，有80%概率为目标附加2回合速度下降[color=#c84a32]防御下降[/color]状态"
+ "text": "美肚鲨为自身附加3层狂暴状态，并对敌方目标造成攻击力100%的伤害，有80%概率为目标附加2回合速度下降[color=#e5621b]防御下降[/color]状态。"
},
"buffid": [],
"map": ""
@@ -24889,7 +24889,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135004011_1",
- "text": "己方攻击增加40%"
+ "text": "己方攻击增加40%。"
},
"buffid": [],
"map": ""
@@ -24918,7 +24918,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135004111_1",
- "text": "黛安·福克斯顿对敌方1个目标造成攻击力120%的伤害，并有100%概率施加2回合[color=#c84a32]无法获得增益[/color] 效果，若目标身上无增益状态，则本次伤害提升50%"
+ "text": "黛安·福克斯顿对敌方1个目标造成攻击力120%的伤害，并有100%概率施加2回合[color=#e5621b]无法获得增益[/color] 效果，若目标身上无增益状态，则本次伤害提升50%。"
},
"buffid": [],
"map": ""
@@ -24947,7 +24947,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135004211_1",
- "text": "黛安·福克斯顿自身行动前，驱散随机1名敌方目标的1个增益状态，有100%概率清除其所有增益状态，有限选择拥有增益状态目标。本效果必定命中。"
+ "text": "黛安·福克斯顿自身行动前，驱散随机1名敌方目标的1个增益状态，有100%概率清除其所有增益状态，有限选择拥有增益状态目标。"
},
"buffid": [],
"map": ""
@@ -24976,7 +24976,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135004311_1",
- "text": "黛安·福克斯顿对敌方1个目标造成攻击力65%的伤害，并对敌方所有目标造成攻击力30%的伤害。若目标身上无增益状态，则无视目标100%防御，目标身上的每个增益状态将对应减少无视防御的效果。"
+ "text": "黛安·福克斯顿对敌方1个目标造成攻击力65%的伤害，并对敌方所有目标造成攻击力30%的伤害。"
},
"buffid": [],
"map": ""
@@ -25005,7 +25005,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124006011_1",
- "text": "己方生命增加24%"
+ "text": "己方生命增加24%。"
},
"buffid": [],
"map": ""
@@ -25034,7 +25034,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124006111_1",
- "text": "对敌方1个目标造成攻击力100%的伤害，并有70%概率驱散目标1个增益状态"
+ "text": "对敌方1个目标造成攻击力100%的伤害，并有70%概率驱散目标1个增益状态。"
},
"buffid": [],
"map": ""
@@ -25092,7 +25092,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124006311_1",
- "text": "凯尔为己方净化全部减益状态，并回复其最大生命值30%的生命，每清除一个状态都能额外回复其最大生命值3%的生命"
+ "text": "凯尔为己方净化全部减益状态，并回复其最大生命值30%的生命，每清除一个状态都能额外回复其最大生命值3%的生命。"
},
"buffid": [],
"map": ""
@@ -25121,7 +25121,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114004011_1",
- "text": "己方生命增加30%"
+ "text": "己方生命增加30%。"
},
"buffid": [],
"map": ""
@@ -25150,7 +25150,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114004111_1",
- "text": "克莱尔·努涅斯对敌方1个目标造成攻击力120%的伤害，并有50%概率附加2回合[color=#c84a32]失手率提升[/color] [/color] 状态。"
+ "text": "克莱尔·努涅斯对敌方1个目标造成攻击力120%的伤害，并有50%概率附加2回合[color=#e5621b]失手率提升[/color] [/color] 状态。"
},
"buffid": [],
"map": ""
@@ -25237,7 +25237,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133004011_1",
- "text": "己方攻击增加18%"
+ "text": "己方攻击增加18%。"
},
"buffid": [],
"map": ""
@@ -25266,7 +25266,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133004111_1",
- "text": "普鲁格兰杰对敌方1个目标造成攻击力130%的伤害，并有30%概率附加1回合[color=#c84a32]眩晕[/color] 状态，并有30%概率使用随心铁杆兵追击目标1次。"
+ "text": "普鲁格兰杰对敌方1个目标造成攻击力130%的伤害，并有30%概率附加1回合[color=#e5621b]眩晕[/color] 状态，并有30%概率使用随心铁杆兵追击目标1次。"
},
"buffid": [],
"map": ""
@@ -25354,7 +25354,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005011_1",
- "text": "己方生命增加30%"
+ "text": "己方生命增加30%。"
},
"buffid": [],
"map": ""
@@ -25383,7 +25383,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005111_1",
- "text": "沃尔特·史翠克勒对敌方1个目标造成攻击力360%的伤害，并有80%概率附加2回合[color=#c84a32]中毒[/color]状态"
+ "text": "沃尔特·史翠克勒对敌方1个目标造成攻击力360%的伤害，并有80%概率附加2回合[color=#e5621b]中毒[/color]状态。"
},
"buffid": [
390001401
@@ -25414,7 +25414,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005111_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401
@@ -25445,7 +25445,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005111_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401
@@ -25476,7 +25476,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005111_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401
@@ -25507,7 +25507,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005111_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401
@@ -25538,7 +25538,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005211_1",
- "text": "沃尔特·史翠克勒为己方附加2回合[color=#37d8a9]毒牙[/color] 状态，状态持续期间受到攻击，有70%概率为攻击者附加1回合[color=#c84a32]中毒[/color]状态。"
+ "text": "沃尔特·史翠克勒为己方附加2回合[color=#37d8a9]毒牙[/color] 状态，状态持续期间受到攻击，有70%概率为攻击者附加1回合[color=#e5621b]中毒[/color]状态。"
},
"buffid": [
390001433
@@ -25569,7 +25569,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005311_1",
- "text": "沃尔特·史翠克勒对敌方目标造成攻击力500%的伤害，并有80%概率为目标附加2回合[color=#c84a32]中毒[/color]状态。若成功附加[color=#c84a32]中毒[/color]状态或目标已出于[color=#c84a32]中毒[/color]状态，则附加1回合[color=#c84a32]石化[/color] 状态。"
+ "text": "沃尔特·史翠克勒对敌方目标造成攻击力500%的伤害，并有80%概率为目标附加2回合[color=#e5621b]中毒[/color]状态。"
},
"buffid": [
390001401
@@ -25600,7 +25600,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005311_2",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401
@@ -25631,7 +25631,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005311_3",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401
@@ -25662,7 +25662,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005311_4",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401
@@ -25693,7 +25693,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005311_5",
- "text": "伤害提升10%"
+ "text": "伤害提升10%。"
},
"buffid": [
390001401
@@ -25724,7 +25724,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133006011_1",
- "text": "己方效果抵抗增加20%"
+ "text": "己方效果抵抗增加20%。"
},
"buffid": [
390001401
@@ -25755,7 +25755,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133006111_1",
- "text": "珍妮丝·邓普顿对敌方1个目标造成攻击力40%的3次伤害，有30%概率为目标附加2回合[color=#c84a32]防御下降[/color]状态。"
+ "text": "珍妮丝·邓普顿对敌方1个目标造成攻击力40%的3次伤害，有30%概率为目标附加2回合[color=#e5621b]防御下降[/color]状态。"
},
"buffid": [],
"map": ""
@@ -25813,7 +25813,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133006311_1",
- "text": "珍妮丝·邓普顿为己方目标附加2回合自身生命上限22%的[color=#37d8a9]护盾[/color] ，并附加2回合[color=#37d8a9]复苏[/color] 状态。己方目标身上存在增益状态时，额外提升30%[color=#37d8a9]护盾[/color] 。"
+ "text": "珍妮丝·邓普顿为己方目标附加2回合自身生命上限22%的[color=#37d8a9]护盾[/color] ，并附加2回合[color=#37d8a9]复苏[/color] 状态。"
},
"buffid": [],
"map": ""
@@ -25842,7 +25842,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125002011_1",
- "text": "己方生命增加30%"
+ "text": "己方生命增加30%。"
},
"buffid": [],
"map": ""
@@ -25871,7 +25871,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125002111_1",
- "text": "沃尔夫对敌方1个目标造成攻击力110%的伤害，并有75%概率对目标附加1回合[color=#c84a32]眩晕[/color] 状态。若目标身上存在减益效果，则提升沃尔夫自身25%行动值"
+ "text": "沃尔夫对敌方1个目标造成攻击力110%的伤害，并有75%概率对目标附加1回合[color=#e5621b]眩晕[/color] 状态。"
},
"buffid": [],
"map": ""
@@ -25931,7 +25931,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125002311_1",
- "text": "沃尔夫对敌方1个目标发起攻击，将己方的全部减益状态转嫁给目标，随后对其造成自身最大生命值13%的伤害"
+ "text": "沃尔夫对敌方1个目标发起攻击，将己方的全部减益状态转嫁给目标，随后对其造成自身最大生命值13%的伤害。"
},
"buffid": [],
"map": ""
@@ -25960,7 +25960,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145002111_1",
- "text": "梅林对敌方1个目标造成3次攻击力35%的伤害，且每10点速度可额外造成1%的伤害，并且有60%概率附加[color=#c84a32]防御下降[/color]状态2回合"
+ "text": "梅林对敌方1个目标造成3次攻击力35%的伤害，且每10点速度可额外造成1%的伤害，并且有60%概率附加[color=#e5621b]防御下降[/color]状态2回合。"
},
"buffid": [],
"map": ""
@@ -26048,7 +26048,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_153005111_1",
- "text": "对敌方1个目标发起2段攻击，每段可造成攻击力50%的伤害，并有20%概率附加1回合[color=#c84a32]中毒[/color]状态"
+ "text": "对敌方1个目标发起2段攻击，每段可造成攻击力50%的伤害，并有20%概率附加1回合[color=#e5621b]中毒[/color]状态。"
},
"buffid": [],
"map": ""
@@ -26077,7 +26077,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_153005211_1",
- "text": "为己方附加2回合[color=#37d8a9]攻击提升[/color]状态"
+ "text": "为己方附加2回合[color=#37d8a9]攻击提升[/color]状态。"
},
"buffid": [],
"map": ""
@@ -26106,7 +26106,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_153006111_1",
- "text": "对敌方1个目标造成攻击力100%的伤害，并为自身附加2回合[color=#37d8a9]护盾[/color] ，可吸收自身生命值10%的伤害"
+ "text": "对敌方1个目标造成攻击力100%的伤害，并为自身附加2回合[color=#37d8a9]护盾[/color] ，可吸收自身生命值10%的伤害。"
},
"buffid": [],
"map": ""
@@ -26136,7 +26136,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_153006211_1",
- "text": "对敌方1个目标发起2次攻击，每段可造成攻击力80%的伤害。发起攻击前，若自身生命值低于50%，则回复本次攻击100%的生命值。"
+ "text": "对敌方1个目标发起2次攻击，每段可造成攻击力80%的伤害。"
},
"buffid": [],
"map": ""
@@ -26167,7 +26167,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_153006311_1",
- "text": "为己方附加2回合[color=#37d8a9]速度提升[/color] 状态，若目标拥有[color=#37d8a9]护盾[/color] 则额外回复其20%最大生命值的血量，之后攻击敌方3次，每段造成攻击力40%的伤害，且有15%概率附加2回合[color=#c84a32]攻击下降[/color] 状态"
+ "text": "为己方附加2回合[color=#37d8a9]速度提升[/color] 状态，若目标拥有[color=#37d8a9]护盾[/color] 则额外回复其20%最大生命值的血量，之后攻击敌方3次，每段造成攻击力40%的伤害，且有15%概率附加2回合[color=#e5621b]攻击下降[/color] 状态。"
},
"buffid": [],
"map": ""
@@ -26196,7 +26196,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_153002111_1",
- "text": "对敌方一个目标发起两段攻击50%的伤害，每段为自身回复5%最大生命值"
+ "text": "对敌方一个目标发起两段攻击50%的伤害，每段为自身回复5%最大生命值。"
},
"buffid": [],
"map": ""
@@ -26254,7 +26254,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144002011_1",
- "text": "己方防御增加30%"
+ "text": "己方防御增加30%。"
},
"buffid": [],
"map": ""
@@ -26343,7 +26343,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144002311_1",
- "text": "蛇先生己方提升25%行动值，并施加[color=#37d8a9]伪装[/color] 。己方每个[color=#37d8a9]伪装[/color] 的触发，都会为自身提升20%的行动值。"
+ "text": "蛇先生己方提升25%行动值，并施加[color=#37d8a9]伪装[/color] 。"
},
"buffid": [
390001436
@@ -26374,7 +26374,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_111021011_1",
- "text": "友方无法受到控制"
+ "text": "友方无法受到控制。"
},
"buffid": [],
"map": ""
@@ -26404,7 +26404,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_111021111_1",
- "text": "巨怪对敌方造成一次AOE伤害，并附带2回合[color=#c84a32]防御下降[/color]"
+ "text": "巨怪对敌方造成一次AOE伤害，并附带2回合[color=#e5621b]防御下降[/color]。"
},
"buffid": [],
"map": ""
@@ -26433,7 +26433,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_111021211_1",
- "text": "巨怪对敌方造成一次震击，并附带2回合[color=#c84a32]眩晕[/color] "
+ "text": "巨怪对敌方造成一次震击，并附带2回合[color=#e5621b]眩晕[/color] 。"
},
"buffid": [],
"map": ""
@@ -26462,7 +26462,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_111021311_1",
- "text": "巨怪对敌方发出死灵射线，并恢复造成伤害20%的血量"
+ "text": "巨怪对敌方发出死灵射线，并恢复造成伤害20%的血量。"
},
"buffid": [],
"map": ""
@@ -26491,7 +26491,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151015111_1",
- "text": "给己方增加50%行动值"
+ "text": "给己方增加50%行动值。"
},
"buffid": [],
"map": ""
@@ -26520,7 +26520,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151016111_1",
- "text": "为己方附加2回合[color=#37d8a9]攻击提升[/color]"
+ "text": "为己方附加2回合[color=#37d8a9]攻击提升[/color]。"
},
"buffid": [],
"map": ""
@@ -26550,7 +26550,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151017111_1",
- "text": "攻击敌方，造成自身攻击力100%的伤害，目标身上有[color=#c84a32]中毒[/color]状态时，有几率额外附加[color=#c84a32]眩晕[/color] 1回合。"
+ "text": "攻击敌方，造成自身攻击力100%的伤害，目标身上有[color=#e5621b]中毒[/color]状态时，有几率额外附加[color=#e5621b]眩晕[/color] 1回合。"
},
"buffid": [],
"map": ""
@@ -26579,7 +26579,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151018111_1",
- "text": "攻击敌方目标，造成自身攻击力100%的伤害并施加3回合的[color=#c84a32]中毒[/color]状态"
+ "text": "攻击敌方目标，造成自身攻击力100%的伤害并施加3回合的[color=#e5621b]中毒[/color]状态。"
},
"buffid": [],
"map": ""
@@ -26608,7 +26608,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151019111_1",
- "text": "攻击敌方，并对其施加2回合的[color=#c84a32]禁疗[/color]状态"
+ "text": "攻击敌方，并对其施加2回合的[color=#e5621b]禁疗[/color]状态。"
},
"buffid": [],
"map": ""
@@ -26637,7 +26637,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151020111_1",
- "text": "清除己方的全部减益状态"
+ "text": "清除己方的全部减益状态。"
},
"buffid": [],
"map": ""
@@ -26666,7 +26666,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151021111_1",
- "text": "附加2回合[color=#c84a32]攻击下降[/color]"
+ "text": "附加2回合[color=#e5621b]攻击下降[/color]。"
},
"buffid": [],
"map": ""
@@ -26695,7 +26695,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151022111_1",
- "text": "为BOSS附加2回合[color=#37d8a9]免疫[/color] [color=#37d8a9]攻击提升[/color]"
+ "text": "为BOSS附加2回合[color=#37d8a9]免疫[/color] [color=#37d8a9]攻击提升[/color]。"
},
"buffid": [],
"map": ""
@@ -26724,7 +26724,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151023111_1",
- "text": "以一定比例回复BOSS血量30%"
+ "text": "以一定比例回复BOSS血量30%。"
},
"buffid": [],
"map": ""
@@ -26753,7 +26753,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151023111_2",
- "text": "以一定比例回复BOSS血量50%"
+ "text": "以一定比例回复BOSS血量50%。"
},
"buffid": [],
"map": ""
@@ -26782,7 +26782,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151023111_3",
- "text": "以一定比例回复BOSS血量70%"
+ "text": "以一定比例回复BOSS血量70%。"
},
"buffid": [],
"map": ""
@@ -26811,7 +26811,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151023111_4",
- "text": "以一定比例回复BOSS血量100%"
+ "text": "以一定比例回复BOSS血量100%。"
},
"buffid": [],
"map": ""
@@ -26840,7 +26840,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151024111_1",
- "text": "攻击所有敌人，附加2回合[color=#c84a32]攻击下降[/color]"
+ "text": "攻击所有敌人，附加2回合[color=#e5621b]攻击下降[/color]。"
},
"buffid": [],
"map": ""
@@ -26869,7 +26869,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151025111_1",
- "text": "攻击所有敌人，有50%概率附加2回合[color=#c84a32]禁疗[/color]"
+ "text": "攻击所有敌人，有50%概率附加2回合[color=#e5621b]禁疗[/color]。"
},
"buffid": [],
"map": ""
@@ -26898,7 +26898,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151026111_1",
- "text": "攻击所有敌人，附加2回合[color=#c84a32]攻击下降[/color] "
+ "text": "攻击所有敌人，附加2回合[color=#e5621b]攻击下降[/color] 。"
},
"buffid": [],
"map": ""
@@ -26927,7 +26927,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151027111_1",
- "text": "为BOSS附加3回合防御提升"
+ "text": "为BOSS附加3回合防御提升。"
},
"buffid": [],
"map": ""
@@ -26956,7 +26956,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_151028111_1",
- "text": "攻击所有敌人，附加2回合[color=#c84a32]攻击下降[/color] "
+ "text": "攻击所有敌人，附加2回合[color=#e5621b]攻击下降[/color] 。"
},
"buffid": [],
"map": ""
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 92ad81873..fd72ddbc5 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -7,7 +7,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001001",
- "text": "攻击提升60%"
+ "text": "攻击提升60%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -38,7 +38,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001002",
- "text": "防御提升60%"
+ "text": "防御提升60%。"
},
"BuffType": 2,
"EffectArgu": [
@@ -69,7 +69,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001003",
- "text": "速度提升30%"
+ "text": "速度提升30%。"
},
"BuffType": 3,
"EffectArgu": [
@@ -100,7 +100,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001004",
- "text": "暴击率提升30%"
+ "text": "暴击率提升30%。"
},
"BuffType": 4,
"EffectArgu": [
@@ -131,7 +131,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001005",
- "text": "受到暴击概率降低30%"
+ "text": "受到暴击概率降低30%。"
},
"BuffType": 5,
"EffectArgu": [
@@ -158,11 +158,11 @@
"Id": 390001006,
"Name": {
"key": "skill_skill_buff_Name_390001006",
- "text": "[color=#c84a32]攻击下降[/color] "
+ "text": "[color=#e5621b]攻击下降[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001006",
- "text": "攻击下降60%"
+ "text": "攻击下降60%。"
},
"BuffType": 6,
"EffectArgu": [
@@ -189,11 +189,11 @@
"Id": 390001007,
"Name": {
"key": "skill_skill_buff_Name_390001007",
- "text": "[color=#c84a32]防御下降[/color] "
+ "text": "[color=#e5621b]防御下降[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001007",
- "text": "防御下降60%"
+ "text": "防御下降60%。"
},
"BuffType": 7,
"EffectArgu": [
@@ -220,11 +220,11 @@
"Id": 390001008,
"Name": {
"key": "skill_skill_buff_Name_390001008",
- "text": "[color=#c84a32]速度下降[/color] "
+ "text": "[color=#e5621b]速度下降[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001008",
- "text": "速度下降30%"
+ "text": "速度下降30%。"
},
"BuffType": 8,
"EffectArgu": [
@@ -254,11 +254,11 @@
"Id": 390001009,
"Name": {
"key": "skill_skill_buff_Name_390001009",
- "text": "[color=#c84a32]暴击下降[/color] "
+ "text": "[color=#e5621b]暴击下降[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001009",
- "text": "暴击率下降30%"
+ "text": "暴击率下降30%。"
},
"BuffType": 9,
"EffectArgu": [
@@ -289,7 +289,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001010",
- "text": "生命下降30%"
+ "text": "生命下降30%。"
},
"BuffType": 27,
"EffectArgu": [
@@ -320,7 +320,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001011",
- "text": "造成伤害提升10%"
+ "text": "造成伤害提升10%。"
},
"BuffType": 30,
"EffectArgu": [
@@ -351,7 +351,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001012",
- "text": "造成伤害提升15%"
+ "text": "造成伤害提升15%。"
},
"BuffType": 30,
"EffectArgu": [
@@ -378,11 +378,11 @@
"Id": 390001101,
"Name": {
"key": "skill_skill_buff_Name_390001101",
- "text": "[color=#c84a32]烙印[/color] "
+ "text": "[color=#e5621b]烙印[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001101",
- "text": "被攻击时，受到的伤害提高15%"
+ "text": "被攻击时，受到的伤害提高15%。"
},
"BuffType": 10,
"EffectArgu": [
@@ -409,11 +409,11 @@
"Id": 390001102,
"Name": {
"key": "skill_skill_buff_Name_390001102",
- "text": "[color=#c84a32]失手率提升[/color] "
+ "text": "[color=#e5621b]失手率提升[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001102",
- "text": "失手率提升50%"
+ "text": "失手率提升50%。"
},
"BuffType": 11,
"EffectArgu": [
@@ -444,7 +444,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001103",
- "text": "不会受到任何伤害"
+ "text": "不会受到任何伤害。"
},
"BuffType": 12,
"EffectArgu": [],
@@ -472,7 +472,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001104",
- "text": "生命最低降为1"
+ "text": "生命最低降为1。"
},
"BuffType": 13,
"EffectArgu": [
@@ -498,11 +498,11 @@
"Id": 390001105,
"Name": {
"key": "skill_skill_buff_Name_390001105",
- "text": "[color=#c84a32]眩晕[/color] "
+ "text": "[color=#e5621b]眩晕[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001105",
- "text": "无法进行任何行动"
+ "text": "无法进行任何行动。"
},
"BuffType": 14,
"EffectArgu": [],
@@ -527,11 +527,11 @@
"Id": 390001106,
"Name": {
"key": "skill_skill_buff_Name_390001106",
- "text": "[color=#c84a32]冰冻[/color] "
+ "text": "[color=#e5621b]冰冻[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001106",
- "text": "无法进行任何行动"
+ "text": "无法进行任何行动。"
},
"BuffType": 15,
"EffectArgu": [],
@@ -557,11 +557,11 @@
"Id": 390001107,
"Name": {
"key": "skill_skill_buff_Name_390001107",
- "text": "[color=#c84a32]禁疗[/color] "
+ "text": "[color=#e5621b]禁疗[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001107",
- "text": "无法恢复生命"
+ "text": "无法恢复生命。"
},
"BuffType": 16,
"EffectArgu": [],
@@ -585,11 +585,11 @@
"Id": 390001108,
"Name": {
"key": "skill_skill_buff_Name_390001108",
- "text": "[color=#c84a32]石化[/color] "
+ "text": "[color=#e5621b]石化[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001108",
- "text": "无法进行任何行动，不会随着回合到来降低技能冷却"
+ "text": "无法进行任何行动，不会随着回合到来降低技能冷却。"
},
"BuffType": 17,
"EffectArgu": [],
@@ -614,11 +614,11 @@
"Id": 390001109,
"Name": {
"key": "skill_skill_buff_Name_390001109",
- "text": "[color=#c84a32]沉默[/color] "
+ "text": "[color=#e5621b]沉默[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001109",
- "text": "只能释放基础技能"
+ "text": "只能释放基础技能。"
},
"BuffType": 18,
"EffectArgu": [],
@@ -643,11 +643,11 @@
"Id": 390001110,
"Name": {
"key": "skill_skill_buff_Name_390001110",
- "text": "[color=#c84a32]挑衅[/color] "
+ "text": "[color=#e5621b]挑衅[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001110",
- "text": "回合开始时，会被迫发起攻击，向附加状态者释放基础技能"
+ "text": "回合开始时，会被迫发起攻击，向附加状态者释放基础技能。"
},
"BuffType": 19,
"EffectArgu": [],
@@ -676,7 +676,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001111",
- "text": "无法获得减益效果"
+ "text": "无法获得减益效果。"
},
"BuffType": 20,
"EffectArgu": [],
@@ -704,7 +704,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001112",
- "text": "增加护盾"
+ "text": "增加护盾。"
},
"BuffType": 21,
"EffectArgu": [
@@ -732,11 +732,11 @@
"Id": 390001113,
"Name": {
"key": "skill_skill_buff_Name_390001113",
- "text": "[color=#c84a32]吞噬[/color] "
+ "text": "[color=#e5621b]吞噬[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001113",
- "text": "无法进行任何行动，无法被选中，无法被攻击，无法获得任何强化及弱化效果"
+ "text": "无法进行任何行动，无法被选中，无法被攻击，无法获得任何强化及弱化效果。"
},
"BuffType": 34,
"EffectArgu": [],
@@ -764,7 +764,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001114",
- "text": "不会失手"
+ "text": "不会失手。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -788,11 +788,11 @@
"Id": 390001115,
"Name": {
"key": "skill_skill_buff_Name_390001115",
- "text": "[color=#c84a32]无法获得增益[/color] "
+ "text": "[color=#e5621b]无法获得增益[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001115",
- "text": "无法附加增益状态"
+ "text": "无法附加增益状态。"
},
"BuffType": 36,
"EffectArgu": [],
@@ -820,7 +820,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001116",
- "text": "无法被附加任何控制效果"
+ "text": "无法被附加任何控制效果。"
},
"BuffType": 37,
"EffectArgu": [],
@@ -848,7 +848,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001117",
- "text": "免除死亡"
+ "text": "免除死亡。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -876,7 +876,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001118",
- "text": "睡眠"
+ "text": "睡眠。"
},
"BuffType": 38,
"EffectArgu": [],
@@ -905,7 +905,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001119",
- "text": "（无法驱散类状态）造成伤害时为目标附加2回合[color=#c84a32]禁疗[/color] "
+ "text": "（无法驱散类状态）造成伤害时为目标附加2回合[color=#e5621b]禁疗[/color] 。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -933,7 +933,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001120",
- "text": "（无法驱散类状态）造成伤害时附带效果附加伤害，伤害为目标最大生命值5%，不超过自身攻击力50%"
+ "text": "（无法驱散类状态）造成伤害时附带效果附加伤害，伤害为目标最大生命值5%，不超过自身攻击力50%。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -961,7 +961,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001121",
- "text": "（无法驱散类状态）造成伤害时有40%概率为目标附加2回合[color=#c84a32]防御下降[/color] "
+ "text": "（无法驱散类状态）造成伤害时有40%概率为目标附加2回合[color=#e5621b]防御下降[/color] 。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -989,7 +989,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001122",
- "text": "护盾量为最大生命值10%"
+ "text": "护盾量为最大生命值10%。"
},
"BuffType": 21,
"EffectArgu": [
@@ -1021,7 +1021,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001123",
- "text": "护盾量为最大生命值5%"
+ "text": "护盾量为最大生命值5%。"
},
"BuffType": 21,
"EffectArgu": [
@@ -1053,7 +1053,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001124",
- "text": "无法复活"
+ "text": "无法复活。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -1081,7 +1081,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001125",
- "text": "增加护盾"
+ "text": "增加护盾。"
},
"BuffType": 21,
"EffectArgu": [
@@ -1113,7 +1113,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001126",
- "text": "无法附加减益状态"
+ "text": "无法附加减益状态。"
},
"BuffType": 20,
"EffectArgu": [],
@@ -1141,7 +1141,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001127",
- "text": "回合开始时受到治疗，治疗量为最大生命值的15%"
+ "text": "回合开始时受到治疗，治疗量为最大生命值的15%。"
},
"BuffType": 47,
"EffectArgu": [
@@ -1173,7 +1173,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001128",
- "text": "无法被选中"
+ "text": "无法被选中。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -1201,7 +1201,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001129",
- "text": "护盾量为最大生命值35%"
+ "text": "护盾量为最大生命值35%。"
},
"BuffType": 21,
"EffectArgu": [
@@ -1233,7 +1233,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001130",
- "text": "护盾量为最大生命值50%"
+ "text": "护盾量为最大生命值50%。"
},
"BuffType": 21,
"EffectArgu": [
@@ -1265,7 +1265,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001201",
- "text": "（无法驱散类状态）每层使自身攻击力提升5%，每10层使自身受到伤害降低3%。最高可叠加50层"
+ "text": "（无法驱散类状态）每层使自身攻击力提升5%，每10层使自身受到伤害降低3%。最高可叠加50层。"
},
"BuffType": 0,
"EffectArgu": [
@@ -1296,7 +1296,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001202",
- "text": "每层使自身基础防御提升10%，效果抵抗提升5%，最多可叠加10层。"
+ "text": "每层使自身基础防御提升10%，效果抵抗提升5%，最多可叠加10层。。"
},
"BuffType": 46,
"EffectArgu": [
@@ -1329,7 +1329,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001204",
- "text": "携带者阵亡时清除此状态，并对携带者一方全体造成（释放者）攻击力40%的效果附加伤害，每层使伤害系数提升40%，最多可叠加5层。"
+ "text": "携带者阵亡时清除此状态，并对携带者一方全体造成（释放者）攻击力40%的效果附加伤害，每层使伤害系数提升40%，最多可叠加5层。。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -1357,7 +1357,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001205",
- "text": "（无法驱散类状态）可以增强自身攻击的威力"
+ "text": "（无法驱散类状态）可以增强自身攻击的威力。"
},
"BuffType": 1,
"EffectArgu": [
@@ -1388,7 +1388,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001206",
- "text": "每层为（释放者）提供15%伤害减免"
+ "text": "每层为（释放者）提供15%伤害减免。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -1416,7 +1416,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001207",
- "text": "无法移动"
+ "text": "无法移动。"
},
"BuffType": 22,
"EffectArgu": [],
@@ -1440,11 +1440,11 @@
"Id": 390001208,
"Name": {
"key": "skill_skill_buff_Name_390001208",
- "text": "[color=#c84a32]喜悦[/color] "
+ "text": "[color=#e5621b]喜悦[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001208",
- "text": "受到伤害降低"
+ "text": "受到伤害降低。"
},
"BuffType": 23,
"EffectArgu": [
@@ -1475,7 +1475,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001209",
- "text": "每次受到攻击提升20%的防御，最多叠加5层"
+ "text": "每次受到攻击提升20%的防御，最多叠加5层。"
},
"BuffType": 39,
"EffectArgu": [],
@@ -1503,7 +1503,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001210",
- "text": "每次受到攻击提升20%的防御，最多叠加5层"
+ "text": "每次受到攻击提升20%的防御，最多叠加5层。"
},
"BuffType": 2,
"EffectArgu": [
@@ -1530,11 +1530,11 @@
"Id": 390001211,
"Name": {
"key": "skill_skill_buff_Name_390001211",
- "text": "[color=#c84a32]童真[/color] "
+ "text": "[color=#e5621b]童真[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001211",
- "text": "状态携带者受击5次后，[color=#c84a32]童真[/color] 自动引爆，对该目标及随机2个地方目标造成该状态释放者攻击力85%的伤害，并有50%概率对被童真影响的目标附加2回合[color=#c84a32]沉默[/color] "
+ "text": "状态携带者受击5次后，[color=#e5621b]童真[/color] 自动引爆，对该目标及随机2个地方目标造成该状态释放者攻击力85%的伤害，并有50%概率对被童真影响的目标附加2回合[color=#e5621b]沉默[/color] 。"
},
"BuffType": 69,
"EffectArgu": [
@@ -1566,7 +1566,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001212",
- "text": "检测效果，最多叠加50层"
+ "text": "检测效果，最多叠加50层。"
},
"BuffType": 45,
"EffectArgu": [
@@ -1593,11 +1593,11 @@
"Id": 390001213,
"Name": {
"key": "skill_skill_buff_Name_390001213",
- "text": "[color=#c84a32]链接[/color] "
+ "text": "[color=#e5621b]链接[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001213",
- "text": "一方收到攻击，另一方收到此次伤害的80%的真实伤害"
+ "text": "一方收到攻击，另一方收到此次伤害的80%的真实伤害。"
},
"BuffType": 54,
"EffectArgu": [
@@ -1623,11 +1623,11 @@
"Id": 390001214,
"Name": {
"key": "skill_skill_buff_Name_390001214",
- "text": "[color=#c84a32]无法行动[/color] "
+ "text": "[color=#e5621b]无法行动[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001214",
- "text": "无法行动"
+ "text": "无法行动。"
},
"BuffType": 22,
"EffectArgu": [],
@@ -1655,7 +1655,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001215",
- "text": "无法被附加减益，任意友方行动结束后，状态携带者行动值提升15%"
+ "text": "无法被附加减益，任意友方行动结束后，状态携带者行动值提升15%。"
},
"BuffType": 3,
"EffectArgu": [
@@ -1681,11 +1681,11 @@
"Id": 390001216,
"Name": {
"key": "skill_skill_buff_Name_390001216",
- "text": "[color=#c84a32]黑客前瞻[/color] "
+ "text": "[color=#e5621b]黑客前瞻[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001216",
- "text": "行动两次后触发，扣除50%的当前生命值并附加1回合[color=#c84a32]眩晕[/color] "
+ "text": "行动两次后触发，扣除50%的当前生命值并附加1回合[color=#e5621b]眩晕[/color] 。"
},
"BuffType": 71,
"EffectArgu": [
@@ -1713,11 +1713,11 @@
"Id": 390001217,
"Name": {
"key": "skill_skill_buff_Name_390001217",
- "text": "[color=#c84a32]添加黑客前瞻[/color] "
+ "text": "[color=#e5621b]添加黑客前瞻[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001217",
- "text": "行动两次后触发，扣除50%的当前生命值并附加2回合[color=#c84a32]眩晕[/color] "
+ "text": "行动两次后触发，扣除50%的当前生命值并附加2回合[color=#e5621b]眩晕[/color] 。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -1745,7 +1745,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001218",
- "text": "攻击提升7%"
+ "text": "攻击提升7%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -1776,7 +1776,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001301",
- "text": "生命提升20%"
+ "text": "生命提升20%。"
},
"BuffType": 24,
"EffectArgu": [
@@ -1807,7 +1807,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001302",
- "text": "攻击提升20%"
+ "text": "攻击提升20%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -1838,7 +1838,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001303",
- "text": "防御提升20%"
+ "text": "防御提升20%。"
},
"BuffType": 2,
"EffectArgu": [
@@ -1869,7 +1869,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001304",
- "text": "速度提升15%"
+ "text": "速度提升15%。"
},
"BuffType": 3,
"EffectArgu": [
@@ -1900,7 +1900,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001305",
- "text": "暴击提升20%"
+ "text": "暴击提升20%。"
},
"BuffType": 4,
"EffectArgu": [
@@ -1931,7 +1931,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001306",
- "text": "命中提升20%"
+ "text": "命中提升20%。"
},
"BuffType": 25,
"EffectArgu": [
@@ -1962,7 +1962,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001307",
- "text": "抵抗提升20%"
+ "text": "抵抗提升20%。"
},
"BuffType": 26,
"EffectArgu": [
@@ -1993,7 +1993,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001311",
- "text": "生命提升24%"
+ "text": "生命提升24%。"
},
"BuffType": 24,
"EffectArgu": [
@@ -2024,7 +2024,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001312",
- "text": "攻击提升25%"
+ "text": "攻击提升25%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -2055,7 +2055,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001313",
- "text": "防御提升25%"
+ "text": "防御提升25%。"
},
"BuffType": 2,
"EffectArgu": [
@@ -2086,7 +2086,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001314",
- "text": "速度提升20%"
+ "text": "速度提升20%。"
},
"BuffType": 3,
"EffectArgu": [
@@ -2113,11 +2113,11 @@
"Id": 390001315,
"Name": {
"key": "skill_skill_buff_Name_390001315",
- "text": "[color=#c84a32]队长技-暴击提升[/color] "
+ "text": "[color=#e5621b]队长技-暴击提升[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001315",
- "text": "暴击提升25%"
+ "text": "暴击提升25%。"
},
"BuffType": 4,
"EffectArgu": [
@@ -2148,7 +2148,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001316",
- "text": "命中提升30%"
+ "text": "命中提升30%。"
},
"BuffType": 25,
"EffectArgu": [
@@ -2179,7 +2179,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001317",
- "text": "抵抗提升30%"
+ "text": "抵抗提升30%。"
},
"BuffType": 26,
"EffectArgu": [
@@ -2210,7 +2210,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001321",
- "text": "生命提升30%"
+ "text": "生命提升30%。"
},
"BuffType": 24,
"EffectArgu": [
@@ -2241,7 +2241,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001322",
- "text": "攻击提升30%"
+ "text": "攻击提升30%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -2272,7 +2272,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001323",
- "text": "防御提升30%"
+ "text": "防御提升30%。"
},
"BuffType": 2,
"EffectArgu": [
@@ -2303,7 +2303,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001324",
- "text": "速度提升25%"
+ "text": "速度提升25%。"
},
"BuffType": 3,
"EffectArgu": [
@@ -2334,7 +2334,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001325",
- "text": "暴击提升30%"
+ "text": "暴击提升30%。"
},
"BuffType": 4,
"EffectArgu": [
@@ -2365,7 +2365,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001326",
- "text": "命中提升40%"
+ "text": "命中提升40%。"
},
"BuffType": 25,
"EffectArgu": [
@@ -2396,7 +2396,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001327",
- "text": "抵抗提升40%"
+ "text": "抵抗提升40%。"
},
"BuffType": 26,
"EffectArgu": [
@@ -2427,7 +2427,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001328",
- "text": "防御提升40%"
+ "text": "防御提升40%。"
},
"BuffType": 2,
"EffectArgu": [
@@ -2458,7 +2458,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001329",
- "text": "防御提升24%"
+ "text": "防御提升24%。"
},
"BuffType": 2,
"EffectArgu": [
@@ -2489,7 +2489,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001330",
- "text": "防御提升18%"
+ "text": "防御提升18%。"
},
"BuffType": 2,
"EffectArgu": [
@@ -2520,7 +2520,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001331",
- "text": "攻击提升40%"
+ "text": "攻击提升40%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -2551,7 +2551,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001332",
- "text": "攻击提升24%"
+ "text": "攻击提升24%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -2582,7 +2582,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001333",
- "text": "攻击提升18%"
+ "text": "攻击提升18%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -2609,11 +2609,11 @@
"Id": 390001401,
"Name": {
"key": "skill_skill_buff_Name_390001401",
- "text": "[color=#c84a32]中毒[/color] "
+ "text": "[color=#e5621b]中毒[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001401",
- "text": "回合开始时受到伤害，伤害为最大生命值4%"
+ "text": "回合开始时受到伤害，伤害为最大生命值4%。"
},
"BuffType": 31,
"EffectArgu": [
@@ -2647,7 +2647,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001402",
- "text": "自身每损失10%最大生命值，伤害增加5%"
+ "text": "自身每损失10%最大生命值，伤害增加5%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -2677,7 +2677,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001403",
- "text": "目标防御比自身低时，自身伤害提升，每1%差值提供1%额外伤害，最高40%"
+ "text": "目标防御比自身低时，自身伤害提升，每1%差值提供1%额外伤害，最高40%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -2703,11 +2703,11 @@
"Id": 390001404,
"Name": {
"key": "skill_skill_buff_Name_390001404",
- "text": "[color=#c84a32]流血[/color] "
+ "text": "[color=#e5621b]流血[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001404",
- "text": "回合开始时受到伤害，附加者攻击力50%"
+ "text": "回合开始时受到伤害，附加者攻击力50%。"
},
"BuffType": 73,
"EffectArgu": [
@@ -2739,7 +2739,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001405",
- "text": "自身每损失10%的生命，伤害增加6%"
+ "text": "自身每损失10%的生命，伤害增加6%。"
},
"BuffType": 41,
"EffectArgu": [
@@ -2766,11 +2766,11 @@
"Id": 390001406,
"Name": {
"key": "skill_skill_buff_Name_390001406",
- "text": "[color=#c84a32]最大生命值上限下降[/color] "
+ "text": "[color=#e5621b]最大生命值上限下降[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001406",
- "text": "最大生命值上限下降"
+ "text": "最大生命值上限下降。"
},
"BuffType": 40,
"EffectArgu": [
@@ -2801,7 +2801,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001407",
- "text": "伤害提升50%"
+ "text": "伤害提升50%。"
},
"BuffType": 30,
"EffectArgu": [
@@ -2832,7 +2832,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001408",
- "text": "自身每损失10%的生命，伤害增加5%"
+ "text": "自身每损失10%的生命，伤害增加5%。"
},
"BuffType": 41,
"EffectArgu": [
@@ -2863,7 +2863,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001409",
- "text": "可以根据自身增益BUFF数量提高3技能的伤害，自身每一个增益BUFF提高10%的伤害"
+ "text": "可以根据自身增益BUFF数量提高3技能的伤害，自身每一个增益BUFF提高10%的伤害。"
},
"BuffType": 48,
"EffectArgu": [
@@ -2893,7 +2893,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001410",
- "text": "伤害提升100%"
+ "text": "伤害提升100%。"
},
"BuffType": 30,
"EffectArgu": [
@@ -2924,7 +2924,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001411",
- "text": "伤害提升100%"
+ "text": "伤害提升100%。"
},
"BuffType": 30,
"EffectArgu": [
@@ -2955,7 +2955,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001412",
- "text": "敌方血量伤害越低，此次伤害越高"
+ "text": "敌方血量伤害越低，此次伤害越高。"
},
"BuffType": 52,
"EffectArgu": [
@@ -2985,7 +2985,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001413",
- "text": "给自身添加一层受击BUFF 用于检测受击次数"
+ "text": "给自身添加一层受击BUFF 用于检测受击次数。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -3013,7 +3013,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001414",
- "text": "根据敌方数量多少增加伤害"
+ "text": "根据敌方数量多少增加伤害。"
},
"BuffType": 30,
"EffectArgu": [
@@ -3043,7 +3043,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001415",
- "text": "受到伤害降低"
+ "text": "受到伤害降低。"
},
"BuffType": 72,
"EffectArgu": [
@@ -3073,7 +3073,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001416",
- "text": "单次受到的伤害不会超过自身生命值的35%"
+ "text": "单次受到的伤害不会超过自身生命值的35%。"
},
"BuffType": 0,
"EffectArgu": [
@@ -3103,7 +3103,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001418",
- "text": "消耗自身20%HP"
+ "text": "消耗自身20%HP。"
},
"BuffType": 27,
"EffectArgu": [
@@ -3133,7 +3133,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001419",
- "text": "无视100%防御"
+ "text": "无视100%防御。"
},
"BuffType": 42,
"EffectArgu": [
@@ -3163,7 +3163,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001420",
- "text": "护盾量为最大生命值15%"
+ "text": "护盾量为最大生命值15%。"
},
"BuffType": 21,
"EffectArgu": [
@@ -3195,7 +3195,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001421",
- "text": "免疫速度下降类效果"
+ "text": "免疫速度下降类效果。"
},
"BuffType": 50,
"EffectArgu": [],
@@ -3223,7 +3223,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001422",
- "text": "每次受到的伤害不会超过自身最大生命值的35%"
+ "text": "每次受到的伤害不会超过自身最大生命值的35%。"
},
"BuffType": 49,
"EffectArgu": [
@@ -3253,7 +3253,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001423",
- "text": "造成伤害提升10%"
+ "text": "造成伤害提升10%。"
},
"BuffType": 30,
"EffectArgu": [
@@ -3284,7 +3284,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001424",
- "text": "为1个友方附加2回合[color=#37d8a9]生死簿[/color] 记录当前生命值，2 回合后，回溯其生命值至记录值。"
+ "text": "为1个友方附加2回合[color=#37d8a9]生死簿[/color] 记录当前生命值，2 回合后，回溯其生命值至记录值。。"
},
"BuffType": 57,
"EffectArgu": [],
@@ -3308,11 +3308,11 @@
"Id": 390001425,
"Name": {
"key": "skill_skill_buff_Name_390001425",
- "text": "[color=#c84a32]最大生命值上限下降[/color] "
+ "text": "[color=#e5621b]最大生命值上限下降[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001425",
- "text": "最大生命值上限下降"
+ "text": "最大生命值上限下降。"
},
"BuffType": 40,
"EffectArgu": [
@@ -3343,7 +3343,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001426",
- "text": "状态消失时，状态携带者受到效果附加伤害，伤害为状态存在时间内携带者所受伤害总和20%"
+ "text": "状态消失时，状态携带者受到效果附加伤害，伤害为状态存在时间内携带者所受伤害总和20%。"
},
"BuffType": 56,
"EffectArgu": [
@@ -3373,7 +3373,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001427",
- "text": "优先攻击不重复的敌方，对重复目标的伤害依次衰减15%"
+ "text": "优先攻击不重复的敌方，对重复目标的伤害依次衰减15%。"
},
"BuffType": 23,
"EffectArgu": [
@@ -3403,7 +3403,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001428",
- "text": "目标每损失最大生命值10%，治疗量增加10%"
+ "text": "目标每损失最大生命值10%，治疗量增加10%。"
},
"BuffType": 53,
"EffectArgu": [
@@ -3434,7 +3434,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001429",
- "text": "每吸收1个减益状态可增加我方全体5%的行动值"
+ "text": "每吸收1个减益状态可增加我方全体5%的行动值。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -3458,11 +3458,11 @@
"Id": 390001430,
"Name": {
"key": "skill_skill_buff_Name_390001430",
- "text": "[color=#c84a32]流血[/color] "
+ "text": "[color=#e5621b]流血[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001430",
- "text": "回合开始时受到伤害，伤害为附加者攻击力50%"
+ "text": "回合开始时受到伤害，伤害为附加者攻击力50%。"
},
"BuffType": 73,
"EffectArgu": [
@@ -3494,7 +3494,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001431",
- "text": "下一次攻击暴击率提升100%"
+ "text": "下一次攻击暴击率提升100%。"
},
"BuffType": 4,
"EffectArgu": [
@@ -3520,11 +3520,11 @@
"Id": 390001432,
"Name": {
"key": "skill_skill_buff_Name_390001432",
- "text": "[color=#c84a32]魔之秘语[/color] "
+ "text": "[color=#e5621b]魔之秘语[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001432",
- "text": "携带者受到伤害时，对攻击者反弹所受伤害60%的真实伤害;携带者回合开始时净化其1个减益。"
+ "text": "携带者受到伤害时，对攻击者反弹所受伤害60%的真实伤害;携带者回合开始时净化其1个减益。。"
},
"BuffType": 62,
"EffectArgu": [],
@@ -3552,7 +3552,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001433",
- "text": "无法被附加[color=#c84a32]中毒[/color] 状态，受击时有概率为攻击者附加1回合[color=#c84a32]中毒[/color] "
+ "text": "无法被附加[color=#e5621b]中毒[/color] 状态，受击时有概率为攻击者附加1回合[color=#e5621b]中毒[/color] 。"
},
"BuffType": 70,
"EffectArgu": [
@@ -3582,7 +3582,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001434",
- "text": "护盾量为最大生命值22%"
+ "text": "护盾量为最大生命值22%。"
},
"BuffType": 21,
"EffectArgu": [
@@ -3614,7 +3614,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001435",
- "text": "每层提高30点速度"
+ "text": "每层提高30点速度。"
},
"BuffType": 63,
"EffectArgu": [
@@ -3645,7 +3645,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001436",
- "text": "受到的伤害降低50%"
+ "text": "受到的伤害降低50%。"
},
"BuffType": 23,
"EffectArgu": [
@@ -3676,7 +3676,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001437",
- "text": "攻击提升2%"
+ "text": "攻击提升2%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -3707,7 +3707,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001438",
- "text": "防御提升2%"
+ "text": "防御提升2%。"
},
"BuffType": 2,
"EffectArgu": [
@@ -3738,7 +3738,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001439",
- "text": "暴击率提升2%"
+ "text": "暴击率提升2%。"
},
"BuffType": 4,
"EffectArgu": [
@@ -3769,7 +3769,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001440",
- "text": "受到暴击概率降低2%"
+ "text": "受到暴击概率降低2%。"
},
"BuffType": 5,
"EffectArgu": [],
@@ -3793,11 +3793,11 @@
"Id": 390001441,
"Name": {
"key": "skill_skill_buff_Name_390001441",
- "text": "[color=#c84a32]命中提升[/color] "
+ "text": "[color=#e5621b]命中提升[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001441",
- "text": "命中提升2%"
+ "text": "命中提升2%。"
},
"BuffType": 25,
"EffectArgu": [
@@ -3824,11 +3824,11 @@
"Id": 390001442,
"Name": {
"key": "skill_skill_buff_Name_390001442",
- "text": "[color=#c84a32]抵抗提升[/color] "
+ "text": "[color=#e5621b]抵抗提升[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001442",
- "text": "抵抗提升2%"
+ "text": "抵抗提升2%。"
},
"BuffType": 26,
"EffectArgu": [
@@ -3859,7 +3859,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001443",
- "text": "减益效果%+10%伤害"
+ "text": "减益效果%+10%伤害。"
},
"BuffType": 58,
"EffectArgu": [
@@ -3886,11 +3886,11 @@
"Id": 390001444,
"Name": {
"key": "skill_skill_buff_Name_390001444",
- "text": "[color=#c84a32]灾祸冰原[/color] "
+ "text": "[color=#e5621b]灾祸冰原[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001444",
- "text": "速度降低100%，无法进行任何行动，无法驱散"
+ "text": "速度降低100%，无法进行任何行动，无法驱散。"
},
"BuffType": 55,
"EffectArgu": [
@@ -3917,11 +3917,11 @@
"Id": 390001445,
"Name": {
"key": "skill_skill_buff_Name_390001445",
- "text": "[color=#c84a32]无法复活[/color] "
+ "text": "[color=#e5621b]无法复活[/color] "
},
"Desc": {
"key": "skill_skill_buff_Desc_390001445",
- "text": "无法复活"
+ "text": "无法复活。"
},
"BuffType": 68,
"EffectArgu": [],
@@ -3949,7 +3949,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001446",
- "text": "造成伤害提升50%"
+ "text": "造成伤害提升50%。"
},
"BuffType": 30,
"EffectArgu": [
@@ -3980,7 +3980,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001447",
- "text": "受击计数"
+ "text": "受击计数。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -4008,7 +4008,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001448",
- "text": "解除自身所有减益效果，自身造成的伤害提升100%，附加2回合[color=#37d8a9]速度提升[/color] "
+ "text": "解除自身所有减益效果，自身造成的伤害提升100%，附加2回合[color=#37d8a9]速度提升[/color] 。"
},
"BuffType": 0,
"EffectArgu": [],
@@ -4036,7 +4036,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001449",
- "text": "治疗造成伤害的35%"
+ "text": "治疗造成伤害的35%。"
},
"BuffType": 1,
"EffectArgu": [
@@ -4067,7 +4067,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001450",
- "text": "每层增加30%暴击伤害"
+ "text": "每层增加30%暴击伤害。"
},
"BuffType": 1,
"EffectArgu": [
@@ -4098,7 +4098,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001451",
- "text": "无法被附加任何控制效果"
+ "text": "无法被附加任何控制效果。"
},
"BuffType": 37,
"EffectArgu": [
diff --git a/bin/json/game_taskactivereward.json b/bin/json/game_taskactivereward.json
index db71032fc..978315ff4 100644
--- a/bin/json/game_taskactivereward.json
+++ b/bin/json/game_taskactivereward.json
@@ -9,6 +9,11 @@
"t": "diamond",
"n": 150
},
+ {
+ "a": "item",
+ "t": "14020000",
+ "n": 50
+ },
{
"a": "attr",
"t": "gold",
@@ -28,6 +33,11 @@
"t": "diamond",
"n": 150
},
+ {
+ "a": "item",
+ "t": "14020000",
+ "n": 100
+ },
{
"a": "attr",
"t": "gold",
@@ -47,6 +57,11 @@
"t": "diamond",
"n": 150
},
+ {
+ "a": "item",
+ "t": "14020000",
+ "n": 100
+ },
{
"a": "attr",
"t": "gold",
@@ -66,6 +81,11 @@
"t": "diamond",
"n": 150
},
+ {
+ "a": "item",
+ "t": "14020000",
+ "n": 100
+ },
{
"a": "attr",
"t": "gold",
diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json
index 0ed5e69eb..96db0fc8a 100644
--- a/bin/json/game_taskround.json
+++ b/bin/json/game_taskround.json
@@ -5,7 +5,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_1",
- "text": "本周竞技场挑战{1}次"
+ "text": "本周竞技场挑战{0}次"
},
"type_id": 13000001,
"active": 10,
@@ -31,7 +31,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_2",
- "text": "本周竞技场挑战{1}次"
+ "text": "本周竞技场挑战{0}次"
},
"type_id": 13000002,
"active": 10,
@@ -57,7 +57,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_3",
- "text": "本周竞技场挑战{1}次"
+ "text": "本周竞技场挑战{0}次"
},
"type_id": 13000003,
"active": 10,
@@ -83,7 +83,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_4",
- "text": "本周竞技场胜利{1}次"
+ "text": "本周竞技场胜利{0}次"
},
"type_id": 13000004,
"active": 10,
@@ -109,7 +109,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_5",
- "text": "本周竞技场胜利{1}次"
+ "text": "本周竞技场胜利{0}次"
},
"type_id": 13000005,
"active": 10,
@@ -135,7 +135,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_6",
- "text": "本周竞技场胜利{1}次"
+ "text": "本周竞技场胜利{0}次"
},
"type_id": 13000006,
"active": 10,
@@ -161,7 +161,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_7",
- "text": "本周累计经验副本消耗{1}体力"
+ "text": "本周累计经验副本消耗{0}体力"
},
"type_id": 13000006,
"active": 10,
@@ -187,7 +187,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_8",
- "text": "本周累计经验副本消耗{1}体力"
+ "text": "本周累计经验副本消耗{0}体力"
},
"type_id": 13000006,
"active": 10,
@@ -213,7 +213,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_9",
- "text": "本周累计经验副本消耗{1}体力"
+ "text": "本周累计经验副本消耗{0}体力"
},
"type_id": 13000006,
"active": 10,
@@ -239,7 +239,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_10",
- "text": "本周累计消耗{1}点金币"
+ "text": "本周累计消耗{0}点金币"
},
"type_id": 13000006,
"active": 10,
@@ -265,7 +265,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_11",
- "text": "本周累计消耗{1}点金币"
+ "text": "本周累计消耗{0}点金币"
},
"type_id": 13000006,
"active": 10,
@@ -291,7 +291,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_12",
- "text": "本周累计消耗{1}点金币"
+ "text": "本周累计消耗{0}点金币"
},
"type_id": 13000006,
"active": 10,
@@ -317,7 +317,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_13",
- "text": "本周累计装备副本消耗{1}体力"
+ "text": "本周累计装备副本消耗{0}体力"
},
"type_id": 13000006,
"active": 10,
@@ -343,7 +343,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_14",
- "text": "本周累计装备副本消耗{1}体力"
+ "text": "本周累计装备副本消耗{0}体力"
},
"type_id": 13000006,
"active": 10,
@@ -369,7 +369,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_15",
- "text": "本周累计装备副本消耗{1}体力"
+ "text": "本周累计装备副本消耗{0}体力"
},
"type_id": 13000006,
"active": 10,
@@ -395,7 +395,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_16",
- "text": "本周累计回响副本消耗{1}体力"
+ "text": "本周累计回响副本消耗{0}体力"
},
"type_id": 13000006,
"active": 10,
@@ -421,7 +421,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_17",
- "text": "本周累计回响副本消耗{1}体力"
+ "text": "本周累计回响副本消耗{0}体力"
},
"type_id": 13000006,
"active": 10,
@@ -447,7 +447,7 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_18",
- "text": "本周累计回响副本消耗{1}体力"
+ "text": "本周累计回响副本消耗{0}体力"
},
"type_id": 13000006,
"active": 10,
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 12770d554..9c7390af8 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -131,7 +131,7 @@
},
"npctxt": {
"key": "worldtask_world_task_npctxt_4",
- "text": "击退豺狼小怪小怪"
+ "text": "击退豺狼小怪"
},
"npc": 10020,
"completetask": [
diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go
index 9607d0188..90e7a2493 100644
--- a/modules/hero/api_drawCard.go
+++ b/modules/hero/api_drawCard.go
@@ -1,14 +1,12 @@
package hero
import (
- "crypto/rand"
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
- "math/big"
)
-func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) {
+func (this *apiComp) DrawCardV2Check(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) {
if req.DrawType < 0 && (req.DrawCount == 1 || req.DrawCount == 10) { // 只能是单抽或10抽
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
@@ -19,254 +17,163 @@ func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCa
}
//抽卡
-func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) {
+func (this *apiComp) DrawCardV2(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) {
var (
- szCards []string // 最终抽到的卡牌
- drawCount int32 // 抽卡次数
- szStar []int32 //星级
- costRes []*cfg.Gameatn // 消耗
- star4Max int32 // 10连抽最大4星数量
- star5Max int32 // 10连抽最大5星数量
- cfgDraw *cfg.GameGlobalData
- costAtn *cfg.Gameatn
+ szCards []string // 最终抽到的卡牌
+ drawCount int32 // 抽卡次数
+ szStar []int32 //星级
+ costRes []*cfg.Gameatn // 消耗
+ star4Count int32 // 10连抽4星数量
+ star5Count int32 // 10连抽5星数量
+ cfgGlobal *cfg.GameGlobalData // 全局配置
heroRecord *pb.DBHeroRecord
- pool string // 当前抽对应的卡池
atno []*pb.UserAtno // 最终获得的资源
strPool []string // 10连跨多个卡池情况
update map[string]interface{}
normalDraw bool // 是否是普通抽
+ drawConf *cfg.GameDrawPoolData
+ err error
+
+ IsBaodiPool bool // 是否是保底卡池
+ appointmap map[int32]string // 指定次数抽卡到指定卡池
)
- update = make(map[string]interface{})
- cfgDraw = this.module.ModuleTools.GetGlobalConf() // 读取抽卡配置文件
- if cfgDraw == nil {
- return
- }
- if errdata = this.DrawCardCheck(session, req); errdata != nil {
- return
- }
+ appointmap = make(map[int32]string)
szCards = make([]string, 0)
-
heroRecord, _ = this.module.modelRecord.GetHeroRecord(session.GetUserId())
- drawCount = heroRecord.Drawcount
-
- if req.DrawType == 0 { // 普通卡池抽卡
- normalDraw = true
- // 获取普通抽卡池
- if req.DrawCount == 1 {
- costAtn = cfgDraw.BasePoolCost
- } else {
- costAtn = cfgDraw.BasePool10cost
+ if heroRecord.Baodi4 == nil {
+ heroRecord.Baodi4 = make(map[int32]int32)
+ }
+ if heroRecord.Baodi5 == nil {
+ heroRecord.Baodi5 = make(map[int32]int32)
+ }
+ if heroRecord.Count == nil {
+ heroRecord.Count = make(map[int32]int32)
+ }
+ // 准备数据
+ /////////////////////////////////////
+ drawConf, err = this.module.configure.GetHeroDrawConfigByType(req.DrawType) // 获取新的抽卡配置
+ if err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ Message: err.Error(),
}
- costRes = append(costRes, costAtn)
+ return
+ }
+ for _, v := range drawConf.RecruitmentType {
+ appointmap[v.K] = v.S // 指定次抽数据
+ }
+
+ ////////////////////////////////////////////////////////
+
+ update = make(map[string]interface{})
+ cfgGlobal = this.module.ModuleTools.GetGlobalConf() // 读取抽卡配置文件
+ if cfgGlobal == nil {
+ return
+ }
+ if errdata = this.DrawCardV2Check(session, req); errdata != nil {
+ return
+ }
+
+ drawCount = heroRecord.Count[req.DrawType] // 获取当前阵容抽卡次数
+ if true { // 普通卡池抽卡
+ ////// 获取消耗 star
+ if req.DrawCount == 1 {
+ costRes = drawConf.ConsumeA // 单抽消耗
+ } else {
+ costRes = drawConf.ConsumeB // 十连消耗
+ }
+
if errdata = this.module.CheckRes(session, costRes); errdata != nil { // 消耗数量不足直接返回
return
}
-
- for i := 0; i < int(req.DrawCount); i++ {
- drawCount += 1
- pool = this.module.modelHero.CheckPool(drawCount, cfgDraw)
-
- strPool = append(strPool, pool)
- ret := this.module.CheckCondition(session.GetUserId())
- if ret == true { // 命中插入5星英雄
- szStar = append(szStar, 5)
- heroRecord.Star5 = 0 // 重置保底
- star5Max++ // 记录当前 5星数量
+ // 校验是否达到保底卡池
+ if drawConf.Protect >= drawCount {
+ IsBaodiPool = true
+ }
+ ///// 获取消耗 end
+ for i := 1; i <= int(req.DrawCount); i++ { // 一张一张的抽
+ drawCount++
+ if v, ok := appointmap[drawCount]; ok { // 优先校验是否是指定抽
+ strPool = append(strPool, v) //找到了
continue
}
- // 3,4,5 星权重
- starWeight := []int32{cfgDraw.BasePoolStar3, cfgDraw.BasePoolStar4, cfgDraw.BasePoolStar5}
+ starWeight := []int32{drawConf.Star3w, drawConf.Star4w, drawConf.Star5w} // 随机获取三星
+ if drawConf.Permission != -1 && heroRecord.Baodi5[req.DrawType] > 0 { // 橙权递增
+ starWeight[2] += this.module.configure.GetHeroDrawWeightConfigById(drawConf.Permission, heroRecord.Baodi5[req.DrawType])
+ }
starIndex := comm.GetRandW(starWeight) // 3 4 5 星索引
-
- // 特殊规则 DrawCard_5StarsInRange 第2-30次抽奖必出一个5星英雄（普通卡池）
- inRangeConf := this.module.ModuleTools.GetGlobalConf().DrawCard5StarsInRange
- if len(inRangeConf) == 3 {
- iStart := inRangeConf[0] // 抽卡开始
- iEnd := inRangeConf[1] // 抽卡结束
- star := inRangeConf[2]
- if star >= 3 { // 保底必须三星+
- if heroRecord.Inevitable == 0 && heroRecord.Drawcount > iStart && heroRecord.Drawcount < iEnd && iEnd >= iStart {
- n, _ := rand.Int(rand.Reader, big.NewInt(int64(iEnd-iStart)))
- if n.Int64() < 1 { // 抽中
- starIndex = star - 3
- heroRecord.Inevitable = heroRecord.Drawcount
- update["inevitable"] = heroRecord.Drawcount
- szStar = append(szStar, star)
- if star == 4 {
- heroRecord.Star4 = 0
- star4Max++
- } else if star == 5 {
- star5Max++
- heroRecord.Star5 = 0
- }
- continue
- }
- }
- // 保底情况
- if heroRecord.Drawcount == iEnd && heroRecord.Inevitable == 0 {
- starIndex = star - 3
- heroRecord.Inevitable = heroRecord.Drawcount
- update["inevitable"] = heroRecord.Drawcount
- szStar = append(szStar, star)
- if star == 4 {
- heroRecord.Star4 = 0
- star4Max++
- } else if star == 5 {
- star5Max++
- heroRecord.Star5 = 0
- }
- continue
- }
+ if IsBaodiPool {
+ if starIndex == 0 {
+ strPool = append(strPool, drawConf.P3pool)
+ } else if starIndex == 1 {
+ star4Count++
+ heroRecord.Baodi4[req.DrawType] = 0
+ strPool = append(strPool, drawConf.P4pool)
+ } else if starIndex == 2 {
+ star5Count++
+ heroRecord.Baodi5[req.DrawType] = 0
+ strPool = append(strPool, drawConf.P5pool)
}
- }
- inRangeConf1 := this.module.ModuleTools.GetGlobalConf().DrawCard5StarsInRange1
- if len(inRangeConf1) == 3 {
- iStart := inRangeConf1[0] // 抽卡开始
- iEnd := inRangeConf1[1] // 抽卡结束
- star := inRangeConf1[2]
- if star >= 3 { // 保底必须三星+
- if heroRecord.Inevitable == 0 && heroRecord.Drawcount > iStart && heroRecord.Drawcount < iEnd && iEnd >= iStart {
- n, _ := rand.Int(rand.Reader, big.NewInt(int64(iEnd-iStart)))
- if n.Int64() < 1 { // 抽中
- starIndex = star - 3
- heroRecord.Inevitable = heroRecord.Drawcount
- update["inevitable1"] = heroRecord.Drawcount
- szStar = append(szStar, star)
- if star == 4 {
- heroRecord.Star4 = 0
- star4Max++
- } else if star == 5 {
- star5Max++
- heroRecord.Star5 = 0
- }
- // 修改卡池
- newPoll := this.module.ModuleTools.GetGlobalConf().DrawCard5StarsInRange1Pool
- if newPoll != "" {
- strPool[len(strPool)-1] = newPoll
- }
- continue
- }
- }
- // 保底情况
- if heroRecord.Drawcount == iEnd && heroRecord.Inevitable == 0 {
- starIndex = star - 3
- heroRecord.Inevitable1 = heroRecord.Drawcount
- update["inevitable1"] = heroRecord.Drawcount
- szStar = append(szStar, star)
- if star == 4 {
- heroRecord.Star4 = 0
- star4Max++
- } else if star == 5 {
- star5Max++
- heroRecord.Star5 = 0
- }
- // 修改卡池
- newPoll := this.module.ModuleTools.GetGlobalConf().DrawCard5StarsInRange1Pool
- if newPoll != "" {
- strPool[len(strPool)-1] = newPoll
- }
- continue
- }
- }
- }
- heroRecord.Star4++ // 4星保底数量+1
- heroRecord.Star5++ // 5星保底数量+1
- if starIndex == 1 {
- heroRecord.Star4 = 0
- star4Max++
- } else if starIndex == 2 {
- star5Max++
- heroRecord.Star5 = 0
- }
- if star4Max >= cfgDraw.Draw10Star4Max || star5Max >= cfgDraw.Draw10Star5Max { // 达到10连抽最大(4,5星)数量 直接给三星
- starIndex = 0
} else {
- // 普通卡池保底
- if cfgDraw.DrawFloorStar4 <= heroRecord.Star4 {
- heroRecord.Star4 = 0
- starIndex = 1
- }
- if cfgDraw.DrawFloorStar5 <= heroRecord.Star5 {
- heroRecord.Star5 = 0
- starIndex = 2
+ if starIndex == 0 {
+ strPool = append(strPool, drawConf.N3pool)
+ } else if starIndex == 1 {
+ star4Count++
+ heroRecord.Baodi4[req.DrawType] = 0
+ strPool = append(strPool, drawConf.N4pool)
+ } else if starIndex == 2 {
+ star5Count++
+ heroRecord.Baodi5[req.DrawType] = 0
+ strPool = append(strPool, drawConf.N5pool)
}
}
-
- szStar = append(szStar, starIndex+3)
- if len(szStar) >= int(req.DrawCount) {
- break
+ // 判断是否必出5星
+ if heroRecord.Baodi5[req.DrawType] >= drawConf.Baidi5 {
+ heroRecord.Baodi5[req.DrawType] = 0
+ star5Count++
+ if IsBaodiPool {
+ strPool[len(strPool)-1] = drawConf.P5pool
+ } else {
+ strPool[len(strPool)-1] = drawConf.N5pool
+ }
+ continue
}
- }
- } else { // 所有阵营抽卡都走这里
- drawCount += req.DrawCount
- if req.DrawCount == 1 {
- switch req.DrawType {
- case 1:
- pool = cfgDraw.Camp1Pool1
-
- costAtn = cfgDraw.Camp1PoolCost
-
- case 2:
- pool = cfgDraw.Camp2Pool1
- costAtn = cfgDraw.Camp2PoolCost
- case 3:
- pool = cfgDraw.Camp3Pool1
- costAtn = cfgDraw.Camp3PoolCost
- case 4:
- pool = cfgDraw.Camp4Pool1
- costAtn = cfgDraw.Camp4PoolCost
+ // 判断是否必出4星
+ if heroRecord.Baodi4[req.DrawType] >= drawConf.Baodi4 {
+ heroRecord.Baodi4[req.DrawType] = 0
+ star4Count++
+ if IsBaodiPool {
+ strPool[len(strPool)-1] = drawConf.P4pool
+ } else {
+ strPool[len(strPool)-1] = drawConf.N4pool
+ }
+ continue
}
- strPool = append(strPool, pool)
- } else {
- costAtn = cfgDraw.Camp1PoolCost
- switch req.DrawType {
- case 1:
- pool = cfgDraw.Camp1Pool1
- costAtn = cfgDraw.Camp1Pool10cost
-
- case 2:
- pool = cfgDraw.Camp2Pool1
- costAtn = cfgDraw.Camp2Pool10cost
- case 3:
- pool = cfgDraw.Camp3Pool1
- costAtn = cfgDraw.Camp3Pool10cost
- case 4:
- pool = cfgDraw.Camp4Pool1
- costAtn = cfgDraw.Camp4Pool10cost
- }
- for i := 0; i < int(req.DrawCount); i++ {
- strPool = append(strPool, pool)
- }
- }
-
- costRes = append(costRes, costAtn)
-
- //阵营消耗
- if errdata = this.module.CheckRes(session, costRes); errdata != nil { // 消耗数量不足直接返回
- return
- }
- for {
- starWeight := []int32{cfgDraw.CampPoolStar3, cfgDraw.CampPoolStar4, cfgDraw.CampPoolStar5}
-
- starIndex := comm.GetRandW(starWeight)
- if starIndex == 1 {
- star4Max++
- } else if starIndex == 2 {
- star5Max++
- }
- if star4Max >= cfgDraw.Draw10Star4Max || star5Max >= cfgDraw.Draw10Star5Max {
- starIndex = 0
- }
- szStar = append(szStar, starIndex)
- if len(szStar) >= int(req.DrawCount) {
- break
+ heroRecord.Baodi5[req.DrawType]++
+ heroRecord.Baodi4[req.DrawType]++
+ if req.DrawType == 10 {
+ if star4Count >= cfgGlobal.Draw10Star4Max { // 10连抽最大4星数量
+ if IsBaodiPool {
+ strPool[len(strPool)-1] = drawConf.P3pool
+ } else {
+ strPool[len(strPool)-1] = drawConf.N3pool
+ }
+ }
+ if star5Count >= cfgGlobal.Draw10Star5Max { // 10连抽最大5星数量
+ if IsBaodiPool {
+ strPool[len(strPool)-1] = drawConf.P3pool
+ } else {
+ strPool[len(strPool)-1] = drawConf.N3pool
+ }
+ }
}
}
}
- for index, star := range szStar {
-
- _data, err := this.module.configure.GetPollByType(strPool[index])
+ // 通过卡池获得最终的英雄
+ for _, v := range strPool {
+ card, err := this.module.configure.GetHeroByPool(v)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
@@ -275,35 +182,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
}
return
}
- sz := make([]int32, 0)
- for _, v := range _data[int32(star)] {
- sz = append(sz, v.Weight)
- }
- randomIndex := comm.GetRandW(sz)
-
- if v, ok := _data[int32(star)]; ok {
- if int32(len(v)) > randomIndex {
- cardId := v[randomIndex].Id
- if star == 5 { // 抽出5星英雄后A次抽奖内不会再抽到5星英雄（普通卡池+阵营卡池）
- curDrawCount := drawCount - req.DrawCount
- if drawCount <= 10 { // 前10次不计算（连续抽卡最多连续出A个相同阵营的英雄）
- szCards = append(szCards, cardId)
- continue
- }
- newID := this.module.ContinuousRestriction(session.GetUserId(), cardId, curDrawCount+int32(index+1), strPool[index])
- szCards = append(szCards, newID)
- continue
- }
- szCards = append(szCards, cardId)
- // 普通卡池 最多连续出A个相同阵营的英雄
- if req.DrawType == 0 {
- newId := this.module.DrawCardContinuousRestrictionCamp(cardId, heroRecord.Race, sz, v)
- if cardId != newId {
- szCards[len(szCards)-1] = newId
- }
- }
- }
- }
+ szCards = append(szCards, card)
}
// 消耗道具
@@ -312,11 +191,12 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
}
heroRecord.Totalcount += req.DrawCount
heroRecord.Daycount += req.DrawCount
- update["star4"] = heroRecord.Star4
- update["star5"] = heroRecord.Star5
+
update["drawcount"] = drawCount
update["totalcount"] = heroRecord.Totalcount
update["daycount"] = heroRecord.Daycount
+ update["baodi4"] = heroRecord.Baodi4
+ update["baodi5"] = heroRecord.Baodi5
this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update)
rsp := &pb.HeroDrawCardResp{
Data: []*pb.AtnoData{},
@@ -343,6 +223,9 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
}
session.SendMsg(string(this.module.GetType()), DrawCard, rsp)
+ if req.DrawType == 0 {
+ normalDraw = true
+ }
// 任务统计
this.module.SendTaskMsg(session, szStar, req.DrawCount, normalDraw)
return
diff --git a/modules/hero/api_drawCardv2.go b/modules/hero/api_drawCardv2.go
deleted file mode 100644
index adc10190c..000000000
--- a/modules/hero/api_drawCardv2.go
+++ /dev/null
@@ -1,369 +0,0 @@
-package hero
-
-import (
- "crypto/rand"
- "go_dreamfactory/comm"
- "go_dreamfactory/pb"
- cfg "go_dreamfactory/sys/configure/structs"
- "math/big"
-)
-
-func (this *apiComp) DrawCardV2Check(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) {
- if req.DrawType < 0 && (req.DrawCount == 1 || req.DrawCount == 10) { // 只能是单抽或10抽
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ReqParameterError,
- Title: pb.ErrorCode_ReqParameterError.ToString(),
- }
- }
- return
-}
-
-//抽卡
-func (this *apiComp) DrawCardV2(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) {
- var (
- szCards []string // 最终抽到的卡牌
- drawCount int32 // 抽卡次数
- szStar []int32 //星级
- costRes []*cfg.Gameatn // 消耗
- star4Max int32 // 10连抽最大4星数量
- star5Max int32 // 10连抽最大5星数量
- cfgDraw *cfg.GameGlobalData
- heroRecord *pb.DBHeroRecord
- pool string // 当前抽对应的卡池
- atno []*pb.UserAtno // 最终获得的资源
- strPool []string // 10连跨多个卡池情况
- update map[string]interface{}
- normalDraw bool // 是否是普通抽
- drawConf *cfg.GameDrawPoolData
- err error
-
- appointmap map[int32]string // 指定次数抽卡到指定卡池
- )
- appointmap = make(map[int32]string)
- szCards = make([]string, 0)
- heroRecord, _ = this.module.modelRecord.GetHeroRecord(session.GetUserId())
- if heroRecord.Baodi4 == nil {
- heroRecord.Baodi4 = make(map[int32]int32)
- }
- if heroRecord.Baodi5 == nil {
- heroRecord.Baodi5 = make(map[int32]int32)
- }
- if heroRecord.Count == nil {
- heroRecord.Count = make(map[int32]int32)
- }
- // 准备数据
- /////////////////////////////////////
- drawConf, err = this.module.configure.GetHeroDrawConfigByType(req.DrawType) // 获取新的抽卡配置
- if err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ReqParameterError,
- Title: pb.ErrorCode_ReqParameterError.ToString(),
- Message: err.Error(),
- }
- return
- }
- for _, v := range drawConf.RecruitmentType {
- appointmap[v.K] = v.S // 指定次抽数据
- }
-
- ////////////////////////////////////////////////////////
-
- update = make(map[string]interface{})
- cfgDraw = this.module.ModuleTools.GetGlobalConf() // 读取抽卡配置文件
- if cfgDraw == nil {
- return
- }
- if errdata = this.DrawCardV2Check(session, req); errdata != nil {
- return
- }
-
- drawCount = heroRecord.Count[req.DrawType] // 获取当前阵容抽卡次数
- if req.DrawType == 0 { // 普通卡池抽卡
- ////// 获取消耗 star
- if req.DrawCount == 1 {
- costRes = drawConf.ConsumeA // 单抽消耗
- } else {
- costRes = drawConf.ConsumeB // 十连消耗
- }
-
- if errdata = this.module.CheckRes(session, costRes); errdata != nil { // 消耗数量不足直接返回
- return
- }
- ///// 获取消耗 end
- for i := 1; i <= int(req.DrawCount); i++ { // 一张一张的抽
- drawCount++
- if v, ok := appointmap[drawCount]; ok { // 优先校验是否是指定抽
- strPool = append(strPool, v) //找到了
- continue
- }
- // 随机获取三星
- }
- } else {
-
- }
-
- if req.DrawType == 0 { // 普通卡池抽卡
- normalDraw = true
- // 获取普通抽卡池
- // if req.DrawCount == 1 {
- // costAtn = cfgDraw.BasePoolCost
- // } else {
- // costAtn = cfgDraw.BasePool10cost
- // }
- // if errdata = this.module.CheckRes(session, costRes); errdata != nil { // 消耗数量不足直接返回
- // return
- // }
-
- for i := 0; i < int(req.DrawCount); i++ {
- drawCount += 1
- pool = this.module.modelHero.CheckPool(drawCount, cfgDraw)
-
- strPool = append(strPool, pool)
- ret := this.module.CheckCondition(session.GetUserId())
- if ret == true { // 命中插入5星英雄
- szStar = append(szStar, 5)
- heroRecord.Star5 = 0 // 重置保底
- star5Max++ // 记录当前 5星数量
- continue
- }
- // 3,4,5 星权重
- starWeight := []int32{cfgDraw.BasePoolStar3, cfgDraw.BasePoolStar4, cfgDraw.BasePoolStar5}
-
- starIndex := comm.GetRandW(starWeight) // 3 4 5 星索引
-
- // 特殊规则 DrawCard_5StarsInRange 第2-30次抽奖必出一个5星英雄（普通卡池）
- inRangeConf := this.module.ModuleTools.GetGlobalConf().DrawCard5StarsInRange
- if len(inRangeConf) == 3 {
- iStart := inRangeConf[0] // 抽卡开始
- iEnd := inRangeConf[1] // 抽卡结束
- star := inRangeConf[2]
- if star >= 3 { // 保底必须三星+
- if heroRecord.Inevitable == 0 && heroRecord.Drawcount > iStart && heroRecord.Drawcount < iEnd && iEnd >= iStart {
- n, _ := rand.Int(rand.Reader, big.NewInt(int64(iEnd-iStart)))
- if n.Int64() < 1 { // 抽中
- starIndex = star - 3
- heroRecord.Inevitable = heroRecord.Drawcount
- update["inevitable"] = heroRecord.Drawcount
- szStar = append(szStar, star)
- if star == 4 {
- heroRecord.Star4 = 0
- star4Max++
- } else if star == 5 {
- star5Max++
- heroRecord.Star5 = 0
- }
- continue
- }
- }
- // 保底情况
- if heroRecord.Drawcount == iEnd && heroRecord.Inevitable == 0 {
- starIndex = star - 3
- heroRecord.Inevitable = heroRecord.Drawcount
- update["inevitable"] = heroRecord.Drawcount
- szStar = append(szStar, star)
- if star == 4 {
- heroRecord.Star4 = 0
- star4Max++
- } else if star == 5 {
- star5Max++
- heroRecord.Star5 = 0
- }
- continue
- }
- }
- }
- inRangeConf1 := this.module.ModuleTools.GetGlobalConf().DrawCard5StarsInRange1
- if len(inRangeConf1) == 3 {
- iStart := inRangeConf1[0] // 抽卡开始
- iEnd := inRangeConf1[1] // 抽卡结束
- star := inRangeConf1[2]
- if star >= 3 { // 保底必须三星+
- if heroRecord.Inevitable == 0 && heroRecord.Drawcount > iStart && heroRecord.Drawcount < iEnd && iEnd >= iStart {
- n, _ := rand.Int(rand.Reader, big.NewInt(int64(iEnd-iStart)))
- if n.Int64() < 1 { // 抽中
- starIndex = star - 3
- heroRecord.Inevitable = heroRecord.Drawcount
- update["inevitable1"] = heroRecord.Drawcount
- szStar = append(szStar, star)
- if star == 4 {
- heroRecord.Star4 = 0
- star4Max++
- } else if star == 5 {
- star5Max++
- heroRecord.Star5 = 0
- }
- // 修改卡池
- newPoll := this.module.ModuleTools.GetGlobalConf().DrawCard5StarsInRange1Pool
- if newPoll != "" {
- strPool[len(strPool)-1] = newPoll
- }
- continue
- }
- }
- // 保底情况
- if heroRecord.Drawcount == iEnd && heroRecord.Inevitable == 0 {
- starIndex = star - 3
- heroRecord.Inevitable1 = heroRecord.Drawcount
- update["inevitable1"] = heroRecord.Drawcount
- szStar = append(szStar, star)
- if star == 4 {
- heroRecord.Star4 = 0
- star4Max++
- } else if star == 5 {
- star5Max++
- heroRecord.Star5 = 0
- }
- // 修改卡池
- newPoll := this.module.ModuleTools.GetGlobalConf().DrawCard5StarsInRange1Pool
- if newPoll != "" {
- strPool[len(strPool)-1] = newPoll
- }
- continue
- }
- }
- }
- heroRecord.Star4++ // 4星保底数量+1
- heroRecord.Star5++ // 5星保底数量+1
- if starIndex == 1 {
- heroRecord.Star4 = 0
- star4Max++
- } else if starIndex == 2 {
- star5Max++
- heroRecord.Star5 = 0
- }
- if star4Max >= cfgDraw.Draw10Star4Max || star5Max >= cfgDraw.Draw10Star5Max { // 达到10连抽最大(4,5星)数量 直接给三星
- starIndex = 0
- } else {
- // 普通卡池保底
- if cfgDraw.DrawFloorStar4 <= heroRecord.Star4 {
- heroRecord.Star4 = 0
- starIndex = 1
- }
- if cfgDraw.DrawFloorStar5 <= heroRecord.Star5 {
- heroRecord.Star5 = 0
- starIndex = 2
- }
- }
-
- szStar = append(szStar, starIndex+3)
- if len(szStar) >= int(req.DrawCount) {
- break
- }
- }
- } else { // 所有阵营抽卡都走这里
- drawCount += req.DrawCount
- if req.DrawCount == 1 {
-
- strPool = append(strPool, pool)
- } else {
-
- for i := 0; i < int(req.DrawCount); i++ {
- strPool = append(strPool, pool)
- }
- }
-
- //阵营消耗
- if errdata = this.module.CheckRes(session, costRes); errdata != nil { // 消耗数量不足直接返回
- return
- }
- for {
- starWeight := []int32{cfgDraw.CampPoolStar3, cfgDraw.CampPoolStar4, cfgDraw.CampPoolStar5}
-
- starIndex := comm.GetRandW(starWeight)
- if starIndex == 1 {
- star4Max++
- } else if starIndex == 2 {
- star5Max++
- }
- if star4Max >= cfgDraw.Draw10Star4Max || star5Max >= cfgDraw.Draw10Star5Max {
- starIndex = 0
- }
- szStar = append(szStar, starIndex)
- if len(szStar) >= int(req.DrawCount) {
- break
- }
- }
- }
- for index, star := range szStar {
-
- _data, err := this.module.configure.GetPollByType(strPool[index])
- if err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: err.Error(),
- }
- return
- }
- sz := make([]int32, 0)
- for _, v := range _data[int32(star)] {
- sz = append(sz, v.Weight)
- }
- randomIndex := comm.GetRandW(sz)
-
- if v, ok := _data[int32(star)]; ok {
- if int32(len(v)) > randomIndex {
- cardId := v[randomIndex].Id
- if star == 5 { // 抽出5星英雄后A次抽奖内不会再抽到5星英雄（普通卡池+阵营卡池）
- curDrawCount := drawCount - req.DrawCount
- if drawCount <= 10 { // 前10次不计算（连续抽卡最多连续出A个相同阵营的英雄）
- szCards = append(szCards, cardId)
- continue
- }
- newID := this.module.ContinuousRestriction(session.GetUserId(), cardId, curDrawCount+int32(index+1), strPool[index])
- szCards = append(szCards, newID)
- continue
- }
- szCards = append(szCards, cardId)
- // 普通卡池 最多连续出A个相同阵营的英雄
- if req.DrawType == 0 {
- newId := this.module.DrawCardContinuousRestrictionCamp(cardId, heroRecord.Race, sz, v)
- if cardId != newId {
- szCards[len(szCards)-1] = newId
- }
- }
- }
- }
- }
-
- // 消耗道具
- if errdata = this.module.ConsumeRes(session, costRes, true); errdata != nil {
- return
- }
- heroRecord.Totalcount += req.DrawCount
- heroRecord.Daycount += req.DrawCount
- update["star4"] = heroRecord.Star4
- update["star5"] = heroRecord.Star5
- update["drawcount"] = drawCount
- update["totalcount"] = heroRecord.Totalcount
- update["daycount"] = heroRecord.Daycount
- this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update)
- rsp := &pb.HeroDrawCardResp{
- Data: []*pb.AtnoData{},
- }
- for _, heroId := range szCards {
-
- if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{{
- A: "hero",
- T: heroId,
- N: 1,
- }}, true); errdata == nil {
-
- rsp.Data = append(rsp.Data, &pb.AtnoData{Atno: atno})
- for _, v := range atno {
- if v.A == "hero" && v.N == 1 {
- if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { // 广播 首次获得英雄
- this.chat.SendSysChatToWorld(comm.ChatSystem13, nil, 0, 0, user.Name, v.T)
- }
- }
- }
- } else {
- return
- }
- }
-
- session.SendMsg(string(this.module.GetType()), DrawCard, rsp)
- // 任务统计
- this.module.SendTaskMsg(session, szStar, req.DrawCount, normalDraw)
- return
-}
diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go
index db01391a2..2ec567f4d 100644
--- a/modules/hero/configure_comp.go
+++ b/modules/hero/configure_comp.go
@@ -15,37 +15,40 @@ import (
const moduleName = "hero"
const (
- equip_suit = "game_equipsuit.json" //装备套装表
- new_hero = "game_hero.json" //英雄
- hero_stargrow = "game_herostargrow.json" //英雄品质系数
- hero_levelgrow = "game_herolevelgrow.json" //英雄成长系数
- hero_starup = "game_herostarup.json" // 升星
- hero_levelup = "game_herolevelup.json" //英雄等级基础属性
- hero_exp = "game_heroexp.json" // 升级
- hero_skillup = "game_heroskilllevel.json" // 英雄技能升级
- game_skillatk = "game_skillatk.json" // 英雄技能
- hero_awaken = "game_heroawaken.json" // 英雄觉醒
- hero_drawcard = "game_drawcard.json" // 抽卡
- hero_drawupdraw = "game_drawupdraw.json" // 抽卡概率调整
- hero_drawcost = "game_drawcost.json" // 抽卡消耗
- hero_fusion = "game_herofusion.json" // 卡牌融合
- hero_talent = "game_herotalent.json" // 天赋详细数据
- hero_talentbox = "game_talentbox.json" // 天赋详细数据
+ equip_suit = "game_equipsuit.json" //装备套装表
+ new_hero = "game_hero.json" //英雄
+ hero_stargrow = "game_herostargrow.json" //英雄品质系数
+ hero_levelgrow = "game_herolevelgrow.json" //英雄成长系数
+ hero_starup = "game_herostarup.json" // 升星
+ hero_levelup = "game_herolevelup.json" //英雄等级基础属性
+ hero_exp = "game_heroexp.json" // 升级
+ hero_skillup = "game_heroskilllevel.json" // 英雄技能升级
+ game_skillatk = "game_skillatk.json" // 英雄技能
+ hero_awaken = "game_heroawaken.json" // 英雄觉醒
+ //hero_drawcard = "game_drawcard.json" // 抽卡
+ hero_drawupdraw = "game_drawupdraw.json" // 抽卡概率调整
+ hero_drawcost = "game_drawcost.json" // 抽卡消耗
+ hero_fusion = "game_herofusion.json" // 卡牌融合
+ hero_talent = "game_herotalent.json" // 天赋详细数据
+ hero_talentbox = "game_talentbox.json" // 天赋详细数据
game_shopitem = "game_shopitem.json"
hero_skill = "game_heroskill.json"
hero_draw = "game_drawpool.json" // 新版抽卡
hero_cardweight = "game_drawweight.json" // 新版抽卡权重
+ hero_cardpool = "game_cardpool.json" // 新版卡池
)
// /配置管理组件
type configureComp struct {
modules.MCompConfigure
- hlock sync.RWMutex
- drawCardCfg map[string]map[int32][]*cfg.GameDrawCardData // 第一个key 卡池id 第二个key 星级
- awakenMap map[int64]*cfg.GameHeroAwakenData
- starMap map[int64]*cfg.GameHeroStarupData
- module *Hero
+ hlock sync.RWMutex
+ //drawCardCfg map[string]map[int32][]*cfg.GameDrawCardData // 第一个key 卡池id 第二个key 星级
+ awakenMap map[int64]*cfg.GameHeroAwakenData
+ starMap map[int64]*cfg.GameHeroStarupData
+ module *Hero
+ starW map[int64]int32
+ cardPool map[string][]*cfg.GameCardPoolData
}
// 组件初始化接口
@@ -54,24 +57,24 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*Hero)
err = this.LoadMultiConfigure(map[string]interface{}{
- equip_suit: cfg.NewGameEquipSuit,
- new_hero: cfg.NewGameHero,
- hero_stargrow: cfg.NewGameHeroStargrow,
- hero_levelgrow: cfg.NewGameHeroLevelgrow,
- hero_levelup: cfg.NewGameHeroLevelup,
- hero_exp: cfg.NewGameHeroExp,
- hero_skillup: cfg.NewGameHeroSkillLevel,
- game_skillatk: cfg.NewGameSkillAtk,
- hero_drawcard: cfg.NewGameDrawCard,
- hero_talent: cfg.NewGameHeroTalent,
- hero_talentbox: cfg.NewGameTalentBox,
- game_shopitem: cfg.NewGameShopitem,
- hero_skill: cfg.NewGameHeroSkill,
- hero_draw: cfg.NewGameDrawPool,
- hero_cardweight: cfg.NewGameDrawWeight,
+ equip_suit: cfg.NewGameEquipSuit,
+ new_hero: cfg.NewGameHero,
+ hero_stargrow: cfg.NewGameHeroStargrow,
+ hero_levelgrow: cfg.NewGameHeroLevelgrow,
+ hero_levelup: cfg.NewGameHeroLevelup,
+ hero_exp: cfg.NewGameHeroExp,
+ hero_skillup: cfg.NewGameHeroSkillLevel,
+ game_skillatk: cfg.NewGameSkillAtk,
+ //hero_drawcard: cfg.NewGameDrawCard,
+ hero_talent: cfg.NewGameHeroTalent,
+ hero_talentbox: cfg.NewGameTalentBox,
+ game_shopitem: cfg.NewGameShopitem,
+ hero_skill: cfg.NewGameHeroSkill,
+ hero_draw: cfg.NewGameDrawPool,
+ //hero_cardweight: cfg.NewGameDrawWeight,
})
- this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0)
- configure.RegisterConfigure(hero_drawcard, cfg.NewGameDrawCard, this.SetHeroDrawConfig)
+ //this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0)
+ //configure.RegisterConfigure(hero_drawcard, cfg.NewGameDrawCard, this.SetHeroDrawConfig)
this.awakenMap = make(map[int64]*cfg.GameHeroAwakenData, 0)
configure.RegisterConfigure(hero_awaken, cfg.NewGameHeroAwaken, func() {
if v, err := this.GetConfigure(hero_awaken); err == nil {
@@ -107,8 +110,40 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
}
})
+ configure.RegisterConfigure(hero_cardweight, cfg.NewGameDrawWeight, func() {
+ if v, err := this.GetConfigure(hero_cardweight); err == nil {
+ if _configure, ok := v.(*cfg.GameDrawWeight); ok {
+ this.hlock.Lock()
+ defer this.hlock.Unlock()
+ this.starW = make(map[int64]int32)
+ for _, v := range _configure.GetDataList() {
+ this.starW[(int64(v.Dtype)<<16)+int64(v.Key)] = v.Weight
+ }
- this.GetHeroDrawConfigByType(1)
+ return
+ }
+ } else {
+ err = fmt.Errorf("%T no is *cfg.NewGameDrawWeight", v)
+ }
+ })
+
+ // 卡池初始化
+ configure.RegisterConfigure(hero_cardpool, cfg.NewGameCardPool, func() {
+ if v, err := this.GetConfigure(hero_cardpool); err == nil {
+ if _configure, ok := v.(*cfg.GameCardPool); ok {
+ this.hlock.Lock()
+ defer this.hlock.Unlock()
+ this.cardPool = make(map[string][]*cfg.GameCardPoolData)
+ for _, v := range _configure.GetDataList() {
+ this.cardPool[v.CardPoolType] = append(this.cardPool[v.CardPoolType], v)
+ }
+
+ return
+ }
+ } else {
+ err = fmt.Errorf("%T no is *cfg.NewGameCardPool", v)
+ }
+ })
return
}
@@ -151,40 +186,40 @@ func (this *configureComp) GetHeroAwakenConfig(hid string, phase int32) (cfg *cf
}
// 抽卡配置表
-func (this *configureComp) SetHeroDrawConfig() {
- var (
- v interface{}
- err error
- )
- if v, err = this.GetConfigure(hero_drawcard); err == nil {
- if _configure, ok := v.(*cfg.GameDrawCard); ok {
- this.hlock.Lock()
- this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0)
- for _, v := range _configure.GetDataList() {
- if _, ok := this.drawCardCfg[v.CardPoolType]; !ok {
- this.drawCardCfg[v.CardPoolType] = make(map[int32][]*cfg.GameDrawCardData, 0)
- }
- if _, ok := this.drawCardCfg[v.CardPoolType][v.Star]; !ok {
- this.drawCardCfg[v.CardPoolType][v.Star] = make([]*cfg.GameDrawCardData, 0)
- }
- this.drawCardCfg[v.CardPoolType][v.Star] = append(this.drawCardCfg[v.CardPoolType][v.Star], v)
- }
- this.hlock.Unlock()
- // this.module.Debug("update cfg.Game_drawCard over")
- return
- }
- }
- err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
- return
-}
+// func (this *configureComp) SetHeroDrawConfig() {
+// var (
+// v interface{}
+// err error
+// )
+// if v, err = this.GetConfigure(hero_drawcard); err == nil {
+// if _configure, ok := v.(*cfg.GameDrawCard); ok {
+// this.hlock.Lock()
+// this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0)
+// for _, v := range _configure.GetDataList() {
+// if _, ok := this.drawCardCfg[v.CardPoolType]; !ok {
+// this.drawCardCfg[v.CardPoolType] = make(map[int32][]*cfg.GameDrawCardData, 0)
+// }
+// if _, ok := this.drawCardCfg[v.CardPoolType][v.Star]; !ok {
+// this.drawCardCfg[v.CardPoolType][v.Star] = make([]*cfg.GameDrawCardData, 0)
+// }
+// this.drawCardCfg[v.CardPoolType][v.Star] = append(this.drawCardCfg[v.CardPoolType][v.Star], v)
+// }
+// this.hlock.Unlock()
+// // this.module.Debug("update cfg.Game_drawCard over")
+// return
+// }
+// }
+// err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
+// return
+// }
-func (this *configureComp) GetPollByType(poosType string) (conf map[int32][]*cfg.GameDrawCardData, err error) {
- var ok bool
- if conf, ok = this.drawCardCfg[poosType]; !ok {
- err = comm.NewNotFoundConfErr(moduleName, hero_drawcard, poosType)
- }
- return
-}
+// func (this *configureComp) GetPollByType(poosType string) (conf map[int32][]*cfg.GameDrawCardData, err error) {
+// var ok bool
+// if conf, ok = this.drawCardCfg[poosType]; !ok {
+// err = comm.NewNotFoundConfErr(moduleName, hero_drawcard, poosType)
+// }
+// return
+// }
func (this *configureComp) GetHeroExp(hid string) (conf *cfg.GameHeroExpData, err error) {
var (
@@ -420,23 +455,24 @@ func (this *configureComp) GetHeroDrawConfigByType(id int32) (data *cfg.GameDraw
return
}
-func (this *configureComp) GetHeroDrawWeightConfigById(id int32) (data *cfg.GameDrawWeightData, err error) {
- var (
- v interface{}
- )
- if id > 0 {
- if v, err = this.GetConfigure(hero_cardweight); err == nil {
- if conf, ok := v.(*cfg.GameDrawWeight); ok {
- if data = conf.Get(id); data != nil {
- return
- } else {
- if len(conf.GetDataList()) > 0 {
- data = conf.GetDataList()[len(conf.GetDataList())-1]
- }
- }
- }
+func (this *configureComp) GetHeroDrawWeightConfigById(dtype int32, key int32) int32 {
+ return this.starW[(int64(dtype)<<16)+int64(key)]
+}
+
+// 通过卡池获取 英雄
+func (this *configureComp) GetHeroByPool(pool string) (hid string, err error) {
+ if v, ok := this.cardPool[pool]; !ok {
+ var sz []int32
+ for _, v1 := range v {
+ sz = append(sz, v1.Weight)
}
+ if len(sz) == 0 { // 异常报错提醒
+ err = comm.NewNotFoundConfErr(moduleName, hero_cardpool, pool)
+ return
+ }
+ hid = v[comm.GetRandW(sz)].Id
+ return
}
- err = comm.NewNotFoundConfErr(moduleName, hero_draw, id)
+ err = comm.NewNotFoundConfErr(moduleName, hero_cardpool, pool)
return
}
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 7cd98aecb..b1df20199 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -589,24 +589,6 @@ func (this *ModelHero) RemoveUserHeroInfo(uid string) (err error) {
return
}
-func (this *ModelHero) CheckPool(drawCount int32, config *cfg.GameGlobalData) (pools string) {
- if config.BasePool1.S <= drawCount && config.BasePool1.E >= drawCount {
- return config.BasePool1.P
- } else if config.BasePool2.S <= drawCount && config.BasePool2.E >= drawCount {
- return config.BasePool2.P
- } else if config.BasePool3.S <= drawCount && config.BasePool3.E >= drawCount {
- return config.BasePool3.P
- } else if config.BasePool4.S <= drawCount && config.BasePool4.E >= drawCount {
- return config.BasePool4.P
- } else if config.BasePool5.S <= drawCount && config.BasePool5.E >= drawCount {
- return config.BasePool5.P
- } else if config.BasePool6.S <= drawCount && config.BasePool6.E >= drawCount {
- return config.BasePool6.P
- }
-
- return config.BasePool7.P
-}
-
// 通过卡池的权重 获取英雄
func (this *ModelHero) GetRandHeroIdBypool(sz []int32) int32 {
diff --git a/modules/hero/module.go b/modules/hero/module.go
index 67ce56d14..ac5517ad6 100644
--- a/modules/hero/module.go
+++ b/modules/hero/module.go
@@ -546,27 +546,18 @@ func (this *Hero) ContinuousRestriction(uid string, heroCid string, drawCount in
conf := this.ModuleTools.GetGlobalConf() //.
iMaxCOunt := conf.DrawCardContinuousRestrictionStar5
if drawCount-index <= iMaxCOunt { // 连续n次还获得该英雄 直接替换其他英雄
-
- _data, _ := this.configure.GetPollByType(pool)
- if _data == nil {
-
- return heroCid
- }
-
- for i := 0; i < len(_data[5]); i++ {
- if v, ok := _data[5]; ok {
- if int32(len(v)) > int32(i) {
- newCid = v[i].Id
- if newCid == heroid {
- continue
- }
- record.Star5Hero[heroid] = drawCount
- update["star5Hero"] = record.Star5Hero
- this.modelRecord.ChangeHeroRecord(uid, update) // 更新信息
- return
+ for i := 0; i < 99; i++ {
+ if newCid, err := this.configure.GetHeroByPool(pool); err != nil {
+ if newCid != heroCid {
+ return newCid
}
}
}
+ record.Star5Hero[heroid] = drawCount
+ update["star5Hero"] = record.Star5Hero
+ this.modelRecord.ChangeHeroRecord(uid, update) // 更新信息
+ return heroCid
+
}
}
}
@@ -771,85 +762,6 @@ func (this *Hero) SendTaskMsg(session comm.IUserSession, szStar []int32, drawCou
go this.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...)
}
-func (this *Hero) newCondition(heroRecord *pb.DBHeroRecord) (get bool, starIndex int32) {
- inRangeConf := this.ModuleTools.GetGlobalConf().DrawCard5StarsInRange
- if len(inRangeConf) == 3 {
- iStart := inRangeConf[0] // 抽卡开始
- iEnd := inRangeConf[1] // 抽卡结束
- star := inRangeConf[2]
- if star >= 3 { // 保底必须三星+
- if heroRecord.Inevitable == 0 && heroRecord.Drawcount > iStart && heroRecord.Drawcount < iEnd && iEnd >= iStart {
- n, _ := rand.Int(rand.Reader, big.NewInt(int64(iEnd-iStart)))
- if n.Int64() < 1 { // 抽中
- starIndex = star
- heroRecord.Inevitable = heroRecord.Drawcount
- update := make(map[string]interface{})
- update["inevitable"] = heroRecord.Drawcount
-
- get = true
- }
- }
- // 保底情况
- if heroRecord.Drawcount == iEnd && heroRecord.Inevitable == 0 {
- starIndex = star
- heroRecord.Inevitable = heroRecord.Drawcount
-
- get = true
- }
- }
- }
- get = false
- return
-}
-
-func (this *Hero) InRange(heroRecord *pb.DBHeroRecord, strPool []string, update map[string]interface{}) (starIndex int32, pool string) {
-
- starIndex = 3 // 默认3星
- inRangeConf1 := this.ModuleTools.GetGlobalConf().DrawCard5StarsInRange1
- pool = this.ModuleTools.GetGlobalConf().DrawCard5StarsInRange1Pool
- if len(inRangeConf1) == 3 {
- iStart := inRangeConf1[0] // 抽卡开始
- iEnd := inRangeConf1[1] // 抽卡结束
- star := inRangeConf1[2]
- if star >= 3 { // 保底必须三星+
- if heroRecord.Inevitable == 0 && heroRecord.Drawcount > iStart && heroRecord.Drawcount < iEnd && iEnd >= iStart {
- n, _ := rand.Int(rand.Reader, big.NewInt(int64(iEnd-iStart)))
- if n.Int64() < 1 { // 抽中
- starIndex = star
- heroRecord.Inevitable = heroRecord.Drawcount
- update["inevitable1"] = heroRecord.Drawcount
-
- if star == 4 {
- heroRecord.Star4 = 0
- } else if star == 5 {
- heroRecord.Star5 = 0
- }
- // 修改卡池
- // if newPoll != "" {
- // strPool[len(strPool)-1] = newPoll
- // }
- return
- }
- }
- // 保底情况
- if heroRecord.Drawcount == iEnd && heroRecord.Inevitable == 0 {
- starIndex = star
- heroRecord.Inevitable1 = heroRecord.Drawcount
- update["inevitable1"] = heroRecord.Drawcount
-
- if star == 4 {
- heroRecord.Star4 = 0
- } else if star == 5 {
- heroRecord.Star5 = 0
- }
-
- return
- }
- }
- }
- return
-}
-
func (this *Hero) RegisterInstructor(session comm.IUserSession, heroOid []string, fulllvenr int32) (errdata *pb.ErrorData) {
var (
_szHero []*pb.DBHero
diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go
index b5ccf698c..2683e9124 100644
--- a/pb/hero_db.pb.go
+++ b/pb/hero_db.pb.go
@@ -646,67 +646,6 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
-<<<<<<< HEAD
-<<<<<<< Updated upstream
- 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x98, 0x05, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72,
- 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61,
- 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12,
- 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
- 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05,
- 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64,
- 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
- 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e,
- 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44,
- 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64,
- 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64,
- 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65,
- 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
- 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72,
- 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72,
- 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
- 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e,
- 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a,
- 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f,
- 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18,
- 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x12, 0x1e, 0x0a,
- 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x20, 0x0a,
- 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x18, 0x0e, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x12,
- 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e,
- 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x52, 0x61, 0x63,
- 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x1a, 0x3c, 0x0a, 0x0e,
- 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
- 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
- 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74,
- 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
- 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
- 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65,
- 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
- 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65,
- 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
- 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06,
- 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44,
- 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65,
- 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a,
- 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
- 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
- 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65,
- 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79,
- 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54,
- 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e,
- 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-=======
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
@@ -798,79 +737,6 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f,
0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
->>>>>>> Stashed changes
-=======
- 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
- 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
- 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
- 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
- 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x72,
- 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e,
- 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
- 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
- 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
- 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x98, 0x05, 0x0a, 0x0c,
- 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
- 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14,
- 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
- 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74,
- 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65,
- 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a,
- 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
- 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
- 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09, 0x73, 0x74,
- 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
- 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61,
- 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73, 0x74, 0x61,
- 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63,
- 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61,
- 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75,
- 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75,
- 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65,
- 0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62,
- 0x75, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65,
- 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62,
- 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65,
- 0x31, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61,
- 0x62, 0x6c, 0x65, 0x31, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72,
- 0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63,
- 0x65, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e,
- 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
- 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72,
- 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
- 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a,
- 0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
- 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
- 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
- 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72,
- 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72,
- 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49,
- 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
- 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61,
- 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e,
- 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a,
- 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48,
- 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e,
- 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01,
- 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
->>>>>>> 03aec7e408a1e80da7f408debda883b93b688d29
}
var (
@@ -888,26 +754,6 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte {
var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
var file_hero_hero_db_proto_goTypes = []interface{}{
-<<<<<<< HEAD
-<<<<<<< Updated upstream
- (HeroType)(0), // 0: HeroType
- (*DBHero)(nil), // 1: DBHero
- (*DBHeroRecord)(nil), // 2: DBHeroRecord
- (*DBHeroTalent)(nil), // 3: DBHeroTalent
- nil, // 4: DBHero.PropertyEntry
- nil, // 5: DBHero.AddPropertyEntry
- nil, // 6: DBHero.JuexPropertyEntry
- nil, // 7: DBHero.TalentPropertyEntry
- nil, // 8: DBHero.HoroscopePropertyEntry
- nil, // 9: DBHero.FettersEntry
- nil, // 10: DBHeroRecord.ConditionEntry
- nil, // 11: DBHeroRecord.Star5HeroEntry
- nil, // 12: DBHeroRecord.RaceEntry
- nil, // 13: DBHeroTalent.TalentEntry
- (*SkillData)(nil), // 14: SkillData
-=======
-=======
->>>>>>> 03aec7e408a1e80da7f408debda883b93b688d29
(HeroType)(0), // 0: HeroType
(*DBHero)(nil), // 1: DBHero
(*DBHeroRecord)(nil), // 2: DBHeroRecord
@@ -921,19 +767,12 @@ var file_hero_hero_db_proto_goTypes = []interface{}{
nil, // 10: DBHeroRecord.ConditionEntry
nil, // 11: DBHeroRecord.Star5HeroEntry
nil, // 12: DBHeroRecord.RaceEntry
-<<<<<<< HEAD
nil, // 13: DBHeroRecord.Baodi4Entry
nil, // 14: DBHeroRecord.Baodi5Entry
nil, // 15: DBHeroRecord.CountEntry
nil, // 16: DBHeroTalent.TalentEntry
(*SkillData)(nil), // 17: SkillData
(*DB_EquipmentSuit)(nil), // 18: DB_EquipmentSuit
->>>>>>> Stashed changes
-=======
- nil, // 13: DBHeroTalent.TalentEntry
- (*SkillData)(nil), // 14: SkillData
- (*DB_EquipmentSuit)(nil), // 15: DB_EquipmentSuit
->>>>>>> 03aec7e408a1e80da7f408debda883b93b688d29
}
var file_hero_hero_db_proto_depIdxs = []int32{
17, // 0: DBHero.normalSkill:type_name -> SkillData
@@ -941,36 +780,14 @@ var file_hero_hero_db_proto_depIdxs = []int32{
5, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry
6, // 3: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
0, // 4: DBHero.status:type_name -> HeroType
-<<<<<<< HEAD
-<<<<<<< Updated upstream
- 7, // 5: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
- 14, // 6: DBHero.equipSkill:type_name -> SkillData
- 8, // 7: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry
- 9, // 8: DBHero.fetters:type_name -> DBHero.FettersEntry
- 10, // 9: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry
- 11, // 10: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry
- 12, // 11: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry
- 13, // 12: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
- 13, // [13:13] is the sub-list for method output_type
- 13, // [13:13] is the sub-list for method input_type
- 13, // [13:13] is the sub-list for extension type_name
- 13, // [13:13] is the sub-list for extension extendee
- 0, // [0:13] is the sub-list for field type_name
-=======
18, // 5: DBHero.suits:type_name -> DB_EquipmentSuit
7, // 6: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
17, // 7: DBHero.equipSkill:type_name -> SkillData
-=======
- 15, // 5: DBHero.suits:type_name -> DB_EquipmentSuit
- 7, // 6: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
- 14, // 7: DBHero.equipSkill:type_name -> SkillData
->>>>>>> 03aec7e408a1e80da7f408debda883b93b688d29
8, // 8: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry
9, // 9: DBHero.fetters:type_name -> DBHero.FettersEntry
10, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry
11, // 11: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry
12, // 12: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry
-<<<<<<< HEAD
13, // 13: DBHeroRecord.baodi4:type_name -> DBHeroRecord.Baodi4Entry
14, // 14: DBHeroRecord.baodi5:type_name -> DBHeroRecord.Baodi5Entry
15, // 15: DBHeroRecord.count:type_name -> DBHeroRecord.CountEntry
@@ -980,15 +797,6 @@ var file_hero_hero_db_proto_depIdxs = []int32{
17, // [17:17] is the sub-list for extension type_name
17, // [17:17] is the sub-list for extension extendee
0, // [0:17] is the sub-list for field type_name
->>>>>>> Stashed changes
-=======
- 13, // 13: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
- 14, // [14:14] is the sub-list for method output_type
- 14, // [14:14] is the sub-list for method input_type
- 14, // [14:14] is the sub-list for extension type_name
- 14, // [14:14] is the sub-list for extension extendee
- 0, // [0:14] is the sub-list for field type_name
->>>>>>> 03aec7e408a1e80da7f408debda883b93b688d29
}
func init() { file_hero_hero_db_proto_init() }
diff --git a/pb/items_db.pb.go b/pb/items_db.pb.go
index 1530730aa..de5a87120 100644
--- a/pb/items_db.pb.go
+++ b/pb/items_db.pb.go
@@ -28,13 +28,12 @@ type DB_UserItemData struct {
GridId string `protobuf:"bytes,1,opt,name=gridId,proto3" json:"gridId" bson:"_id"` // 背包格子Id
UId string `protobuf:"bytes,2,opt,name=uId,proto3" json:"uId" bson:"uid"` // 用户id
- ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id
+ ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id
Amount uint32 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount" bson:"amount"` // 存放物品的数量
- Change int32 `protobuf:"varint,5,opt,name=change,proto3" json:"change" bson:"change"` // 最后一次变化量
- CTime int64 `protobuf:"varint,6,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间
- ETime int64 `protobuf:"varint,7,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间
- IsNewItem bool `protobuf:"varint,8,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的
- Lastopt int64 `protobuf:"varint,9,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间
+ CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间
+ ETime int64 `protobuf:"varint,6,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间
+ IsNewItem bool `protobuf:"varint,7,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的
+ Lastopt int64 `protobuf:"varint,8,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间
}
func (x *DB_UserItemData) Reset() {
@@ -97,13 +96,6 @@ func (x *DB_UserItemData) GetAmount() uint32 {
return 0
}
-func (x *DB_UserItemData) GetChange() int32 {
- if x != nil {
- return x.Change
- }
- return 0
-}
-
func (x *DB_UserItemData) GetCTime() int64 {
if x != nil {
return x.CTime
@@ -136,22 +128,21 @@ var File_items_items_db_proto protoreflect.FileDescriptor
var file_items_items_db_proto_rawDesc = []byte{
0x0a, 0x14, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x64, 0x62,
- 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe7, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73,
0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72,
0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x69, 0x64,
0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x03,
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06,
0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x61, 0x6d,
- 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x05,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05,
- 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69,
- 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
- 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65,
- 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e,
- 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70,
- 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74,
- 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20,
+ 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54,
+ 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65,
+ 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x07, 0x20,
+ 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18,
+ 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52,
+ 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+ 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/sys/configure/structs/Game.CardPool.go b/sys/configure/structs/Game.CardPool.go
new file mode 100644
index 000000000..563035b66
--- /dev/null
+++ b/sys/configure/structs/Game.CardPool.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameCardPool struct {
+ _dataMap map[int32]*GameCardPoolData
+ _dataList []*GameCardPoolData
+}
+
+func NewGameCardPool(_buf []map[string]interface{}) (*GameCardPool, error) {
+ _dataList := make([]*GameCardPoolData, 0, len(_buf))
+ dataMap := make(map[int32]*GameCardPoolData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameCardPoolData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Key] = _v
+ }
+ }
+ return &GameCardPool{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameCardPool) GetDataMap() map[int32]*GameCardPoolData {
+ return table._dataMap
+}
+
+func (table *GameCardPool) GetDataList() []*GameCardPoolData {
+ return table._dataList
+}
+
+func (table *GameCardPool) Get(key int32) *GameCardPoolData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.CardPoolData.go b/sys/configure/structs/Game.CardPoolData.go
new file mode 100644
index 000000000..2ebad35c8
--- /dev/null
+++ b/sys/configure/structs/Game.CardPoolData.go
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameCardPoolData struct {
+ Key int32
+ CardPoolType string
+ Id string
+ Weight int32
+}
+
+const TypeId_GameCardPoolData = 1562200466
+
+func (*GameCardPoolData) GetTypeId() int32 {
+ return 1562200466
+}
+
+func (_v *GameCardPoolData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
+ { var _ok_ bool; if _v.CardPoolType, _ok_ = _buf["card_pool_type"].(string); !_ok_ { err = errors.New("card_pool_type error"); return } }
+ { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameCardPoolData(_buf map[string]interface{}) (*GameCardPoolData, error) {
+ v := &GameCardPoolData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.DrawWeight.go b/sys/configure/structs/Game.DrawWeight.go
index 3d7fc277b..2692919ef 100644
--- a/sys/configure/structs/Game.DrawWeight.go
+++ b/sys/configure/structs/Game.DrawWeight.go
@@ -21,7 +21,7 @@ func NewGameDrawWeight(_buf []map[string]interface{}) (*GameDrawWeight, error) {
return nil, err2
} else {
_dataList = append(_dataList, _v)
- dataMap[_v.Key] = _v
+ dataMap[_v.Id] = _v
}
}
return &GameDrawWeight{_dataList:_dataList, _dataMap:dataMap}, nil
diff --git a/sys/configure/structs/Game.DrawWeightData.go b/sys/configure/structs/Game.DrawWeightData.go
index a386094fc..c24df00f2 100644
--- a/sys/configure/structs/Game.DrawWeightData.go
+++ b/sys/configure/structs/Game.DrawWeightData.go
@@ -11,6 +11,8 @@ package cfg
import "errors"
type GameDrawWeightData struct {
+ Id int32
+ Dtype int32
Key int32
Weight int32
}
@@ -22,6 +24,8 @@ func (*GameDrawWeightData) GetTypeId() int32 {
}
func (_v *GameDrawWeightData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dtype"].(float64); !_ok_ { err = errors.New("dtype error"); return }; _v.Dtype = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) }
return
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index c4f3ebfd6..2c3738bda 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -184,6 +184,7 @@ type Tables struct {
PhotoFilter *GamePhotoFilter
DrawPool *GameDrawPool
DrawWeight *GameDrawWeight
+ CardPool *GameCardPool
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1229,5 +1230,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.DrawWeight, err = NewGameDrawWeight(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_cardpool") ; err != nil {
+ return nil, err
+ }
+ if tables.CardPool, err = NewGameCardPool(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 41008685c..b801dd8a3 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -39,36 +39,7 @@ type GameGlobalData struct {
DrawToplimit int32
Draw10Star4Max int32
Draw10Star5Max int32
- DrawFloorStar4 int32
- DrawFloorStar5 int32
DuplicateRemoval int32
- BasePoolCost *Gameatn
- Camp1PoolCost *Gameatn
- Camp2PoolCost *Gameatn
- Camp3PoolCost *Gameatn
- Camp4PoolCost *Gameatn
- BasePool10cost *Gameatn
- Camp1Pool10cost *Gameatn
- Camp2Pool10cost *Gameatn
- Camp3Pool10cost *Gameatn
- Camp4Pool10cost *Gameatn
- Camp1Pool1 string
- Camp2Pool1 string
- Camp3Pool1 string
- Camp4Pool1 string
- BasePool1 *Gamebasepool
- BasePool2 *Gamebasepool
- BasePool3 *Gamebasepool
- BasePool4 *Gamebasepool
- BasePool5 *Gamebasepool
- BasePool6 *Gamebasepool
- BasePool7 *Gamebasepool
- BasePoolStar3 int32
- BasePoolStar4 int32
- BasePoolStar5 int32
- CampPoolStar3 int32
- CampPoolStar4 int32
- CampPoolStar5 int32
Gourmet int32
SmithyMaxplayer int32
SmithyMaxtime int32
@@ -142,9 +113,6 @@ type GameGlobalData struct {
SkillGetLocation []int32
DrawCardRechargeReward []int32
DrawCardRegressionReward []int32
- DrawCard5StarsInRange []int32
- DrawCard5StarsInRange1 []int32
- DrawCard5StarsInRange1Pool string
DrawCardContinuousRestrictionStar5 int32
DrawCardContinuousRestrictionCamp int32
EquipmentConsumption []int32
@@ -327,36 +295,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_toplimit"].(float64); !_ok_ { err = errors.New("draw_toplimit error"); return }; _v.DrawToplimit = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw10_star4_max"].(float64); !_ok_ { err = errors.New("draw10_star4_max error"); return }; _v.Draw10Star4Max = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw10_star5_max"].(float64); !_ok_ { err = errors.New("draw10_star5_max error"); return }; _v.Draw10Star5Max = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_floor_star4"].(float64); !_ok_ { err = errors.New("draw_floor_star4 error"); return }; _v.DrawFloorStar4 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_floor_star5"].(float64); !_ok_ { err = errors.New("draw_floor_star5 error"); return }; _v.DrawFloorStar5 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duplicate_removal"].(float64); !_ok_ { err = errors.New("duplicate_removal error"); return }; _v.DuplicateRemoval = int32(_tempNum_) }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool_cost error"); return }; if _v.BasePoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp1_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp1_pool_cost error"); return }; if _v.Camp1PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp2_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp2_pool_cost error"); return }; if _v.Camp2PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp3_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp3_pool_cost error"); return }; if _v.Camp3PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp4_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp4_pool_cost error"); return }; if _v.Camp4PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool_10cost"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool_10cost error"); return }; if _v.BasePool10cost, err = DeserializeGameatn(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp1_pool_10cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp1_pool_10cost error"); return }; if _v.Camp1Pool10cost, err = DeserializeGameatn(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp2_pool_10cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp2_pool_10cost error"); return }; if _v.Camp2Pool10cost, err = DeserializeGameatn(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp3_pool_10cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp3_pool_10cost error"); return }; if _v.Camp3Pool10cost, err = DeserializeGameatn(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp4_pool_10cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp4_pool_10cost error"); return }; if _v.Camp4Pool10cost, err = DeserializeGameatn(_x_); err != nil { return } }
- { var _ok_ bool; if _v.Camp1Pool1, _ok_ = _buf["camp1_pool1"].(string); !_ok_ { err = errors.New("camp1_pool1 error"); return } }
- { var _ok_ bool; if _v.Camp2Pool1, _ok_ = _buf["camp2_pool1"].(string); !_ok_ { err = errors.New("camp2_pool1 error"); return } }
- { var _ok_ bool; if _v.Camp3Pool1, _ok_ = _buf["camp3_pool1"].(string); !_ok_ { err = errors.New("camp3_pool1 error"); return } }
- { var _ok_ bool; if _v.Camp4Pool1, _ok_ = _buf["camp4_pool1"].(string); !_ok_ { err = errors.New("camp4_pool1 error"); return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool1"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool1 error"); return }; if _v.BasePool1, err = DeserializeGamebasepool(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool2"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool2 error"); return }; if _v.BasePool2, err = DeserializeGamebasepool(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool3"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool3 error"); return }; if _v.BasePool3, err = DeserializeGamebasepool(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool4"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool4 error"); return }; if _v.BasePool4, err = DeserializeGamebasepool(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool5"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool5 error"); return }; if _v.BasePool5, err = DeserializeGamebasepool(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool6"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool6 error"); return }; if _v.BasePool6, err = DeserializeGamebasepool(_x_); err != nil { return } }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool7"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool7 error"); return }; if _v.BasePool7, err = DeserializeGamebasepool(_x_); err != nil { return } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star3"].(float64); !_ok_ { err = errors.New("base_pool_star3 error"); return }; _v.BasePoolStar3 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star4"].(float64); !_ok_ { err = errors.New("base_pool_star4 error"); return }; _v.BasePoolStar4 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star5"].(float64); !_ok_ { err = errors.New("base_pool_star5 error"); return }; _v.BasePoolStar5 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star3"].(float64); !_ok_ { err = errors.New("camp_pool_star3 error"); return }; _v.CampPoolStar3 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star4"].(float64); !_ok_ { err = errors.New("camp_pool_star4 error"); return }; _v.CampPoolStar4 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star5"].(float64); !_ok_ { err = errors.New("camp_pool_star5 error"); return }; _v.CampPoolStar5 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gourmet"].(float64); !_ok_ { err = errors.New("gourmet error"); return }; _v.Gourmet = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["smithy_maxplayer"].(float64); !_ok_ { err = errors.New("smithy_maxplayer error"); return }; _v.SmithyMaxplayer = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["smithy_maxtime"].(float64); !_ok_ { err = errors.New("smithy_maxtime error"); return }; _v.SmithyMaxtime = int32(_tempNum_) }
@@ -677,35 +616,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
}
}
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["DrawCard_5StarsInRange"].([]interface{}); !_ok_ { err = errors.New("DrawCard_5StarsInRange error"); return }
-
- _v.DrawCard5StarsInRange = make([]int32, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ int32
- { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
- _v.DrawCard5StarsInRange = append(_v.DrawCard5StarsInRange, _list_v_)
- }
- }
-
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["DrawCard_5StarsInRange1"].([]interface{}); !_ok_ { err = errors.New("DrawCard_5StarsInRange1 error"); return }
-
- _v.DrawCard5StarsInRange1 = make([]int32, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ int32
- { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
- _v.DrawCard5StarsInRange1 = append(_v.DrawCard5StarsInRange1, _list_v_)
- }
- }
-
- { var _ok_ bool; if _v.DrawCard5StarsInRange1Pool, _ok_ = _buf["DrawCard_5StarsInRange1_pool"].(string); !_ok_ { err = errors.New("DrawCard_5StarsInRange1_pool error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Star5"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Star5 error"); return }; _v.DrawCardContinuousRestrictionStar5 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Camp"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Camp error"); return }; _v.DrawCardContinuousRestrictionCamp = int32(_tempNum_) }
{