From d4b6c368cbfd5ff3dbb4e1ac1133bb731d0ed80b Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 26 Sep 2022 11:59:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_hero.json | 598 ++++---
bin/json/game_heroresonance.json | 28 +-
bin/json/game_initial.json | 360 +++++
bin/json/game_item.json | 192 +--
bin/json/game_namelibrary.json | 1388 +++++++++++++++++
bin/json/game_opencond.json | 53 +-
bin/json/game_shop.json | 77 +-
bin/json/game_shopitem.json | 1089 +++++--------
bin/json/game_skillafteratk.json | 276 ++++
bin/json/game_skillatk.json | 200 +++
bin/json/game_stroy.json | 488 ++++--
bin/json/game_taskround.json | 965 ++++--------
modules/hero/api_info.go | 3 +
sys/configure/structs/Game.NameLibrary.go | 42 +
sys/configure/structs/Game.NameLibraryData.go | 39 +
sys/configure/structs/Game.RdtaskData.go | 2 +
sys/configure/structs/Tables.go | 7 +
sys/configure/structs/game.heroData.go | 2 +
18 files changed, 3859 insertions(+), 1950 deletions(-)
create mode 100644 bin/json/game_namelibrary.json
create mode 100644 sys/configure/structs/Game.NameLibrary.go
create mode 100644 sys/configure/structs/Game.NameLibraryData.go
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index d9e22ad43..a84c342fa 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -56,7 +56,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "13002",
@@ -115,7 +116,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "13003",
@@ -174,7 +176,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "13004",
@@ -233,7 +236,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "13005",
@@ -292,7 +296,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "14001",
@@ -351,7 +356,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "14002",
@@ -410,7 +416,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "14003",
@@ -469,7 +476,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "14004",
@@ -528,7 +536,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "14005",
@@ -587,7 +596,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "14006",
@@ -646,7 +656,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "14007",
@@ -705,7 +716,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "15001",
@@ -764,7 +776,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "15002",
@@ -823,7 +836,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "15003",
@@ -882,7 +896,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "15004",
@@ -941,7 +956,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "23001",
@@ -1000,7 +1016,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "23002",
@@ -1059,7 +1076,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "23003",
@@ -1118,7 +1136,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "23004",
@@ -1177,7 +1196,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "24001",
@@ -1236,7 +1256,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "24002",
@@ -1295,7 +1316,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "24003",
@@ -1354,7 +1376,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "24004",
@@ -1413,7 +1436,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "24005",
@@ -1472,7 +1496,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "24006",
@@ -1531,7 +1556,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "24007",
@@ -1590,7 +1616,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "24008",
@@ -1649,7 +1676,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "24009",
@@ -1708,7 +1736,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "25001",
@@ -1767,7 +1796,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "25002",
@@ -1826,7 +1856,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "25003",
@@ -1885,7 +1916,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "25004",
@@ -1944,7 +1976,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "33001",
@@ -2003,7 +2036,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "33002",
@@ -2062,7 +2096,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "33003",
@@ -2121,7 +2156,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "33004",
@@ -2180,7 +2216,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "33005",
@@ -2239,7 +2276,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "33006",
@@ -2298,7 +2336,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "34001",
@@ -2357,7 +2396,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "34002",
@@ -2416,7 +2456,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "34003",
@@ -2475,7 +2516,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "34004",
@@ -2534,7 +2576,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "34005",
@@ -2593,7 +2636,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "34006",
@@ -2652,7 +2696,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "34007",
@@ -2711,7 +2756,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "34008",
@@ -2770,7 +2816,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "35001",
@@ -2829,7 +2876,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "35002",
@@ -2888,7 +2936,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "35003",
@@ -2947,7 +2996,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "35004",
@@ -3006,7 +3056,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "35005",
@@ -3065,7 +3116,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "35006",
@@ -3124,7 +3176,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43001",
@@ -3183,7 +3236,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43002",
@@ -3242,7 +3296,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43003",
@@ -3301,7 +3356,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43004",
@@ -3360,7 +3416,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43005",
@@ -3419,7 +3476,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43006",
@@ -3478,7 +3536,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43007",
@@ -3537,7 +3596,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "44001",
@@ -3596,7 +3656,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "44002",
@@ -3655,7 +3716,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "44003",
@@ -3714,7 +3776,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "44004",
@@ -3773,7 +3836,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "44006",
@@ -3832,7 +3896,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "45001",
@@ -3891,7 +3956,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "45002",
@@ -3950,7 +4016,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "45003",
@@ -4009,7 +4076,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "45004",
@@ -4068,7 +4136,128 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
+ },
+ {
+ "hid": "44005",
+ "name": {
+ "key": "hero_44005",
+ "text": "小伊"
+ },
+ "star": 3,
+ "color": 2,
+ "race": 4,
+ "job": 3,
+ "type": 1,
+ "ip": 3,
+ "sd": 1,
+ "handbook": 1,
+ "prefab": "44005",
+ "rotation": "0|0|0",
+ "icon": "44005",
+ "vocal": "44005",
+ "tujing": [
+ 1
+ ],
+ "intr": {
+ "key": "",
+ "text": ""
+ },
+ "events": "Hero_44005",
+ "cite": "",
+ "effectstay": [],
+ "hpspace": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "skill": 144005011,
+ "skill1": 144005111,
+ "skill2": 144005211,
+ "skill3": 144005311,
+ "txt": {
+ "key": "",
+ "text": ""
+ },
+ "enteranivalue": 0,
+ "camerainterval": 0.6,
+ "equiprcom": [
+ "10001",
+ "10002",
+ "10003",
+ "10004",
+ "10005",
+ "10006",
+ "10011",
+ "10012",
+ "10013",
+ "10014",
+ "10015",
+ "10016"
+ ],
+ "angle": 0,
+ "deviation": 0
+ },
+ {
+ "hid": "15005",
+ "name": {
+ "key": "hero_15001",
+ "text": "亚力克斯"
+ },
+ "star": 3,
+ "color": 2,
+ "race": 1,
+ "job": 3,
+ "type": 1,
+ "ip": 8,
+ "sd": 1,
+ "handbook": 1,
+ "prefab": "15005",
+ "rotation": "0|0|0",
+ "icon": "15005",
+ "vocal": "15005",
+ "tujing": [
+ 1
+ ],
+ "intr": {
+ "key": "",
+ "text": ""
+ },
+ "events": "Hero_15005",
+ "cite": "",
+ "effectstay": [],
+ "hpspace": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "skill": 115005011,
+ "skill1": 115005111,
+ "skill2": 115005211,
+ "skill3": 115005311,
+ "txt": {
+ "key": "",
+ "text": ""
+ },
+ "enteranivalue": 0,
+ "camerainterval": 0.6,
+ "equiprcom": [
+ "10021",
+ "10022",
+ "10023",
+ "10024",
+ "10025",
+ "10026",
+ "10031",
+ "10032",
+ "10033",
+ "10034",
+ "10035",
+ "10036"
+ ],
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43901",
@@ -4127,7 +4316,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43902",
@@ -4186,7 +4376,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43903",
@@ -4245,7 +4436,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "42911",
@@ -4304,7 +4496,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43911",
@@ -4363,7 +4556,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "44911",
@@ -4422,7 +4616,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "43921",
@@ -4481,7 +4676,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "44921",
@@ -4540,7 +4736,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "45921",
@@ -4599,7 +4796,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51001",
@@ -4658,7 +4856,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51002",
@@ -4717,7 +4916,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51003",
@@ -4776,7 +4976,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51004",
@@ -4835,7 +5036,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51005",
@@ -4894,7 +5096,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51006",
@@ -4953,7 +5156,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51007",
@@ -5012,7 +5216,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51008",
@@ -5071,7 +5276,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51009",
@@ -5130,7 +5336,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51010",
@@ -5189,7 +5396,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51011",
@@ -5248,7 +5456,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51012",
@@ -5307,7 +5516,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51013",
@@ -5366,7 +5576,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "51014",
@@ -5425,7 +5636,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "54001",
@@ -5484,7 +5696,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "53001",
@@ -5543,7 +5756,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "53002",
@@ -5602,7 +5816,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "53003",
@@ -5661,7 +5876,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "53004",
@@ -5720,7 +5936,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "53005",
@@ -5779,7 +5996,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "53006",
@@ -5838,7 +6056,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "55001",
@@ -5897,7 +6116,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "55002",
@@ -5956,7 +6176,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "55003",
@@ -6015,7 +6236,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "55004",
@@ -6074,7 +6296,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "55005",
@@ -6133,7 +6356,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "55006",
@@ -6192,7 +6416,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "55007",
@@ -6251,7 +6476,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "11021",
@@ -6310,7 +6536,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "12003",
@@ -6371,125 +6598,8 @@
"10055",
"10056"
],
- "angle": 0
- },
- {
- "hid": "44005",
- "name": {
- "key": "hero_44005",
- "text": "小伊"
- },
- "star": 3,
- "color": 2,
- "race": 4,
- "job": 3,
- "type": 1,
- "ip": 1,
- "sd": 1,
- "handbook": 1,
- "prefab": "44005",
- "rotation": "0|0|0",
- "icon": "44005",
- "vocal": "44005",
- "tujing": [
- 1
- ],
- "intr": {
- "key": "",
- "text": ""
- },
- "events": "Hero_44005",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill": 144005011,
- "skill1": 144005111,
- "skill2": 144005211,
- "skill3": 144005311,
- "txt": {
- "key": "",
- "text": ""
- },
- "enteranivalue": 0,
- "camerainterval": 0.6,
- "equiprcom": [
- "10001",
- "10002",
- "10003",
- "10004",
- "10005",
- "10006",
- "10011",
- "10012",
- "10013",
- "10014",
- "10015",
- "10016"
- ],
- "angle": 0
- },
- {
- "hid": "15005",
- "name": {
- "key": "hero_15001",
- "text": "亚力克斯"
- },
- "star": 3,
- "color": 2,
- "race": 1,
- "job": 3,
- "type": 1,
- "ip": 1,
- "sd": 1,
- "handbook": 1,
- "prefab": "15005",
- "rotation": "0|0|0",
- "icon": "15005",
- "vocal": "15005",
- "tujing": [
- 1
- ],
- "intr": {
- "key": "",
- "text": ""
- },
- "events": "Hero_15005",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill": 115005011,
- "skill1": 115005111,
- "skill2": 115005211,
- "skill3": 115005311,
- "txt": {
- "key": "",
- "text": ""
- },
- "enteranivalue": 0,
- "camerainterval": 0.6,
- "equiprcom": [
- "10021",
- "10022",
- "10023",
- "10024",
- "10025",
- "10026",
- "10031",
- "10032",
- "10033",
- "10034",
- "10035",
- "10036"
- ],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "63002",
@@ -6546,7 +6656,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "63003",
@@ -6603,7 +6714,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "63004",
@@ -6660,7 +6772,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "64003",
@@ -6717,7 +6830,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "74002",
@@ -6774,7 +6888,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "74003",
@@ -6831,7 +6946,8 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "74004",
@@ -6888,7 +7004,8 @@
"10055",
"10056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "83002",
@@ -6945,7 +7062,8 @@
"11015",
"11016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "83006",
@@ -7002,7 +7120,8 @@
"11035",
"11036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "84002",
@@ -7059,7 +7178,8 @@
"11055",
"11056"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "94002",
@@ -7116,7 +7236,8 @@
"10015",
"10016"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
},
{
"hid": "94005",
@@ -7175,6 +7296,7 @@
"10035",
"10036"
],
- "angle": 0
+ "angle": 0,
+ "deviation": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_heroresonance.json b/bin/json/game_heroresonance.json
index fee08d559..085739026 100644
--- a/bin/json/game_heroresonance.json
+++ b/bin/json/game_heroresonance.json
@@ -232,7 +232,7 @@
},
{
"hid": "14003",
- "star": 4,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -364,7 +364,7 @@
},
{
"hid": "14007",
- "star": 4,
+ "star": 5,
"energy": 6,
"prize": [
{
@@ -496,7 +496,7 @@
},
{
"hid": "15004",
- "star": 5,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -694,7 +694,7 @@
},
{
"hid": "24002",
- "star": 4,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -727,7 +727,7 @@
},
{
"hid": "24003",
- "star": 4,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -760,7 +760,7 @@
},
{
"hid": "24004",
- "star": 4,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -958,7 +958,7 @@
},
{
"hid": "25001",
- "star": 5,
+ "star": 4,
"energy": 6,
"prize": [
{
@@ -1057,7 +1057,7 @@
},
{
"hid": "25004",
- "star": 5,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -1552,7 +1552,7 @@
},
{
"hid": "35001",
- "star": 4,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -1618,7 +1618,7 @@
},
{
"hid": "35003",
- "star": 5,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -2113,7 +2113,7 @@
},
{
"hid": "44006",
- "star": 4,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -2212,7 +2212,7 @@
},
{
"hid": "45003",
- "star": 5,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -2278,7 +2278,7 @@
},
{
"hid": "44005",
- "star": 4,
+ "star": 3,
"energy": 6,
"prize": [
{
@@ -2311,7 +2311,7 @@
},
{
"hid": "15005",
- "star": 5,
+ "star": 3,
"energy": 6,
"prize": [
{
diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json
index 2503d13e7..64f5e0f15 100644
--- a/bin/json/game_initial.json
+++ b/bin/json/game_initial.json
@@ -598,5 +598,365 @@
"n": 5
}
]
+ },
+ {
+ "index": "75",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "76",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "77",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "78",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10004",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "79",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10005",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "80",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10006",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "81",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10011",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "82",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10012",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "83",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10013",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "84",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10014",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "85",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10015",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "86",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10016",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "87",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10021",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "88",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10022",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "89",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10023",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "90",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10024",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "91",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10025",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "92",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10026",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "93",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10031",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "94",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10032",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "95",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10033",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "96",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10034",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "97",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10035",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "98",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10036",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "99",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10041",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "100",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10042",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "101",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10043",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "102",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10044",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "103",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10045",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "104",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10046",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "105",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10051",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "106",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10052",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "107",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10053",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "108",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10054",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "109",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10055",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "index": "110",
+ "var": [
+ {
+ "a": "equi",
+ "t": "10056",
+ "n": 1
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 3ae338592..602453e69 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -132,7 +132,7 @@
"id": "10004",
"name": {
"key": "itemname_10004",
- "text": "声波自选箱"
+ "text": "金币自选箱"
},
"usetype": 4,
"color": 4,
@@ -168,7 +168,7 @@
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_10004",
- "text": "声波自选箱不足"
+ "text": "金币自选箱不足"
}
},
{
@@ -777,7 +777,7 @@
"id": "30001",
"name": {
"key": "itemname_30001",
- "text": "普通招募券"
+ "text": "时空石"
},
"usetype": 3,
"color": 5,
@@ -798,23 +798,23 @@
"star": 0,
"race": 0,
"img": "wp_icon_10009",
- "ico": "wp_icon_10009",
+ "ico": "wp_icon_10019",
"intr": {
"key": "itemdesc_30001",
- "text": "可以用于普通招募招募英雄"
+ "text": "可以用于招募英雄"
},
"sale": [],
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_30001",
- "text": "普通招募券不足"
+ "text": "时空石不足"
}
},
{
"id": "30002",
"name": {
"key": "itemname_30002",
- "text": "阵营1招募券"
+ "text": "奥术石"
},
"usetype": 3,
"color": 5,
@@ -835,23 +835,23 @@
"star": 0,
"race": 0,
"img": "wp_icon_10010",
- "ico": "wp_icon_10010",
+ "ico": "wp_icon_10020",
"intr": {
"key": "itemdesc_30002",
- "text": "可以用于阵营1招募英雄"
+ "text": "可以用于奥术阵营招募英雄"
},
"sale": [],
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_30002",
- "text": "阵营1招募券不足"
+ "text": "奥术石不足"
}
},
{
"id": "30003",
"name": {
"key": "itemname_30003",
- "text": "阵营2招募券"
+ "text": "科技石"
},
"usetype": 3,
"color": 5,
@@ -872,23 +872,23 @@
"star": 0,
"race": 0,
"img": "wp_icon_10011",
- "ico": "wp_icon_10011",
+ "ico": "wp_icon_10021",
"intr": {
"key": "itemdesc_30003",
- "text": "可以用于阵营2招募英雄"
+ "text": "可以用于科技阵营招募英雄"
},
"sale": [],
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_30003",
- "text": "阵营2招募券不足"
+ "text": "科技石不足"
}
},
{
"id": "30004",
"name": {
"key": "itemname_30004",
- "text": "阵营3招募券"
+ "text": "自然石"
},
"usetype": 3,
"color": 5,
@@ -909,23 +909,23 @@
"star": 0,
"race": 0,
"img": "wp_icon_10012",
- "ico": "wp_icon_10012",
+ "ico": "wp_icon_10022",
"intr": {
"key": "itemdesc_30004",
- "text": "可以用于阵营3招募英雄"
+ "text": "可以用于自然阵营招募英雄"
},
"sale": [],
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_30004",
- "text": "阵营3招募券不足"
+ "text": "自然石不足"
}
},
{
"id": "30005",
"name": {
"key": "itemname_30005",
- "text": "阵营4招募券"
+ "text": "光耀石"
},
"usetype": 3,
"color": 5,
@@ -946,23 +946,23 @@
"star": 0,
"race": 0,
"img": "wp_icon_10013",
- "ico": "wp_icon_10013",
+ "ico": "wp_icon_10023",
"intr": {
"key": "itemdesc_30005",
- "text": "可以用于阵营4招募英雄"
+ "text": "可以用于光耀阵营招募英雄"
},
"sale": [],
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_30005",
- "text": "阵营4招募券不足"
+ "text": "光耀石不足"
}
},
{
"id": "50001",
"name": {
"key": "itemname_50001",
- "text": "闪耀声波-低级"
+ "text": "奥术美食-低级"
},
"usetype": 8,
"color": 3,
@@ -971,7 +971,7 @@
"special_type": 0,
"time": 0,
"effects": "",
- "box_id": 50005,
+ "box_id": 0,
"synthetize_num": 5,
"access": [
109
@@ -982,11 +982,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10013",
- "ico": "wp_icon_10013",
+ "img": "wp_icon_10031",
+ "ico": "wp_icon_10031",
"intr": {
"key": "itemdesc_50001",
- "text": "把它放在背包里会带来好运"
+ "text": "食用后可以提升奥术系英雄的觉醒等级"
},
"sale": [
{
@@ -1004,14 +1004,14 @@
],
"tipstxt": {
"key": "itemtipstxt_50001",
- "text": "闪耀声波-低级不足"
+ "text": "奥术美食-低级不足"
}
},
{
"id": "50002",
"name": {
"key": "itemname_50002",
- "text": "灼热声波-低级"
+ "text": "科技美食-低级"
},
"usetype": 8,
"color": 3,
@@ -1020,7 +1020,7 @@
"special_type": 0,
"time": 0,
"effects": "",
- "box_id": 50006,
+ "box_id": 0,
"synthetize_num": 5,
"access": [
109
@@ -1031,11 +1031,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10014",
- "ico": "wp_icon_10014",
+ "img": "wp_icon_10032",
+ "ico": "wp_icon_10032",
"intr": {
"key": "itemdesc_50002",
- "text": "你登录了游戏就是冒险家，就会获得这个勋章"
+ "text": "食用后可以提升科技系英雄的觉醒等级"
},
"sale": [
{
@@ -1053,14 +1053,14 @@
],
"tipstxt": {
"key": "itemtipstxt_50002",
- "text": "灼热声波-低级不足"
+ "text": "科技美食-低级不足"
}
},
{
"id": "50003",
"name": {
"key": "itemname_50003",
- "text": "呼啸声波-低级"
+ "text": "自然美食-低级"
},
"usetype": 8,
"color": 3,
@@ -1069,7 +1069,7 @@
"special_type": 0,
"time": 0,
"effects": "",
- "box_id": 50007,
+ "box_id": 0,
"synthetize_num": 5,
"access": [
109
@@ -1080,11 +1080,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10015",
- "ico": "wp_icon_10015",
+ "img": "wp_icon_10033",
+ "ico": "wp_icon_10033",
"intr": {
"key": "itemdesc_50003",
- "text": "比幸运草更幸运"
+ "text": "食用后可以提升自然系英雄的觉醒等级"
},
"sale": [
{
@@ -1102,14 +1102,14 @@
],
"tipstxt": {
"key": "itemtipstxt_50003",
- "text": "呼啸声波-低级不足"
+ "text": "自然美食-低级不足"
}
},
{
"id": "50004",
"name": {
"key": "itemname_50004",
- "text": "涌动声波-低级"
+ "text": "光耀美食-低级"
},
"usetype": 8,
"color": 3,
@@ -1118,7 +1118,7 @@
"special_type": 0,
"time": 0,
"effects": "",
- "box_id": 50008,
+ "box_id": 0,
"synthetize_num": 5,
"access": [
109
@@ -1129,11 +1129,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10016",
- "ico": "wp_icon_10016",
+ "img": "wp_icon_10034",
+ "ico": "wp_icon_10034",
"intr": {
"key": "itemdesc_50004",
- "text": "钻石是人造的，所以不能用来买商城的商品"
+ "text": "食用后可以提升光耀系英雄的觉醒等级"
},
"sale": [
{
@@ -1151,14 +1151,14 @@
],
"tipstxt": {
"key": "itemtipstxt_50004",
- "text": "涌动声波-低级不足"
+ "text": "光耀美食-低级不足"
}
},
{
"id": "50005",
"name": {
"key": "itemname_50005",
- "text": "闪耀声波-中级"
+ "text": "奥术美食-中级"
},
"usetype": 8,
"color": 4,
@@ -1167,7 +1167,7 @@
"special_type": 0,
"time": 0,
"effects": "",
- "box_id": 50009,
+ "box_id": 0,
"synthetize_num": 5,
"access": [
109
@@ -1178,11 +1178,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10013",
- "ico": "wp_icon_10013",
+ "img": "wp_icon_10031",
+ "ico": "wp_icon_10031",
"intr": {
"key": "itemdesc_50005",
- "text": "把它放在背包里会带来好运"
+ "text": "食用后可以提升奥术系英雄的觉醒等级"
},
"sale": [
{
@@ -1200,14 +1200,14 @@
],
"tipstxt": {
"key": "itemtipstxt_50005",
- "text": "闪耀声波-中级不足"
+ "text": "奥术美食-中级不足"
}
},
{
"id": "50006",
"name": {
"key": "itemname_50006",
- "text": "灼热声波-中级"
+ "text": "科技美食-中级"
},
"usetype": 8,
"color": 4,
@@ -1216,7 +1216,7 @@
"special_type": 0,
"time": 0,
"effects": "",
- "box_id": 50010,
+ "box_id": 0,
"synthetize_num": 5,
"access": [
109
@@ -1227,11 +1227,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10014",
- "ico": "wp_icon_10014",
+ "img": "wp_icon_10032",
+ "ico": "wp_icon_10032",
"intr": {
"key": "itemdesc_50006",
- "text": "你登录了游戏就是冒险家，就会获得这个勋章"
+ "text": "食用后可以提升科技系英雄的觉醒等级"
},
"sale": [
{
@@ -1249,14 +1249,14 @@
],
"tipstxt": {
"key": "itemtipstxt_50006",
- "text": "灼热声波-中级不足"
+ "text": "科技美食-中级不足"
}
},
{
"id": "50007",
"name": {
"key": "itemname_50007",
- "text": "呼啸声波-中级"
+ "text": "自然美食-中级"
},
"usetype": 8,
"color": 4,
@@ -1265,7 +1265,7 @@
"special_type": 0,
"time": 0,
"effects": "",
- "box_id": 50011,
+ "box_id": 0,
"synthetize_num": 5,
"access": [
109
@@ -1276,11 +1276,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10015",
- "ico": "wp_icon_10015",
+ "img": "wp_icon_10033",
+ "ico": "wp_icon_10033",
"intr": {
"key": "itemdesc_50007",
- "text": "比幸运草更幸运"
+ "text": "食用后可以提升自然系英雄的觉醒等级"
},
"sale": [
{
@@ -1298,14 +1298,14 @@
],
"tipstxt": {
"key": "itemtipstxt_50007",
- "text": "呼啸声波-中级不足"
+ "text": "自然美食-中级不足"
}
},
{
"id": "50008",
"name": {
"key": "itemname_50008",
- "text": "涌动声波-中级"
+ "text": "光耀美食-中级"
},
"usetype": 8,
"color": 4,
@@ -1314,7 +1314,7 @@
"special_type": 0,
"time": 0,
"effects": "",
- "box_id": 50012,
+ "box_id": 0,
"synthetize_num": 5,
"access": [
109
@@ -1325,11 +1325,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10016",
- "ico": "wp_icon_10016",
+ "img": "wp_icon_10034",
+ "ico": "wp_icon_10034",
"intr": {
"key": "itemdesc_50008",
- "text": "钻石是人造的，所以不能用来买商城的商品"
+ "text": "食用后可以提升光耀系英雄的觉醒等级"
},
"sale": [
{
@@ -1347,14 +1347,14 @@
],
"tipstxt": {
"key": "itemtipstxt_50008",
- "text": "涌动声波-中级不足"
+ "text": "光耀美食-中级不足"
}
},
{
"id": "50009",
"name": {
"key": "itemname_50009",
- "text": "闪耀声波-高级"
+ "text": "奥术美食-高级"
},
"usetype": 8,
"color": 5,
@@ -1374,11 +1374,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10013",
- "ico": "wp_icon_10013",
+ "img": "wp_icon_10031",
+ "ico": "wp_icon_10031",
"intr": {
"key": "itemdesc_50009",
- "text": "把它放在背包里会带来好运"
+ "text": "食用后可以提升奥术系英雄的觉醒等级"
},
"sale": [
{
@@ -1390,14 +1390,14 @@
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_50009",
- "text": "闪耀声波-高级不足"
+ "text": "奥术美食-高级不足"
}
},
{
"id": "50010",
"name": {
"key": "itemname_50010",
- "text": "灼热声波-高级"
+ "text": "科技美食-高级"
},
"usetype": 8,
"color": 5,
@@ -1417,11 +1417,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10014",
- "ico": "wp_icon_10014",
+ "img": "wp_icon_10032",
+ "ico": "wp_icon_10032",
"intr": {
"key": "itemdesc_50010",
- "text": "你登录了游戏就是冒险家，就会获得这个勋章"
+ "text": "食用后可以提升科技系英雄的觉醒等级"
},
"sale": [
{
@@ -1433,14 +1433,14 @@
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_50010",
- "text": "灼热声波-高级不足"
+ "text": "科技美食-高级不足"
}
},
{
"id": "50011",
"name": {
"key": "itemname_50011",
- "text": "呼啸声波-高级"
+ "text": "自然美食-高级"
},
"usetype": 8,
"color": 5,
@@ -1460,11 +1460,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10015",
- "ico": "wp_icon_10015",
+ "img": "wp_icon_10033",
+ "ico": "wp_icon_10033",
"intr": {
"key": "itemdesc_50011",
- "text": "比幸运草更幸运"
+ "text": "食用后可以提升自然系英雄的觉醒等级"
},
"sale": [
{
@@ -1476,14 +1476,14 @@
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_50011",
- "text": "呼啸声波-高级不足"
+ "text": "自然美食-高级不足"
}
},
{
"id": "50012",
"name": {
"key": "itemname_50012",
- "text": "涌动声波-高级"
+ "text": "光耀美食-高级"
},
"usetype": 8,
"color": 5,
@@ -1503,11 +1503,11 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10016",
- "ico": "wp_icon_10016",
+ "img": "wp_icon_10034",
+ "ico": "wp_icon_10034",
"intr": {
"key": "itemdesc_50012",
- "text": "钻石是人造的，所以不能用来买商城的商品"
+ "text": "食用后可以提升光耀系英雄的觉醒等级"
},
"sale": [
{
@@ -1519,7 +1519,7 @@
"synthetize_deplete": [],
"tipstxt": {
"key": "itemtipstxt_50012",
- "text": "涌动声波-高级不足"
+ "text": "光耀美食-高级不足"
}
},
{
@@ -1546,8 +1546,8 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10009",
- "ico": "wp_icon_10009",
+ "img": "wp_icon_10029",
+ "ico": "wp_icon_10029",
"intr": {
"key": "itemdesc_60001",
"text": "可以任选一件5星装备"
@@ -1583,8 +1583,8 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10009",
- "ico": "wp_icon_10009",
+ "img": "wp_icon_10029",
+ "ico": "wp_icon_10029",
"intr": {
"key": "itemdesc_60002",
"text": "可以随机获得一件5星装备"
@@ -1620,8 +1620,8 @@
"isani": 0,
"star": 0,
"race": 0,
- "img": "wp_icon_10009",
- "ico": "wp_icon_10009",
+ "img": "wp_icon_10030",
+ "ico": "wp_icon_10030",
"intr": {
"key": "itemdesc_60003",
"text": "可以获得一套5星装备"
diff --git a/bin/json/game_namelibrary.json b/bin/json/game_namelibrary.json
new file mode 100644
index 000000000..45e69064d
--- /dev/null
+++ b/bin/json/game_namelibrary.json
@@ -0,0 +1,1388 @@
+[
+ {
+ "id": 1,
+ "surname": {
+ "key": "surname_10001",
+ "text": "愤怒的"
+ },
+ "name": {
+ "key": "name_10001",
+ "text": "辛巴达"
+ }
+ },
+ {
+ "id": 2,
+ "surname": {
+ "key": "surname_10002",
+ "text": "快乐的"
+ },
+ "name": {
+ "key": "name_10002",
+ "text": "艾丽莎"
+ }
+ },
+ {
+ "id": 3,
+ "surname": {
+ "key": "surname_10003",
+ "text": "忧伤的"
+ },
+ "name": {
+ "key": "name_10003",
+ "text": "海柔尔"
+ }
+ },
+ {
+ "id": 4,
+ "surname": {
+ "key": "surname_10004",
+ "text": "吵闹的"
+ },
+ "name": {
+ "key": "name_10004",
+ "text": "塞莉亚"
+ }
+ },
+ {
+ "id": 5,
+ "surname": {
+ "key": "surname_10005",
+ "text": "喜悦的"
+ },
+ "name": {
+ "key": "name_10005",
+ "text": "灰姑凉"
+ }
+ },
+ {
+ "id": 6,
+ "surname": {
+ "key": "surname_10006",
+ "text": "悲伤的"
+ },
+ "name": {
+ "key": "name_10006",
+ "text": "哈迪"
+ }
+ },
+ {
+ "id": 7,
+ "surname": {
+ "key": "surname_10007",
+ "text": "难过的"
+ },
+ "name": {
+ "key": "name_10007",
+ "text": "爱莉儿"
+ }
+ },
+ {
+ "id": 8,
+ "surname": {
+ "key": "surname_10008",
+ "text": "兴奋的"
+ },
+ "name": {
+ "key": "name_10008",
+ "text": "贝尔"
+ }
+ },
+ {
+ "id": 9,
+ "surname": {
+ "key": "surname_10009",
+ "text": "潇洒的"
+ },
+ "name": {
+ "key": "name_10009",
+ "text": "爱洛"
+ }
+ },
+ {
+ "id": 10,
+ "surname": {
+ "key": "surname_10010",
+ "text": "开心的"
+ },
+ "name": {
+ "key": "name_10010",
+ "text": "茉莉"
+ }
+ },
+ {
+ "id": 11,
+ "surname": {
+ "key": "surname_10011",
+ "text": "幸运的"
+ },
+ "name": {
+ "key": "name_10011",
+ "text": "蒂安娜"
+ }
+ },
+ {
+ "id": 12,
+ "surname": {
+ "key": "surname_10012",
+ "text": "欢喜的"
+ },
+ "name": {
+ "key": "name_10012",
+ "text": "乐佩"
+ }
+ },
+ {
+ "id": 13,
+ "surname": {
+ "key": "surname_10013",
+ "text": "愉快的"
+ },
+ "name": {
+ "key": "name_10013",
+ "text": "爱罗拉"
+ }
+ },
+ {
+ "id": 14,
+ "surname": {
+ "key": "surname_10014",
+ "text": "神奇的"
+ },
+ "name": {
+ "key": "name_10014",
+ "text": "塔利娅"
+ }
+ },
+ {
+ "id": 15,
+ "surname": {
+ "key": "surname_10015",
+ "text": "刻苦的"
+ },
+ "name": {
+ "key": "name_10015",
+ "text": "佩洛"
+ }
+ },
+ {
+ "id": 16,
+ "surname": {
+ "key": "surname_10016",
+ "text": "进步的"
+ },
+ "name": {
+ "key": "name_10016",
+ "text": "汉塞尔"
+ }
+ },
+ {
+ "id": 17,
+ "surname": {
+ "key": "surname_10017",
+ "text": "业余的"
+ },
+ "name": {
+ "key": "name_10017",
+ "text": "桃乐丝"
+ }
+ },
+ {
+ "id": 18,
+ "surname": {
+ "key": "surname_10018",
+ "text": "友好的"
+ },
+ "name": {
+ "key": "name_10018",
+ "text": "爱丽丝"
+ }
+ },
+ {
+ "id": 19,
+ "surname": {
+ "key": "surname_10019",
+ "text": "着急的"
+ },
+ "name": {
+ "key": "name_10019",
+ "text": "小矮人"
+ }
+ },
+ {
+ "id": 20,
+ "surname": {
+ "key": "surname_10020",
+ "text": "友爱的"
+ },
+ "name": {
+ "key": "name_10020",
+ "text": "白雪"
+ }
+ },
+ {
+ "id": 21,
+ "surname": {
+ "key": "surname_10021",
+ "text": "聪明的"
+ },
+ "name": {
+ "key": "name_10021",
+ "text": "玛娅"
+ }
+ },
+ {
+ "id": 22,
+ "surname": {
+ "key": "surname_10022",
+ "text": "细心的"
+ },
+ "name": {
+ "key": "name_10022",
+ "text": "阿拉丁"
+ }
+ },
+ {
+ "id": 23,
+ "surname": {
+ "key": "surname_10023",
+ "text": "冰冷的"
+ },
+ "name": {
+ "key": "name_10023",
+ "text": "查理"
+ }
+ },
+ {
+ "id": 24,
+ "surname": {
+ "key": "surname_10024",
+ "text": "无知的"
+ },
+ "name": {
+ "key": "name_10024",
+ "text": "伊凡"
+ }
+ },
+ {
+ "id": 25,
+ "surname": {
+ "key": "surname_10025",
+ "text": "秀美的"
+ },
+ "name": {
+ "key": "name_10025",
+ "text": "奥斯汀"
+ }
+ },
+ {
+ "id": 26,
+ "surname": {
+ "key": "surname_10026",
+ "text": "活泼的"
+ },
+ "name": {
+ "key": "name_10026",
+ "text": "赫瑟尔"
+ }
+ },
+ {
+ "id": 27,
+ "surname": {
+ "key": "surname_10027",
+ "text": "害羞的"
+ },
+ "name": {
+ "key": "name_10027",
+ "text": "夏洛特"
+ }
+ },
+ {
+ "id": 28,
+ "surname": {
+ "key": "surname_10028",
+ "text": "热情的"
+ },
+ "name": {
+ "key": "name_10028",
+ "text": "海洛伊"
+ }
+ },
+ {
+ "id": 29,
+ "surname": {
+ "key": "surname_10029",
+ "text": "开朗的"
+ },
+ "name": {
+ "key": "name_10029",
+ "text": "克莱儿"
+ }
+ },
+ {
+ "id": 30,
+ "surname": {
+ "key": "surname_10030",
+ "text": "唠叨的"
+ },
+ "name": {
+ "key": "name_10030",
+ "text": "巴比特"
+ }
+ },
+ {
+ "id": 31,
+ "surname": {
+ "key": "surname_10031",
+ "text": "糊涂的"
+ },
+ "name": {
+ "key": "name_10031",
+ "text": "胡尔达"
+ }
+ },
+ {
+ "id": 32,
+ "surname": {
+ "key": "surname_10032",
+ "text": "飞驰的"
+ },
+ "name": {
+ "key": "name_10032",
+ "text": "克莱拉"
+ }
+ },
+ {
+ "id": 33,
+ "surname": {
+ "key": "surname_10033",
+ "text": "职业的"
+ },
+ "name": {
+ "key": "name_10033",
+ "text": "艾尔玛"
+ }
+ },
+ {
+ "id": 34,
+ "surname": {
+ "key": "surname_10034",
+ "text": "迟缓的"
+ },
+ "name": {
+ "key": "name_10034",
+ "text": "康斯坦"
+ }
+ },
+ {
+ "id": 35,
+ "surname": {
+ "key": "surname_10035",
+ "text": "迷茫的"
+ },
+ "name": {
+ "key": "name_10035",
+ "text": "鲍德温"
+ }
+ },
+ {
+ "id": 36,
+ "surname": {
+ "key": "surname_10036",
+ "text": "优秀的"
+ },
+ "name": {
+ "key": "name_10036",
+ "text": "伊莎尔"
+ }
+ },
+ {
+ "id": 37,
+ "surname": {
+ "key": "surname_10037",
+ "text": "火红的"
+ },
+ "name": {
+ "key": "name_10037",
+ "text": "巴纳德"
+ }
+ },
+ {
+ "id": 38,
+ "surname": {
+ "key": "surname_10038",
+ "text": "好动的"
+ },
+ "name": {
+ "key": "name_10038",
+ "text": "杰奎琳"
+ }
+ },
+ {
+ "id": 39,
+ "surname": {
+ "key": "surname_10039",
+ "text": "行走的"
+ },
+ "name": {
+ "key": "name_10039",
+ "text": "卡洛儿"
+ }
+ },
+ {
+ "id": 40,
+ "surname": {
+ "key": "surname_10040",
+ "text": "欢闹的"
+ },
+ "name": {
+ "key": "name_10040",
+ "text": "妮莉雅"
+ }
+ },
+ {
+ "id": 41,
+ "surname": {
+ "key": "surname_10041",
+ "text": "风度的"
+ },
+ "name": {
+ "key": "name_10041",
+ "text": "巴雷特"
+ }
+ },
+ {
+ "id": 42,
+ "surname": {
+ "key": "surname_10042",
+ "text": "柔韧的"
+ },
+ "name": {
+ "key": "name_10042",
+ "text": "希伯来"
+ }
+ },
+ {
+ "id": 43,
+ "surname": {
+ "key": "surname_10043",
+ "text": "温柔的"
+ },
+ "name": {
+ "key": "name_10043",
+ "text": "乔伊斯"
+ }
+ },
+ {
+ "id": 44,
+ "surname": {
+ "key": "surname_10044",
+ "text": "美丽的"
+ },
+ "name": {
+ "key": "name_10044",
+ "text": "黛芙妮"
+ }
+ },
+ {
+ "id": 45,
+ "surname": {
+ "key": "surname_10045",
+ "text": "高雅的"
+ },
+ "name": {
+ "key": "name_10045",
+ "text": "巴塞洛"
+ }
+ },
+ {
+ "id": 46,
+ "surname": {
+ "key": "surname_10046",
+ "text": "洋气的"
+ },
+ "name": {
+ "key": "name_10046",
+ "text": "达莲娜"
+ }
+ },
+ {
+ "id": 47,
+ "surname": {
+ "key": "surname_10047",
+ "text": "恬静的"
+ },
+ "name": {
+ "key": "name_10047",
+ "text": "巴利特"
+ }
+ },
+ {
+ "id": 48,
+ "surname": {
+ "key": "surname_10048",
+ "text": "大方的"
+ },
+ "name": {
+ "key": "name_10048",
+ "text": "迪得莉"
+ }
+ },
+ {
+ "id": 49,
+ "surname": {
+ "key": "surname_10049",
+ "text": "端庄的"
+ },
+ "name": {
+ "key": "name_10049",
+ "text": "金百莉"
+ }
+ },
+ {
+ "id": 50,
+ "surname": {
+ "key": "surname_10050",
+ "text": "秀气的"
+ },
+ "name": {
+ "key": "name_10050",
+ "text": "迪丽雅"
+ }
+ },
+ {
+ "id": 51,
+ "surname": {
+ "key": "surname_10051",
+ "text": "清秀的"
+ },
+ "name": {
+ "key": "name_10051",
+ "text": "丹尼丝"
+ }
+ },
+ {
+ "id": 52,
+ "surname": {
+ "key": "surname_10052",
+ "text": "妩媚的"
+ },
+ "name": {
+ "key": "name_10052",
+ "text": "比尔德"
+ }
+ },
+ {
+ "id": 53,
+ "surname": {
+ "key": "surname_10053",
+ "text": "轩昂的"
+ },
+ "name": {
+ "key": "name_10053",
+ "text": "克里斯"
+ }
+ },
+ {
+ "id": 54,
+ "surname": {
+ "key": "surname_10054",
+ "text": "迷人的"
+ },
+ "name": {
+ "key": "name_10054",
+ "text": "黛安娜"
+ }
+ },
+ {
+ "id": 55,
+ "surname": {
+ "key": "surname_10055",
+ "text": "淡定的"
+ },
+ "name": {
+ "key": "name_10055",
+ "text": "博福特"
+ }
+ },
+ {
+ "id": 56,
+ "surname": {
+ "key": "surname_10056",
+ "text": "畅快的"
+ },
+ "name": {
+ "key": "name_10056",
+ "text": "罗瑞尔"
+ }
+ },
+ {
+ "id": 57,
+ "surname": {
+ "key": "surname_10057",
+ "text": "坚强的"
+ },
+ "name": {
+ "key": "name_10057",
+ "text": "伊迪丝"
+ }
+ },
+ {
+ "id": 58,
+ "surname": {
+ "key": "surname_10058",
+ "text": "甜美的"
+ },
+ "name": {
+ "key": "name_10058",
+ "text": "弗伦丝"
+ }
+ },
+ {
+ "id": 59,
+ "surname": {
+ "key": "surname_10059",
+ "text": "爽朗的"
+ },
+ "name": {
+ "key": "name_10059",
+ "text": "弗莉达"
+ }
+ },
+ {
+ "id": 60,
+ "surname": {
+ "key": "surname_10060",
+ "text": "安然的"
+ },
+ "name": {
+ "key": "name_10060",
+ "text": "菲蕾卡"
+ }
+ },
+ {
+ "id": 61,
+ "surname": {
+ "key": "surname_10061",
+ "text": "文雅的"
+ },
+ "name": {
+ "key": "name_10061",
+ "text": "维多利"
+ }
+ },
+ {
+ "id": 62,
+ "surname": {
+ "key": "surname_10062",
+ "text": "悠然的"
+ },
+ "name": {
+ "key": "name_10062",
+ "text": "嘉比拉"
+ }
+ },
+ {
+ "id": 63,
+ "surname": {
+ "key": "surname_10063",
+ "text": "宁静的"
+ },
+ "name": {
+ "key": "name_10063",
+ "text": "乔治亚"
+ }
+ },
+ {
+ "id": 64,
+ "surname": {
+ "key": "surname_10064",
+ "text": "沮丧的"
+ },
+ "name": {
+ "key": "name_10064",
+ "text": "比勒尔"
+ }
+ },
+ {
+ "id": 65,
+ "surname": {
+ "key": "surname_10065",
+ "text": "从容的"
+ },
+ "name": {
+ "key": "name_10065",
+ "text": "珍妮芙"
+ }
+ },
+ {
+ "id": 66,
+ "surname": {
+ "key": "surname_10066",
+ "text": "随和的"
+ },
+ "name": {
+ "key": "name_10066",
+ "text": "吉榭尔"
+ }
+ },
+ {
+ "id": 67,
+ "surname": {
+ "key": "surname_10067",
+ "text": "坦荡的"
+ },
+ "name": {
+ "key": "name_10067",
+ "text": "雷德姬"
+ }
+ },
+ {
+ "id": 68,
+ "surname": {
+ "key": "surname_10068",
+ "text": "随性的"
+ },
+ "name": {
+ "key": "name_10068",
+ "text": "布莱克"
+ }
+ },
+ {
+ "id": 69,
+ "surname": {
+ "key": "surname_10069",
+ "text": "红润的"
+ },
+ "name": {
+ "key": "name_10069",
+ "text": "桑席"
+ }
+ },
+ {
+ "id": 70,
+ "surname": {
+ "key": "surname_10070",
+ "text": "傲骨的"
+ },
+ "name": {
+ "key": "name_10070",
+ "text": "格拉迪"
+ }
+ },
+ {
+ "id": 71,
+ "surname": {
+ "key": "surname_10071",
+ "text": "欣喜的"
+ },
+ "name": {
+ "key": "name_10071",
+ "text": "布卢默"
+ }
+ },
+ {
+ "id": 72,
+ "surname": {
+ "key": "surname_10072",
+ "text": "宽容的"
+ },
+ "name": {
+ "key": "name_10072",
+ "text": "耶达"
+ }
+ },
+ {
+ "id": 73,
+ "surname": {
+ "key": "surname_10073",
+ "text": "大气的"
+ },
+ "name": {
+ "key": "name_10073",
+ "text": "葛瑞丝"
+ }
+ },
+ {
+ "id": 74,
+ "surname": {
+ "key": "surname_10074",
+ "text": "厚道的"
+ },
+ "name": {
+ "key": "name_10074",
+ "text": "菲尔德"
+ }
+ },
+ {
+ "id": 75,
+ "surname": {
+ "key": "surname_10075",
+ "text": "王者的"
+ },
+ "name": {
+ "key": "name_10075",
+ "text": "小仙女"
+ }
+ },
+ {
+ "id": 76,
+ "surname": {
+ "key": "surname_10076",
+ "text": "羞涩的"
+ },
+ "name": {
+ "key": "name_10076",
+ "text": "谢尔达"
+ }
+ },
+ {
+ "id": 77,
+ "surname": {
+ "key": "surname_10077",
+ "text": "尽情的"
+ },
+ "name": {
+ "key": "name_10077",
+ "text": "丝塔芙"
+ }
+ },
+ {
+ "id": 78,
+ "surname": {
+ "key": "surname_10078",
+ "text": "激奋的"
+ },
+ "name": {
+ "key": "name_10078",
+ "text": "布卢尔"
+ }
+ },
+ {
+ "id": 79,
+ "surname": {
+ "key": "surname_10079",
+ "text": "俊美的"
+ },
+ "name": {
+ "key": "name_10079",
+ "text": "关德琳"
+ }
+ },
+ {
+ "id": 80,
+ "surname": {
+ "key": "surname_10080",
+ "text": "朴素的"
+ },
+ "name": {
+ "key": "name_10080",
+ "text": "希伯来"
+ }
+ },
+ {
+ "id": 81,
+ "surname": {
+ "key": "surname_10081",
+ "text": "庄重的"
+ },
+ "name": {
+ "key": "name_10081",
+ "text": "布卢姆"
+ }
+ },
+ {
+ "id": 82,
+ "surname": {
+ "key": "surname_10082",
+ "text": "和谐的"
+ },
+ "name": {
+ "key": "name_10082",
+ "text": "哈莉特"
+ }
+ },
+ {
+ "id": 83,
+ "surname": {
+ "key": "surname_10083",
+ "text": "坦然的"
+ },
+ "name": {
+ "key": "name_10083",
+ "text": "乔伊斯"
+ }
+ },
+ {
+ "id": 84,
+ "surname": {
+ "key": "surname_10084",
+ "text": "苗条的"
+ },
+ "name": {
+ "key": "name_10084",
+ "text": "赫瑟尔"
+ }
+ },
+ {
+ "id": 85,
+ "surname": {
+ "key": "surname_10085",
+ "text": "可人的"
+ },
+ "name": {
+ "key": "name_10085",
+ "text": "博斯韦"
+ }
+ },
+ {
+ "id": 86,
+ "surname": {
+ "key": "surname_10086",
+ "text": "青春的"
+ },
+ "name": {
+ "key": "name_10086",
+ "text": "罗瑞尔"
+ }
+ },
+ {
+ "id": 87,
+ "surname": {
+ "key": "surname_10087",
+ "text": "激昂的"
+ },
+ "name": {
+ "key": "name_10087",
+ "text": "希尔达"
+ }
+ },
+ {
+ "id": 88,
+ "surname": {
+ "key": "surname_10088",
+ "text": "小巧的"
+ },
+ "name": {
+ "key": "name_10088",
+ "text": "希拉莉"
+ }
+ },
+ {
+ "id": 89,
+ "surname": {
+ "key": "surname_10089",
+ "text": "踊跃的"
+ },
+ "name": {
+ "key": "name_10089",
+ "text": "波伊尔"
+ }
+ },
+ {
+ "id": 90,
+ "surname": {
+ "key": "surname_10090",
+ "text": "可爱的"
+ },
+ "name": {
+ "key": "name_10090",
+ "text": "汉妮"
+ }
+ },
+ {
+ "id": 91,
+ "surname": {
+ "key": "surname_10091",
+ "text": "帅气的"
+ },
+ "name": {
+ "key": "name_10091",
+ "text": "布拉德"
+ }
+ },
+ {
+ "id": 92,
+ "surname": {
+ "key": "surname_10092",
+ "text": "不凡的"
+ },
+ "name": {
+ "key": "name_10092",
+ "text": "埃达"
+ }
+ },
+ {
+ "id": 93,
+ "surname": {
+ "key": "surname_10093",
+ "text": "激情的"
+ },
+ "name": {
+ "key": "name_10093",
+ "text": "艾娜"
+ }
+ },
+ {
+ "id": 94,
+ "surname": {
+ "key": "surname_10094",
+ "text": "慈祥的"
+ },
+ "name": {
+ "key": "name_10094",
+ "text": "英格丽"
+ }
+ },
+ {
+ "id": 95,
+ "surname": {
+ "key": "surname_10095",
+ "text": "整洁的"
+ },
+ "name": {
+ "key": "name_10095",
+ "text": "薇薇安"
+ }
+ },
+ {
+ "id": 96,
+ "surname": {
+ "key": "surname_10096",
+ "text": "认真的"
+ },
+ "name": {
+ "key": "name_10096",
+ "text": "塞尔特"
+ }
+ },
+ {
+ "id": 97,
+ "surname": {
+ "key": "surname_10097",
+ "text": "情调的"
+ },
+ "name": {
+ "key": "name_10097",
+ "text": "布里奇"
+ }
+ },
+ {
+ "id": 98,
+ "surname": {
+ "key": "surname_10098",
+ "text": "海涵的"
+ },
+ "name": {
+ "key": "name_10098",
+ "text": "艾琳"
+ }
+ },
+ {
+ "id": 99,
+ "surname": {
+ "key": "surname_10099",
+ "text": "善良的"
+ },
+ "name": {
+ "key": "name_10099",
+ "text": "麦格"
+ }
+ },
+ {
+ "id": 100,
+ "surname": {
+ "key": "surname_10100",
+ "text": "娇美的"
+ },
+ "name": {
+ "key": "name_10100",
+ "text": "布赖特"
+ }
+ },
+ {
+ "id": 101,
+ "surname": {
+ "key": "surname_10101",
+ "text": "妖媚的"
+ },
+ "name": {
+ "key": "name_10101",
+ "text": "爱莉丝"
+ }
+ },
+ {
+ "id": 102,
+ "surname": {
+ "key": "surname_10102",
+ "text": "冷魅的"
+ },
+ "name": {
+ "key": "name_10102",
+ "text": "梅根"
+ }
+ },
+ {
+ "id": 103,
+ "surname": {
+ "key": "surname_10103",
+ "text": "雍容的"
+ },
+ "name": {
+ "key": "name_10103",
+ "text": "布罗德"
+ }
+ },
+ {
+ "id": 104,
+ "surname": {
+ "key": "surname_10104",
+ "text": "儒雅的"
+ },
+ "name": {
+ "key": "name_10104",
+ "text": "艾尔玛"
+ }
+ },
+ {
+ "id": 105,
+ "surname": {
+ "key": "surname_10105",
+ "text": "敬佩的"
+ },
+ "name": {
+ "key": "name_10105",
+ "text": "欧尔佳"
+ }
+ },
+ {
+ "id": 106,
+ "surname": {
+ "key": "surname_10106",
+ "text": "时髦的"
+ },
+ "name": {
+ "key": "name_10106",
+ "text": "白朗蒂"
+ }
+ },
+ {
+ "id": 107,
+ "surname": {
+ "key": "surname_10107",
+ "text": "无邪的"
+ },
+ "name": {
+ "key": "name_10107",
+ "text": "伊莎蓓"
+ }
+ },
+ {
+ "id": 108,
+ "surname": {
+ "key": "surname_10108",
+ "text": "娇媚的"
+ },
+ "name": {
+ "key": "name_10108",
+ "text": "波比"
+ }
+ },
+ {
+ "id": 109,
+ "surname": {
+ "key": "surname_10109",
+ "text": "绝美的"
+ },
+ "name": {
+ "key": "name_10109",
+ "text": "艾薇"
+ }
+ },
+ {
+ "id": 110,
+ "surname": {
+ "key": "surname_10110",
+ "text": "邪魅的"
+ },
+ "name": {
+ "key": "name_10110",
+ "text": "罗伯塔"
+ }
+ },
+ {
+ "id": 111,
+ "surname": {
+ "key": "surname_10111",
+ "text": "佩服的"
+ },
+ "name": {
+ "key": "name_10111",
+ "text": "布鲁克"
+ }
+ },
+ {
+ "id": 112,
+ "surname": {
+ "key": "surname_10112",
+ "text": "白皙的"
+ },
+ "name": {
+ "key": "name_10112",
+ "text": "杰奎琳"
+ }
+ },
+ {
+ "id": 113,
+ "surname": {
+ "key": "surname_10113",
+ "text": "摩登的"
+ },
+ "name": {
+ "key": "name_10113",
+ "text": "鲁思"
+ }
+ },
+ {
+ "id": 114,
+ "surname": {
+ "key": "surname_10114",
+ "text": "结实的"
+ },
+ "name": {
+ "key": "name_10114",
+ "text": "丝柏凌"
+ }
+ },
+ {
+ "id": 115,
+ "surname": {
+ "key": "surname_10115",
+ "text": "率性的"
+ },
+ "name": {
+ "key": "name_10115",
+ "text": "布朗"
+ }
+ },
+ {
+ "id": 116,
+ "surname": {
+ "key": "surname_10116",
+ "text": "娇艳的"
+ },
+ "name": {
+ "key": "name_10116",
+ "text": "丝特勒"
+ }
+ },
+ {
+ "id": 117,
+ "surname": {
+ "key": "surname_10117",
+ "text": "素雅的"
+ },
+ "name": {
+ "key": "name_10117",
+ "text": "布朗宁"
+ }
+ },
+ {
+ "id": 118,
+ "surname": {
+ "key": "surname_10118",
+ "text": "惆怅的"
+ },
+ "name": {
+ "key": "name_10118",
+ "text": "珍妮特"
+ }
+ },
+ {
+ "id": 119,
+ "surname": {
+ "key": "surname_10119",
+ "text": "欢畅的"
+ },
+ "name": {
+ "key": "name_10119",
+ "text": "托比"
+ }
+ },
+ {
+ "id": 120,
+ "surname": {
+ "key": "surname_10120",
+ "text": "崇拜的"
+ },
+ "name": {
+ "key": "name_10120",
+ "text": "勃朗宁"
+ }
+ },
+ {
+ "id": 121,
+ "surname": {
+ "key": "surname_10121",
+ "text": "漂亮的"
+ },
+ "name": {
+ "key": "name_10121",
+ "text": "珍尼丝"
+ }
+ },
+ {
+ "id": 122,
+ "surname": {
+ "key": "surname_10122",
+ "text": "艳丽的"
+ },
+ "name": {
+ "key": "name_10122",
+ "text": "厄休拉"
+ }
+ },
+ {
+ "id": 123,
+ "surname": {
+ "key": "surname_10123",
+ "text": "淡雅的"
+ },
+ "name": {
+ "key": "name_10123",
+ "text": "布鲁斯"
+ }
+ },
+ {
+ "id": 124,
+ "surname": {
+ "key": "surname_10124",
+ "text": "倾城的"
+ },
+ "name": {
+ "key": "name_10124",
+ "text": "维隆卡"
+ }
+ },
+ {
+ "id": 125,
+ "surname": {
+ "key": "surname_10125",
+ "text": "光滑的"
+ },
+ "name": {
+ "key": "name_10125",
+ "text": "布鲁诺"
+ }
+ },
+ {
+ "id": 126,
+ "surname": {
+ "key": "surname_10126",
+ "text": "巧嘴的"
+ },
+ "name": {
+ "key": "name_10126",
+ "text": "维基"
+ }
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 9f4edc123..3babf449d 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -37,7 +37,7 @@
"id": "shop",
"name": {
"key": "opencond_name_10003",
- "text": "商店"
+ "text": "购物"
},
"main": 1,
"optional": "",
@@ -67,6 +67,57 @@
},
"uiid": 0
},
+ {
+ "id": "mall",
+ "name": {
+ "key": "opencond_name_10003",
+ "text": "商城"
+ },
+ "main": 999,
+ "optional": "",
+ "wkqbx": 2,
+ "kqbx": 0,
+ "img": "zc_icon_01",
+ "prompt": {
+ "key": "opencond_prompt_mall",
+ "text": "功能暂未开启"
+ },
+ "uiid": 0
+ },
+ {
+ "id": "rdtask",
+ "name": {
+ "key": "opencond_name_10003",
+ "text": "随机任务总览"
+ },
+ "main": 1,
+ "optional": "",
+ "wkqbx": 0,
+ "kqbx": 0,
+ "img": "zc_icon_01",
+ "prompt": {
+ "key": "opencond_prompt_rdtask",
+ "text": "功能暂未开启"
+ },
+ "uiid": 0
+ },
+ {
+ "id": "currency",
+ "name": {
+ "key": "opencond_name_10003",
+ "text": "货币栏"
+ },
+ "main": 999,
+ "optional": "",
+ "wkqbx": 2,
+ "kqbx": 0,
+ "img": "zc_icon_01",
+ "prompt": {
+ "key": "opencond_prompt_currency",
+ "text": "功能暂未开启"
+ },
+ "uiid": 0
+ },
{
"id": "alliance",
"name": {
diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json
index 89d848dfb..a66ae0939 100644
--- a/bin/json/game_shop.json
+++ b/bin/json/game_shop.json
@@ -29,13 +29,18 @@
{
"a": "attr",
"t": "diamond",
- "n": 20
+ "n": 50
}
],
"shopitem": [
10001,
- 10002,
- 10003
+ 10001,
+ 10001,
+ 10001,
+ 10001,
+ 10001,
+ 10001,
+ 10001
]
},
{
@@ -43,7 +48,7 @@
"tab": 2,
"shopname": {
"key": "shop_2",
- "text": "钻石商店"
+ "text": "友情商店"
},
"upper_shop": {
"key": "",
@@ -52,7 +57,7 @@
"needshow": [
{
"a": "attr",
- "t": "gold",
+ "t": "friend",
"n": 1
},
{
@@ -63,27 +68,10 @@
],
"rtype": 2,
"rtime": 1,
- "rnum": 5,
- "rneed": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
+ "rnum": -1,
+ "rneed": [],
"shopitem": [
- 20001,
- 20002,
- 20003,
- 20004,
- 20005,
- 20006,
- 20007,
- 20008,
- 20009,
- 20010,
- 20011,
- 20012
+ 20001
]
},
{
@@ -114,7 +102,9 @@
"rnum": -1,
"rneed": [],
"shopitem": [
- 10005
+ 30001,
+ 30002,
+ 30003
]
},
{
@@ -145,39 +135,8 @@
"rnum": -1,
"rneed": [],
"shopitem": [
- 10006
- ]
- },
- {
- "shopid": 5,
- "tab": 5,
- "shopname": {
- "key": "shop_5",
- "text": "联盟商店"
- },
- "upper_shop": {
- "key": "shop_title1",
- "text": "玩法商店"
- },
- "needshow": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1
- },
- {
- "a": "attr",
- "t": "diamond",
- "n": 1
- }
- ],
- "rtype": 2,
- "rtime": 14,
- "rnum": -1,
- "rneed": [],
- "shopitem": [
- 10007,
- 10008
+ 40001,
+ 40002
]
}
]
\ No newline at end of file
diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json
index 7c2934475..35e2a7353 100644
--- a/bin/json/game_shopitem.json
+++ b/bin/json/game_shopitem.json
@@ -4,20 +4,20 @@
"id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "60001",
+ "a": "equi",
+ "t": "10031",
"n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
- "t": "diamond",
- "n": 50
+ "t": "gold",
+ "n": 50000
}
],
- "sale": 800,
+ "sale": 0,
"salelist": [
1000,
1000,
@@ -36,23 +36,23 @@
},
{
"key": 2,
- "id": 10002,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "60002",
+ "a": "equi",
+ "t": "10032",
"n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
- "t": "diamond",
- "n": 50
+ "t": "gold",
+ "n": 50000
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
1000,
@@ -61,7 +61,7 @@
1000,
1000
],
- "buyminnum": 2,
+ "buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
@@ -71,32 +71,32 @@
},
{
"key": 3,
- "id": 10003,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "60003",
+ "a": "equi",
+ "t": "10033",
"n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
- "t": "diamond",
- "n": 50
+ "t": "gold",
+ "n": 50000
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
- 1200,
- 1400,
+ 1000,
+ 1000,
1000,
1000,
1000
],
- "buyminnum": 3,
+ "buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
@@ -106,505 +106,540 @@
},
{
"key": 4,
- "id": 10004,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10004",
- "n": 5
+ "a": "equi",
+ "t": "10034",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 10000
+ "n": 50000
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
1000,
- 1100,
- 1200,
- 1300,
- 1400
+ 1000,
+ 1000,
+ 1000,
+ 1000
],
"buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
"key": 5,
- "id": 10004,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10004",
- "n": 5
+ "a": "equi",
+ "t": "10035",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 10000
+ "n": 50000
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
1000,
- 1100,
- 1200,
- 1300,
- 1400
+ 1000,
+ 1000,
+ 1000,
+ 1000
],
- "buyminnum": 2,
+ "buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
"key": 6,
- "id": 10004,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10004",
- "n": 5
+ "a": "equi",
+ "t": "10036",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 10000
+ "n": 50000
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
1000,
- 1100,
- 1200,
- 1300,
- 1400
+ 1000,
+ 1000,
+ 1000,
+ 1000
],
- "buyminnum": 3,
+ "buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
"key": 7,
- "id": 10005,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10005",
- "n": 5
+ "a": "equi",
+ "t": "10041",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 500,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 10000
+ "n": 150000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
- "mapidmax": 110
+ "mapidmax": 9999
},
{
"key": 8,
- "id": 10005,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10005",
- "n": 10
+ "a": "equi",
+ "t": "10042",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 500,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 20000
+ "n": 150000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
- "vip": 1,
+ "vip": 0,
"lvmin": 1,
- "lvmax": 1,
- "mapidmin": 111,
- "mapidmax": 120
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
},
{
"key": 9,
- "id": 10005,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10005",
- "n": 15
+ "a": "equi",
+ "t": "10043",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 500,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 30000
+ "n": 150000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
- "vip": 2,
+ "vip": 0,
"lvmin": 1,
- "lvmax": 1,
- "mapidmin": 201,
- "mapidmax": 220
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
},
{
"key": 10,
- "id": 10005,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10005",
- "n": 20
+ "a": "equi",
+ "t": "10044",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 500,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 40000
+ "n": 150000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
- "vip": 3,
+ "vip": 0,
"lvmin": 1,
- "lvmax": 1,
- "mapidmin": 221,
- "mapidmax": 320
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
},
{
"key": 11,
- "id": 10005,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10005",
- "n": 25
+ "a": "equi",
+ "t": "10045",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 500,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 50000
+ "n": 150000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
- "vip": 4,
+ "vip": 0,
"lvmin": 1,
- "lvmax": 1,
- "mapidmin": 321,
- "mapidmax": 340
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
},
{
"key": 12,
- "id": 10005,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10005",
- "n": 30
+ "a": "equi",
+ "t": "10046",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 500,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 60000
+ "n": 150000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
- "vip": 5,
+ "vip": 0,
"lvmin": 1,
- "lvmax": 1,
- "mapidmin": 340,
+ "lvmax": 60,
+ "mapidmin": 101,
"mapidmax": 9999
},
{
"key": 13,
- "id": 10006,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10006",
- "n": 5
+ "a": "equi",
+ "t": "10051",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 250,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 10000
+ "n": 450000
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
1000,
- 1100,
- 1200,
- 1300,
- 1400
+ 1000,
+ 1000,
+ 1000,
+ 1000
],
"buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
"key": 14,
- "id": 10006,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10006",
- "n": 5
+ "a": "equi",
+ "t": "10052",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 250,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 10000
+ "n": 450000
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
1000,
- 1100,
- 1200,
- 1300,
- 1400
+ 1000,
+ 1000,
+ 1000,
+ 1000
],
- "buyminnum": 2,
+ "buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
"key": 15,
- "id": 10006,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10006",
- "n": 5
+ "a": "equi",
+ "t": "10053",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 250,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 10000
+ "n": 450000
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
1000,
- 1100,
- 1200,
- 1300,
- 1400
+ 1000,
+ 1000,
+ 1000,
+ 1000
],
- "buyminnum": 3,
+ "buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
"key": 16,
- "id": 10007,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10007",
- "n": 5
+ "a": "equi",
+ "t": "10054",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 250,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 10000
+ "n": 450000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
- "mapidmax": 110
+ "mapidmax": 9999
},
{
"key": 17,
- "id": 10007,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10007",
- "n": 10
+ "a": "equi",
+ "t": "10055",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 250,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 20000
+ "n": 450000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
- "vip": 1,
+ "vip": 0,
"lvmin": 1,
- "lvmax": 1,
- "mapidmin": 111,
- "mapidmax": 120
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
},
{
"key": 18,
- "id": 10007,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10007",
- "n": 15
+ "a": "equi",
+ "t": "10056",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 250,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 30000
+ "n": 450000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
- "vip": 2,
+ "vip": 0,
"lvmin": 1,
- "lvmax": 1,
- "mapidmin": 201,
- "mapidmax": 220
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
},
{
"key": 19,
- "id": 10007,
+ "id": 10001,
"iteminfo": [
{
- "a": "item",
- "t": "10007",
- "n": 20
+ "a": "hero",
+ "t": "43901",
+ "n": 1
}
],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 40000
- }
- ],
- "sale": 500,
- "salelist": [],
- "buyminnum": 1,
- "buymaxnum": 10,
- "vip": 3,
- "lvmin": 1,
- "lvmax": 1,
- "mapidmin": 221,
- "mapidmax": 320
- },
- {
- "key": 20,
- "id": 10007,
- "iteminfo": [
- {
- "a": "item",
- "t": "10007",
- "n": 25
- }
- ],
- "probability": 200,
+ "probability": 250,
"need": [
{
"a": "attr",
@@ -612,24 +647,66 @@
"n": 50000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
- "vip": 4,
+ "vip": 0,
"lvmin": 1,
- "lvmax": 1,
- "mapidmin": 321,
- "mapidmax": 340
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 20,
+ "id": 10001,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "42911",
+ "n": 1
+ }
+ ],
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 10,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
},
{
"key": 21,
- "id": 10007,
+ "id": 10001,
"iteminfo": [
{
"a": "item",
- "t": "10007",
- "n": 30
+ "t": "30001",
+ "n": 1
}
],
"probability": 200,
@@ -637,127 +714,64 @@
{
"a": "attr",
"t": "gold",
- "n": 60000
+ "n": 200000
}
],
- "sale": 500,
- "salelist": [],
+ "sale": 0,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
- "vip": 5,
+ "vip": 0,
"lvmin": 1,
- "lvmax": 1,
- "mapidmin": 340,
+ "lvmax": 60,
+ "mapidmin": 101,
"mapidmax": 9999
},
{
"key": 22,
- "id": 10008,
+ "id": 20001,
"iteminfo": [
{
- "a": "item",
- "t": "10008",
- "n": 5
+ "a": "hero",
+ "t": "43901",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 10000
+ "n": 200000
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
1000,
- 1100,
- 1200,
- 1300,
- 1400
- ],
- "buyminnum": 1,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 1,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 23,
- "id": 10008,
- "iteminfo": [
- {
- "a": "item",
- "t": "10008",
- "n": 5
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 10000
- }
- ],
- "sale": 1000,
- "salelist": [
1000,
1000,
- 1100,
- 1200,
- 1300,
- 1400
- ],
- "buyminnum": 2,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 1,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 24,
- "id": 10008,
- "iteminfo": [
- {
- "a": "item",
- "t": "10008",
- "n": 5
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 10000
- }
- ],
- "sale": 1000,
- "salelist": [
1000,
- 1000,
- 1100,
- 1200,
- 1300,
- 1400
+ 1000
],
"buyminnum": 3,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
- "key": 25,
- "id": 10001,
+ "key": 23,
+ "id": 30001,
"iteminfo": [
{
"a": "item",
@@ -765,27 +779,34 @@
"n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
"t": "diamond",
- "n": 50
+ "n": 350
}
],
"sale": 800,
- "salelist": [],
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
"buyminnum": 1,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
- "key": 26,
- "id": 10002,
+ "key": 24,
+ "id": 30002,
"iteminfo": [
{
"a": "item",
@@ -793,15 +814,15 @@
"n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
"t": "diamond",
- "n": 50
+ "n": 200
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
1000,
@@ -814,13 +835,13 @@
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
- "key": 27,
- "id": 10003,
+ "key": 25,
+ "id": 30003,
"iteminfo": [
{
"a": "item",
@@ -828,59 +849,59 @@
"n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
"t": "diamond",
- "n": 50
+ "n": 2100
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
- 1200,
- 1400,
+ 1000,
+ 1000,
1000,
1000,
1000
],
- "buyminnum": 3,
+ "buyminnum": 2,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
- "lvmax": 1,
+ "lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
- "key": 28,
- "id": 20001,
+ "key": 26,
+ "id": 40001,
"iteminfo": [
{
"a": "item",
- "t": "50001",
- "n": 50
+ "t": "30001",
+ "n": 1
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
"t": "diamond",
- "n": 50
+ "n": 200
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
- 1100,
- 1200,
- 1300,
- 1400,
- 1500
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
],
- "buyminnum": 10,
+ "buyminnum": 999,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
@@ -889,16 +910,16 @@
"mapidmax": 9999
},
{
- "key": 29,
- "id": 20002,
+ "key": 27,
+ "id": 40002,
"iteminfo": [
{
- "a": "item",
- "t": "50002",
- "n": 50
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
}
],
- "probability": 200,
+ "probability": 1000,
"need": [
{
"a": "attr",
@@ -906,338 +927,16 @@
"n": 50
}
],
- "sale": 1000,
+ "sale": 0,
"salelist": [
1000,
- 1100,
- 1200,
- 1300,
- 1400,
- 1500
- ],
- "buyminnum": 10,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 30,
- "id": 20003,
- "iteminfo": [
- {
- "a": "item",
- "t": "50003",
- "n": 50
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ],
- "sale": 1000,
- "salelist": [
1000,
- 1100,
- 1200,
- 1300,
- 1400,
- 1500
- ],
- "buyminnum": 10,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 31,
- "id": 20004,
- "iteminfo": [
- {
- "a": "item",
- "t": "50004",
- "n": 50
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ],
- "sale": 1000,
- "salelist": [
1000,
- 1100,
- 1200,
- 1300,
- 1400,
- 1500
- ],
- "buyminnum": 10,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 32,
- "id": 20005,
- "iteminfo": [
- {
- "a": "item",
- "t": "50005",
- "n": 50
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 120
- }
- ],
- "sale": 1000,
- "salelist": [
1000,
- 1100,
- 1200,
- 1300,
- 1400,
- 1500
- ],
- "buyminnum": 5,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 33,
- "id": 20006,
- "iteminfo": [
- {
- "a": "item",
- "t": "50006",
- "n": 50
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 120
- }
- ],
- "sale": 1000,
- "salelist": [
1000,
- 1100,
- 1200,
- 1300,
- 1400,
- 1500
+ 1000
],
- "buyminnum": 5,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 34,
- "id": 20007,
- "iteminfo": [
- {
- "a": "item",
- "t": "50007",
- "n": 50
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 120
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1100,
- 1200,
- 1300,
- 1400,
- 1500
- ],
- "buyminnum": 5,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 35,
- "id": 20008,
- "iteminfo": [
- {
- "a": "item",
- "t": "50008",
- "n": 50
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 120
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1100,
- 1200,
- 1300,
- 1400,
- 1500
- ],
- "buyminnum": 5,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 36,
- "id": 20009,
- "iteminfo": [
- {
- "a": "item",
- "t": "50009",
- "n": 50
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 320
- }
- ],
- "sale": 1000,
- "salelist": [],
- "buyminnum": 1,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 37,
- "id": 20010,
- "iteminfo": [
- {
- "a": "item",
- "t": "50050",
- "n": 50
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 320
- }
- ],
- "sale": 1000,
- "salelist": [],
- "buyminnum": 1,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 38,
- "id": 20011,
- "iteminfo": [
- {
- "a": "item",
- "t": "50011",
- "n": 50
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 320
- }
- ],
- "sale": 1000,
- "salelist": [],
- "buyminnum": 1,
- "buymaxnum": 10,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 39,
- "id": 20012,
- "iteminfo": [
- {
- "a": "item",
- "t": "50012",
- "n": 50
- }
- ],
- "probability": 200,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 320
- }
- ],
- "sale": 1000,
- "salelist": [],
- "buyminnum": 1,
+ "buyminnum": 999,
"buymaxnum": 10,
"vip": 0,
"lvmin": 1,
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 79b70ba5f..59bd2b64e 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -9891,5 +9891,281 @@
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
+ },
+ {
+ "Id": 251002111,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 1000
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251002211,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 1200
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [
+ 251002212
+ ],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251002212,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001007,
+ 500,
+ 2,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251003111,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 1000
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251003211,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 1200
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [
+ 251003212
+ ],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251003212,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001105,
+ 250,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251004111,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 2,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 500
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [
+ 251005112
+ ],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251004112,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001007,
+ 200,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251004211,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 1800
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [
+ 251005212
+ ],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251004212,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001006,
+ 200,
+ 2
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251005111,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 2,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 500
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [
+ 251005112
+ ],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251005112,
+ "EmitPR": 200,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 11,
+ "Argu": [
+ -200
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251005211,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": "",
+ "Order": "",
+ "Limit": 10,
+ "ExecuteCnt": 2,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 500
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [
+ 251005212
+ ],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 251005212,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": "",
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 11,
+ "Argu": [
+ -100
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
}
]
\ No newline at end of file
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index b8e18c027..88da082cf 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -6963,5 +6963,205 @@
},
"buffid": [],
"map": ""
+ },
+ {
+ "id": 151002111,
+ "level": 1,
+ "MaxLV": 1,
+ "Name": {
+ "key": "skillname_151002111",
+ "text": "盾击"
+ },
+ "ico": "jn_icon_046",
+ "act": "Skill_1",
+ "Type": 1,
+ "CD": 1,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 251002111
+ ]
+ },
+ "Desc": {
+ "key": "skill_1510021111",
+ "text": "对敌方一个目标发起攻击，造成攻击力100%的伤害"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 151002211,
+ "level": 1,
+ "MaxLV": 1,
+ "Name": {
+ "key": "skillname_151002211",
+ "text": "力倾"
+ },
+ "ico": "jn_icon_047",
+ "act": "Skill_2",
+ "Type": 1,
+ "CD": 2,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 251002211
+ ]
+ },
+ "Desc": {
+ "key": "skill_1510022111",
+ "text": "对敌方一个目标发起攻击，造成攻击力120%的伤害。并有50%概率附加2回合【防御下降】状态。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 151003111,
+ "level": 1,
+ "MaxLV": 1,
+ "Name": {
+ "key": "skillname_151003111",
+ "text": "攻守之势"
+ },
+ "ico": "jn_icon_048",
+ "act": "Skill_1",
+ "Type": 1,
+ "CD": 1,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 251003111
+ ]
+ },
+ "Desc": {
+ "key": "skill_1510031111",
+ "text": "对敌方一个目标发起攻击，造成攻击力100%的伤害"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 151003211,
+ "level": 1,
+ "MaxLV": 1,
+ "Name": {
+ "key": "skillname_151003211",
+ "text": "重枪冲击"
+ },
+ "ico": "jn_icon_049",
+ "act": "Skill_2",
+ "Type": 1,
+ "CD": 2,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 251003211
+ ]
+ },
+ "Desc": {
+ "key": "skill_1510032111",
+ "text": "对敌方一个目标发起攻击，造成攻击力120%的伤害。并有25%概率附加1回合【眩晕】状态。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 151004111,
+ "level": 1,
+ "MaxLV": 1,
+ "Name": {
+ "key": "skillname_151004111",
+ "text": "野性之力"
+ },
+ "ico": "jn_icon_050",
+ "act": "Skill_1",
+ "Type": 1,
+ "CD": 1,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 251004111
+ ]
+ },
+ "Desc": {
+ "key": "skill_1510041111",
+ "text": "对敌方1个目标发起2段攻击，每段可造成攻击力50%的伤害，并有20%概率减少目标20%行动值。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 151004211,
+ "level": 1,
+ "MaxLV": 1,
+ "Name": {
+ "key": "skillname_151004211",
+ "text": "绝命上挑"
+ },
+ "ico": "jn_icon_051",
+ "act": "Skill_2",
+ "Type": 1,
+ "CD": 3,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 251004211
+ ]
+ },
+ "Desc": {
+ "key": "skill_1510042111",
+ "text": "对敌方全体发起2段攻击，每段可造成攻击50%的伤害，若发生暴击，可使目标减少10%行动值。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 151005111,
+ "level": 1,
+ "MaxLV": 1,
+ "Name": {
+ "key": "skillname_151005111",
+ "text": "双重攻势"
+ },
+ "ico": "jn_icon_052",
+ "act": "Skill_1",
+ "Type": 1,
+ "CD": 1,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 251005111
+ ]
+ },
+ "Desc": {
+ "key": "skill_1510051111",
+ "text": "对敌方一个目标发起两段攻击，每段造成攻击力75%的伤害"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 151005211,
+ "level": 1,
+ "MaxLV": 1,
+ "Name": {
+ "key": "skillname_151005211",
+ "text": "力之回旋"
+ },
+ "ico": "jn_icon_053",
+ "act": "Skill_2",
+ "Type": 1,
+ "CD": 3,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 251005211
+ ]
+ },
+ "Desc": {
+ "key": "skill_1510052111",
+ "text": "对敌方1个目标发起攻击，造成攻击力180%的伤害，并附加2回合【攻击下降】状态。"
+ },
+ "buffid": [],
+ "map": ""
}
]
\ No newline at end of file
diff --git a/bin/json/game_stroy.json b/bin/json/game_stroy.json
index 53bb4606c..7a77a5cce 100644
--- a/bin/json/game_stroy.json
+++ b/bin/json/game_stroy.json
@@ -6561,7 +6561,7 @@
"place": 1,
"speak": "44006",
"listen": "45003",
- "des": "盖，我说过很多次，在都市举火不仅没用还非常不安全……等等，怎么这么黑，微缩地球呢？！",
+ "des": "盖1，我说过很多次，在都市举火不仅没用还非常不安全……等等，怎么这么黑，微缩地球呢？！",
"modelstatetarget": "",
"modelstate": 0,
"modelaction": "",
@@ -8689,7 +8689,7 @@
"place": 0,
"speak": "44005",
"listen": "",
- "des": "这里可.....真实漂亮。",
+ "des": "这里可.....真是漂亮。",
"modelstatetarget": "",
"modelstate": 0,
"modelaction": "",
@@ -9432,32 +9432,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 1
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 1
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 1
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 1
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.1
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.1
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -9488,32 +9488,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 2
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 2
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 2
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 2
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.11
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.11
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -9544,32 +9544,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 3
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 3
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 3
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 3
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.12
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.12
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -9579,13 +9579,13 @@
"id": 322001,
"groupid": 322,
"before": -1,
- "next": -1,
+ "next": 322002,
"type": 2,
"bg": "jqdh_bg01",
"place": 0,
"speak": "45003",
"listen": "",
- "des": "我们胜利了，而且夺回了微缩地球！",
+ "des": "微缩地球是梦工厂十分重要的神器，可以帮助我们前往世界各地区阻止反派势力",
"modelstatetarget": "",
"modelstate": 0,
"modelaction": "",
@@ -9600,37 +9600,93 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 3
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 3
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 3
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 3
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.12
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.12
+ "z": 0.9
},
"perf": "",
"cg": "",
"skip": true
},
+ {
+ "id": 322002,
+ "groupid": 322,
+ "before": 322001,
+ "next": -1,
+ "type": 2,
+ "bg": "jqdh_bg01",
+ "place": 0,
+ "speak": "45003",
+ "listen": "",
+ "des": "要是准备好的了话，就点击我来使用微缩地球吧！",
+ "modelstatetarget": "",
+ "modelstate": 0,
+ "modelaction": "",
+ "speakstate": "",
+ "listenstate": "",
+ "chose": [],
+ "turn": 0,
+ "show": 0,
+ "move": "",
+ "action": "",
+ "sound": "",
+ "positionR": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "positionL": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "revolveR": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "revolveL": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "sizeR": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "sizeL": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "perf": "",
+ "cg": "",
+ "skip": false
+ },
{
"id": 323001,
"groupid": 323,
@@ -9656,32 +9712,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 3
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 3
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 3
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 3
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.12
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.12
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -9712,32 +9768,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 3
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 3
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 3
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 3
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.12
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.12
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -9768,32 +9824,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 4
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 4
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 4
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 4
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.13
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.13
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -9824,32 +9880,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 5
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 5
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 5
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 5
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.14
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.14
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -9880,32 +9936,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -9936,32 +9992,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -9992,32 +10048,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10048,32 +10104,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10104,32 +10160,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10160,32 +10216,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10216,32 +10272,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10272,32 +10328,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10328,32 +10384,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10384,32 +10440,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10440,32 +10496,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10496,32 +10552,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10552,32 +10608,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10608,32 +10664,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10664,32 +10720,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10720,32 +10776,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10776,32 +10832,32 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"perf": "",
"cg": "",
@@ -10832,32 +10888,144 @@
"positionR": {
"x": 0.2,
"y": -0.8,
- "z": 6
+ "z": 0
},
"positionL": {
"x": -0.1,
"y": -1.2,
- "z": 6
+ "z": 0
},
"revolveR": {
"x": 0,
"y": -150,
- "z": 6
+ "z": 0
},
"revolveL": {
"x": 0,
"y": -210,
- "z": 6
+ "z": 0
},
"sizeR": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
},
"sizeL": {
"x": 0.9,
"y": 0.9,
- "z": 0.15
+ "z": 0.9
+ },
+ "perf": "",
+ "cg": "",
+ "skip": true
+ },
+ {
+ "id": 337001,
+ "groupid": 337,
+ "before": -1,
+ "next": -1,
+ "type": 2,
+ "bg": "jqdh_bg01",
+ "place": 0,
+ "speak": "45003",
+ "listen": "",
+ "des": "小伊呢，我记得她先回来了........",
+ "modelstatetarget": "",
+ "modelstate": 0,
+ "modelaction": "",
+ "speakstate": "",
+ "listenstate": "",
+ "chose": [],
+ "turn": 0,
+ "show": 0,
+ "move": "",
+ "action": "",
+ "sound": "",
+ "positionR": {
+ "x": 0.2,
+ "y": -0.8,
+ "z": 0
+ },
+ "positionL": {
+ "x": -0.1,
+ "y": -1.2,
+ "z": 0
+ },
+ "revolveR": {
+ "x": 0,
+ "y": -150,
+ "z": 0
+ },
+ "revolveL": {
+ "x": 0,
+ "y": -210,
+ "z": 0
+ },
+ "sizeR": {
+ "x": 0.9,
+ "y": 0.9,
+ "z": 0.9
+ },
+ "sizeL": {
+ "x": 0.9,
+ "y": 0.9,
+ "z": 0.9
+ },
+ "perf": "",
+ "cg": "",
+ "skip": true
+ },
+ {
+ "id": 999001,
+ "groupid": 999,
+ "before": -1,
+ "next": -1,
+ "type": 2,
+ "bg": "jqdh_bg01",
+ "place": 0,
+ "speak": "25004",
+ "listen": "",
+ "des": "点我跳过随机任务",
+ "modelstatetarget": "",
+ "modelstate": 0,
+ "modelaction": "",
+ "speakstate": "",
+ "listenstate": "",
+ "chose": [],
+ "turn": 0,
+ "show": 0,
+ "move": "",
+ "action": "",
+ "sound": "",
+ "positionR": {
+ "x": 0.2,
+ "y": -0.8,
+ "z": 0
+ },
+ "positionL": {
+ "x": -0.1,
+ "y": -1.2,
+ "z": 0
+ },
+ "revolveR": {
+ "x": 0,
+ "y": -150,
+ "z": 0
+ },
+ "revolveL": {
+ "x": 0,
+ "y": -210,
+ "z": 0
+ },
+ "sizeR": {
+ "x": 0.9,
+ "y": 0.9,
+ "z": 0.9
+ },
+ "sizeL": {
+ "x": 0.9,
+ "y": 0.9,
+ "z": 0.9
},
"perf": "",
"cg": "",
diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json
index 0486c83fb..3a80740c2 100644
--- a/bin/json/game_taskround.json
+++ b/bin/json/game_taskround.json
@@ -5,13 +5,13 @@
"id_tag": 1,
"task_display": {
"key": "task_10001",
- "text": "提升英雄1级"
+ "text": "提升任意英雄1级"
},
- "type_id": 114,
- "active": 5,
+ "type_id": 10001,
+ "active": 40,
"id_after": 0,
"jump_interface": 103,
- "icon": "wp_icon_0001",
+ "icon": "rw_cj_icon07",
"reword": []
},
{
@@ -20,13 +20,13 @@
"id_tag": 1,
"task_display": {
"key": "task_10002",
- "text": "提升英雄2级"
+ "text": "登录游戏"
},
- "type_id": 114,
- "active": 10,
+ "type_id": 10101,
+ "active": 40,
"id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
+ "jump_interface": 0,
+ "icon": "rw_cj_icon07",
"reword": []
},
{
@@ -35,787 +35,378 @@
"id_tag": 1,
"task_display": {
"key": "task_10003",
- "text": "提升英雄3级"
+ "text": "进行1次普通招募"
},
- "type_id": 114,
- "active": 15,
+ "type_id": 10201,
+ "active": 40,
"id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10004,
- "id_list": 4,
- "id_tag": 1,
- "task_display": {
- "key": "task_10004",
- "text": "提升英雄4级"
- },
- "type_id": 114,
- "active": 15,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10005,
- "id_list": 5,
- "id_tag": 1,
- "task_display": {
- "key": "task_10005",
- "text": "提升英雄5级"
- },
- "type_id": 114,
- "active": 15,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10006,
- "id_list": 6,
- "id_tag": 1,
- "task_display": {
- "key": "task_10006",
- "text": "提升英雄6级"
- },
- "type_id": 114,
- "active": 15,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10007,
- "id_list": 7,
- "id_tag": 1,
- "task_display": {
- "key": "task_10007",
- "text": "提升英雄7级"
- },
- "type_id": 114,
- "active": 15,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10008,
- "id_list": 8,
- "id_tag": 1,
- "task_display": {
- "key": "task_10008",
- "text": "提升英雄8级"
- },
- "type_id": 114,
- "active": 15,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10009,
- "id_list": 9,
- "id_tag": 1,
- "task_display": {
- "key": "task_10009",
- "text": "提升英雄9级"
- },
- "type_id": 114,
- "active": 15,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10010,
- "id_list": 10,
- "id_tag": 1,
- "task_display": {
- "key": "task_10010",
- "text": "提升英雄10级"
- },
- "type_id": 114,
- "active": 15,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
+ "jump_interface": 107,
+ "icon": "rw_cj_icon07",
"reword": []
},
{
"key": 20001,
- "id_list": 11,
+ "id_list": 9,
"id_tag": 2,
"task_display": {
"key": "task_20001",
- "text": "提升英雄11级"
+ "text": "提升任意英雄5级"
},
- "type_id": 114,
- "active": 10,
+ "type_id": 10002,
+ "active": 100,
"id_after": 0,
"jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 20002,
- "id_list": 12,
- "id_tag": 2,
- "task_display": {
- "key": "task_20002",
- "text": "提升英雄12级"
- },
- "type_id": 114,
- "active": 15,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
+ "icon": "rw_cj_icon07",
"reword": []
},
{
"key": 20003,
- "id_list": 13,
+ "id_list": 10,
"id_tag": 2,
"task_display": {
"key": "task_20003",
- "text": "提升英雄13级"
+ "text": "进行5次普通招募"
},
- "type_id": 114,
- "active": 20,
+ "type_id": 10202,
+ "active": 100,
"id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 20004,
- "id_list": 14,
- "id_tag": 2,
- "task_display": {
- "key": "task_20004",
- "text": "提升英雄14级"
- },
- "type_id": 114,
- "active": 25,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 20005,
- "id_list": 15,
- "id_tag": 2,
- "task_display": {
- "key": "task_20005",
- "text": "提升英雄15级"
- },
- "type_id": 114,
- "active": 25,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 20006,
- "id_list": 16,
- "id_tag": 2,
- "task_display": {
- "key": "task_20006",
- "text": "提升英雄16级"
- },
- "type_id": 114,
- "active": 25,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 20007,
- "id_list": 17,
- "id_tag": 2,
- "task_display": {
- "key": "task_20007",
- "text": "提升英雄17级"
- },
- "type_id": 114,
- "active": 25,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 20008,
- "id_list": 18,
- "id_tag": 2,
- "task_display": {
- "key": "task_20008",
- "text": "提升英雄18级"
- },
- "type_id": 114,
- "active": 25,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 20009,
- "id_list": 19,
- "id_tag": 2,
- "task_display": {
- "key": "task_20009",
- "text": "提升英雄19级"
- },
- "type_id": 114,
- "active": 25,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 20010,
- "id_list": 20,
- "id_tag": 2,
- "task_display": {
- "key": "task_20010",
- "text": "提升英雄20级"
- },
- "type_id": 114,
- "active": 25,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
+ "jump_interface": 107,
+ "icon": "rw_cj_icon07",
"reword": []
},
{
"key": 30001,
- "id_list": 21,
+ "id_list": 16,
"id_tag": 3,
"task_display": {
"key": "task_30001",
- "text": "提升英雄21级"
+ "text": "提升任意英雄10级"
},
- "type_id": 114,
+ "type_id": 10003,
"active": 0,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "rw_cj_icon01",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 150
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30101,
- "id_list": 22,
- "id_tag": 3,
- "task_display": {
- "key": "task_30101",
- "text": "提升英雄22级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30102,
- "jump_interface": 103,
- "icon": "rw_cj_icon02",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 300
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30102,
- "id_list": 23,
- "id_tag": 3,
- "task_display": {
- "key": "task_30102",
- "text": "提升英雄23级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30103,
- "jump_interface": 103,
- "icon": "rw_cj_icon09",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 450
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30103,
- "id_list": 24,
- "id_tag": 3,
- "task_display": {
- "key": "task_30103",
- "text": "提升英雄24级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30104,
+ "id_after": 10004,
"jump_interface": 103,
"icon": "rw_cj_icon10",
"reword": [
{
"a": "attr",
- "t": "gold",
+ "t": "diamond",
+ "n": 100
+ }
+ ]
+ },
+ {
+ "key": 30002,
+ "id_list": 17,
+ "id_tag": 3,
+ "task_display": {
+ "key": "task_30002",
+ "text": "提升任意英雄20级"
+ },
+ "type_id": 10004,
+ "active": 0,
+ "id_after": 10005,
+ "jump_interface": 103,
+ "icon": "rw_cj_icon10",
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 150
+ }
+ ]
+ },
+ {
+ "key": 30003,
+ "id_list": 18,
+ "id_tag": 3,
+ "task_display": {
+ "key": "task_30003",
+ "text": "提升任意英雄50级"
+ },
+ "type_id": 10005,
+ "active": 0,
+ "id_after": 10006,
+ "jump_interface": 103,
+ "icon": "rw_cj_icon10",
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 250
+ }
+ ]
+ },
+ {
+ "key": 30004,
+ "id_list": 19,
+ "id_tag": 3,
+ "task_display": {
+ "key": "task_30004",
+ "text": "提升任意英雄100级"
+ },
+ "type_id": 10006,
+ "active": 0,
+ "id_after": 10007,
+ "jump_interface": 103,
+ "icon": "rw_cj_icon10",
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 400
+ }
+ ]
+ },
+ {
+ "key": 30005,
+ "id_list": 20,
+ "id_tag": 3,
+ "task_display": {
+ "key": "task_30005",
+ "text": "提升任意英雄200级"
+ },
+ "type_id": 10007,
+ "active": 0,
+ "id_after": 10008,
+ "jump_interface": 103,
+ "icon": "rw_cj_icon10",
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
"n": 600
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
}
]
},
{
- "key": 30104,
- "id_list": 25,
+ "key": 30006,
+ "id_list": 21,
"id_tag": 3,
"task_display": {
- "key": "task_30104",
- "text": "提升英雄25级"
+ "key": "task_30006",
+ "text": "提升任意英雄300级"
},
- "type_id": 114,
+ "type_id": 10008,
"active": 0,
- "id_after": 30105,
+ "id_after": 10009,
"jump_interface": 103,
- "icon": "rw_cj_icon11",
+ "icon": "rw_cj_icon10",
"reword": [
{
"a": "attr",
- "t": "gold",
- "n": 750
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30105,
- "id_list": 26,
- "id_tag": 3,
- "task_display": {
- "key": "task_30105",
- "text": "提升英雄26级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30106,
- "jump_interface": 103,
- "icon": "rw_cj_icon12",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
+ "t": "diamond",
"n": 900
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
}
]
},
{
- "key": 30106,
- "id_list": 27,
+ "key": 30007,
+ "id_list": 22,
"id_tag": 3,
"task_display": {
- "key": "task_30106",
- "text": "提升英雄27级"
+ "key": "task_30007",
+ "text": "提升任意英雄500级"
},
- "type_id": 114,
+ "type_id": 10009,
"active": 0,
- "id_after": 30107,
+ "id_after": 10010,
"jump_interface": 103,
- "icon": "rw_cj_icon13",
+ "icon": "rw_cj_icon10",
"reword": [
{
"a": "attr",
- "t": "gold",
- "n": 1050
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30107,
- "id_list": 28,
- "id_tag": 3,
- "task_display": {
- "key": "task_30107",
- "text": "提升英雄28级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30108,
- "jump_interface": 103,
- "icon": "rw_cj_icon14",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
+ "t": "diamond",
"n": 1200
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
}
]
},
{
- "key": 30108,
- "id_list": 29,
+ "key": 30008,
+ "id_list": 23,
"id_tag": 3,
"task_display": {
- "key": "task_30108",
- "text": "提升英雄29级"
+ "key": "task_30008",
+ "text": "提升任意英雄1000级"
},
- "type_id": 114,
+ "type_id": 10010,
"active": 0,
- "id_after": 30109,
+ "id_after": 0,
"jump_interface": 103,
"icon": "rw_cj_icon15",
"reword": [
{
"a": "attr",
- "t": "gold",
- "n": 1350
- },
+ "t": "diamond",
+ "n": 1500
+ }
+ ]
+ },
+ {
+ "key": 30009,
+ "id_list": 24,
+ "id_tag": 3,
+ "task_display": {
+ "key": "task_30009",
+ "text": "进行10次普通招募"
+ },
+ "type_id": 10203,
+ "active": 0,
+ "id_after": 10204,
+ "jump_interface": 107,
+ "icon": "rw_cj_icon15",
+ "reword": [
{
"a": "item",
- "t": "10006",
+ "t": "30001",
"n": 1
}
]
},
{
- "key": 30109,
+ "key": 30010,
+ "id_list": 25,
+ "id_tag": 3,
+ "task_display": {
+ "key": "task_30010",
+ "text": "进行20次普通招募"
+ },
+ "type_id": 10204,
+ "active": 0,
+ "id_after": 10205,
+ "jump_interface": 107,
+ "icon": "rw_cj_icon15",
+ "reword": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 2
+ }
+ ]
+ },
+ {
+ "key": 30011,
+ "id_list": 26,
+ "id_tag": 3,
+ "task_display": {
+ "key": "task_30011",
+ "text": "进行50次普通招募"
+ },
+ "type_id": 10205,
+ "active": 0,
+ "id_after": 10206,
+ "jump_interface": 107,
+ "icon": "rw_cj_icon15",
+ "reword": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 30012,
+ "id_list": 27,
+ "id_tag": 3,
+ "task_display": {
+ "key": "task_30012",
+ "text": "进行100次普通招募"
+ },
+ "type_id": 10206,
+ "active": 0,
+ "id_after": 10207,
+ "jump_interface": 107,
+ "icon": "rw_cj_icon15",
+ "reword": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 30013,
+ "id_list": 28,
+ "id_tag": 3,
+ "task_display": {
+ "key": "task_30013",
+ "text": "进行200次普通招募"
+ },
+ "type_id": 10207,
+ "active": 0,
+ "id_after": 10208,
+ "jump_interface": 107,
+ "icon": "rw_cj_icon15",
+ "reword": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 30014,
+ "id_list": 29,
+ "id_tag": 3,
+ "task_display": {
+ "key": "task_30014",
+ "text": "进行300次普通招募"
+ },
+ "type_id": 10208,
+ "active": 0,
+ "id_after": 10209,
+ "jump_interface": 107,
+ "icon": "rw_cj_icon15",
+ "reword": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 30015,
"id_list": 30,
"id_tag": 3,
"task_display": {
- "key": "task_30109",
- "text": "提升英雄30级"
+ "key": "task_30015",
+ "text": "进行500次普通招募"
},
- "type_id": 114,
+ "type_id": 10209,
"active": 0,
- "id_after": 30110,
- "jump_interface": 103,
- "icon": "rw_cj_icon16",
+ "id_after": 10210,
+ "jump_interface": 107,
+ "icon": "rw_cj_icon15",
"reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1500
- },
{
"a": "item",
- "t": "10006",
- "n": 1
+ "t": "30001",
+ "n": 10
}
]
},
{
- "key": 30110,
+ "key": 30016,
"id_list": 31,
"id_tag": 3,
"task_display": {
- "key": "task_30110",
- "text": "提升英雄31级"
+ "key": "task_30016",
+ "text": "进行1000次普通招募"
},
- "type_id": 114,
- "active": 0,
- "id_after": 30111,
- "jump_interface": 103,
- "icon": "rw_cj_icon17",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1650
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30111,
- "id_list": 32,
- "id_tag": 3,
- "task_display": {
- "key": "task_30111",
- "text": "提升英雄32级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30112,
- "jump_interface": 103,
- "icon": "rw_cj_icon18",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1800
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30112,
- "id_list": 33,
- "id_tag": 3,
- "task_display": {
- "key": "task_30112",
- "text": "提升英雄33级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30113,
- "jump_interface": 103,
- "icon": "rw_cj_icon01",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1950
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30113,
- "id_list": 34,
- "id_tag": 3,
- "task_display": {
- "key": "task_30113",
- "text": "提升英雄34级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30114,
- "jump_interface": 103,
- "icon": "rw_cj_icon02",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 2100
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30114,
- "id_list": 35,
- "id_tag": 3,
- "task_display": {
- "key": "task_30114",
- "text": "提升英雄35级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30115,
- "jump_interface": 103,
- "icon": "rw_cj_icon09",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 2250
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30115,
- "id_list": 36,
- "id_tag": 3,
- "task_display": {
- "key": "task_30115",
- "text": "提升英雄36级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30116,
- "jump_interface": 103,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 2400
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30116,
- "id_list": 37,
- "id_tag": 3,
- "task_display": {
- "key": "task_30116",
- "text": "提升英雄37级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30117,
- "jump_interface": 103,
- "icon": "rw_cj_icon11",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 2550
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30117,
- "id_list": 38,
- "id_tag": 3,
- "task_display": {
- "key": "task_30117",
- "text": "提升英雄38级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30118,
- "jump_interface": 103,
- "icon": "rw_cj_icon12",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 2700
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30118,
- "id_list": 39,
- "id_tag": 3,
- "task_display": {
- "key": "task_30118",
- "text": "提升英雄39级"
- },
- "type_id": 114,
- "active": 0,
- "id_after": 30119,
- "jump_interface": 103,
- "icon": "rw_cj_icon13",
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 2850
- },
- {
- "a": "item",
- "t": "10006",
- "n": 1
- }
- ]
- },
- {
- "key": 30119,
- "id_list": 40,
- "id_tag": 3,
- "task_display": {
- "key": "task_30119",
- "text": "提升英雄40级"
- },
- "type_id": 114,
+ "type_id": 10210,
"active": 0,
"id_after": 0,
- "jump_interface": 103,
- "icon": "rw_cj_icon14",
+ "jump_interface": 107,
+ "icon": "rw_cj_icon15",
"reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 3000
- },
{
"a": "item",
- "t": "10006",
- "n": 1
+ "t": "30001",
+ "n": 10
}
]
}
diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go
index 2d998e893..c0273159d 100644
--- a/modules/hero/api_info.go
+++ b/modules/hero/api_info.go
@@ -40,5 +40,8 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code
rsp.Base = hero
fmt.Printf("[ %v ] \n", hero)
+
+ this.module.AddHeroExp(session, hero.Id, 5000)
+ fmt.Printf("exp:=%d,exp+%d", hero.Lv, hero.Exp)
return
}
diff --git a/sys/configure/structs/Game.NameLibrary.go b/sys/configure/structs/Game.NameLibrary.go
new file mode 100644
index 000000000..f5feb77a7
--- /dev/null
+++ b/sys/configure/structs/Game.NameLibrary.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 GameNameLibrary struct {
+ _dataMap map[int32]*GameNameLibraryData
+ _dataList []*GameNameLibraryData
+}
+
+func NewGameNameLibrary(_buf []map[string]interface{}) (*GameNameLibrary, error) {
+ _dataList := make([]*GameNameLibraryData, 0, len(_buf))
+ dataMap := make(map[int32]*GameNameLibraryData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameNameLibraryData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameNameLibrary{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameNameLibrary) GetDataMap() map[int32]*GameNameLibraryData {
+ return table._dataMap
+}
+
+func (table *GameNameLibrary) GetDataList() []*GameNameLibraryData {
+ return table._dataList
+}
+
+func (table *GameNameLibrary) Get(key int32) *GameNameLibraryData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.NameLibraryData.go b/sys/configure/structs/Game.NameLibraryData.go
new file mode 100644
index 000000000..88f40e89e
--- /dev/null
+++ b/sys/configure/structs/Game.NameLibraryData.go
@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameNameLibraryData struct {
+ Id int32
+ Surname string
+ Name string
+}
+
+const TypeId_GameNameLibraryData = 77094270
+
+func (*GameNameLibraryData) GetTypeId() int32 {
+ return 77094270
+}
+
+func (_v *GameNameLibraryData)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 __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["surname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Surname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Surname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ return
+}
+
+func DeserializeGameNameLibraryData(_buf map[string]interface{}) (*GameNameLibraryData, error) {
+ v := &GameNameLibraryData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.RdtaskData.go b/sys/configure/structs/Game.RdtaskData.go
index 7e6414b37..822b5d393 100644
--- a/sys/configure/structs/Game.RdtaskData.go
+++ b/sys/configure/structs/Game.RdtaskData.go
@@ -13,6 +13,7 @@ import "errors"
type GameRdtaskData struct {
Id int32
Group int32
+ Subgroup int32
Type int32
PreTid int32
Condition []int32
@@ -28,6 +29,7 @@ func (*GameRdtaskData) GetTypeId() int32 {
func (_v *GameRdtaskData)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["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subgroup"].(float64); !_ok_ { err = errors.New("subgroup error"); return }; _v.Subgroup = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["preTid"].(float64); !_ok_ { err = errors.New("preTid error"); return }; _v.PreTid = int32(_tempNum_) }
{
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 23d7c30e7..63dab99e0 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -99,6 +99,7 @@ type Tables struct {
Robot *GameRobot
Ip *GameIp
GameColor *GameGameColor
+ NameLibrary *GameNameLibrary
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -634,5 +635,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.GameColor, err = NewGameGameColor(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_namelibrary") ; err != nil {
+ return nil, err
+ }
+ if tables.NameLibrary, err = NewGameNameLibrary(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go
index 4f6548f68..8b517d863 100644
--- a/sys/configure/structs/game.heroData.go
+++ b/sys/configure/structs/game.heroData.go
@@ -41,6 +41,7 @@ type GameHeroData struct {
Camerainterval float32
Equiprcom []string
Angle int32
+ Deviation int32
}
const TypeId_GameHeroData = 1513828672
@@ -125,6 +126,7 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) {
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["angle"].(float64); !_ok_ { err = errors.New("angle error"); return }; _v.Angle = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deviation"].(float64); !_ok_ { err = errors.New("deviation error"); return }; _v.Deviation = int32(_tempNum_) }
return
}