From e19b50bd045448d23b693b847550e94d8ccf20e5 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 2 Aug 2023 11:46:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E7=BD=B2=E9=85=8D=E7=BD=AE=E8=A1=A8?=
=?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_accumulatemoney.json | 227 ++++++++++++++++
bin/json/game_buriedcondi.json | 14 +-
bin/json/game_huntingboss.json | 96 +++----
bin/json/game_huntinglineup.json | 96 +++----
bin/json/game_item.json | 10 +-
bin/json/game_mainstage.json | 34 +--
bin/json/game_robot.json | 400 ++++++++++++++---------------
bin/json/game_ruledesc.json | 8 +-
bin/json/game_skillafteratk.json | 33 +--
bin/json/game_skillatk.json | 3 +-
bin/json/game_vikinglineup.json | 100 ++++----
11 files changed, 611 insertions(+), 410 deletions(-)
create mode 100644 bin/json/game_accumulatemoney.json
diff --git a/bin/json/game_accumulatemoney.json b/bin/json/game_accumulatemoney.json
new file mode 100644
index 000000000..d187e5fc4
--- /dev/null
+++ b/bin/json/game_accumulatemoney.json
@@ -0,0 +1,227 @@
+[
+ {
+ "accumulate": 1000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ]
+ },
+ {
+ "accumulate": 2000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 2000
+ }
+ ]
+ },
+ {
+ "accumulate": 3000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 3000
+ }
+ ]
+ },
+ {
+ "accumulate": 4000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 4000
+ }
+ ]
+ },
+ {
+ "accumulate": 5000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 5000
+ }
+ ]
+ },
+ {
+ "accumulate": 6000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 6000
+ }
+ ]
+ },
+ {
+ "accumulate": 7000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 7000
+ }
+ ]
+ },
+ {
+ "accumulate": 8000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 8000
+ }
+ ]
+ },
+ {
+ "accumulate": 9000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 9000
+ }
+ ]
+ },
+ {
+ "accumulate": 10000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
+ }
+ ]
+ },
+ {
+ "accumulate": 11000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 11000
+ }
+ ]
+ },
+ {
+ "accumulate": 12000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 12000
+ }
+ ]
+ },
+ {
+ "accumulate": 13000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 13000
+ }
+ ]
+ },
+ {
+ "accumulate": 14000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 14000
+ }
+ ]
+ },
+ {
+ "accumulate": 15000,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 15000
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 2462e48ac..c245b3c77 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -17202,7 +17202,7 @@
},
{
"id": 12070150,
- "rtype": 1,
+ "rtype": 2,
"ctype": 1,
"notify": [],
"type_sp": 1,
@@ -17677,7 +17677,7 @@
},
{
"id": 12070330,
- "rtype": 1,
+ "rtype": 2,
"ctype": 1,
"notify": [],
"type_sp": 1,
@@ -17750,7 +17750,7 @@
},
{
"id": 12070360,
- "rtype": 1,
+ "rtype": 2,
"ctype": 1,
"notify": [],
"type_sp": 1,
@@ -17917,7 +17917,7 @@
},
{
"id": 12070420,
- "rtype": 1,
+ "rtype": 2,
"ctype": 1,
"notify": [],
"type_sp": 1,
@@ -18363,7 +18363,7 @@
},
"type": 173,
"valid": 0,
- "NPC": 10584,
+ "NPC": -171,
"value": 3,
"filter": [],
"filter2": [
@@ -18769,7 +18769,7 @@
},
"type": 199,
"valid": 0,
- "NPC": 10754,
+ "NPC": -155,
"value": 10,
"filter": [],
"filter2": [
@@ -18791,7 +18791,7 @@
},
"type": 199,
"valid": 0,
- "NPC": 10764,
+ "NPC": -155,
"value": 15,
"filter": [],
"filter2": [
diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json
index 23081326e..e59704f2b 100644
--- a/bin/json/game_huntingboss.json
+++ b/bin/json/game_huntingboss.json
@@ -28,7 +28,7 @@
}
],
"drop": 10001000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401003
],
@@ -83,7 +83,7 @@
}
],
"drop": 10002000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401006
],
@@ -143,7 +143,7 @@
}
],
"drop": 10003000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401009
],
@@ -203,7 +203,7 @@
}
],
"drop": 10004000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401012
],
@@ -263,7 +263,7 @@
}
],
"drop": 10005000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401015
],
@@ -323,7 +323,7 @@
}
],
"drop": 10006000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401018
],
@@ -388,7 +388,7 @@
}
],
"drop": 10007000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401021
],
@@ -453,7 +453,7 @@
}
],
"drop": 10008000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401024
],
@@ -518,7 +518,7 @@
}
],
"drop": 10009000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401027
],
@@ -583,7 +583,7 @@
}
],
"drop": 10010000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401030
],
@@ -648,7 +648,7 @@
}
],
"drop": 10011000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401033
],
@@ -713,7 +713,7 @@
}
],
"drop": 10012000,
- "bossmodel": 53001,
+ "bossmodel": 55002,
"boss": [
401036
],
@@ -768,7 +768,7 @@
}
],
"drop": 20001000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402003
],
@@ -823,7 +823,7 @@
}
],
"drop": 20002000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402006
],
@@ -883,7 +883,7 @@
}
],
"drop": 20003000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402009
],
@@ -943,7 +943,7 @@
}
],
"drop": 20004000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402012
],
@@ -1003,7 +1003,7 @@
}
],
"drop": 20005000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402015
],
@@ -1063,7 +1063,7 @@
}
],
"drop": 20006000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402018
],
@@ -1128,7 +1128,7 @@
}
],
"drop": 20007000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402021
],
@@ -1193,7 +1193,7 @@
}
],
"drop": 20008000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402024
],
@@ -1258,7 +1258,7 @@
}
],
"drop": 20009000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402027
],
@@ -1323,7 +1323,7 @@
}
],
"drop": 20010000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402030
],
@@ -1388,7 +1388,7 @@
}
],
"drop": 20011000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402033
],
@@ -1453,7 +1453,7 @@
}
],
"drop": 20012000,
- "bossmodel": 51004,
+ "bossmodel": 55001,
"boss": [
402036
],
@@ -1508,7 +1508,7 @@
}
],
"drop": 30001000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403003
],
@@ -1563,7 +1563,7 @@
}
],
"drop": 30002000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403006
],
@@ -1623,7 +1623,7 @@
}
],
"drop": 30003000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403009
],
@@ -1683,7 +1683,7 @@
}
],
"drop": 30004000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403012
],
@@ -1743,7 +1743,7 @@
}
],
"drop": 30005000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403015
],
@@ -1803,7 +1803,7 @@
}
],
"drop": 30006000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403018
],
@@ -1868,7 +1868,7 @@
}
],
"drop": 30007000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403021
],
@@ -1933,7 +1933,7 @@
}
],
"drop": 30008000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403024
],
@@ -1998,7 +1998,7 @@
}
],
"drop": 30009000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403027
],
@@ -2063,7 +2063,7 @@
}
],
"drop": 30010000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403030
],
@@ -2128,7 +2128,7 @@
}
],
"drop": 30011000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403033
],
@@ -2193,7 +2193,7 @@
}
],
"drop": 30012000,
- "bossmodel": 51005,
+ "bossmodel": 55004,
"boss": [
403036
],
@@ -2248,7 +2248,7 @@
}
],
"drop": 40001000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404003
],
@@ -2303,7 +2303,7 @@
}
],
"drop": 40002000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404006
],
@@ -2363,7 +2363,7 @@
}
],
"drop": 40003000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404009
],
@@ -2423,7 +2423,7 @@
}
],
"drop": 40004000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404012
],
@@ -2483,7 +2483,7 @@
}
],
"drop": 40005000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404015
],
@@ -2543,7 +2543,7 @@
}
],
"drop": 40006000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404018
],
@@ -2608,7 +2608,7 @@
}
],
"drop": 40007000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404021
],
@@ -2673,7 +2673,7 @@
}
],
"drop": 40008000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404024
],
@@ -2738,7 +2738,7 @@
}
],
"drop": 40009000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404027
],
@@ -2803,7 +2803,7 @@
}
],
"drop": 40010000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404030
],
@@ -2868,7 +2868,7 @@
}
],
"drop": 40011000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404033
],
@@ -2933,7 +2933,7 @@
}
],
"drop": 40012000,
- "bossmodel": 51002,
+ "bossmodel": 55003,
"boss": [
404036
],
diff --git a/bin/json/game_huntinglineup.json b/bin/json/game_huntinglineup.json
index 535c44095..6deb07333 100644
--- a/bin/json/game_huntinglineup.json
+++ b/bin/json/game_huntinglineup.json
@@ -3,288 +3,288 @@
"id": 10001,
"robotid": 10001,
"difficulty": 1,
- "time": 30
+ "time": 54320
},
{
"id": 10002,
"robotid": 10002,
"difficulty": 2,
- "time": 30
+ "time": 51794
},
{
"id": 10003,
"robotid": 10003,
"difficulty": 3,
- "time": 30
+ "time": 57966
},
{
"id": 10004,
"robotid": 10004,
"difficulty": 4,
- "time": 30
+ "time": 55588
},
{
"id": 10005,
"robotid": 10005,
"difficulty": 5,
- "time": 30
+ "time": 43621
},
{
"id": 10006,
"robotid": 10006,
"difficulty": 6,
- "time": 30
+ "time": 44601
},
{
"id": 10007,
"robotid": 10007,
"difficulty": 7,
- "time": 30
+ "time": 53703
},
{
"id": 10008,
"robotid": 10008,
"difficulty": 8,
- "time": 30
+ "time": 54588
},
{
"id": 10009,
"robotid": 10009,
"difficulty": 9,
- "time": 30
+ "time": 57484
},
{
"id": 10010,
"robotid": 10010,
"difficulty": 10,
- "time": 30
+ "time": 53991
},
{
"id": 10011,
"robotid": 10011,
"difficulty": 11,
- "time": 30
+ "time": 56324
},
{
"id": 10012,
"robotid": 10012,
"difficulty": 12,
- "time": 30
+ "time": 46618
},
{
"id": 20001,
"robotid": 10013,
"difficulty": 1,
- "time": 30
+ "time": 57164
},
{
"id": 20002,
"robotid": 10014,
"difficulty": 2,
- "time": 30
+ "time": 51885
},
{
"id": 20003,
"robotid": 10015,
"difficulty": 3,
- "time": 30
+ "time": 44705
},
{
"id": 20004,
"robotid": 10016,
"difficulty": 4,
- "time": 30
+ "time": 58020
},
{
"id": 20005,
"robotid": 10017,
"difficulty": 5,
- "time": 30
+ "time": 45974
},
{
"id": 20006,
"robotid": 10018,
"difficulty": 6,
- "time": 30
+ "time": 54166
},
{
"id": 20007,
"robotid": 10019,
"difficulty": 7,
- "time": 30
+ "time": 41269
},
{
"id": 20008,
"robotid": 10020,
"difficulty": 8,
- "time": 30
+ "time": 57863
},
{
"id": 20009,
"robotid": 10021,
"difficulty": 9,
- "time": 30
+ "time": 42844
},
{
"id": 20010,
"robotid": 10022,
"difficulty": 10,
- "time": 30
+ "time": 53881
},
{
"id": 20011,
"robotid": 10023,
"difficulty": 11,
- "time": 30
+ "time": 44333
},
{
"id": 20012,
"robotid": 10024,
"difficulty": 12,
- "time": 30
+ "time": 58938
},
{
"id": 30001,
"robotid": 10025,
"difficulty": 1,
- "time": 30
+ "time": 56208
},
{
"id": 30002,
"robotid": 10026,
"difficulty": 2,
- "time": 30
+ "time": 56012
},
{
"id": 30003,
"robotid": 10027,
"difficulty": 3,
- "time": 30
+ "time": 41148
},
{
"id": 30004,
"robotid": 10028,
"difficulty": 4,
- "time": 30
+ "time": 57442
},
{
"id": 30005,
"robotid": 10029,
"difficulty": 5,
- "time": 30
+ "time": 48224
},
{
"id": 30006,
"robotid": 10030,
"difficulty": 6,
- "time": 30
+ "time": 49538
},
{
"id": 30007,
"robotid": 10031,
"difficulty": 7,
- "time": 30
+ "time": 57264
},
{
"id": 30008,
"robotid": 10032,
"difficulty": 8,
- "time": 30
+ "time": 45736
},
{
"id": 30009,
"robotid": 10033,
"difficulty": 9,
- "time": 30
+ "time": 59969
},
{
"id": 30010,
"robotid": 10034,
"difficulty": 10,
- "time": 30
+ "time": 51273
},
{
"id": 30011,
"robotid": 10035,
"difficulty": 11,
- "time": 30
+ "time": 58122
},
{
"id": 30012,
"robotid": 10036,
"difficulty": 12,
- "time": 30
+ "time": 55431
},
{
"id": 40001,
"robotid": 10037,
"difficulty": 1,
- "time": 30
+ "time": 46249
},
{
"id": 40002,
"robotid": 10038,
"difficulty": 2,
- "time": 30
+ "time": 56579
},
{
"id": 40003,
"robotid": 10039,
"difficulty": 3,
- "time": 30
+ "time": 45039
},
{
"id": 40004,
"robotid": 10040,
"difficulty": 4,
- "time": 30
+ "time": 59942
},
{
"id": 40005,
"robotid": 10034,
"difficulty": 5,
- "time": 31
+ "time": 48198
},
{
"id": 40006,
"robotid": 10035,
"difficulty": 6,
- "time": 32
+ "time": 48598
},
{
"id": 40007,
"robotid": 10036,
"difficulty": 7,
- "time": 33
+ "time": 57425
},
{
"id": 40008,
"robotid": 10037,
"difficulty": 8,
- "time": 34
+ "time": 59239
},
{
"id": 40009,
"robotid": 10038,
"difficulty": 9,
- "time": 35
+ "time": 45893
},
{
"id": 40010,
"robotid": 10039,
"difficulty": 10,
- "time": 36
+ "time": 54283
},
{
"id": 40011,
"robotid": 10040,
"difficulty": 11,
- "time": 37
+ "time": 59920
},
{
"id": 40012,
"robotid": 10037,
"difficulty": 12,
- "time": 38
+ "time": 49293
}
]
\ No newline at end of file
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 05e362618..132faac56 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -123,7 +123,7 @@
"text": "低级功夫卷轴"
},
"usetype": 1,
- "color": 3,
+ "color": 2,
"bagtype": 1,
"index": 99,
"special_type": 0,
@@ -162,13 +162,13 @@
"text": "中级功夫卷轴"
},
"usetype": 1,
- "color": 4,
+ "color": 3,
"bagtype": 1,
"index": 99,
"special_type": 0,
"time": 0,
"reddottype": 0,
- "effects": "effect_ui_bagwindow_3",
+ "effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
@@ -195,13 +195,13 @@
"text": "高级功夫卷轴"
},
"usetype": 1,
- "color": 5,
+ "color": 4,
"bagtype": 1,
"index": 99,
"special_type": 0,
"time": 0,
"reddottype": 0,
- "effects": "effect_ui_bagwindow_2",
+ "effects": "effect_ui_bagwindow_3",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 66ecb1df8..67a2fad72 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -2746,7 +2746,7 @@
"FormatList": [
104071
],
- "captainId": 340075,
+ "captainId": 510105,
"star": [
1,
1,
@@ -11451,7 +11451,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -11540,7 +11540,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -11629,7 +11629,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -11718,7 +11718,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -11807,7 +11807,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -11896,7 +11896,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -11985,7 +11985,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -12074,7 +12074,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -19995,7 +19995,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -20084,7 +20084,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -20173,7 +20173,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -20262,7 +20262,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -20351,7 +20351,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -20440,7 +20440,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -20529,7 +20529,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
@@ -20618,7 +20618,7 @@
"n": 1
}
],
- "lotteryward": 0,
+ "lotteryward": 17111810,
"commonaward": [
{
"a": "attr",
diff --git a/bin/json/game_robot.json b/bin/json/game_robot.json
index ea7833154..ec34a8c46 100644
--- a/bin/json/game_robot.json
+++ b/bin/json/game_robot.json
@@ -7,7 +7,7 @@
"key": "robot_Sheet1_text_1",
"text": "玩家1"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -18,7 +18,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 35005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -29,7 +29,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 33003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -40,7 +40,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 44006,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -51,7 +51,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 43002,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -71,7 +71,7 @@
"key": "robot_Sheet1_text_2",
"text": "玩家2"
},
- "hero1": 25004,
+ "hero1": 25001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -82,7 +82,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43001,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -93,7 +93,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24008,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -104,7 +104,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 35001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -115,7 +115,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 35006,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -135,7 +135,7 @@
"key": "robot_Sheet1_text_3",
"text": "玩家3"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -146,7 +146,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -157,7 +157,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 13004,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -168,7 +168,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 24002,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -179,7 +179,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -199,7 +199,7 @@
"key": "robot_Sheet1_text_4",
"text": "玩家4"
},
- "hero1": 25004,
+ "hero1": 13003,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -210,7 +210,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 15005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -221,7 +221,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 34003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -232,7 +232,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 15003,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -243,7 +243,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 34008,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -263,7 +263,7 @@
"key": "robot_Sheet1_text_5",
"text": "玩家5"
},
- "hero1": 25004,
+ "hero1": 13001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -274,7 +274,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43003,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -285,7 +285,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 13004,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -296,7 +296,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -307,7 +307,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 34005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -327,7 +327,7 @@
"key": "robot_Sheet1_text_6",
"text": "玩家6"
},
- "hero1": 25004,
+ "hero1": 14001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -338,7 +338,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 35005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -349,7 +349,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24001,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -360,7 +360,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 44006,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -371,7 +371,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 14003,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -391,7 +391,7 @@
"key": "robot_Sheet1_text_7",
"text": "玩家7"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -402,7 +402,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -413,7 +413,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 33003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -424,7 +424,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -435,7 +435,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -455,7 +455,7 @@
"key": "robot_Sheet1_text_8",
"text": "玩家8"
},
- "hero1": 25004,
+ "hero1": 14001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -466,7 +466,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -477,7 +477,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24008,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -488,7 +488,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -499,7 +499,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24009,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -519,7 +519,7 @@
"key": "robot_Sheet1_text_9",
"text": "玩家9"
},
- "hero1": 25004,
+ "hero1": 13003,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -530,7 +530,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 25004,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -541,7 +541,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 15002,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -552,7 +552,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 14005,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -563,7 +563,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 15004,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -583,7 +583,7 @@
"key": "robot_Sheet1_text_10",
"text": "玩家10"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -594,7 +594,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43001,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -605,7 +605,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24001,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -616,7 +616,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 35001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -627,7 +627,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 15004,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -647,7 +647,7 @@
"key": "robot_Sheet1_text_11",
"text": "玩家11"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -658,7 +658,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 35005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -669,7 +669,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 33003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -680,7 +680,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 44006,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -691,7 +691,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 43002,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -711,7 +711,7 @@
"key": "robot_Sheet1_text_12",
"text": "玩家12"
},
- "hero1": 25004,
+ "hero1": 25001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -722,7 +722,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43001,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -733,7 +733,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24008,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -744,7 +744,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 35001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -755,7 +755,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 35006,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -775,7 +775,7 @@
"key": "robot_Sheet1_text_13",
"text": "玩家13"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -786,7 +786,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -797,7 +797,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 13004,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -808,7 +808,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 24002,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -819,7 +819,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -839,7 +839,7 @@
"key": "robot_Sheet1_text_14",
"text": "玩家14"
},
- "hero1": 25004,
+ "hero1": 13003,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -850,7 +850,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 15005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -861,7 +861,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 34003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -872,7 +872,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 15003,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -883,7 +883,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 34008,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -903,7 +903,7 @@
"key": "robot_Sheet1_text_15",
"text": "玩家15"
},
- "hero1": 25004,
+ "hero1": 13001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -914,7 +914,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43003,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -925,7 +925,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 13004,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -936,7 +936,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -947,7 +947,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 34005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -967,7 +967,7 @@
"key": "robot_Sheet1_text_16",
"text": "玩家16"
},
- "hero1": 25004,
+ "hero1": 14001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -978,7 +978,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 35005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -989,7 +989,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24001,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1000,7 +1000,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 44006,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1011,7 +1011,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 14003,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1031,7 +1031,7 @@
"key": "robot_Sheet1_text_17",
"text": "玩家17"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1042,7 +1042,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1053,7 +1053,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 33003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1064,7 +1064,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1075,7 +1075,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1095,7 +1095,7 @@
"key": "robot_Sheet1_text_18",
"text": "玩家18"
},
- "hero1": 25004,
+ "hero1": 14001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1106,7 +1106,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1117,7 +1117,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24008,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1128,7 +1128,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1139,7 +1139,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24009,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1159,7 +1159,7 @@
"key": "robot_Sheet1_text_19",
"text": "玩家19"
},
- "hero1": 25004,
+ "hero1": 13003,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1170,7 +1170,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 25004,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1181,7 +1181,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 15002,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1192,7 +1192,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 14005,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1203,7 +1203,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 15004,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1223,7 +1223,7 @@
"key": "robot_Sheet1_text_20",
"text": "玩家20"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1234,7 +1234,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43001,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1245,7 +1245,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24001,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1256,7 +1256,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 35001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1267,7 +1267,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 15004,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1287,7 +1287,7 @@
"key": "robot_Sheet1_text_21",
"text": "玩家21"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1298,7 +1298,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 35005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1309,7 +1309,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 33003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1320,7 +1320,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 44006,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1331,7 +1331,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 43002,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1351,7 +1351,7 @@
"key": "robot_Sheet1_text_22",
"text": "玩家22"
},
- "hero1": 25004,
+ "hero1": 25001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1362,7 +1362,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43001,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1373,7 +1373,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24008,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1384,7 +1384,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 35001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1395,7 +1395,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 35006,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1415,7 +1415,7 @@
"key": "robot_Sheet1_text_23",
"text": "玩家23"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1426,7 +1426,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1437,7 +1437,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 13004,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1448,7 +1448,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 24002,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1459,7 +1459,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1479,7 +1479,7 @@
"key": "robot_Sheet1_text_24",
"text": "玩家24"
},
- "hero1": 25004,
+ "hero1": 13003,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1490,7 +1490,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 15005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1501,7 +1501,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 34003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1512,7 +1512,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 15003,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1523,7 +1523,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 34008,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1543,7 +1543,7 @@
"key": "robot_Sheet1_text_25",
"text": "玩家25"
},
- "hero1": 25004,
+ "hero1": 13001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1554,7 +1554,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43003,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1565,7 +1565,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 13004,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1576,7 +1576,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1587,7 +1587,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 34005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1607,7 +1607,7 @@
"key": "robot_Sheet1_text_26",
"text": "玩家26"
},
- "hero1": 25004,
+ "hero1": 14001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1618,7 +1618,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 35005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1629,7 +1629,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24001,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1640,7 +1640,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 44006,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1651,7 +1651,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 14003,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1671,7 +1671,7 @@
"key": "robot_Sheet1_text_27",
"text": "玩家27"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1682,7 +1682,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1693,7 +1693,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 33003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1704,7 +1704,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1715,7 +1715,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1735,7 +1735,7 @@
"key": "robot_Sheet1_text_28",
"text": "玩家28"
},
- "hero1": 25004,
+ "hero1": 14001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1746,7 +1746,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1757,7 +1757,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24008,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1768,7 +1768,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1779,7 +1779,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24009,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1799,7 +1799,7 @@
"key": "robot_Sheet1_text_29",
"text": "玩家29"
},
- "hero1": 25004,
+ "hero1": 13003,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1810,7 +1810,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 25004,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1821,7 +1821,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 15002,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1832,7 +1832,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 14005,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1843,7 +1843,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 15004,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1863,7 +1863,7 @@
"key": "robot_Sheet1_text_30",
"text": "玩家30"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1874,7 +1874,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43001,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1885,7 +1885,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24001,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1896,7 +1896,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 35001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1907,7 +1907,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 15004,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1927,7 +1927,7 @@
"key": "robot_Sheet1_text_31",
"text": "玩家31"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -1938,7 +1938,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 35005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -1949,7 +1949,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 33003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -1960,7 +1960,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 44006,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -1971,7 +1971,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 43002,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -1991,7 +1991,7 @@
"key": "robot_Sheet1_text_32",
"text": "玩家32"
},
- "hero1": 25004,
+ "hero1": 25001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -2002,7 +2002,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43001,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -2013,7 +2013,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24008,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -2024,7 +2024,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 35001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -2035,7 +2035,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 35006,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -2055,7 +2055,7 @@
"key": "robot_Sheet1_text_33",
"text": "玩家33"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -2066,7 +2066,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -2077,7 +2077,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 13004,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -2088,7 +2088,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 24002,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -2099,7 +2099,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -2119,7 +2119,7 @@
"key": "robot_Sheet1_text_34",
"text": "玩家34"
},
- "hero1": 25004,
+ "hero1": 13003,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -2130,7 +2130,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 15005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -2141,7 +2141,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 34003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -2152,7 +2152,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 15003,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -2163,7 +2163,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 34008,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -2183,7 +2183,7 @@
"key": "robot_Sheet1_text_35",
"text": "玩家35"
},
- "hero1": 25004,
+ "hero1": 13001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -2194,7 +2194,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43003,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -2205,7 +2205,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 13004,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -2216,7 +2216,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -2227,7 +2227,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 34005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -2247,7 +2247,7 @@
"key": "robot_Sheet1_text_36",
"text": "玩家36"
},
- "hero1": 25004,
+ "hero1": 14001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -2258,7 +2258,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 35005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -2269,7 +2269,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24001,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -2280,7 +2280,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 44006,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -2291,7 +2291,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 14003,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -2311,7 +2311,7 @@
"key": "robot_Sheet1_text_37",
"text": "玩家37"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -2322,7 +2322,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -2333,7 +2333,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 33003,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -2344,7 +2344,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -2355,7 +2355,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24005,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -2375,7 +2375,7 @@
"key": "robot_Sheet1_text_38",
"text": "玩家38"
},
- "hero1": 25004,
+ "hero1": 14001,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -2386,7 +2386,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 13005,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -2397,7 +2397,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24008,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -2408,7 +2408,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 45001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -2419,7 +2419,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 24009,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -2439,7 +2439,7 @@
"key": "robot_Sheet1_text_39",
"text": "玩家39"
},
- "hero1": 25004,
+ "hero1": 13003,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -2450,7 +2450,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 25004,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -2461,7 +2461,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 15002,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -2472,7 +2472,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 14005,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -2483,7 +2483,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 15004,
"lv5": 60,
"star5": 6,
"equip5": [
@@ -2503,7 +2503,7 @@
"key": "robot_Sheet1_text_40",
"text": "玩家40"
},
- "hero1": 25004,
+ "hero1": 14007,
"lv1": 60,
"star1": 6,
"equip1": [
@@ -2514,7 +2514,7 @@
10005,
10006
],
- "hero2": 25001,
+ "hero2": 43001,
"lv2": 60,
"star2": 6,
"equip2": [
@@ -2525,7 +2525,7 @@
10015,
10016
],
- "hero3": 34006,
+ "hero3": 24001,
"lv3": 60,
"star3": 6,
"equip3": [
@@ -2536,7 +2536,7 @@
10025,
10026
],
- "hero4": 34006,
+ "hero4": 35001,
"lv4": 60,
"star4": 6,
"equip4": [
@@ -2547,7 +2547,7 @@
10025,
10026
],
- "hero5": 34006,
+ "hero5": 15004,
"lv5": 60,
"star5": 6,
"equip5": [
diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json
index 04fbcee35..c4b382131 100644
--- a/bin/json/game_ruledesc.json
+++ b/bin/json/game_ruledesc.json
@@ -51,7 +51,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_5",
- "text": "这里可以查看各种功夫陪练,完成陪练可以获得高额奖励。
完成3/6/9次的陪练还有格外奖励可以领取。"
+ "text": "这里可以查看各种功夫陪练,完成陪练可以获得高额奖励。
完成3/6/9次的陪练还有额外奖励可以领取。"
}
},
{
@@ -62,7 +62,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_6",
- "text": "这里可以选择守护者去完成陪练任务,每个陪练任务有不同的等级与阵容要求,满足格外需求还可以获得格外的道具奖励,完成任务可以获得高额奖励。"
+ "text": "这里可以选择守护者去完成陪练任务,每个陪练任务有不同的等级与阵容要求,满足额外需求还可以获得额外的道具奖励,完成任务可以获得高额奖励。"
}
},
{
@@ -260,7 +260,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_24",
- "text": "这里可以查看关卡星完成条件,积累一定的关卡星可以获得格外的道具奖励。"
+ "text": "这里可以查看关卡星完成条件,积累一定的关卡星可以获得额外的道具奖励。"
}
},
{
@@ -381,7 +381,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_35",
- "text": "这里可以登记不同职业类别,登记类别提升后,该类别的守护者可以获得格外的木桩锻炼经验加成。"
+ "text": "这里可以登记不同职业类别,登记类别提升后,该类别的守护者可以获得额外的木桩锻炼经验加成。"
}
},
{
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index b1a46a20b..efb84bf6c 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -20539,7 +20539,7 @@
"From": 4,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 2,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
@@ -20547,35 +20547,10 @@
4,
4000
],
- "FollowSK": [],
- "SucFollowSK": [
- 243001313
- ],
- "FailFollowSK": [],
- "MustHit": false,
- "DpsRevisiType": 0,
- "DpsCondition": "",
- "RevisiCondition": "",
- "RevisiParams": []
- },
- {
- "Id": 243001312,
- "EmitPR": 1000,
- "From": 11,
- "Where": [],
- "Order": "Type=Rand",
- "Limit": 1,
- "ExecuteCnt": 1,
- "Type": 1,
- "Argu": [
- 1,
- 4,
- 4000
- ],
- "FollowSK": [],
- "SucFollowSK": [
+ "FollowSK": [
243001313
],
+ "SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@@ -20589,7 +20564,7 @@
"From": 9,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 8068e20b4..e0191d3fd 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -15467,8 +15467,7 @@
"Target": 2,
"ChildSkill": {
"Id": [
- 243001311,
- 243001312
+ 243001311
]
},
"Desc": {
diff --git a/bin/json/game_vikinglineup.json b/bin/json/game_vikinglineup.json
index 21ff156c0..17a60f243 100644
--- a/bin/json/game_vikinglineup.json
+++ b/bin/json/game_vikinglineup.json
@@ -3,300 +3,300 @@
"id": 1001,
"robotid": 10001,
"difficulty": 1,
- "time": 30000
+ "time": 30237
},
{
"id": 1002,
"robotid": 10002,
"difficulty": 2,
- "time": 31000
+ "time": 31192
},
{
"id": 1003,
"robotid": 10003,
"difficulty": 3,
- "time": 32000
+ "time": 32968
},
{
"id": 1004,
"robotid": 10004,
"difficulty": 4,
- "time": 33000
+ "time": 33810
},
{
"id": 1005,
"robotid": 10005,
"difficulty": 5,
- "time": 34000
+ "time": 34212
},
{
"id": 1006,
"robotid": 10006,
"difficulty": 6,
- "time": 35000
+ "time": 35739
},
{
"id": 1007,
"robotid": 10007,
"difficulty": 7,
- "time": 36000
+ "time": 36422
},
{
"id": 1008,
"robotid": 10008,
"difficulty": 8,
- "time": 37000
+ "time": 37445
},
{
"id": 1009,
"robotid": 10009,
"difficulty": 9,
- "time": 38000
+ "time": 38868
},
{
"id": 1010,
"robotid": 10010,
"difficulty": 10,
- "time": 39000
+ "time": 39483
},
{
"id": 2001,
"robotid": 10011,
"difficulty": 1,
- "time": 40000
+ "time": 40942
},
{
"id": 2002,
"robotid": 10012,
"difficulty": 2,
- "time": 41000
+ "time": 41916
},
{
"id": 2003,
"robotid": 10013,
"difficulty": 3,
- "time": 42000
+ "time": 42229
},
{
"id": 2004,
"robotid": 10014,
"difficulty": 4,
- "time": 43000
+ "time": 43516
},
{
"id": 2005,
"robotid": 10015,
"difficulty": 5,
- "time": 44000
+ "time": 44104
},
{
"id": 2006,
"robotid": 10016,
"difficulty": 6,
- "time": 45000
+ "time": 45524
},
{
"id": 2007,
"robotid": 10017,
"difficulty": 7,
- "time": 46000
+ "time": 46946
},
{
"id": 2008,
"robotid": 10018,
"difficulty": 8,
- "time": 47000
+ "time": 47265
},
{
"id": 2009,
"robotid": 10019,
"difficulty": 9,
- "time": 48000
+ "time": 48869
},
{
"id": 2010,
"robotid": 10020,
"difficulty": 10,
- "time": 49000
+ "time": 49895
},
{
"id": 3001,
"robotid": 10021,
"difficulty": 1,
- "time": 50000
+ "time": 50133
},
{
"id": 3002,
"robotid": 10022,
"difficulty": 2,
- "time": 51000
+ "time": 51140
},
{
"id": 3003,
"robotid": 10023,
"difficulty": 3,
- "time": 52000
+ "time": 52241
},
{
"id": 3004,
"robotid": 10024,
"difficulty": 4,
- "time": 53000
+ "time": 53963
},
{
"id": 3005,
"robotid": 10025,
"difficulty": 5,
- "time": 54000
+ "time": 54144
},
{
"id": 3006,
"robotid": 10026,
"difficulty": 6,
- "time": 55000
+ "time": 55631
},
{
"id": 3007,
"robotid": 10027,
"difficulty": 7,
- "time": 56000
+ "time": 56345
},
{
"id": 3008,
"robotid": 10028,
"difficulty": 8,
- "time": 57000
+ "time": 57709
},
{
"id": 3009,
"robotid": 10029,
"difficulty": 9,
- "time": 58000
+ "time": 58705
},
{
"id": 3010,
"robotid": 10030,
"difficulty": 10,
- "time": 59000
+ "time": 59912
},
{
"id": 11001,
"robotid": 10031,
"difficulty": 1,
- "time": 60000
+ "time": 60259
},
{
"id": 11002,
"robotid": 10032,
"difficulty": 2,
- "time": 61000
+ "time": 61414
},
{
"id": 11003,
"robotid": 10033,
"difficulty": 3,
- "time": 62000
+ "time": 62354
},
{
"id": 11004,
"robotid": 10034,
"difficulty": 4,
- "time": 63000
+ "time": 63599
},
{
"id": 11005,
"robotid": 10035,
"difficulty": 5,
- "time": 64000
+ "time": 64199
},
{
"id": 11006,
"robotid": 10036,
"difficulty": 6,
- "time": 65000
+ "time": 65925
},
{
"id": 11007,
"robotid": 10037,
"difficulty": 7,
- "time": 66000
+ "time": 66200
},
{
"id": 11008,
"robotid": 10038,
"difficulty": 8,
- "time": 67000
+ "time": 67623
},
{
"id": 11009,
"robotid": 10039,
"difficulty": 9,
- "time": 68000
+ "time": 68499
},
{
"id": 11010,
"robotid": 10040,
"difficulty": 10,
- "time": 69000
+ "time": 69183
},
{
"id": 21001,
"robotid": 10041,
"difficulty": 1,
- "time": 70000
+ "time": 70511
},
{
"id": 21002,
"robotid": 10042,
"difficulty": 2,
- "time": 71000
+ "time": 71238
},
{
"id": 21003,
"robotid": 10043,
"difficulty": 3,
- "time": 72000
+ "time": 72514
},
{
"id": 21004,
"robotid": 10044,
"difficulty": 4,
- "time": 73000
+ "time": 73525
},
{
"id": 21005,
"robotid": 10045,
"difficulty": 5,
- "time": 74000
+ "time": 74888
},
{
"id": 21006,
"robotid": 10046,
"difficulty": 6,
- "time": 75000
+ "time": 75654
},
{
"id": 21007,
"robotid": 10047,
"difficulty": 7,
- "time": 76000
+ "time": 76264
},
{
"id": 21008,
"robotid": 10048,
"difficulty": 8,
- "time": 77000
+ "time": 77304
},
{
"id": 21009,
"robotid": 10049,
"difficulty": 9,
- "time": 78000
+ "time": 78613
},
{
"id": 21010,
"robotid": 10050,
"difficulty": 10,
- "time": 79000
+ "time": 79718
}
]
\ No newline at end of file