diff --git a/bin/json/game_equipscompose.json b/bin/json/game_equipscompose.json
new file mode 100644
index 000000000..79452bb52
--- /dev/null
+++ b/bin/json/game_equipscompose.json
@@ -0,0 +1,611 @@
+[
+ {
+ "key": 1,
+ "suittype": 1,
+ "star": 4,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 16851
+ }
+ ],
+ "ico": "zb_icon_01",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 2,
+ "suittype": 1,
+ "star": 5,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 21064
+ }
+ ],
+ "ico": "zb_icon_02",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 3,
+ "suittype": 1,
+ "star": 6,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 23936
+ }
+ ],
+ "ico": "zb_icon_03",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 4,
+ "suittype": 2,
+ "star": 4,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 24681
+ }
+ ],
+ "ico": "zb_icon_04",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 5,
+ "suittype": 2,
+ "star": 5,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 25319
+ }
+ ],
+ "ico": "zb_icon_05",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 6,
+ "suittype": 2,
+ "star": 6,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 25532
+ }
+ ],
+ "ico": "zb_icon_06",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 7,
+ "suittype": 3,
+ "star": 4,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 16851
+ }
+ ],
+ "ico": "zb_icon_01",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 8,
+ "suittype": 3,
+ "star": 5,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 21064
+ }
+ ],
+ "ico": "zb_icon_02",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 9,
+ "suittype": 3,
+ "star": 6,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 23936
+ }
+ ],
+ "ico": "zb_icon_03",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 10,
+ "suittype": 4,
+ "star": 4,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 24681
+ }
+ ],
+ "ico": "zb_icon_04",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 11,
+ "suittype": 4,
+ "star": 5,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 25319
+ }
+ ],
+ "ico": "zb_icon_05",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 12,
+ "suittype": 4,
+ "star": 6,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 25532
+ }
+ ],
+ "ico": "zb_icon_06",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 13,
+ "suittype": 5,
+ "star": 4,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 16851
+ }
+ ],
+ "ico": "zb_icon_01",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 14,
+ "suittype": 5,
+ "star": 5,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 21064
+ }
+ ],
+ "ico": "zb_icon_02",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 15,
+ "suittype": 5,
+ "star": 6,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 23936
+ }
+ ],
+ "ico": "zb_icon_03",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 16,
+ "suittype": 6,
+ "star": 4,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 24681
+ }
+ ],
+ "ico": "zb_icon_04",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 17,
+ "suittype": 6,
+ "star": 5,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 25319
+ }
+ ],
+ "ico": "zb_icon_05",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 18,
+ "suittype": 6,
+ "star": 6,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 25532
+ }
+ ],
+ "ico": "zb_icon_06",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 19,
+ "suittype": 7,
+ "star": 4,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 16851
+ }
+ ],
+ "ico": "zb_icon_01",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 20,
+ "suittype": 7,
+ "star": 5,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 21064
+ }
+ ],
+ "ico": "zb_icon_02",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ },
+ {
+ "key": 21,
+ "suittype": 7,
+ "star": 6,
+ "skillintr": {
+ "key": "equip_13215",
+ "text": "战神套装/n4件套效果:攻击力+30%"
+ },
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 23936
+ }
+ ],
+ "ico": "zb_icon_03",
+ "equip": [
+ "10001",
+ "10002",
+ "10003",
+ "10004"
+ ],
+ "probability": [
+ 10001,
+ 10002,
+ 10003,
+ 10004
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 842245ca2..c7beb46be 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -175,8 +175,8 @@
"selling_tips_star": 5,
"selling_tips_entry": 4,
"gourmet_robot": [
- 3,
- 4
+ 1,
+ 2
],
"gourmet_pause": [
500,
@@ -274,7 +274,8 @@
],
"run_horsetime1": 3,
"run_horsetime2": 10,
- "boy_headPortrait": "101",
- "girl_headPortrait": "102"
+ "boy_headPortrait": "1",
+ "girl_headPortrait": "2",
+ "namecolor": "#000080"
}
]
\ No newline at end of file
diff --git a/bin/json/game_growtask.json b/bin/json/game_growtask.json
index 69fdeac1b..20be0d83f 100644
--- a/bin/json/game_growtask.json
+++ b/bin/json/game_growtask.json
@@ -2,12 +2,18 @@
{
"id": 1,
"type": 1,
- "title": "通关1-1",
+ "title": {
+ "key": "ClearanceThread",
+ "text": "通关1-1"
+ },
"onetask": 0,
- "txt": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~",
+ "txt": {
+ "key": "Growtxtone",
+ "text": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~"
+ },
"portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -24,12 +30,18 @@
{
"id": 2,
"type": 1,
- "title": "通关1-2",
+ "title": {
+ "key": "ClearanceThread",
+ "text": "通关1-2"
+ },
"onetask": 1,
- "txt": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~",
- "portrait": "N6_0002_图层-31254",
+ "txt": {
+ "key": "Growtxtone",
+ "text": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -46,12 +58,18 @@
{
"id": 3,
"type": 1,
- "title": "通关1-3",
+ "title": {
+ "key": "ClearanceThread",
+ "text": "通关1-3"
+ },
"onetask": 2,
- "txt": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~",
- "portrait": "N6_0002_图层-31255",
+ "txt": {
+ "key": "Growtxtone",
+ "text": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -68,12 +86,18 @@
{
"id": 4,
"type": 1,
- "title": "通关1-4",
+ "title": {
+ "key": "ClearanceThread",
+ "text": "通关1-4"
+ },
"onetask": 3,
- "txt": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~",
- "portrait": "N6_0002_图层-31256",
+ "txt": {
+ "key": "Growtxtone",
+ "text": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -90,12 +114,18 @@
{
"id": 5,
"type": 1,
- "title": "通关1-5",
+ "title": {
+ "key": "ClearanceThread",
+ "text": "通关1-5"
+ },
"onetask": 4,
- "txt": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~",
- "portrait": "N6_0002_图层-31257",
+ "txt": {
+ "key": "Growtxtone",
+ "text": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -112,12 +142,18 @@
{
"id": 6,
"type": 1,
- "title": "通关1-6",
+ "title": {
+ "key": "ClearanceThread",
+ "text": "通关1-6"
+ },
"onetask": 5,
- "txt": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~",
- "portrait": "N6_0002_图层-31258",
+ "txt": {
+ "key": "Growtxtone",
+ "text": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -134,12 +170,18 @@
{
"id": 7,
"type": 1,
- "title": "通关1-7",
+ "title": {
+ "key": "ClearanceThread",
+ "text": "通关1-7"
+ },
"onetask": 6,
- "txt": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~",
- "portrait": "N6_0002_图层-31259",
+ "txt": {
+ "key": "Growtxtone",
+ "text": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -156,12 +198,18 @@
{
"id": 8,
"type": 1,
- "title": "通关1-8",
+ "title": {
+ "key": "ClearanceThread",
+ "text": "通关1-8"
+ },
"onetask": 7,
- "txt": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~",
- "portrait": "N6_0002_图层-31260",
+ "txt": {
+ "key": "Growtxtone",
+ "text": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -178,12 +226,18 @@
{
"id": 9,
"type": 1,
- "title": "通关1-9",
+ "title": {
+ "key": "ClearanceThread",
+ "text": "通关1-9"
+ },
"onetask": 8,
- "txt": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~",
- "portrait": "N6_0002_图层-31261",
+ "txt": {
+ "key": "Growtxtone",
+ "text": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -200,12 +254,18 @@
{
"id": 10,
"type": 1,
- "title": "通关1-10",
+ "title": {
+ "key": "ClearanceThread",
+ "text": "通关1-10"
+ },
"onetask": 9,
- "txt": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~",
- "portrait": "N6_0002_图层-31262",
+ "txt": {
+ "key": "Growtxtone",
+ "text": "位置的丛林充满了危险,赶快带上你的小伙伴去探索一番吧~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -222,12 +282,18 @@
{
"id": 11,
"type": 2,
- "title": "阿宝升1级",
+ "title": {
+ "key": "CharacterGrowth",
+ "text": "阿宝升1级"
+ },
"onetask": 10,
- "txt": "阿宝需要变强,快去帮助他把~",
- "portrait": "N6_0002_图层-31263",
+ "txt": {
+ "key": "Growtxttwo",
+ "text": "阿宝需要变强,快去帮助他把~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -244,12 +310,18 @@
{
"id": 12,
"type": 2,
- "title": "阿宝升2级",
+ "title": {
+ "key": "CharacterGrowth",
+ "text": "阿宝升2级"
+ },
"onetask": 11,
- "txt": "阿宝需要变强,快去帮助他把~",
- "portrait": "N6_0002_图层-31264",
+ "txt": {
+ "key": "Growtxttwo",
+ "text": "阿宝需要变强,快去帮助他把~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -266,12 +338,18 @@
{
"id": 13,
"type": 2,
- "title": "阿宝升3级",
+ "title": {
+ "key": "CharacterGrowth",
+ "text": "阿宝升3级"
+ },
"onetask": 12,
- "txt": "阿宝需要变强,快去帮助他把~",
- "portrait": "N6_0002_图层-31265",
+ "txt": {
+ "key": "Growtxttwo",
+ "text": "阿宝需要变强,快去帮助他把~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -288,12 +366,18 @@
{
"id": 14,
"type": 2,
- "title": "阿宝升4级",
+ "title": {
+ "key": "CharacterGrowth",
+ "text": "阿宝升4级"
+ },
"onetask": 13,
- "txt": "阿宝需要变强,快去帮助他把~",
- "portrait": "N6_0002_图层-31266",
+ "txt": {
+ "key": "Growtxttwo",
+ "text": "阿宝需要变强,快去帮助他把~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -310,12 +394,18 @@
{
"id": 15,
"type": 2,
- "title": "阿宝升5级",
+ "title": {
+ "key": "CharacterGrowth",
+ "text": "阿宝升5级"
+ },
"onetask": 14,
- "txt": "阿宝需要变强,快去帮助他把~",
- "portrait": "N6_0002_图层-31267",
+ "txt": {
+ "key": "Growtxttwo",
+ "text": "阿宝需要变强,快去帮助他把~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -332,12 +422,18 @@
{
"id": 16,
"type": 2,
- "title": "阿宝升6级",
+ "title": {
+ "key": "CharacterGrowth",
+ "text": "阿宝升6级"
+ },
"onetask": 15,
- "txt": "阿宝需要变强,快去帮助他把~",
- "portrait": "N6_0002_图层-31268",
+ "txt": {
+ "key": "Growtxttwo",
+ "text": "阿宝需要变强,快去帮助他把~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -354,12 +450,18 @@
{
"id": 17,
"type": 2,
- "title": "阿宝升7级",
+ "title": {
+ "key": "CharacterGrowth",
+ "text": "阿宝升7级"
+ },
"onetask": 16,
- "txt": "阿宝需要变强,快去帮助他把~",
- "portrait": "N6_0002_图层-31269",
+ "txt": {
+ "key": "Growtxttwo",
+ "text": "阿宝需要变强,快去帮助他把~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -376,12 +478,18 @@
{
"id": 18,
"type": 2,
- "title": "阿宝升8级",
+ "title": {
+ "key": "CharacterGrowth",
+ "text": "阿宝升8级"
+ },
"onetask": 17,
- "txt": "阿宝需要变强,快去帮助他把~",
- "portrait": "N6_0002_图层-31270",
+ "txt": {
+ "key": "Growtxttwo",
+ "text": "阿宝需要变强,快去帮助他把~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -398,12 +506,18 @@
{
"id": 19,
"type": 2,
- "title": "阿宝升9级",
+ "title": {
+ "key": "CharacterGrowth",
+ "text": "阿宝升9级"
+ },
"onetask": 18,
- "txt": "阿宝需要变强,快去帮助他把~",
- "portrait": "N6_0002_图层-31271",
+ "txt": {
+ "key": "Growtxttwo",
+ "text": "阿宝需要变强,快去帮助他把~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -420,12 +534,18 @@
{
"id": 20,
"type": 2,
- "title": "阿宝升10级",
+ "title": {
+ "key": "CharacterGrowth",
+ "text": "阿宝升10级"
+ },
"onetask": 19,
- "txt": "阿宝需要变强,快去帮助他把~",
- "portrait": "N6_0002_图层-31272",
+ "txt": {
+ "key": "Growtxttwo",
+ "text": "阿宝需要变强,快去帮助他把~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -442,12 +562,18 @@
{
"id": 21,
"type": 3,
- "title": "波比升1级",
+ "title": {
+ "key": "CharacterIpgrading",
+ "text": "波比升1级"
+ },
"onetask": 20,
- "txt": "你们都变强了,我也需要变强,请助我一臂之力~",
- "portrait": "N6_0002_图层-31273",
+ "txt": {
+ "key": "Growtxtthree",
+ "text": "你们都变强了,我也需要变强,请助我一臂之力~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -464,12 +590,18 @@
{
"id": 22,
"type": 3,
- "title": "波比升2级",
+ "title": {
+ "key": "CharacterIpgrading",
+ "text": "波比升2级"
+ },
"onetask": 21,
- "txt": "你们都变强了,我也需要变强,请助我一臂之力~",
- "portrait": "N6_0002_图层-31274",
+ "txt": {
+ "key": "Growtxtthree",
+ "text": "你们都变强了,我也需要变强,请助我一臂之力~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -486,12 +618,18 @@
{
"id": 23,
"type": 3,
- "title": "波比升3级",
+ "title": {
+ "key": "CharacterIpgrading",
+ "text": "波比升3级"
+ },
"onetask": 22,
- "txt": "你们都变强了,我也需要变强,请助我一臂之力~",
- "portrait": "N6_0002_图层-31275",
+ "txt": {
+ "key": "Growtxtthree",
+ "text": "你们都变强了,我也需要变强,请助我一臂之力~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -508,12 +646,18 @@
{
"id": 24,
"type": 3,
- "title": "波比升4级",
+ "title": {
+ "key": "CharacterIpgrading",
+ "text": "波比升4级"
+ },
"onetask": 23,
- "txt": "你们都变强了,我也需要变强,请助我一臂之力~",
- "portrait": "N6_0002_图层-31276",
+ "txt": {
+ "key": "Growtxtthree",
+ "text": "你们都变强了,我也需要变强,请助我一臂之力~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -530,12 +674,18 @@
{
"id": 25,
"type": 3,
- "title": "波比升5级",
+ "title": {
+ "key": "CharacterIpgrading",
+ "text": "波比升5级"
+ },
"onetask": 24,
- "txt": "你们都变强了,我也需要变强,请助我一臂之力~",
- "portrait": "N6_0002_图层-31277",
+ "txt": {
+ "key": "Growtxtthree",
+ "text": "你们都变强了,我也需要变强,请助我一臂之力~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -552,12 +702,18 @@
{
"id": 26,
"type": 3,
- "title": "波比升6级",
+ "title": {
+ "key": "CharacterIpgrading",
+ "text": "波比升6级"
+ },
"onetask": 25,
- "txt": "你们都变强了,我也需要变强,请助我一臂之力~",
- "portrait": "N6_0002_图层-31278",
+ "txt": {
+ "key": "Growtxtthree",
+ "text": "你们都变强了,我也需要变强,请助我一臂之力~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -574,12 +730,18 @@
{
"id": 27,
"type": 3,
- "title": "波比升7级",
+ "title": {
+ "key": "CharacterIpgrading",
+ "text": "波比升7级"
+ },
"onetask": 26,
- "txt": "你们都变强了,我也需要变强,请助我一臂之力~",
- "portrait": "N6_0002_图层-31279",
+ "txt": {
+ "key": "Growtxtthree",
+ "text": "你们都变强了,我也需要变强,请助我一臂之力~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -596,12 +758,18 @@
{
"id": 28,
"type": 3,
- "title": "波比升8级",
+ "title": {
+ "key": "CharacterIpgrading",
+ "text": "波比升8级"
+ },
"onetask": 27,
- "txt": "你们都变强了,我也需要变强,请助我一臂之力~",
- "portrait": "N6_0002_图层-31280",
+ "txt": {
+ "key": "Growtxtthree",
+ "text": "你们都变强了,我也需要变强,请助我一臂之力~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
"reward": [
{
"a": "attr",
@@ -618,12 +786,46 @@
{
"id": 29,
"type": 3,
- "title": "波比升9级",
+ "title": {
+ "key": "CharacterIpgrading",
+ "text": "波比升9级"
+ },
"onetask": 28,
- "txt": "你们都变强了,我也需要变强,请助我一臂之力~",
- "portrait": "N6_0002_图层-31281",
+ "txt": {
+ "key": "Growtxtthree",
+ "text": "你们都变强了,我也需要变强,请助我一臂之力~"
+ },
+ "portrait": "N6_0002_图层-31253",
"fstask": 101,
- "jump": 120,
+ "jump": 107,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1000
+ }
+ ]
+ },
+ {
+ "id": 30,
+ "type": 3,
+ "title": {
+ "key": "CharacterIpgrading",
+ "text": "波比升9级"
+ },
+ "onetask": 29,
+ "txt": {
+ "key": "Growtxtthree",
+ "text": "你们都变强了,我也需要变强,请助我一臂之力~"
+ },
+ "portrait": "N6_0002_图层-31253",
+ "fstask": 101,
+ "jump": 107,
"reward": [
{
"a": "attr",
diff --git a/bin/json/game_linestorymaintask.json b/bin/json/game_linestorymaintask.json
new file mode 100644
index 000000000..a990b7c90
--- /dev/null
+++ b/bin/json/game_linestorymaintask.json
@@ -0,0 +1,113 @@
+[
+ {
+ "id": 101000,
+ "paretnTask": 1,
+ "subTask": 0,
+ "name": {
+ "key": "SubplotMainTask_101000",
+ "text": "让阿宝变强1"
+ },
+ "img": "",
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ],
+ "ending": 0,
+ "resetto": []
+ },
+ {
+ "id": 102000,
+ "paretnTask": 1,
+ "subTask": 101000,
+ "name": {
+ "key": "SubplotMainTask_102000",
+ "text": "让阿宝变强2"
+ },
+ "img": "",
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ],
+ "ending": 2,
+ "resetto": []
+ },
+ {
+ "id": 103000,
+ "paretnTask": 1,
+ "subTask": 101000,
+ "name": {
+ "key": "SubplotMainTask_103000",
+ "text": "让阿宝变强3"
+ },
+ "img": "",
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ],
+ "ending": 2,
+ "resetto": []
+ },
+ {
+ "id": 104000,
+ "paretnTask": 1,
+ "subTask": 103000,
+ "name": {
+ "key": "SubplotMainTask_104000",
+ "text": "让阿宝变强4"
+ },
+ "img": "",
+ "reward": [],
+ "ending": 1,
+ "resetto": []
+ },
+ {
+ "id": 105000,
+ "paretnTask": 2,
+ "subTask": 104000,
+ "name": {
+ "key": "SubplotMainTask_105000",
+ "text": "让阿宝变强5"
+ },
+ "img": "",
+ "reward": [],
+ "ending": 0,
+ "resetto": []
+ },
+ {
+ "id": 106000,
+ "paretnTask": 2,
+ "subTask": 105000,
+ "name": {
+ "key": "SubplotMainTask_106000",
+ "text": "让阿宝变强6"
+ },
+ "img": "",
+ "reward": [],
+ "ending": 1,
+ "resetto": []
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_linestorytimeline.json b/bin/json/game_linestorytimeline.json
new file mode 100644
index 000000000..fc053b835
--- /dev/null
+++ b/bin/json/game_linestorytimeline.json
@@ -0,0 +1,135 @@
+[
+ {
+ "index": 1,
+ "nodeIndex": 0,
+ "cond": [],
+ "name": {
+ "key": "阿宝的成长1",
+ "text": "阿宝的成长1"
+ },
+ "img": "zx_pt_01",
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "index": 2,
+ "nodeIndex": 0,
+ "cond": [],
+ "name": {
+ "key": "阿宝的成长2",
+ "text": "阿宝的成长2"
+ },
+ "img": "zx_pt_02",
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "index": 3,
+ "nodeIndex": 0,
+ "cond": [],
+ "name": {
+ "key": "阿宝的成长3",
+ "text": "阿宝的成长3"
+ },
+ "img": "zx_pt_03",
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "index": 4,
+ "nodeIndex": 1,
+ "cond": [
+ 1,
+ 2,
+ 3
+ ],
+ "name": {
+ "key": "阿宝的成长4",
+ "text": "阿宝的成长4"
+ },
+ "img": "zx_pt_04",
+ "reward": []
+ },
+ {
+ "index": 5,
+ "nodeIndex": 1,
+ "cond": [
+ 1
+ ],
+ "name": {
+ "key": "阿宝的成长5",
+ "text": "阿宝的成长5"
+ },
+ "img": "zx_pt_05",
+ "reward": []
+ },
+ {
+ "index": 6,
+ "nodeIndex": 2,
+ "cond": [
+ 4
+ ],
+ "name": {
+ "key": "阿宝的成长6",
+ "text": "阿宝的成长6"
+ },
+ "img": "zx_pt_06",
+ "reward": []
+ },
+ {
+ "index": 7,
+ "nodeIndex": 3,
+ "cond": [
+ 6
+ ],
+ "name": {
+ "key": "阿宝的成长7",
+ "text": "阿宝的成长7"
+ },
+ "img": "zx_pt_07",
+ "reward": []
+ },
+ {
+ "index": 8,
+ "nodeIndex": 4,
+ "cond": [
+ 7
+ ],
+ "name": {
+ "key": "阿宝的成长8",
+ "text": "阿宝的成长8"
+ },
+ "img": "zx_pt_08",
+ "reward": []
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_mail.json b/bin/json/game_mail.json
new file mode 100644
index 000000000..bccfdd49b
--- /dev/null
+++ b/bin/json/game_mail.json
@@ -0,0 +1,122 @@
+[
+ {
+ "id": "GuildDissolution",
+ "title": {
+ "key": "MailTitle_GuildDissolution",
+ "text": "公会解散"
+ },
+ "recipient": {
+ "key": "MailRecipient_GuildDissolution",
+ "text": "通知:"
+ },
+ "content": {
+ "key": "MailContent_GuildDissolution",
+ "text": "您加入的{0}公会已被会长解散。"
+ },
+ "sender": {
+ "key": "MailSender_GuildDissolution",
+ "text": "系统"
+ },
+ "duration": 720
+ },
+ {
+ "id": "GuildExpel",
+ "title": {
+ "key": "MailTitle_GuildExpel",
+ "text": "移出公会"
+ },
+ "recipient": {
+ "key": "MailRecipient_GuildExpel",
+ "text": "通知:"
+ },
+ "content": {
+ "key": "MailContent_GuildExpel",
+ "text": "您加入的{0}公会已将您移除公会。"
+ },
+ "sender": {
+ "key": "MailSender_GuildExpel",
+ "text": "系统"
+ },
+ "duration": 720
+ },
+ {
+ "id": "GuildApproved",
+ "title": {
+ "key": "MailTitle_GuildApproved",
+ "text": "加入公会"
+ },
+ "recipient": {
+ "key": "MailRecipient_GuildApproved",
+ "text": "通知:"
+ },
+ "content": {
+ "key": "MailContent_GuildApproved",
+ "text": "{0}公会已经通过您的加入申请。"
+ },
+ "sender": {
+ "key": "MailSender_GuildApproved",
+ "text": "系统"
+ },
+ "duration": 720
+ },
+ {
+ "id": "Activity_PrivilegeCardDailyReward_lv1",
+ "title": {
+ "key": "MailTitle_Activity_PrivilegeCardDailyReward_lv1",
+ "text": "奖励"
+ },
+ "recipient": {
+ "key": "MailRecipient_Activity_PrivilegeCardDailyReward_lv1",
+ "text": "亲爱的玩家:"
+ },
+ "content": {
+ "key": "MailContent_Activity_PrivilegeCardDailyReward_lv1",
+ "text": "本日经典月卡奖励已发放,请查收。"
+ },
+ "sender": {
+ "key": "MailSender_Activity_PrivilegeCardDailyReward_lv1",
+ "text": "系统"
+ },
+ "duration": 720
+ },
+ {
+ "id": "Activity_PrivilegeCardDailyReward_lv2",
+ "title": {
+ "key": "MailTitle_Activity_PrivilegeCardDailyReward_lv2",
+ "text": "奖励"
+ },
+ "recipient": {
+ "key": "MailRecipient_Activity_PrivilegeCardDailyReward_lv2",
+ "text": "亲爱的玩家:"
+ },
+ "content": {
+ "key": "MailContent_Activity_PrivilegeCardDailyReward_lv2",
+ "text": "本日典藏月卡奖励已发放,请查收。"
+ },
+ "sender": {
+ "key": "MailSender_Activity_PrivilegeCardDailyReward_lv2",
+ "text": "系统"
+ },
+ "duration": 720
+ },
+ {
+ "id": "SeasonPagodaReward",
+ "title": {
+ "key": "MailTitle_SeasonPagodaReward",
+ "text": "赛季塔排行奖励"
+ },
+ "recipient": {
+ "key": "MailRecipient_SeasonPagodaReward",
+ "text": "亲爱的玩家:"
+ },
+ "content": {
+ "key": "MailContent_SeasonPagodaReward",
+ "text": "获得第{0}名,奖励请查收。"
+ },
+ "sender": {
+ "key": "MailSender_SeasonPagodaReward",
+ "text": "系统"
+ },
+ "duration": 720
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 8b9c724f8..0b59bc2ae 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -105,9 +105,9 @@
"id": "currency",
"name": {
"key": "opencond_name_10003",
- "text": "货币栏"
+ "text": "充值"
},
- "main": 999,
+ "main": 1,
"optional": "",
"wkqbx": 0,
"kqbx": 0,
diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json
index cb0935dae..1d7a992c9 100644
--- a/bin/json/game_recharge.json
+++ b/bin/json/game_recharge.json
@@ -31,7 +31,7 @@
],
"channel": "0",
"text": "0",
- "image": ""
+ "image": "cz_zs_01"
},
{
"id": "2",
@@ -65,7 +65,7 @@
],
"channel": "0",
"text": "0",
- "image": ""
+ "image": "cz_zs_02"
},
{
"id": "3",
@@ -99,7 +99,7 @@
],
"channel": "0",
"text": "0",
- "image": ""
+ "image": "cz_zs_02"
},
{
"id": "4",
@@ -133,7 +133,7 @@
],
"channel": "0",
"text": "0",
- "image": ""
+ "image": "cz_zs_02"
},
{
"id": "5",
@@ -167,7 +167,7 @@
],
"channel": "0",
"text": "0",
- "image": ""
+ "image": "cz_zs_03"
},
{
"id": "6",
@@ -201,7 +201,7 @@
],
"channel": "0",
"text": "0",
- "image": ""
+ "image": "cz_zs_03"
},
{
"id": "7",
@@ -235,7 +235,7 @@
],
"channel": "0",
"text": "0",
- "image": ""
+ "image": "cz_zs_03"
},
{
"id": "8",
@@ -269,7 +269,7 @@
],
"channel": "0",
"text": "0",
- "image": ""
+ "image": "cz_zs_03"
},
{
"id": "9",
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index bf4523d05..5b5a977a6 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -15558,6 +15558,26 @@
{
"Id": 243003211,
"EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 10,
+ "Argu": [
+ 200
+ ],
+ "FollowSK": [
+ 243003212,
+ 243003213
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 243003212,
+ "EmitPR": 1000,
"From": 1,
"Where": [],
"Order": "",
@@ -15569,15 +15589,13 @@
2,
400
],
- "FollowSK": [
- 243003212
- ],
+ "FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
- "Id": 243003212,
+ "Id": 243003213,
"EmitPR": 1000,
"From": 4,
"Where": [],
@@ -17678,124 +17696,6 @@
"FailFollowSK": [],
"MustHit": false
},
- {
- "Id": 255002111,
- "EmitPR": 1000,
- "From": 2,
- "Where": [],
- "Order": "",
- "Limit": 1,
- "ExecuteCnt": 1,
- "Type": 1,
- "Argu": [
- 1,
- 4,
- 1500
- ],
- "FollowSK": [],
- "SucFollowSK": [],
- "FailFollowSK": [],
- "MustHit": false
- },
- {
- "Id": 255002211,
- "EmitPR": 1000,
- "From": 3,
- "Where": [],
- "Order": "",
- "Limit": 1,
- "ExecuteCnt": 1,
- "Type": 2,
- "Argu": [
- 455002211,
- 1,
- -1
- ],
- "FollowSK": [
- 255002212,
- 255002213
- ],
- "SucFollowSK": [],
- "FailFollowSK": [],
- "MustHit": false
- },
- {
- "Id": 255002212,
- "EmitPR": 1000,
- "From": 3,
- "Where": [],
- "Order": "",
- "Limit": 1,
- "ExecuteCnt": 1,
- "Type": 26,
- "Argu": [
- 300
- ],
- "FollowSK": [],
- "SucFollowSK": [],
- "FailFollowSK": [],
- "MustHit": false
- },
- {
- "Id": 255002213,
- "EmitPR": 1000,
- "From": 2,
- "Where": [],
- "Order": "",
- "Limit": 1,
- "ExecuteCnt": 1,
- "Type": 2,
- "Argu": [
- 455002211,
- 1,
- -1
- ],
- "FollowSK": [
- 255002214
- ],
- "SucFollowSK": [],
- "FailFollowSK": [],
- "MustHit": false
- },
- {
- "Id": 255002214,
- "EmitPR": 1000,
- "From": 3,
- "Where": [],
- "Order": "",
- "Limit": 1,
- "ExecuteCnt": 1,
- "Type": 3,
- "Argu": [
- 390001411,
- 1000,
- 1,
- -1
- ],
- "FollowSK": [],
- "SucFollowSK": [],
- "FailFollowSK": [],
- "MustHit": false
- },
- {
- "Id": 255002311,
- "EmitPR": 1000,
- "From": 2,
- "Where": [],
- "Order": "",
- "Limit": 1,
- "ExecuteCnt": 1,
- "Type": 1,
- "Argu": [
- 1,
- 4,
- 2000
- ],
- "FollowSK": [],
- "SucFollowSK": [],
- "FailFollowSK": [],
- "MustHit": false
- },
{
"Id": 255005111,
"EmitPR": 1000,
@@ -18185,15 +18085,15 @@
{
"Id": 255007111,
"EmitPR": 1000,
- "From": 2,
+ "From": 3,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
455007111,
- 1,
+ -1,
1
],
"FollowSK": [],
@@ -18204,19 +18104,21 @@
{
"Id": 255007112,
"EmitPR": 1000,
- "From": 2,
+ "From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
- 390001414,
+ 390001423,
1000,
1,
- 1
+ -1
+ ],
+ "FollowSK": [
+ 255007113
],
- "FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
@@ -18227,7 +18129,7 @@
"From": 2,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
@@ -18235,7 +18137,9 @@
4,
2000
],
- "FollowSK": [],
+ "FollowSK": [
+ 255007114
+ ],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
@@ -18290,7 +18194,7 @@
"Type": 3,
"Argu": [
390001105,
- 1000,
+ 500,
1,
1
],
@@ -18404,6 +18308,24 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
+ "Type": 2,
+ "Argu": [
+ 455007311,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 255007312,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001421,
@@ -18417,7 +18339,7 @@
"MustHit": false
},
{
- "Id": 255007312,
+ "Id": 255007313,
"EmitPR": 1000,
"From": 3,
"Where": [],
@@ -18437,7 +18359,7 @@
"MustHit": false
},
{
- "Id": 255007313,
+ "Id": 255007314,
"EmitPR": 1000,
"From": 3,
"Where": [],
@@ -18446,27 +18368,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
- 455007313,
- 1,
- 1
- ],
- "FollowSK": [],
- "SucFollowSK": [],
- "FailFollowSK": [],
- "MustHit": false
- },
- {
- "Id": 255007314,
- "EmitPR": 1000,
- "From": 3,
- "Where": [],
- "Order": "",
- "Limit": 1,
- "ExecuteCnt": 1,
- "Type": 3,
- "Argu": [
- 390001415,
- 1000,
+ 455007314,
1,
1
],
@@ -18483,13 +18385,16 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
- "Type": 2,
+ "Type": 3,
"Argu": [
- 455007315,
+ 390001415,
+ 1000,
1,
1
],
- "FollowSK": [],
+ "FollowSK": [
+ 255007316
+ ],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
@@ -18502,9 +18407,30 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 2000
+ ],
+ "FollowSK": [
+ 255007317
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 255007317,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
"Type": 3,
"Argu": [
- 390001417,
+ 390001105,
1000,
1,
1
@@ -18514,6 +18440,25 @@
"FailFollowSK": [],
"MustHit": false
},
+ {
+ "Id": 255007318,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001406,
+ 1000,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
{
"Id": 253003111,
"EmitPR": 1000,
@@ -18599,7 +18544,7 @@
{
"Id": 200003001,
"EmitPR": 1000,
- "From": 2,
+ "From": 3,
"Where": [],
"Order": "",
"Limit": 1,
@@ -18607,7 +18552,7 @@
"Type": 2,
"Argu": [
400003001,
- 1,
+ -1,
1
],
"FollowSK": [],
@@ -18618,7 +18563,7 @@
{
"Id": 200003002,
"EmitPR": 1000,
- "From": 2,
+ "From": 8,
"Where": [],
"Order": "",
"Limit": 1,
@@ -18626,9 +18571,9 @@
"Type": 3,
"Argu": [
390001106,
- 250,
+ 1000,
1,
- 1
+ 2
],
"FollowSK": [],
"SucFollowSK": [],
@@ -18686,6 +18631,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
+ 400007001,
1,
1
],
@@ -18919,5 +18865,793 @@
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
+ },
+ {
+ "Id": 255002111,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 1500
+ ],
+ "FollowSK": [
+ 255002112
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 255002112,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 26,
+ "Argu": [
+ 300
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 255002211,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 2,
+ "Argu": [
+ 455002211,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 255002212,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001423,
+ 1000,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 255002311,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 2000
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 255002312,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 26,
+ "Argu": [
+ 300
+ ],
+ "FollowSK": [
+ 255002312
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234004111,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 1000
+ ],
+ "FollowSK": [
+ 234004112
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234004112,
+ "EmitPR": 1000,
+ "From": 1,
+ "Where": [],
+ "Order": "PropertyUp=3",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 26,
+ "Argu": [
+ 300
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234004211,
+ "EmitPR": 1000,
+ "From": 1,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001424,
+ 1000,
+ 1,
+ 2
+ ],
+ "FollowSK": [
+ 234004212
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234004212,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001127,
+ 1000,
+ 1,
+ 2
+ ],
+ "FollowSK": [
+ 234004213
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234004213,
+ "EmitPR": 1000,
+ "From": 4,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001001,
+ 1000,
+ 1,
+ 2
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234004311,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 1000
+ ],
+ "FollowSK": [
+ 234004312
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234004312,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001425,
+ 1000,
+ 1,
+ -1
+ ],
+ "FollowSK": [
+ 234004313
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234004313,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001107,
+ 500,
+ 1,
+ 2
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 214002111,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 300,
+ 1,
+ 1,
+ 45
+ ],
+ "FollowSK": [
+ 214002112,
+ 214002211
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 214002112,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001110,
+ 300,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 214002211,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001426,
+ 1000,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 214002212,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 2,
+ "Argu": [
+ 414002212,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 214002213,
+ "EmitPR": 1000,
+ "From": 1,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 2,
+ "Argu": [
+ 414002213,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 214002311,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 900,
+ 1,
+ 11,
+ 150
+ ],
+ "FollowSK": [
+ 214002312,
+ 214002211
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 214002312,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001006,
+ 700,
+ 1,
+ 2
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 243007111,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 1000
+ ],
+ "FollowSK": [
+ 143007112
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 243007112,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001109,
+ 300,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 243007211,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 2,
+ "Argu": [
+ 443007211,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 243007212,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 7,
+ "Argu": [
+ 0,
+ 1,
+ 1,
+ 1000
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 243007311,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "Type=Rand",
+ "Limit": 1,
+ "ExecuteCnt": 5,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 900
+ ],
+ "FollowSK": [
+ 243007312,
+ 243007313
+ ],
+ "SucFollowSK": [
+ 243007314
+ ],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 243007312,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 5,
+ "Type": 28,
+ "Argu": [
+ 0,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 243007313,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001101,
+ 1000,
+ 1,
+ 2
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 243007314,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 1000,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234001111,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 3,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 350
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234001112,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001101,
+ 400,
+ 1,
+ 2
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234001211,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 2,
+ "Argu": [
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234001212,
+ "EmitPR": 150,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 19,
+ "Argu": [
+ 2,
+ 1,
+ 100
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234001311,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "Type=Rand",
+ "Limit": 1,
+ "ExecuteCnt": 9,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 350
+ ],
+ "FollowSK": [
+ 234001312
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 234001312,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 9,
+ "Type": 3,
+ "Argu": [
+ 390001404,
+ 400,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 223001111,
+ "EmitPR": 1000,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 1,
+ "Argu": [
+ 1,
+ 4,
+ 1000
+ ],
+ "FollowSK": [
+ 223001112
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 223001112,
+ "EmitPR": 700,
+ "From": 2,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 11,
+ "Argu": [
+ -150
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 223001211,
+ "EmitPR": 1000,
+ "From": 1,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 1,
+ "Type": 4,
+ "Argu": [
+ 2,
+ 1,
+ 150,
+ 1,
+ 4,
+ 1500
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false
+ },
+ {
+ "Id": 223001311,
+ "EmitPR": 1000,
+ "From": 1,
+ "Where": [],
+ "Order": "",
+ "Limit": 1,
+ "ExecuteCnt": 10,
+ "Type": 4,
+ "Argu": [
+ 2,
+ 1,
+ 150,
+ 1,
+ 4,
+ 850
+ ],
+ "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 b8fbb4697..0be998ac4 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -7744,7 +7744,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_113003111",
- "text": "啊啊1技能"
+ "text": "冲击之拳"
},
"ico": "jn_icon_054",
"CorrectPos": 0,
@@ -7771,7 +7771,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_113003211",
- "text": "啊啊2技能"
+ "text": "能量窃取"
},
"ico": "jn_icon_055",
"CorrectPos": 0,
@@ -7801,7 +7801,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_113003311",
- "text": "啊啊3技能"
+ "text": "灵魂吞噬"
},
"ico": "jn_icon_056",
"CorrectPos": 0,
@@ -10775,7 +10775,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_124001111",
- "text": "警长1技能"
+ "text": "正义之才"
},
"ico": "jn_icon_054",
"CorrectPos": 0,
@@ -10803,7 +10803,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_124001211",
- "text": "警长2技能"
+ "text": "枪弹镣铐"
},
"ico": "jn_icon_055",
"CorrectPos": 0,
@@ -10830,7 +10830,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_124001311",
- "text": "警长3技能"
+ "text": "暴风飞车"
},
"ico": "jn_icon_056",
"CorrectPos": 0,
@@ -11047,7 +11047,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155004111",
- "text": "大厨1技能"
+ "text": "锋利菜刀"
},
"ico": "jn_icon_054",
"CorrectPos": 0,
@@ -11074,7 +11074,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155004211",
- "text": "大厨2技能"
+ "text": "凶恶恐吓"
},
"ico": "jn_icon_055",
"CorrectPos": 0,
@@ -11101,7 +11101,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155004311",
- "text": "大厨3技能"
+ "text": "火焰喷发"
},
"ico": "jn_icon_056",
"CorrectPos": 0,
@@ -11128,7 +11128,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_145004111",
- "text": "穿靴子的猫1技能"
+ "text": "宫廷之花剑"
},
"ico": "jn_icon_054",
"CorrectPos": 0,
@@ -11155,7 +11155,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_145004211",
- "text": "穿靴子的猫2技能"
+ "text": "薛定谔连斩"
},
"ico": "jn_icon_055",
"CorrectPos": 0,
@@ -11184,7 +11184,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_145004311",
- "text": "穿靴子的猫3技能"
+ "text": "飞刺芭蕾舞"
},
"ico": "jn_icon_056",
"CorrectPos": 0,
@@ -11211,7 +11211,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155003111",
- "text": "格尔族1技能"
+ "text": "海盘车"
},
"ico": "jn_icon_054",
"CorrectPos": 0,
@@ -11238,7 +11238,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155003211",
- "text": "格尔族2技能"
+ "text": "海星之息"
},
"ico": "jn_icon_055",
"CorrectPos": 0,
@@ -11265,7 +11265,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155003311",
- "text": "格尔族3技能"
+ "text": "光·格尔之怒"
},
"ico": "jn_icon_056",
"CorrectPos": 0,
@@ -11292,7 +11292,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155001111",
- "text": "火龙1技能"
+ "text": "炽烈吐息"
},
"ico": "jn_icon_054",
"CorrectPos": 0,
@@ -11319,7 +11319,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155001211",
- "text": "火龙2技能"
+ "text": "怒焰之衣"
},
"ico": "jn_icon_055",
"CorrectPos": 0,
@@ -11346,7 +11346,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155001311",
- "text": "火龙3技能"
+ "text": "绝境龙炎"
},
"ico": "jn_icon_056",
"CorrectPos": 0,
@@ -11373,7 +11373,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155002111",
- "text": "巨型猩猩怪兽1技能"
+ "text": "蕉果投掷"
},
"ico": "jn_icon_054",
"CorrectPos": 0,
@@ -11400,14 +11400,14 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155002211",
- "text": "巨型猩猩怪兽2技能"
+ "text": "嗜血"
},
"ico": "jn_icon_055",
"CorrectPos": 0,
"act": "Skill_2",
"Type": 2,
"CD": 0,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
255002211
@@ -11427,7 +11427,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155002311",
- "text": "巨型猩猩怪兽3技能"
+ "text": "地裂天倾"
},
"ico": "jn_icon_056",
"CorrectPos": 0,
@@ -11539,7 +11539,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155006111",
- "text": "森林泰坦1技能"
+ "text": "绿藤烟瘴"
},
"ico": "jn_icon_054",
"CorrectPos": 0,
@@ -11566,7 +11566,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155006211",
- "text": "森林泰坦2技能"
+ "text": "毒物弥散"
},
"ico": "jn_icon_055",
"CorrectPos": 0,
@@ -11596,7 +11596,7 @@
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_155006311",
- "text": "森林泰坦3技能"
+ "text": "青棘之甲"
},
"ico": "jn_icon_056",
"CorrectPos": 0,
@@ -11638,7 +11638,6 @@
"ChildSkill": {
"Id": [
255007111,
- 255007112,
255007113,
255007114,
255007115,
@@ -11697,15 +11696,11 @@
"act": "Skill_3",
"Type": 2,
"CD": 2,
- "Target": 2,
+ "Target": 0,
"ChildSkill": {
"Id": [
255007311,
- 255007312,
- 255007313,
- 255007314,
- 255007315,
- 255007316
+ 255007314
]
},
"Desc": {
@@ -11783,7 +11778,7 @@
"act": "Skill_1",
"Type": 2,
"CD": 0,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
200003001,
@@ -11811,7 +11806,7 @@
"act": "Skill_1",
"Type": 2,
"CD": 0,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
200006001,
@@ -11839,7 +11834,7 @@
"act": "Skill_1",
"Type": 2,
"CD": 0,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
200007001,
@@ -11867,7 +11862,7 @@
"act": "Skill_1",
"Type": 2,
"CD": 0,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
200001401
@@ -11894,7 +11889,7 @@
"act": "Skill_1",
"Type": 2,
"CD": 0,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
200001501,
@@ -11922,7 +11917,7 @@
"act": "Skill_1",
"Type": 2,
"CD": 0,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
200001001,
@@ -11950,7 +11945,7 @@
"act": "Skill_1",
"Type": 2,
"CD": 0,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
200009001,
@@ -11978,7 +11973,7 @@
"act": "Skill_1",
"Type": 2,
"CD": 0,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
200001701,
@@ -12006,7 +12001,7 @@
"act": "Skill_1",
"Type": 2,
"CD": 0,
- "Target": 1,
+ "Target": 0,
"ChildSkill": {
"Id": [
200001901,
@@ -12019,5 +12014,411 @@
},
"buffid": [],
"map": ""
+ },
+ {
+ "id": 134004111,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_134004111",
+ "text": "瓜哥1技能"
+ },
+ "ico": "jn_icon_054",
+ "CorrectPos": 0,
+ "act": "Skill_1",
+ "Type": 1,
+ "CD": 0,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 234004111
+ ]
+ },
+ "Desc": {
+ "key": "skill_1340041111",
+ "text": "攻击1个敌方,伤害为自身攻击力100%。治疗生命值比例最低的友方,治疗量为本次伤害30%。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 134004211,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_134004211",
+ "text": "瓜哥2技能"
+ },
+ "ico": "jn_icon_055",
+ "CorrectPos": 0,
+ "act": "Skill_2",
+ "Type": 1,
+ "CD": 4,
+ "Target": 1,
+ "ChildSkill": {
+ "Id": [
+ 234004211
+ ]
+ },
+ "Desc": {
+ "key": "skill_1340042111",
+ "text": "为1个友方附加2回合[生死簿]记录当前生命值,2 回合后,回溯其生命值至记录值。为目标附加2 回合[复苏]和[攻击提升]。冷却回合: 4"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 134004311,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_134004311",
+ "text": "瓜哥3技能"
+ },
+ "ico": "jn_icon_056",
+ "CorrectPos": 0,
+ "act": "Skill_3",
+ "Type": 1,
+ "CD": 5,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 234004311
+ ]
+ },
+ "Desc": {
+ "key": "skill_1340043111",
+ "text": "攻击全体敌方,伤害为自身攻击100%,降低目标30%最大生命值上限,50%概率为目标附加2回合[禁疗]冷却回合: 5"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 114002111,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_114002111",
+ "text": "大龙1技能"
+ },
+ "ico": "jn_icon_054",
+ "CorrectPos": 0,
+ "act": "Skill_1",
+ "Type": 1,
+ "CD": 0,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 214002111
+ ]
+ },
+ "Desc": {
+ "key": "skill_1140021111",
+ "text": "攻击1个敌方,伤害为自身攻击力30%和最大生命值4.5%,30%概率为目标附加1回合[挑衅]。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 114002211,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_114002211",
+ "text": "大龙2技能"
+ },
+ "ico": "jn_icon_055",
+ "CorrectPos": 0,
+ "act": "Skill_2",
+ "Type": 2,
+ "CD": 0,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 214002212,
+ 214002213
+ ]
+ },
+ "Desc": {
+ "key": "skill_1140022111",
+ "text": "攻击时为目标附加1回合[荷鲁斯之眼]。,受击时,若攻击者[荷鲁斯之眼],15%概率使用苍鹰之主反击;其他友方受击时,若攻击者有[荷鲁斯之眼],60%概率反击"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 114002311,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_114002311",
+ "text": "大龙3技能"
+ },
+ "ico": "jn_icon_056",
+ "CorrectPos": 0,
+ "act": "Skill_3",
+ "Type": 1,
+ "CD": 4,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 214002311
+ ]
+ },
+ "Desc": {
+ "key": "skill_1140023111",
+ "text": "攻击全体敌方,伤害为自身攻击力90%和已损失生命值15%,70%概率为目标附加2回合[攻击下降]"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 143007111,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_143007111",
+ "text": "戈伯1技能"
+ },
+ "ico": "jn_icon_054",
+ "CorrectPos": 0,
+ "act": "Skill_1",
+ "Type": 1,
+ "CD": 0,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 243007111
+ ]
+ },
+ "Desc": {
+ "key": "skill_1430071111",
+ "text": "攻击1个敌方,伤害为自身攻击力100%,30%概率为目标附加1回合[沉默]。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 143007211,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_143007211",
+ "text": "戈伯2技能"
+ },
+ "ico": "jn_icon_055",
+ "CorrectPos": 0,
+ "act": "Skill_2",
+ "Type": 2,
+ "CD": 0,
+ "Target": 3,
+ "ChildSkill": {
+ "Id": [
+ 243007211
+ ]
+ },
+ "Desc": {
+ "key": "skill_1430072111",
+ "text": "回合开始时,净化自身1个减益。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 143007311,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_143007311",
+ "text": "戈伯3技能"
+ },
+ "ico": "jn_icon_056",
+ "CorrectPos": 0,
+ "act": "Skill_3",
+ "Type": 1,
+ "CD": 5,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 243007311
+ ]
+ },
+ "Desc": {
+ "key": "skill_1430073111",
+ "text": "攻击随机敌方5次,每次伤害为自身攻击力90%。每次有50%概率偷取目标1个增益,为目标附加2回合[烙印]。优先攻击不重复的敌方,对重复目标的伤害依次衰减15%"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 134001111,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_134001111",
+ "text": "贫嘴驴1技能"
+ },
+ "ico": "jn_icon_054",
+ "CorrectPos": 0,
+ "act": "Skill_1",
+ "Type": 1,
+ "CD": 0,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 234001111
+ ]
+ },
+ "Desc": {
+ "key": "skill_1340011111",
+ "text": "攻击1个敌方3次,每次伤害为自身攻击力35%,每次有40%概率为目标附加2回合[烙印]。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 134001211,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_134001211",
+ "text": "贫嘴驴2技能"
+ },
+ "ico": "jn_icon_055",
+ "CorrectPos": 0,
+ "act": "Skill_2",
+ "Type": 2,
+ "CD": 0,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 234001211
+ ]
+ },
+ "Desc": {
+ "key": "skill_1340012111",
+ "text": "攻击时有15%概率附带效果附加伤害,伤害为目标最大生命值10%不超过自身攻击力100%。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 134001311,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_134001311",
+ "text": "贫嘴驴3技能"
+ },
+ "ico": "jn_icon_056",
+ "CorrectPos": 0,
+ "act": "Skill_3",
+ "Type": 1,
+ "CD": 4,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 234001311
+ ]
+ },
+ "Desc": {
+ "key": "skill_1340013111",
+ "text": "攻击随机敌方9次,每次伤害为自身攻击力35%,每次有40%概率为目标附加1回合[流血]。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 123001111,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_123001111",
+ "text": "斯梅克船长1技能"
+ },
+ "ico": "jn_icon_054",
+ "CorrectPos": 0,
+ "act": "Skill_1",
+ "Type": 1,
+ "CD": 0,
+ "Target": 2,
+ "ChildSkill": {
+ "Id": [
+ 223001111
+ ]
+ },
+ "Desc": {
+ "key": "skill_1230011111",
+ "text": "攻击1个敌方,伤害为自身攻击力100%,70%概率降低目标15%行动值。"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 123001211,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_123001211",
+ "text": "斯梅克船长2技能"
+ },
+ "ico": "jn_icon_055",
+ "CorrectPos": 0,
+ "act": "Skill_2",
+ "Type": 1,
+ "CD": 3,
+ "Target": 1,
+ "ChildSkill": {
+ "Id": [
+ 223001211
+ ]
+ },
+ "Desc": {
+ "key": "skill_1230012111",
+ "text": "治疗1个友方,治疗量为目标最大生命值15%和自身攻击力150%。目标每损失最大生命值10%,治疗量增加10%"
+ },
+ "buffid": [],
+ "map": ""
+ },
+ {
+ "id": 123001311,
+ "level": 1,
+ "MaxLV": 1,
+ "UnavailablePlayTypes": [],
+ "Name": {
+ "key": "skillname_123001311",
+ "text": "斯梅克船长3技能"
+ },
+ "ico": "jn_icon_056",
+ "CorrectPos": 0,
+ "act": "Skill_3",
+ "Type": 1,
+ "CD": 4,
+ "Target": 1,
+ "ChildSkill": {
+ "Id": [
+ 223001311
+ ]
+ },
+ "Desc": {
+ "key": "skill_1230013111",
+ "text": "治疗全体友方,治疗量为目标最大生命值15%和自身攻击力85%。冷却回合: 4"
+ },
+ "buffid": [],
+ "map": ""
}
]
\ No newline at end of file
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 2a4cae78d..adf0f1ab9 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -2275,7 +2275,9 @@
"text": "最大生命值上限下降"
},
"BuffType": 40,
- "EffectArgu": [],
+ "EffectArgu": [
+ 250
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -2497,7 +2499,7 @@
"Id": 390001415,
"Name": {
"key": "skill_buff_390001415",
- "text": "冰霜宝石"
+ "text": "【冰霜宝石】"
},
"Desc": {
"key": "skill_buffdes_390001415",
@@ -2541,30 +2543,6 @@
"buffeffect": "",
"buffpos": ""
},
- {
- "Id": 390001417,
- "Name": {
- "key": "skill_buff_390001417",
- "text": "【灾祸冰原】"
- },
- "Desc": {
- "key": "skill_buffdes_390001417",
- "text": ""
- },
- "BuffType": 0,
- "EffectArgu": [],
- "BufParNum": 0,
- "RelyCheckArgu": [],
- "CoexistCheckArgu": [],
- "Effect": 0,
- "AddEffect": false,
- "RemoveType": false,
- "OverlayTimes": 0,
- "SameID": false,
- "buffIcon": "",
- "buffeffect": "",
- "buffpos": ""
- },
{
"Id": 390001418,
"Name": {
@@ -2620,11 +2598,11 @@
{
"Id": 390001420,
"Name": {
- "key": "skill_buff_390001130",
+ "key": "skill_buff_390001120",
"text": "护盾"
},
"Desc": {
- "key": "skill_buffdes_390001130",
+ "key": "skill_buffdes_390001120",
"text": "护盾量为最大生命值15%"
},
"BuffType": 21,
@@ -2648,11 +2626,11 @@
{
"Id": 390001421,
"Name": {
- "key": "skill_buff_390001131",
+ "key": "skill_buff_390001121",
"text": "免疫速度下降"
},
"Desc": {
- "key": "skill_buffdes_390001131",
+ "key": "skill_buffdes_390001121",
"text": "免疫速度下降类效果"
},
"BuffType": 90,
@@ -2663,7 +2641,7 @@
"Effect": 0,
"AddEffect": false,
"RemoveType": false,
- "OverlayTimes": 0,
+ "OverlayTimes": 1,
"SameID": false,
"buffIcon": "",
"buffeffect": "",
@@ -2672,11 +2650,11 @@
{
"Id": 390001422,
"Name": {
- "key": "skill_buff_390001132",
+ "key": "skill_buff_390001122",
"text": "每次受到的伤害不会超过自身最大生命值的35%"
},
"Desc": {
- "key": "skill_buffdes_390001132",
+ "key": "skill_buffdes_390001122",
"text": "每次受到的伤害不会超过自身最大生命值的35%"
},
"BuffType": 89,
@@ -2694,5 +2672,131 @@
"buffIcon": "",
"buffeffect": "",
"buffpos": ""
+ },
+ {
+ "Id": 390001423,
+ "Name": {
+ "key": "skill_buff_390001423",
+ "text": "伤害提升"
+ },
+ "Desc": {
+ "key": "skill_buffdes_390001023",
+ "text": "造成伤害提升10%"
+ },
+ "BuffType": 30,
+ "EffectArgu": [
+ 100
+ ],
+ "BufParNum": 1,
+ "RelyCheckArgu": [],
+ "CoexistCheckArgu": [],
+ "Effect": 0,
+ "AddEffect": false,
+ "RemoveType": true,
+ "OverlayTimes": 10,
+ "SameID": false,
+ "buffIcon": "",
+ "buffeffect": "",
+ "buffpos": "头"
+ },
+ {
+ "Id": 390001424,
+ "Name": {
+ "key": "skill_buff_390001424",
+ "text": "【生死簿】"
+ },
+ "Desc": {
+ "key": "skill_buffdes_390001024",
+ "text": "为1个友方附加2回合【生死簿】记录当前生命值,2 回合后,回溯其生命值至记录值。"
+ },
+ "BuffType": 0,
+ "EffectArgu": [],
+ "BufParNum": 0,
+ "RelyCheckArgu": [],
+ "CoexistCheckArgu": [],
+ "Effect": 0,
+ "AddEffect": false,
+ "RemoveType": false,
+ "OverlayTimes": 0,
+ "SameID": false,
+ "buffIcon": "",
+ "buffeffect": "",
+ "buffpos": ""
+ },
+ {
+ "Id": 390001425,
+ "Name": {
+ "key": "skill_buff_390001425",
+ "text": "最大生命值上限下降"
+ },
+ "Desc": {
+ "key": "skill_buffdes_390001425",
+ "text": "最大生命值上限下降"
+ },
+ "BuffType": 40,
+ "EffectArgu": [
+ 300
+ ],
+ "BufParNum": 1,
+ "RelyCheckArgu": [],
+ "CoexistCheckArgu": [],
+ "Effect": 1,
+ "AddEffect": false,
+ "RemoveType": false,
+ "OverlayTimes": 1,
+ "SameID": true,
+ "buffIcon": "",
+ "buffeffect": "",
+ "buffpos": ""
+ },
+ {
+ "Id": 390001426,
+ "Name": {
+ "key": "skill_buff_390001426",
+ "text": "[荷鲁斯之眼]"
+ },
+ "Desc": {
+ "key": "skill_buffdes_390001426",
+ "text": "状态消失时,状态携带者受到效果附加伤害,伤害为状态存在时间内携带者所受伤害总和20%"
+ },
+ "BuffType": 0,
+ "EffectArgu": [],
+ "BufParNum": 0,
+ "RelyCheckArgu": [],
+ "CoexistCheckArgu": [],
+ "Effect": 0,
+ "AddEffect": false,
+ "RemoveType": false,
+ "OverlayTimes": 0,
+ "SameID": false,
+ "buffIcon": "",
+ "buffeffect": "",
+ "buffpos": ""
+ },
+ {
+ "Id": 390001427,
+ "Name": {
+ "key": "skill_buff_390001427",
+ "text": "【伤害减免】"
+ },
+ "Desc": {
+ "key": "skill_buffdes_390001427",
+ "text": "优先攻击不重复的敌方,对重复目标的伤害依次衰减15%"
+ },
+ "BuffType": 23,
+ "EffectArgu": [
+ 150
+ ],
+ "BufParNum": 1,
+ "RelyCheckArgu": [],
+ "CoexistCheckArgu": [],
+ "Effect": 0,
+ "AddEffect": false,
+ "RemoveType": false,
+ "OverlayTimes": 5,
+ "SameID": true,
+ "buffIcon": "",
+ "buffeffect": "",
+ "buffpos": ""
}
]
\ No newline at end of file
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index 5d9f60f34..10d0e1df7 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -1271,19 +1271,6 @@
255003213
]
},
- {
- "Id": 455002211,
- "When": 2,
- "FromCheck": 3,
- "TargetCheck": 0,
- "AddCon": [],
- "PasPr": 1000,
- "Type": "CallSkillPas",
- "MaxEmitTimes": 1,
- "Callback": [
- 255002214
- ]
- },
{
"Id": 455005211,
"When": 4,
@@ -1364,19 +1351,6 @@
255006315
]
},
- {
- "Id": 455007112,
- "When": 4,
- "FromCheck": 2,
- "TargetCheck": 3,
- "AddCon": [],
- "PasPr": 1000,
- "Type": "CallSkillPas",
- "MaxEmitTimes": 1,
- "Callback": [
- 255007112
- ]
- },
{
"Id": 455007115,
"When": 11,
@@ -1411,7 +1385,7 @@
"Id": 455007214,
"When": 14,
"FromCheck": 3,
- "TargetCheck": 2,
+ "TargetCheck": 0,
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
@@ -1420,32 +1394,6 @@
255007215
]
},
- {
- "Id": 455007313,
- "When": 11,
- "FromCheck": 3,
- "TargetCheck": 3,
- "AddCon": [],
- "PasPr": 1000,
- "Type": "CallSkillPas",
- "MaxEmitTimes": 1,
- "Callback": [
- 255007314
- ]
- },
- {
- "Id": 455007315,
- "When": 11,
- "FromCheck": 3,
- "TargetCheck": 3,
- "AddCon": [],
- "PasPr": 1000,
- "Type": "CallSkillPas",
- "MaxEmitTimes": 1,
- "Callback": [
- 255007316
- ]
- },
{
"Id": 400003001,
"When": 15,
@@ -1580,5 +1528,114 @@
390001401,
10
]
+ },
+ {
+ "Id": 455007111,
+ "When": 14,
+ "FromCheck": 0,
+ "TargetCheck": 2,
+ "AddCon": [],
+ "PasPr": 1000,
+ "Type": "CallSkillPas",
+ "MaxEmitTimes": 1,
+ "Callback": [
+ 255007112
+ ]
+ },
+ {
+ "Id": 455007311,
+ "When": 2,
+ "FromCheck": 3,
+ "TargetCheck": 0,
+ "AddCon": [],
+ "PasPr": 1000,
+ "Type": "CallSkillPas",
+ "MaxEmitTimes": 1,
+ "Callback": [
+ 255007312,
+ 255007313
+ ]
+ },
+ {
+ "Id": 455007314,
+ "When": 11,
+ "FromCheck": 0,
+ "TargetCheck": 3,
+ "AddCon": [],
+ "PasPr": 1000,
+ "Type": "CallSkillPas",
+ "MaxEmitTimes": 1,
+ "Callback": [
+ 255007315
+ ]
+ },
+ {
+ "Id": 455002211,
+ "When": 20,
+ "FromCheck": 3,
+ "TargetCheck": 0,
+ "AddCon": [],
+ "PasPr": 1000,
+ "Type": "CallSkillPas",
+ "MaxEmitTimes": 1,
+ "Callback": [
+ 255002212
+ ]
+ },
+ {
+ "Id": 414002212,
+ "When": 11,
+ "FromCheck": 2,
+ "TargetCheck": 3,
+ "AddCon": [
+ "BuffCheck=390001426,Target=2,Result=1"
+ ],
+ "PasPr": 150,
+ "Type": "BeatBack",
+ "MaxEmitTimes": 1,
+ "Callback": [
+ 114002311
+ ]
+ },
+ {
+ "Id": 414002213,
+ "When": 11,
+ "FromCheck": 2,
+ "TargetCheck": 1,
+ "AddCon": [
+ "BuffCheck=390001426,Target=2,Result=1"
+ ],
+ "PasPr": 600,
+ "Type": "BeatBack",
+ "MaxEmitTimes": 1,
+ "Callback": [
+ 114002111
+ ]
+ },
+ {
+ "Id": 443007211,
+ "When": 2,
+ "FromCheck": 3,
+ "TargetCheck": 0,
+ "AddCon": [],
+ "PasPr": 1000,
+ "Type": "CallSkillPas",
+ "MaxEmitTimes": 1,
+ "Callback": [
+ 243007212
+ ]
+ },
+ {
+ "Id": 434001211,
+ "When": 11,
+ "FromCheck": 3,
+ "TargetCheck": 0,
+ "AddCon": [],
+ "PasPr": 1000,
+ "Type": "CallSkillPas",
+ "MaxEmitTimes": 1,
+ "Callback": [
+ 234001212
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_teachtask.json b/bin/json/game_teachtask.json
index c97a18cd9..94ce8658d 100644
--- a/bin/json/game_teachtask.json
+++ b/bin/json/game_teachtask.json
@@ -6,12 +6,13 @@
"key": "teach_task_10001",
"text": "使用
攻击全体敌人,并吸收敌人的行动值。"
},
- "When": 2,
- "FromCheck": "",
+ "When": 15,
+ "FromCheck": "HeroID=25001",
"TargetCheck": "",
- "MainSkillCheck": "",
+ "MainSkillCheck": "MainSkillID=125001111",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "",
"AddCon": []
},
{
@@ -21,12 +22,13 @@
"key": "teach_task_10002",
"text": "使用
击杀首领,并获得生命值恢复。"
},
- "When": 2,
- "FromCheck": "",
+ "When": 15,
+ "FromCheck": "HeroID=25001",
"TargetCheck": "",
- "MainSkillCheck": "",
+ "MainSkillCheck": "MainSkillID=125001311",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "",
"AddCon": []
},
{
@@ -36,12 +38,13 @@
"key": "teach_task_10003",
"text": "获得本次战斗胜利。"
},
- "When": 2,
+ "When": 24,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "Win=1",
"AddCon": []
},
{
@@ -51,12 +54,13 @@
"key": "teach_task_10001",
"text": "使用
攻击全体敌人,并吸收敌人的行动值。"
},
- "When": 2,
+ "When": 15,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "",
"AddCon": []
},
{
@@ -66,12 +70,13 @@
"key": "teach_task_10002",
"text": "使用
击杀首领,并获得生命值恢复。"
},
- "When": 2,
+ "When": 15,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "",
"AddCon": []
},
{
@@ -81,12 +86,13 @@
"key": "teach_task_10003",
"text": "获得本次战斗胜利。"
},
- "When": 2,
+ "When": 24,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "",
"AddCon": []
},
{
@@ -96,12 +102,13 @@
"key": "teach_task_10001",
"text": "使用
攻击全体敌人,并吸收敌人的行动值。"
},
- "When": 2,
+ "When": 15,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "",
"AddCon": []
},
{
@@ -111,12 +118,13 @@
"key": "teach_task_10002",
"text": "使用
击杀首领,并获得生命值恢复。"
},
- "When": 2,
+ "When": 15,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "",
"AddCon": []
},
{
@@ -126,12 +134,13 @@
"key": "teach_task_10003",
"text": "获得本次战斗胜利。"
},
- "When": 2,
+ "When": 24,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "",
"AddCon": []
},
{
@@ -141,12 +150,13 @@
"key": "teach_task_10001",
"text": "使用
攻击全体敌人,并吸收敌人的行动值。"
},
- "When": 2,
+ "When": 15,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "",
"AddCon": []
},
{
@@ -156,12 +166,13 @@
"key": "teach_task_10002",
"text": "使用
击杀首领,并获得生命值恢复。"
},
- "When": 2,
+ "When": 15,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
+ "FightEndCheck": "",
"AddCon": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json
index 68bad6128..d11f56962 100644
--- a/bin/json/game_worldbattle.json
+++ b/bin/json/game_worldbattle.json
@@ -4,6 +4,11 @@
"FormatList": [
700011
],
- "captainId": "250011"
+ "captainId": "250011",
+ "buff": [],
+ "battlestory": [],
+ "teammate": [],
+ "numberofteam": 0,
+ "battleteam": []
}
]
\ No newline at end of file
diff --git a/modules/equipment/api_forg.go b/modules/equipment/api_forg.go
index df1266faa..39581fb17 100644
--- a/modules/equipment/api_forg.go
+++ b/modules/equipment/api_forg.go
@@ -19,7 +19,7 @@ func (this *apiComp) ForgCheck(session comm.IUserSession, req *pb.EquipmentForgR
//锻造
func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (code pb.ErrorCode, data proto.Message) {
var (
- conf *cfg.GameEquipComposeData
+ conf *cfg.GameEquipSComposeData
need []*cfg.Gameatn
equis map[string]uint32
reward []*pb.UserAssets
diff --git a/modules/equipment/configure.go b/modules/equipment/configure.go
index cc2d62281..3e6c229e8 100644
--- a/modules/equipment/configure.go
+++ b/modules/equipment/configure.go
@@ -32,7 +32,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.LoadConfigure(equip_attrlibrary, cfg.NewGameEquipAttrlibrary)
this.LoadConfigure(equip_intensify, cfg.NewGameEquipIntensify)
this.LoadConfigure(equip_suit, cfg.NewGameEquipSuit)
- this.LoadConfigure(game_equipcompose, cfg.NewGameEquipCompose)
+ this.LoadConfigure(game_equipcompose, cfg.NewGameEquipSCompose)
this.LoadConfigure(game_equipattribute, cfg.NewGameEquipAttribute)
this.LoadConfigure(game_equipenchanting, cfg.NewGameEquipEnchanting)
return
@@ -200,7 +200,7 @@ func (this *configureComp) GetEquipmentIntensifyConfigureById(etype, star, lv in
}
//获取装备锻造数据
-func (this *configureComp) GetEquipCompose(id int32) (result *cfg.GameEquipComposeData, err error) {
+func (this *configureComp) GetEquipCompose(id int32) (result *cfg.GameEquipSComposeData, err error) {
var (
v interface{}
ok bool
@@ -209,7 +209,7 @@ func (this *configureComp) GetEquipCompose(id int32) (result *cfg.GameEquipCompo
this.module.Errorf("err:%v", err)
return
} else {
- if result, ok = v.(*cfg.GameEquipCompose).GetDataMap()[id]; !ok {
+ if result, ok = v.(*cfg.GameEquipSCompose).GetDataMap()[id]; !ok {
err = fmt.Errorf("on found GetEquipCompose id:%d", id)
this.module.Errorf("err:%v", err)
return
diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go
index b972ddb33..0efd42b4f 100644
--- a/sys/configure/structs/Game.BuffType.go
+++ b/sys/configure/structs/Game.BuffType.go
@@ -51,4 +51,55 @@ const (
GameBuffType_XUANYU = 39
GameBuffType_HPDOWN_PRO = 40
GameBuffType_LOSTPERHPCAUSEDAMUP = 41
+ GameBuffType_MATH = 42
+ GameBuffType_NOTSKILLCD = 43
+ GameBuffType_MODIFYBUFFDURATION = 44
+ GameBuffType_SIGHPOWER = 45
+ GameBuffType_CHIEFWRATH = 46
+ GameBuffType_CATOVERAWE = 47
+ GameBuffType_RECOVERY = 48
+ GameBuffType_GAINNUMADDDMG = 49
+ GameBuffType_INTUITIONCAUSEDAM_UP = 50
+ GameBuffType_SINCERECAUSEDAM_UP = 51
+ GameBuffType_EMPATHYCAUSEDAM_UP = 52
+ GameBuffType_DUTYCAUSEDAM_UP = 53
+ GameBuffType_INTUITIONDAMRE_UP = 54
+ GameBuffType_SINCEREDAMRE_UP = 55
+ GameBuffType_EMPATHYDAMRE_UP = 56
+ GameBuffType_DUTYDAMRE_UP = 57
+ GameBuffType_TARGETLOSTHPCRITDAM_UP = 58
+ GameBuffType_TARGETCURRENTHPCRITDAM_UP = 59
+ GameBuffType_EXTRADMG_UP = 60
+ GameBuffType_BEATBACKCAUSEDAM_UP = 61
+ GameBuffType_SUCKBLOOD_UP = 62
+ GameBuffType_REBIRTHHPADD_UP = 63
+ GameBuffType_REBIRTHOPERATEADD_UP = 64
+ GameBuffType_CRITDAMRE_UP = 65
+ GameBuffType_SKILL1TREADD_UP = 66
+ GameBuffType_SKILL2TREADD_UP = 67
+ GameBuffType_SKILL3TREADD_UP = 68
+ GameBuffType_SKILL4TREADD_UP = 69
+ GameBuffType_SKILL1CRITCAUSEDAM_UP = 70
+ GameBuffType_SKILL2CRITCAUSEDAM_UP = 71
+ GameBuffType_SKILL3CRITCAUSEDAM_UP = 72
+ GameBuffType_SKILL4CRITCAUSEDAM_UP = 73
+ GameBuffType_SKILL1HITADD_UP = 74
+ GameBuffType_SKILL2HITADD_UP = 75
+ GameBuffType_SKILL3HITADD_UP = 76
+ GameBuffType_SKILL4HITADD_UP = 77
+ GameBuffType_LOSEHPADDATK_UP = 78
+ GameBuffType_LOSEHPADDDEF_UP = 79
+ GameBuffType_LOSEHPADDSPEED_UP = 80
+ GameBuffType_LOSEHPADDCRIT_UP = 81
+ GameBuffType_LOSEHPADDCRITDMG_UP = 82
+ GameBuffType_LOSEHPADDEFFHIT_UP = 83
+ GameBuffType_LOSEHPADDEFFRE_UP = 84
+ GameBuffType_ADDEXTRADMGBYATK_UP = 85
+ GameBuffType_ADDEXTRADMGBYDEF_UP = 86
+ GameBuffType_ADDEXTRADMGBYHP_UP = 87
+ GameBuffType_ADDEXTRADMGBYSPEED_UP = 88
+ GameBuffType_SINGLEDMGLIMIT = 89
+ GameBuffType_IMMUNEACTVALUEDOWN = 90
+ GameBuffType_LOSEHPADDCAUSEDAM_UP = 91
+ GameBuffType_TARGETLOSTHPCAUSEDAM_UP = 92
)
diff --git a/sys/configure/structs/Game.EquipAttributeData.go b/sys/configure/structs/Game.EquipAttributeData.go
index 5dd0c09d7..c493e53ab 100644
--- a/sys/configure/structs/Game.EquipAttributeData.go
+++ b/sys/configure/structs/Game.EquipAttributeData.go
@@ -12,8 +12,10 @@ import "errors"
type GameEquipAttributeData struct {
Key string
- AttributeText string
SkillId int32
+ AttributeText string
+ AttributeTextNovalue string
+ SkillParameter []string
}
const TypeId_GameEquipAttributeData = 1950061970
@@ -24,8 +26,23 @@ func (*GameEquipAttributeData) GetTypeId() int32 {
func (_v *GameEquipAttributeData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
- {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["attribute_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.AttributeText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.AttributeText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_id"].(float64); !_ok_ { err = errors.New("skill_id error"); return }; _v.SkillId = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["attribute_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.AttributeText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.AttributeText, _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["attribute_text_novalue"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.AttributeTextNovalue error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.AttributeTextNovalue, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["skill_parameter"].([]interface{}); !_ok_ { err = errors.New("skill_parameter error"); return }
+
+ _v.SkillParameter = make([]string, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+ _v.SkillParameter = append(_v.SkillParameter, _list_v_)
+ }
+ }
+
return
}
diff --git a/sys/configure/structs/Game.EquipCompose.go b/sys/configure/structs/Game.EquipCompose.go
index 43ad30334..ef8066bab 100644
--- a/sys/configure/structs/Game.EquipCompose.go
+++ b/sys/configure/structs/Game.EquipCompose.go
@@ -9,34 +9,26 @@
package cfg
type GameEquipCompose struct {
- _dataMap map[int32]*GameEquipComposeData
_dataList []*GameEquipComposeData
}
func NewGameEquipCompose(_buf []map[string]interface{}) (*GameEquipCompose, error) {
_dataList := make([]*GameEquipComposeData, 0, len(_buf))
- dataMap := make(map[int32]*GameEquipComposeData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameEquipComposeData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
- dataMap[_v.Key] = _v
}
}
- return &GameEquipCompose{_dataList:_dataList, _dataMap:dataMap}, nil
-}
-
-func (table *GameEquipCompose) GetDataMap() map[int32]*GameEquipComposeData {
- return table._dataMap
+ return &GameEquipCompose{_dataList:_dataList}, nil
}
func (table *GameEquipCompose) GetDataList() []*GameEquipComposeData {
return table._dataList
}
-func (table *GameEquipCompose) Get(key int32) *GameEquipComposeData {
- return table._dataMap[key]
+func (table *GameEquipCompose) Get(index int) *GameEquipComposeData {
+ return table._dataList[index]
}
-
diff --git a/sys/configure/structs/Game.EquipSCompose.go b/sys/configure/structs/Game.EquipSCompose.go
new file mode 100644
index 000000000..fef5fb63d
--- /dev/null
+++ b/sys/configure/structs/Game.EquipSCompose.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 GameEquipSCompose struct {
+ _dataMap map[int32]*GameEquipSComposeData
+ _dataList []*GameEquipSComposeData
+}
+
+func NewGameEquipSCompose(_buf []map[string]interface{}) (*GameEquipSCompose, error) {
+ _dataList := make([]*GameEquipSComposeData, 0, len(_buf))
+ dataMap := make(map[int32]*GameEquipSComposeData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameEquipSComposeData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Key] = _v
+ }
+ }
+ return &GameEquipSCompose{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameEquipSCompose) GetDataMap() map[int32]*GameEquipSComposeData {
+ return table._dataMap
+}
+
+func (table *GameEquipSCompose) GetDataList() []*GameEquipSComposeData {
+ return table._dataList
+}
+
+func (table *GameEquipSCompose) Get(key int32) *GameEquipSComposeData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.EquipSComposeData.go b/sys/configure/structs/Game.EquipSComposeData.go
new file mode 100644
index 000000000..37be50538
--- /dev/null
+++ b/sys/configure/structs/Game.EquipSComposeData.go
@@ -0,0 +1,88 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameEquipSComposeData struct {
+ Key int32
+ Suittype int32
+ Star int32
+ Skillintr string
+ Need []*Gameatn
+ Ico string
+ Equip []string
+ Probability []int32
+}
+
+const TypeId_GameEquipSComposeData = 953426749
+
+func (*GameEquipSComposeData) GetTypeId() int32 {
+ return 953426749
+}
+
+func (_v *GameEquipSComposeData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skillintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillintr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["need"].([]interface{}); !_ok_ { err = errors.New("need error"); return }
+
+ _v.Need = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Need = append(_v.Need, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["equip"].([]interface{}); !_ok_ { err = errors.New("equip error"); return }
+
+ _v.Equip = make([]string, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+ _v.Equip = append(_v.Equip, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["probability"].([]interface{}); !_ok_ { err = errors.New("probability error"); return }
+
+ _v.Probability = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Probability = append(_v.Probability, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameEquipSComposeData(_buf map[string]interface{}) (*GameEquipSComposeData, error) {
+ v := &GameEquipSComposeData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.FightEventType.go b/sys/configure/structs/Game.FightEventType.go
index 63c083ab1..6757f5319 100644
--- a/sys/configure/structs/Game.FightEventType.go
+++ b/sys/configure/structs/Game.FightEventType.go
@@ -32,4 +32,6 @@ const (
GameFightEventType_OnRoundEnd = 20
GameFightEventType_OnShieldEnd = 21
GameFightEventType_OnCurHpChange = 22
+ GameFightEventType_OnRoleProChange = 23
+ GameFightEventType_OnFightEnd = 24
)
diff --git a/sys/configure/structs/Game.GrowTaskData.go b/sys/configure/structs/Game.GrowTaskData.go
index 8b57cd7b3..6563a4b51 100644
--- a/sys/configure/structs/Game.GrowTaskData.go
+++ b/sys/configure/structs/Game.GrowTaskData.go
@@ -31,9 +31,9 @@ func (*GameGrowTaskData) GetTypeId() int32 {
func (_v *GameGrowTaskData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
- { var _ok_ bool; if _v.Title, _ok_ = _buf["title"].(string); !_ok_ { err = errors.New("title error"); return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onetask"].(float64); !_ok_ { err = errors.New("onetask error"); return }; _v.Onetask = int32(_tempNum_) }
- { var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Portrait, _ok_ = _buf["portrait"].(string); !_ok_ { err = errors.New("portrait error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fstask"].(float64); !_ok_ { err = errors.New("fstask error"); return }; _v.Fstask = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jump"].(float64); !_ok_ { err = errors.New("jump error"); return }; _v.Jump = int32(_tempNum_) }
diff --git a/sys/configure/structs/Game.HerofusionData.go b/sys/configure/structs/Game.HerofusionData.go
index 3959dcad4..8c0f4cc3a 100644
--- a/sys/configure/structs/Game.HerofusionData.go
+++ b/sys/configure/structs/Game.HerofusionData.go
@@ -17,6 +17,7 @@ type GameHerofusionData struct {
Awaken int32
Start int32
Lv int32
+ Fuison []*Gameatn
}
const TypeId_GameHerofusionData = -689698108
@@ -45,6 +46,20 @@ func (_v *GameHerofusionData)Deserialize(_buf map[string]interface{}) (err error
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["awaken"].(float64); !_ok_ { err = errors.New("awaken error"); return }; _v.Awaken = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["start"].(float64); !_ok_ { err = errors.New("start error"); return }; _v.Start = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["fuison"].([]interface{}); !_ok_ { err = errors.New("fuison error"); return }
+
+ _v.Fuison = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Fuison = append(_v.Fuison, _list_v_)
+ }
+ }
+
return
}
diff --git a/sys/configure/structs/Game.LibraryBubble.go b/sys/configure/structs/Game.LibraryBubble.go
new file mode 100644
index 000000000..3023287af
--- /dev/null
+++ b/sys/configure/structs/Game.LibraryBubble.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 GameLibraryBubble struct {
+ _dataMap map[int32]*GameLibraryBubbleData
+ _dataList []*GameLibraryBubbleData
+}
+
+func NewGameLibraryBubble(_buf []map[string]interface{}) (*GameLibraryBubble, error) {
+ _dataList := make([]*GameLibraryBubbleData, 0, len(_buf))
+ dataMap := make(map[int32]*GameLibraryBubbleData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameLibraryBubbleData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameLibraryBubble{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameLibraryBubble) GetDataMap() map[int32]*GameLibraryBubbleData {
+ return table._dataMap
+}
+
+func (table *GameLibraryBubble) GetDataList() []*GameLibraryBubbleData {
+ return table._dataList
+}
+
+func (table *GameLibraryBubble) Get(key int32) *GameLibraryBubbleData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.LibraryBubbleData.go b/sys/configure/structs/Game.LibraryBubbleData.go
new file mode 100644
index 000000000..e3cb93add
--- /dev/null
+++ b/sys/configure/structs/Game.LibraryBubbleData.go
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameLibraryBubbleData struct {
+ Id int32
+ Txt string
+}
+
+const TypeId_GameLibraryBubbleData = 1254622837
+
+func (*GameLibraryBubbleData) GetTypeId() int32 {
+ return 1254622837
+}
+
+func (_v *GameLibraryBubbleData)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["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ return
+}
+
+func DeserializeGameLibraryBubbleData(_buf map[string]interface{}) (*GameLibraryBubbleData, error) {
+ v := &GameLibraryBubbleData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.LibraryFavorlvData.go b/sys/configure/structs/Game.LibraryFavorlvData.go
index 4bffd9e64..044a3337e 100644
--- a/sys/configure/structs/Game.LibraryFavorlvData.go
+++ b/sys/configure/structs/Game.LibraryFavorlvData.go
@@ -24,7 +24,7 @@ func (*GameLibraryFavorlvData) GetTypeId() int32 {
func (_v *GameLibraryFavorlvData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorlv"].(float64); !_ok_ { err = errors.New("favorlv error"); return }; _v.Favorlv = int32(_tempNum_) }
- { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name 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 } } }
{ var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } }
return
}
diff --git a/sys/configure/structs/Game.LinestoryMainTask.go b/sys/configure/structs/Game.LinestoryMainTask.go
new file mode 100644
index 000000000..5cf7fcf4c
--- /dev/null
+++ b/sys/configure/structs/Game.LinestoryMainTask.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 GameLinestoryMainTask struct {
+ _dataMap map[int32]*GameLinestoryMainTaskData
+ _dataList []*GameLinestoryMainTaskData
+}
+
+func NewGameLinestoryMainTask(_buf []map[string]interface{}) (*GameLinestoryMainTask, error) {
+ _dataList := make([]*GameLinestoryMainTaskData, 0, len(_buf))
+ dataMap := make(map[int32]*GameLinestoryMainTaskData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameLinestoryMainTaskData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameLinestoryMainTask{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameLinestoryMainTask) GetDataMap() map[int32]*GameLinestoryMainTaskData {
+ return table._dataMap
+}
+
+func (table *GameLinestoryMainTask) GetDataList() []*GameLinestoryMainTaskData {
+ return table._dataList
+}
+
+func (table *GameLinestoryMainTask) Get(key int32) *GameLinestoryMainTaskData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.LinestoryMainTaskData.go b/sys/configure/structs/Game.LinestoryMainTaskData.go
new file mode 100644
index 000000000..097b4d911
--- /dev/null
+++ b/sys/configure/structs/Game.LinestoryMainTaskData.go
@@ -0,0 +1,75 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameLinestoryMainTaskData struct {
+ Id int32
+ ParetnTask int32
+ SubTask int32
+ Name string
+ Img string
+ Reward []*Gameatn
+ Ending int32
+ Resetto []int32
+}
+
+const TypeId_GameLinestoryMainTaskData = 1251904205
+
+func (*GameLinestoryMainTaskData) GetTypeId() int32 {
+ return 1251904205
+}
+
+func (_v *GameLinestoryMainTaskData)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["paretnTask"].(float64); !_ok_ { err = errors.New("paretnTask error"); return }; _v.ParetnTask = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subTask"].(float64); !_ok_ { err = errors.New("subTask error"); return }; _v.SubTask = int32(_tempNum_) }
+ {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 } } }
+ { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
+
+ _v.Reward = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Reward = append(_v.Reward, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ending"].(float64); !_ok_ { err = errors.New("ending error"); return }; _v.Ending = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["resetto"].([]interface{}); !_ok_ { err = errors.New("resetto error"); return }
+
+ _v.Resetto = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Resetto = append(_v.Resetto, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameLinestoryMainTaskData(_buf map[string]interface{}) (*GameLinestoryMainTaskData, error) {
+ v := &GameLinestoryMainTaskData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.LinestoryTimeLine.go b/sys/configure/structs/Game.LinestoryTimeLine.go
new file mode 100644
index 000000000..92aa91e3e
--- /dev/null
+++ b/sys/configure/structs/Game.LinestoryTimeLine.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 GameLinestoryTimeLine struct {
+ _dataMap map[int32]*GameLinestoryTimeLineData
+ _dataList []*GameLinestoryTimeLineData
+}
+
+func NewGameLinestoryTimeLine(_buf []map[string]interface{}) (*GameLinestoryTimeLine, error) {
+ _dataList := make([]*GameLinestoryTimeLineData, 0, len(_buf))
+ dataMap := make(map[int32]*GameLinestoryTimeLineData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameLinestoryTimeLineData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Index] = _v
+ }
+ }
+ return &GameLinestoryTimeLine{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameLinestoryTimeLine) GetDataMap() map[int32]*GameLinestoryTimeLineData {
+ return table._dataMap
+}
+
+func (table *GameLinestoryTimeLine) GetDataList() []*GameLinestoryTimeLineData {
+ return table._dataList
+}
+
+func (table *GameLinestoryTimeLine) Get(key int32) *GameLinestoryTimeLineData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.LinestoryTimeLineData.go b/sys/configure/structs/Game.LinestoryTimeLineData.go
new file mode 100644
index 000000000..d87f625ba
--- /dev/null
+++ b/sys/configure/structs/Game.LinestoryTimeLineData.go
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameLinestoryTimeLineData struct {
+ Index int32
+ NodeIndex int32
+ Cond []int32
+ Name string
+ Img string
+ Reward []*Gameatn
+}
+
+const TypeId_GameLinestoryTimeLineData = 564735696
+
+func (*GameLinestoryTimeLineData) GetTypeId() int32 {
+ return 564735696
+}
+
+func (_v *GameLinestoryTimeLineData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["nodeIndex"].(float64); !_ok_ { err = errors.New("nodeIndex error"); return }; _v.NodeIndex = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["cond"].([]interface{}); !_ok_ { err = errors.New("cond error"); return }
+
+ _v.Cond = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Cond = append(_v.Cond, _list_v_)
+ }
+ }
+
+ {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 } } }
+ { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
+
+ _v.Reward = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Reward = append(_v.Reward, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameLinestoryTimeLineData(_buf map[string]interface{}) (*GameLinestoryTimeLineData, error) {
+ v := &GameLinestoryTimeLineData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.Mail.go b/sys/configure/structs/Game.Mail.go
new file mode 100644
index 000000000..48cf28d17
--- /dev/null
+++ b/sys/configure/structs/Game.Mail.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 GameMail struct {
+ _dataMap map[string]*GameMailData
+ _dataList []*GameMailData
+}
+
+func NewGameMail(_buf []map[string]interface{}) (*GameMail, error) {
+ _dataList := make([]*GameMailData, 0, len(_buf))
+ dataMap := make(map[string]*GameMailData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameMailData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameMail{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameMail) GetDataMap() map[string]*GameMailData {
+ return table._dataMap
+}
+
+func (table *GameMail) GetDataList() []*GameMailData {
+ return table._dataList
+}
+
+func (table *GameMail) Get(key string) *GameMailData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.MailData.go b/sys/configure/structs/Game.MailData.go
new file mode 100644
index 000000000..1929fe5bb
--- /dev/null
+++ b/sys/configure/structs/Game.MailData.go
@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameMailData struct {
+ Id string
+ Title string
+ Recipient string
+ Content string
+ Sender string
+ Duration int32
+}
+
+const TypeId_GameMailData = 2122465405
+
+func (*GameMailData) GetTypeId() int32 {
+ return 2122465405
+}
+
+func (_v *GameMailData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _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["recipient"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Recipient error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Recipient, _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["content"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Content error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Content, _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["sender"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Sender error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Sender, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duration"].(float64); !_ok_ { err = errors.New("duration error"); return }; _v.Duration = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameMailData(_buf map[string]interface{}) (*GameMailData, error) {
+ v := &GameMailData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.ProBoss.go b/sys/configure/structs/Game.ProBoss.go
new file mode 100644
index 000000000..4aafbec33
--- /dev/null
+++ b/sys/configure/structs/Game.ProBoss.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 GameProBoss struct {
+ _dataMap map[int32]*GameProBossData
+ _dataList []*GameProBossData
+}
+
+func NewGameProBoss(_buf []map[string]interface{}) (*GameProBoss, error) {
+ _dataList := make([]*GameProBossData, 0, len(_buf))
+ dataMap := make(map[int32]*GameProBossData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameProBossData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameProBoss{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameProBoss) GetDataMap() map[int32]*GameProBossData {
+ return table._dataMap
+}
+
+func (table *GameProBoss) GetDataList() []*GameProBossData {
+ return table._dataList
+}
+
+func (table *GameProBoss) Get(key int32) *GameProBossData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.ProBossData.go b/sys/configure/structs/Game.ProBossData.go
new file mode 100644
index 000000000..e07225b35
--- /dev/null
+++ b/sys/configure/structs/Game.ProBossData.go
@@ -0,0 +1,101 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameProBossData struct {
+ Id int32
+ Name string
+ Difficulty int32
+ Firstprize []*Gameatn
+ Dropshow []int32
+ Dropshowp []int32
+ Bossmodel int32
+ Boss []int32
+}
+
+const TypeId_GameProBossData = 1594871432
+
+func (*GameProBossData) GetTypeId() int32 {
+ return 1594871432
+}
+
+func (_v *GameProBossData)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["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 } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["firstprize"].([]interface{}); !_ok_ { err = errors.New("firstprize error"); return }
+
+ _v.Firstprize = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Firstprize = append(_v.Firstprize, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["dropshow"].([]interface{}); !_ok_ { err = errors.New("dropshow error"); return }
+
+ _v.Dropshow = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Dropshow = append(_v.Dropshow, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["dropshowp"].([]interface{}); !_ok_ { err = errors.New("dropshowp error"); return }
+
+ _v.Dropshowp = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Dropshowp = append(_v.Dropshowp, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["boss"].([]interface{}); !_ok_ { err = errors.New("boss error"); return }
+
+ _v.Boss = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Boss = append(_v.Boss, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameProBossData(_buf map[string]interface{}) (*GameProBossData, error) {
+ v := &GameProBossData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.ProBossskill.go b/sys/configure/structs/Game.ProBossskill.go
new file mode 100644
index 000000000..df32fd033
--- /dev/null
+++ b/sys/configure/structs/Game.ProBossskill.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 GameProBossskill struct {
+ _dataMap map[int32]*GameProBossskillData
+ _dataList []*GameProBossskillData
+}
+
+func NewGameProBossskill(_buf []map[string]interface{}) (*GameProBossskill, error) {
+ _dataList := make([]*GameProBossskillData, 0, len(_buf))
+ dataMap := make(map[int32]*GameProBossskillData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameProBossskillData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Type] = _v
+ }
+ }
+ return &GameProBossskill{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameProBossskill) GetDataMap() map[int32]*GameProBossskillData {
+ return table._dataMap
+}
+
+func (table *GameProBossskill) GetDataList() []*GameProBossskillData {
+ return table._dataList
+}
+
+func (table *GameProBossskill) Get(key int32) *GameProBossskillData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.ProBossskillData.go b/sys/configure/structs/Game.ProBossskillData.go
new file mode 100644
index 000000000..e3c05a4b7
--- /dev/null
+++ b/sys/configure/structs/Game.ProBossskillData.go
@@ -0,0 +1,56 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameProBossskillData struct {
+ Type int32
+ Name string
+ Introduce string
+ Icon string
+ Guardskill []int32
+}
+
+const TypeId_GameProBossskillData = 990067101
+
+func (*GameProBossskillData) GetTypeId() int32 {
+ return 990067101
+}
+
+func (_v *GameProBossskillData)Deserialize(_buf map[string]interface{}) (err error) {
+ { 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 __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 } } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["guardskill"].([]interface{}); !_ok_ { err = errors.New("guardskill error"); return }
+
+ _v.Guardskill = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Guardskill = append(_v.Guardskill, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameProBossskillData(_buf map[string]interface{}) (*GameProBossskillData, error) {
+ v := &GameProBossskillData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.ProChallenge.go b/sys/configure/structs/Game.ProChallenge.go
new file mode 100644
index 000000000..e8cd04836
--- /dev/null
+++ b/sys/configure/structs/Game.ProChallenge.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 GameProChallenge struct {
+ _dataMap map[int32]*GameProChallengeData
+ _dataList []*GameProChallengeData
+}
+
+func NewGameProChallenge(_buf []map[string]interface{}) (*GameProChallenge, error) {
+ _dataList := make([]*GameProChallengeData, 0, len(_buf))
+ dataMap := make(map[int32]*GameProChallengeData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameProChallengeData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Buynum] = _v
+ }
+ }
+ return &GameProChallenge{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameProChallenge) GetDataMap() map[int32]*GameProChallengeData {
+ return table._dataMap
+}
+
+func (table *GameProChallenge) GetDataList() []*GameProChallengeData {
+ return table._dataList
+}
+
+func (table *GameProChallenge) Get(key int32) *GameProChallengeData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.ProChallengeData.go b/sys/configure/structs/Game.ProChallengeData.go
new file mode 100644
index 000000000..f0894fced
--- /dev/null
+++ b/sys/configure/structs/Game.ProChallengeData.go
@@ -0,0 +1,50 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameProChallengeData struct {
+ Buynum int32
+ Need []*Gameatn
+}
+
+const TypeId_GameProChallengeData = 1342325628
+
+func (*GameProChallengeData) GetTypeId() int32 {
+ return 1342325628
+}
+
+func (_v *GameProChallengeData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buynum"].(float64); !_ok_ { err = errors.New("buynum error"); return }; _v.Buynum = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["need"].([]interface{}); !_ok_ { err = errors.New("need error"); return }
+
+ _v.Need = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Need = append(_v.Need, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameProChallengeData(_buf map[string]interface{}) (*GameProChallengeData, error) {
+ v := &GameProChallengeData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.ProLineup.go b/sys/configure/structs/Game.ProLineup.go
new file mode 100644
index 000000000..239ca9d29
--- /dev/null
+++ b/sys/configure/structs/Game.ProLineup.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 GameProLineup struct {
+ _dataMap map[string]*GameProLineupData
+ _dataList []*GameProLineupData
+}
+
+func NewGameProLineup(_buf []map[string]interface{}) (*GameProLineup, error) {
+ _dataList := make([]*GameProLineupData, 0, len(_buf))
+ dataMap := make(map[string]*GameProLineupData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameProLineupData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Robotid] = _v
+ }
+ }
+ return &GameProLineup{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameProLineup) GetDataMap() map[string]*GameProLineupData {
+ return table._dataMap
+}
+
+func (table *GameProLineup) GetDataList() []*GameProLineupData {
+ return table._dataList
+}
+
+func (table *GameProLineup) Get(key string) *GameProLineupData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.ProLineupData.go b/sys/configure/structs/Game.ProLineupData.go
new file mode 100644
index 000000000..43cb0b0a9
--- /dev/null
+++ b/sys/configure/structs/Game.ProLineupData.go
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameProLineupData struct {
+ Robotid string
+ Ranking int32
+ Difficulty int32
+ First float32
+}
+
+const TypeId_GameProLineupData = 1408766826
+
+func (*GameProLineupData) GetTypeId() int32 {
+ return 1408766826
+}
+
+func (_v *GameProLineupData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; if _v.Robotid, _ok_ = _buf["robotid"].(string); !_ok_ { err = errors.New("robotid error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ranking"].(float64); !_ok_ { err = errors.New("ranking error"); return }; _v.Ranking = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["first"].(float64); !_ok_ { err = errors.New("first error"); return }; _v.First = float32(_tempNum_) }
+ return
+}
+
+func DeserializeGameProLineupData(_buf map[string]interface{}) (*GameProLineupData, error) {
+ v := &GameProLineupData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.PropertyType.go b/sys/configure/structs/Game.PropertyType.go
index 4bc2ce99f..ee4b5f88f 100644
--- a/sys/configure/structs/Game.PropertyType.go
+++ b/sys/configure/structs/Game.PropertyType.go
@@ -9,6 +9,7 @@
package cfg
const (
+ GamePropertyType_None = 0
GamePropertyType_Total_Hp = 1
GamePropertyType_NowTotal_Hp = 2
GamePropertyType_NowHp = 3
@@ -51,4 +52,33 @@ const (
GamePropertyType_UnderStand_per = 40
GamePropertyType_TreAdd = 41
GamePropertyType_BeTreAdd = 42
+ GamePropertyType_IntuitionCauseDam = 43
+ GamePropertyType_SincereCauseDam = 44
+ GamePropertyType_EmpathyCauseDam = 45
+ GamePropertyType_DutyCauseDam = 46
+ GamePropertyType_IntuitionDamRe = 47
+ GamePropertyType_SincereDamRe = 48
+ GamePropertyType_EmpathyDamRe = 49
+ GamePropertyType_DutyDamRe = 50
+ GamePropertyType_TargetLostHpCritDam = 51
+ GamePropertyType_TargetLostHpCauseDam = 52
+ GamePropertyType_TargetCurrentHpCritDam = 53
+ GamePropertyType_ExtraDmg = 54
+ GamePropertyType_BeatBackCauseDam = 55
+ GamePropertyType_SuckBlood = 56
+ GamePropertyType_RebirthHpAdd = 57
+ GamePropertyType_RebirthOperateAdd = 58
+ GamePropertyType_CritDamRe = 59
+ GamePropertyType_Skill1TreAdd = 60
+ GamePropertyType_Skill2TreAdd = 61
+ GamePropertyType_Skill3TreAdd = 62
+ GamePropertyType_Skill4TreAdd = 63
+ GamePropertyType_Skill1CritCauseDam = 64
+ GamePropertyType_Skill2CritCauseDam = 65
+ GamePropertyType_Skill3CritCauseDam = 66
+ GamePropertyType_Skill4CritCauseDam = 67
+ GamePropertyType_Skill1HitAdd = 68
+ GamePropertyType_Skill2HitAdd = 69
+ GamePropertyType_Skill3HitAdd = 70
+ GamePropertyType_Skill4HitAdd = 71
)
diff --git a/sys/configure/structs/Game.RdtaskSideData.go b/sys/configure/structs/Game.RdtaskSideData.go
index 35d56b52e..a97b9ae3c 100644
--- a/sys/configure/structs/Game.RdtaskSideData.go
+++ b/sys/configure/structs/Game.RdtaskSideData.go
@@ -16,6 +16,7 @@ type GameRdtaskSideData struct {
ObjType int32
Location string
Point string
+ CamPoint string
StoryBegin int32
Entity []string
EntityChange []string
@@ -48,6 +49,7 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["objType"].(float64); !_ok_ { err = errors.New("objType error"); return }; _v.ObjType = int32(_tempNum_) }
{ var _ok_ bool; if _v.Location, _ok_ = _buf["location"].(string); !_ok_ { err = errors.New("location error"); return } }
{ var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } }
+ { var _ok_ bool; if _v.CamPoint, _ok_ = _buf["CamPoint"].(string); !_ok_ { err = errors.New("CamPoint error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["storyBegin"].(float64); !_ok_ { err = errors.New("storyBegin error"); return }; _v.StoryBegin = int32(_tempNum_) }
{
var _arr_ []interface{}
diff --git a/sys/configure/structs/Game.RechargeData.go b/sys/configure/structs/Game.RechargeData.go
index 38778b990..94bc08426 100644
--- a/sys/configure/structs/Game.RechargeData.go
+++ b/sys/configure/structs/Game.RechargeData.go
@@ -11,145 +11,69 @@ package cfg
import "errors"
type GameRechargeData struct {
- Id string
- Editionid string
- RechargeType int32
- Monetaryunit string
- Amount string
- Vipexp []*Gameatn
- DiamondNumDouble []*Gameatn
- Channel string
- Text string
- Image string
+ Id string
+ Editionid string
+ RechargeType int32
+ Monetaryunit string
+ Amount string
+ Vipexp []*Gameatn
+ DiamondNumDouble []*Gameatn
+ Channel string
+ Text string
+ Image string
}
const TypeId_GameRechargeData = -1686494355
func (*GameRechargeData) GetTypeId() int32 {
- return -1686494355
+ return -1686494355
}
-func (_v *GameRechargeData) Deserialize(_buf map[string]interface{}) (err error) {
- {
- var _ok_ bool
- if _v.Id, _ok_ = _buf["id"].(string); !_ok_ {
- err = errors.New("id error")
- return
- }
- }
- {
- var _ok_ bool
- if _v.Editionid, _ok_ = _buf["editionid"].(string); !_ok_ {
- err = errors.New("editionid error")
- return
- }
- }
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["recharge_type"].(float64); !_ok_ {
- err = errors.New("recharge_type error")
- return
- }
- _v.RechargeType = int32(_tempNum_)
- }
- {
- var _ok_ bool
- if _v.Monetaryunit, _ok_ = _buf["monetaryunit"].(string); !_ok_ {
- err = errors.New("monetaryunit error")
- return
- }
- }
- {
- var _ok_ bool
- if _v.Amount, _ok_ = _buf["amount"].(string); !_ok_ {
- err = errors.New("amount error")
- return
- }
- }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["vipexp"].([]interface{}); !_ok_ {
- err = errors.New("vipexp error")
- return
- }
+func (_v *GameRechargeData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
+ { var _ok_ bool; if _v.Editionid, _ok_ = _buf["editionid"].(string); !_ok_ { err = errors.New("editionid error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recharge_type"].(float64); !_ok_ { err = errors.New("recharge_type error"); return }; _v.RechargeType = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Monetaryunit, _ok_ = _buf["monetaryunit"].(string); !_ok_ { err = errors.New("monetaryunit error"); return } }
+ { var _ok_ bool; if _v.Amount, _ok_ = _buf["amount"].(string); !_ok_ { err = errors.New("amount error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["vipexp"].([]interface{}); !_ok_ { err = errors.New("vipexp error"); return }
- _v.Vipexp = make([]*Gameatn, 0, len(_arr_))
+ _v.Vipexp = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Vipexp = append(_v.Vipexp, _list_v_)
+ }
+ }
- for _, _e_ := range _arr_ {
- var _list_v_ *Gameatn
- {
- var _ok_ bool
- var _x_ map[string]interface{}
- if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ {
- err = errors.New("_list_v_ error")
- return
- }
- if _list_v_, err = DeserializeGameatn(_x_); err != nil {
- return
- }
- }
- _v.Vipexp = append(_v.Vipexp, _list_v_)
- }
- }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["diamond_num_double"].([]interface{}); !_ok_ { err = errors.New("diamond_num_double error"); return }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["diamond_num_double"].([]interface{}); !_ok_ {
- err = errors.New("diamond_num_double error")
- return
- }
+ _v.DiamondNumDouble = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.DiamondNumDouble = append(_v.DiamondNumDouble, _list_v_)
+ }
+ }
- _v.DiamondNumDouble = make([]*Gameatn, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ *Gameatn
- {
- var _ok_ bool
- var _x_ map[string]interface{}
- if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ {
- err = errors.New("_list_v_ error")
- return
- }
- if _list_v_, err = DeserializeGameatn(_x_); err != nil {
- return
- }
- }
- _v.DiamondNumDouble = append(_v.DiamondNumDouble, _list_v_)
- }
- }
-
- {
- var _ok_ bool
- if _v.Channel, _ok_ = _buf["channel"].(string); !_ok_ {
- err = errors.New("channel error")
- return
- }
- }
- {
- var _ok_ bool
- if _v.Text, _ok_ = _buf["text"].(string); !_ok_ {
- err = errors.New("text error")
- return
- }
- }
- {
- var _ok_ bool
- if _v.Image, _ok_ = _buf["image"].(string); !_ok_ {
- err = errors.New("image error")
- return
- }
- }
- return
+ { var _ok_ bool; if _v.Channel, _ok_ = _buf["channel"].(string); !_ok_ { err = errors.New("channel error"); return } }
+ { var _ok_ bool; if _v.Text, _ok_ = _buf["text"].(string); !_ok_ { err = errors.New("text error"); return } }
+ { var _ok_ bool; if _v.Image, _ok_ = _buf["image"].(string); !_ok_ { err = errors.New("image error"); return } }
+ return
}
func DeserializeGameRechargeData(_buf map[string]interface{}) (*GameRechargeData, error) {
- v := &GameRechargeData{}
- if err := v.Deserialize(_buf); err == nil {
- return v, nil
- } else {
- return nil, err
- }
+ v := &GameRechargeData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
}
diff --git a/sys/configure/structs/Game.RedDot.go b/sys/configure/structs/Game.RedDot.go
new file mode 100644
index 000000000..fa777d773
--- /dev/null
+++ b/sys/configure/structs/Game.RedDot.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 GameRedDot struct {
+ _dataMap map[int32]*GameRedDotData
+ _dataList []*GameRedDotData
+}
+
+func NewGameRedDot(_buf []map[string]interface{}) (*GameRedDot, error) {
+ _dataList := make([]*GameRedDotData, 0, len(_buf))
+ dataMap := make(map[int32]*GameRedDotData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameRedDotData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameRedDot{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameRedDot) GetDataMap() map[int32]*GameRedDotData {
+ return table._dataMap
+}
+
+func (table *GameRedDot) GetDataList() []*GameRedDotData {
+ return table._dataList
+}
+
+func (table *GameRedDot) Get(key int32) *GameRedDotData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.RedDotData.go b/sys/configure/structs/Game.RedDotData.go
new file mode 100644
index 000000000..4dd663ed1
--- /dev/null
+++ b/sys/configure/structs/Game.RedDotData.go
@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameRedDotData struct {
+ Id int32
+ Type int32
+ Hero string
+ Desc string
+ Skip int32
+ Index int32
+}
+
+const TypeId_GameRedDotData = -60014018
+
+func (*GameRedDotData) GetTypeId() int32 {
+ return -60014018
+}
+
+func (_v *GameRedDotData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Hero, _ok_ = _buf["hero"].(string); !_ok_ { err = errors.New("hero error"); return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skip"].(float64); !_ok_ { err = errors.New("skip error"); return }; _v.Skip = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameRedDotData(_buf map[string]interface{}) (*GameRedDotData, error) {
+ v := &GameRedDotData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.RedDotTalkid.go b/sys/configure/structs/Game.RedDotTalkid.go
new file mode 100644
index 000000000..e8a642a46
--- /dev/null
+++ b/sys/configure/structs/Game.RedDotTalkid.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 GameRedDotTalkid struct {
+ _dataMap map[int32]*GameRedDotTalkidData
+ _dataList []*GameRedDotTalkidData
+}
+
+func NewGameRedDotTalkid(_buf []map[string]interface{}) (*GameRedDotTalkid, error) {
+ _dataList := make([]*GameRedDotTalkidData, 0, len(_buf))
+ dataMap := make(map[int32]*GameRedDotTalkidData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameRedDotTalkidData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Talkid] = _v
+ }
+ }
+ return &GameRedDotTalkid{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameRedDotTalkid) GetDataMap() map[int32]*GameRedDotTalkidData {
+ return table._dataMap
+}
+
+func (table *GameRedDotTalkid) GetDataList() []*GameRedDotTalkidData {
+ return table._dataList
+}
+
+func (table *GameRedDotTalkid) Get(key int32) *GameRedDotTalkidData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.RedDotTalkidData.go b/sys/configure/structs/Game.RedDotTalkidData.go
new file mode 100644
index 000000000..dd13d8cc8
--- /dev/null
+++ b/sys/configure/structs/Game.RedDotTalkidData.go
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameRedDotTalkidData struct {
+ Talkid int32
+ Desc string
+}
+
+const TypeId_GameRedDotTalkidData = -170949979
+
+func (*GameRedDotTalkidData) GetTypeId() int32 {
+ return -170949979
+}
+
+func (_v *GameRedDotTalkidData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["talkid"].(float64); !_ok_ { err = errors.New("talkid error"); return }; _v.Talkid = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ return
+}
+
+func DeserializeGameRedDotTalkidData(_buf map[string]interface{}) (*GameRedDotTalkidData, error) {
+ v := &GameRedDotTalkidData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.Show.go b/sys/configure/structs/Game.Show.go
new file mode 100644
index 000000000..42211015c
--- /dev/null
+++ b/sys/configure/structs/Game.Show.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 GameShow struct {
+ _dataMap map[int32]*GameShowData
+ _dataList []*GameShowData
+}
+
+func NewGameShow(_buf []map[string]interface{}) (*GameShow, error) {
+ _dataList := make([]*GameShowData, 0, len(_buf))
+ dataMap := make(map[int32]*GameShowData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameShowData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameShow{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameShow) GetDataMap() map[int32]*GameShowData {
+ return table._dataMap
+}
+
+func (table *GameShow) GetDataList() []*GameShowData {
+ return table._dataList
+}
+
+func (table *GameShow) Get(key int32) *GameShowData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.ShowData.go b/sys/configure/structs/Game.ShowData.go
new file mode 100644
index 000000000..7d66584da
--- /dev/null
+++ b/sys/configure/structs/Game.ShowData.go
@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameShowData struct {
+ Id int32
+ Desc string
+ Access int32
+ Position string
+ Sex int32
+ Resources string
+}
+
+const TypeId_GameShowData = 1793917635
+
+func (*GameShowData) GetTypeId() int32 {
+ return 1793917635
+}
+
+func (_v *GameShowData)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["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["access"].(float64); !_ok_ { err = errors.New("access error"); return }; _v.Access = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Position, _ok_ = _buf["position"].(string); !_ok_ { err = errors.New("position error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sex"].(float64); !_ok_ { err = errors.New("sex error"); return }; _v.Sex = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Resources, _ok_ = _buf["resources"].(string); !_ok_ { err = errors.New("resources error"); return } }
+ return
+}
+
+func DeserializeGameShowData(_buf map[string]interface{}) (*GameShowData, error) {
+ v := &GameShowData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.SkillEffectType.go b/sys/configure/structs/Game.SkillEffectType.go
index 89da9be72..8aa48fb33 100644
--- a/sys/configure/structs/Game.SkillEffectType.go
+++ b/sys/configure/structs/Game.SkillEffectType.go
@@ -22,18 +22,21 @@ const (
GameSkillEffectType_AddActValue = 11
GameSkillEffectType_DrawActValue = 12
GameSkillEffectType_SkillCD = 13
- GameSkillEffectType_MaxDmg = 14
- GameSkillEffectType_RandBuff = 15
- GameSkillEffectType_DpsByAddBuff = 16
- GameSkillEffectType_FrontDmg_1 = 17
- GameSkillEffectType_FrontDmg_2 = 18
- GameSkillEffectType_FrontDmg_3 = 19
- GameSkillEffectType_ExtraDmg_1 = 20
- GameSkillEffectType_ExtraDmg_2 = 21
- GameSkillEffectType_ExtraDmg_3 = 22
- GameSkillEffectType_Round = 23
- GameSkillEffectType_TreBeyondByAddBuff = 24
- GameSkillEffectType_DpsByTre = 25
- GameSkillEffectType_Rebirth = 26
- GameSkillEffectType_StealBuff = 27
+ GameSkillEffectType_SkillMaxCD = 14
+ GameSkillEffectType_MaxDmg = 15
+ GameSkillEffectType_RandBuff = 16
+ GameSkillEffectType_DpsByAddBuff = 17
+ GameSkillEffectType_FrontDmg_1 = 18
+ GameSkillEffectType_FrontDmg_2 = 19
+ GameSkillEffectType_FrontDmg_3 = 20
+ GameSkillEffectType_ExtraDmg_1 = 21
+ GameSkillEffectType_ExtraDmg_2 = 22
+ GameSkillEffectType_ExtraDmg_3 = 23
+ GameSkillEffectType_Round = 24
+ GameSkillEffectType_TreBeyondByAddBuff = 25
+ GameSkillEffectType_DpsByTre = 26
+ GameSkillEffectType_Rebirth = 27
+ GameSkillEffectType_StealBuff = 28
+ GameSkillEffectType_BuffDmg = 29
+ GameSkillEffectType_ShiftOurAllBuff = 30
)
diff --git a/sys/configure/structs/Game.TaskCondData.go b/sys/configure/structs/Game.TaskCondData.go
index fcea43388..ef4f3231f 100644
--- a/sys/configure/structs/Game.TaskCondData.go
+++ b/sys/configure/structs/Game.TaskCondData.go
@@ -12,7 +12,9 @@ import "errors"
type GameTaskCondData struct {
Id int32
+ Datatype int32
Type int32
+ Inited []int32
Data1 int32
Data2 int32
Data3 int32
@@ -28,7 +30,22 @@ func (*GameTaskCondData) GetTypeId() int32 {
func (_v *GameTaskCondData)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["datatype"].(float64); !_ok_ { err = errors.New("datatype error"); return }; _v.Datatype = 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 _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["inited"].([]interface{}); !_ok_ { err = errors.New("inited error"); return }
+
+ _v.Inited = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Inited = append(_v.Inited, _list_v_)
+ }
+ }
+
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data1"].(float64); !_ok_ { err = errors.New("data1 error"); return }; _v.Data1 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data2"].(float64); !_ok_ { err = errors.New("data2 error"); return }; _v.Data2 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data3"].(float64); !_ok_ { err = errors.New("data3 error"); return }; _v.Data3 = int32(_tempNum_) }
diff --git a/sys/configure/structs/Game.TaskTypeData.go b/sys/configure/structs/Game.TaskTypeData.go
index 9294b950d..404cfa990 100644
--- a/sys/configure/structs/Game.TaskTypeData.go
+++ b/sys/configure/structs/Game.TaskTypeData.go
@@ -18,6 +18,7 @@ type GameTaskTypeData struct {
Data2 string
Data3 string
Data4 string
+ Data5 string
}
const TypeId_GameTaskTypeData = -1813579995
@@ -34,6 +35,7 @@ func (_v *GameTaskTypeData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; if _v.Data2, _ok_ = _buf["data2"].(string); !_ok_ { err = errors.New("data2 error"); return } }
{ var _ok_ bool; if _v.Data3, _ok_ = _buf["data3"].(string); !_ok_ { err = errors.New("data3 error"); return } }
{ var _ok_ bool; if _v.Data4, _ok_ = _buf["data4"].(string); !_ok_ { err = errors.New("data4 error"); return } }
+ { var _ok_ bool; if _v.Data5, _ok_ = _buf["data5"].(string); !_ok_ { err = errors.New("data5 error"); return } }
return
}
diff --git a/sys/configure/structs/Game.TeachTask.go b/sys/configure/structs/Game.TeachTask.go
new file mode 100644
index 000000000..d3a88091c
--- /dev/null
+++ b/sys/configure/structs/Game.TeachTask.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 GameTeachTask struct {
+ _dataMap map[int32]*GameTeachTaskData
+ _dataList []*GameTeachTaskData
+}
+
+func NewGameTeachTask(_buf []map[string]interface{}) (*GameTeachTask, error) {
+ _dataList := make([]*GameTeachTaskData, 0, len(_buf))
+ dataMap := make(map[int32]*GameTeachTaskData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameTeachTaskData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameTeachTask{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameTeachTask) GetDataMap() map[int32]*GameTeachTaskData {
+ return table._dataMap
+}
+
+func (table *GameTeachTask) GetDataList() []*GameTeachTaskData {
+ return table._dataList
+}
+
+func (table *GameTeachTask) Get(key int32) *GameTeachTaskData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.TeachTaskData.go b/sys/configure/structs/Game.TeachTaskData.go
new file mode 100644
index 000000000..7f0ccee71
--- /dev/null
+++ b/sys/configure/structs/Game.TeachTaskData.go
@@ -0,0 +1,68 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameTeachTaskData struct {
+ Id int32
+ Count int32
+ Desc string
+ When int32
+ FromCheck string
+ TargetCheck string
+ MainSkillCheck string
+ AfterSkillCheck string
+ BuffCheck string
+ FightEndCheck string
+ AddCon []string
+}
+
+const TypeId_GameTeachTaskData = 2141854056
+
+func (*GameTeachTaskData) GetTypeId() int32 {
+ return 2141854056
+}
+
+func (_v *GameTeachTaskData)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["Count"].(float64); !_ok_ { err = errors.New("Count error"); return }; _v.Count = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["When"].(float64); !_ok_ { err = errors.New("When error"); return }; _v.When = int32(_tempNum_) }
+ { var _ok_ bool; if _v.FromCheck, _ok_ = _buf["FromCheck"].(string); !_ok_ { err = errors.New("FromCheck error"); return } }
+ { var _ok_ bool; if _v.TargetCheck, _ok_ = _buf["TargetCheck"].(string); !_ok_ { err = errors.New("TargetCheck error"); return } }
+ { var _ok_ bool; if _v.MainSkillCheck, _ok_ = _buf["MainSkillCheck"].(string); !_ok_ { err = errors.New("MainSkillCheck error"); return } }
+ { var _ok_ bool; if _v.AfterSkillCheck, _ok_ = _buf["AfterSkillCheck"].(string); !_ok_ { err = errors.New("AfterSkillCheck error"); return } }
+ { var _ok_ bool; if _v.BuffCheck, _ok_ = _buf["BuffCheck"].(string); !_ok_ { err = errors.New("BuffCheck error"); return } }
+ { var _ok_ bool; if _v.FightEndCheck, _ok_ = _buf["FightEndCheck"].(string); !_ok_ { err = errors.New("FightEndCheck error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["AddCon"].([]interface{}); !_ok_ { err = errors.New("AddCon error"); return }
+
+ _v.AddCon = make([]string, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+ _v.AddCon = append(_v.AddCon, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameTeachTaskData(_buf map[string]interface{}) (*GameTeachTaskData, error) {
+ v := &GameTeachTaskData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.VikingBossData.go b/sys/configure/structs/Game.VikingBossData.go
index c721cbacb..b889fb040 100644
--- a/sys/configure/structs/Game.VikingBossData.go
+++ b/sys/configure/structs/Game.VikingBossData.go
@@ -21,6 +21,7 @@ type GameVikingBossData struct {
Dropshow []*Gameatn
Drop int32
Bossmodel int32
+ BossSkill int32
Boss []int32
}
@@ -80,6 +81,7 @@ func (_v *GameVikingBossData)Deserialize(_buf map[string]interface{}) (err error
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_skill"].(float64); !_ok_ { err = errors.New("boss_skill error"); return }; _v.BossSkill = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
diff --git a/sys/configure/structs/Game.VikingEntrance.go b/sys/configure/structs/Game.VikingEntrance.go
new file mode 100644
index 000000000..609b0bb1a
--- /dev/null
+++ b/sys/configure/structs/Game.VikingEntrance.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 GameVikingEntrance struct {
+ _dataMap map[int32]*GameVikingEntranceData
+ _dataList []*GameVikingEntranceData
+}
+
+func NewGameVikingEntrance(_buf []map[string]interface{}) (*GameVikingEntrance, error) {
+ _dataList := make([]*GameVikingEntranceData, 0, len(_buf))
+ dataMap := make(map[int32]*GameVikingEntranceData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameVikingEntranceData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.TypeId] = _v
+ }
+ }
+ return &GameVikingEntrance{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameVikingEntrance) GetDataMap() map[int32]*GameVikingEntranceData {
+ return table._dataMap
+}
+
+func (table *GameVikingEntrance) GetDataList() []*GameVikingEntranceData {
+ return table._dataList
+}
+
+func (table *GameVikingEntrance) Get(key int32) *GameVikingEntranceData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.VikingEntranceData.go b/sys/configure/structs/Game.VikingEntranceData.go
new file mode 100644
index 000000000..6d9108b3c
--- /dev/null
+++ b/sys/configure/structs/Game.VikingEntranceData.go
@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameVikingEntranceData struct {
+ TypeId int32
+ Title string
+ Introduce string
+ Unlock string
+ Bg string
+ Open string
+}
+
+const TypeId_GameVikingEntranceData = 292778214
+
+func (*GameVikingEntranceData) GetTypeId() int32 {
+ return 292778214
+}
+
+func (_v *GameVikingEntranceData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type_id"].(float64); !_ok_ { err = errors.New("type_id error"); return }; _v.TypeId = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _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["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _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["unlock"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Unlock error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Unlock, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.Bg, _ok_ = _buf["bg"].(string); !_ok_ { err = errors.New("bg error"); return } }
+ { var _ok_ bool; if _v.Open, _ok_ = _buf["open"].(string); !_ok_ { err = errors.New("open error"); return } }
+ return
+}
+
+func DeserializeGameVikingEntranceData(_buf map[string]interface{}) (*GameVikingEntranceData, error) {
+ v := &GameVikingEntranceData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go
index fba1047f0..a5b4ab575 100644
--- a/sys/configure/structs/Game.WorldBattleData.go
+++ b/sys/configure/structs/Game.WorldBattleData.go
@@ -14,6 +14,11 @@ type GameWorldBattleData struct {
Id int32
FormatList []int32
CaptainId string
+ Buff []int32
+ Battlestory []int32
+ Teammate []int32
+ Numberofteam int32
+ Battleteam []int32
}
const TypeId_GameWorldBattleData = 1096332216
@@ -39,6 +44,63 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro
}
{ var _ok_ bool; if _v.CaptainId, _ok_ = _buf["captainId"].(string); !_ok_ { err = errors.New("captainId error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["buff"].([]interface{}); !_ok_ { err = errors.New("buff error"); return }
+
+ _v.Buff = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Buff = append(_v.Buff, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["battlestory"].([]interface{}); !_ok_ { err = errors.New("battlestory error"); return }
+
+ _v.Battlestory = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Battlestory = append(_v.Battlestory, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["teammate"].([]interface{}); !_ok_ { err = errors.New("teammate error"); return }
+
+ _v.Teammate = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Teammate = append(_v.Teammate, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["numberofteam"].(float64); !_ok_ { err = errors.New("numberofteam error"); return }; _v.Numberofteam = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["battleteam"].([]interface{}); !_ok_ { err = errors.New("battleteam error"); return }
+
+ _v.Battleteam = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Battleteam = append(_v.Battleteam, _list_v_)
+ }
+ }
+
return
}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index fa3a6c085..3d4668128 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -11,810 +11,1020 @@ package cfg
type JsonLoader func(string) ([]map[string]interface{}, error)
type Tables struct {
- Global *GameGlobal
- Plot *GamePlot
- Extservers *GameExtservers
- SkillAtk *GameSkillAtk
- SkillAfteratk *GameSkillAfteratk
- SkillBuff *GameSkillBuff
- SkillPassive *GameSkillPassive
- Hero *GameHero
- HeroStargrow *GameHeroStargrow
- HeroLevelgrow *GameHeroLevelgrow
- HeroStarup *GameHeroStarup
- HeroStarupSp *GameHeroStarupSp
- HeroExp *GameHeroExp
- HeroLevelup *GameHeroLevelup
- Equip *GameEquip
- EquipAttrlibrary *GameEquipAttrlibrary
- EquipSuit *GameEquipSuit
- EquipColor *GameEquipColor
- EquipIntensify *GameEquipIntensify
- Item *GameItem
- HeroSkillLevel *GameHeroSkillLevel
- HeroResonance *GameHeroResonance
- ComAtn *GameComAtn
- HeroAwaken *GameHeroAwaken
- HeroMethod *GameHeroMethod
- Shop *GameShop
- Shopitem *GameShopitem
- ActiveReward *GameActiveReward
- Model *GameModel
- MainlineChapter *GameMainlineChapter
- Mainline *GameMainline
- RDMainlineChapter *GameRDMainlineChapter
- RDMainline *GameRDMainline
- DrawCard *GameDrawCard
- ChatChannel *GameChatChannel
- ChatSystem *GameChatSystem
- ChatServerGroup *GameChatServerGroup
- ChatChannelCom *GameChatChannelCom
- ChatExpression *GameChatExpression
- TaskRound *GameTaskRound
- TaskActiveReward *GameTaskActiveReward
- Coin *GameCoin
- Initial *GameInitial
- Monster *GameMonster
- EquipPos *GameEquipPos
- Playerlv *GamePlayerlv
- Propsgroup *GamePropsgroup
- Facemod *GameFacemod
- Msgdistrib *GameMsgdistrib
- Opencond *GameOpencond
- Stroy *GameStroy
- Pagoda *GamePagoda
- SeasonLoop *GameSeasonLoop
- PagodaTaskReward *GamePagodaTaskReward
- PagodaSeasonReward *GamePagodaSeasonReward
- Rdtask *GameRdtask
- RdtaskCondi *GameRdtaskCondi
- RdtaskChoose *GameRdtaskChoose
- RdtaskSide *GameRdtaskSide
- RdtaskBattle *GameRdtaskBattle
- KungfuUnlock *GameKungfuUnlock
- KungfuMasterworker *GameKungfuMasterworker
- Gourmet *GameGourmet
- Drop *GameDrop
- Smithy *GameSmithy
- SmithyStove *GameSmithyStove
- SmithyText *GameSmithyText
- VikingBoss *GameVikingBoss
- VikingChallenge *GameVikingChallenge
- DreamlandBoos *GameDreamlandBoos
- DreamlandChallenge *GameDreamlandChallenge
- DreamlandTrigger *GameDreamlandTrigger
- HuntingBoss *GameHuntingBoss
- HuntingChallenge *GameHuntingChallenge
- HuntingOpenTime *GameHuntingOpenTime
- HuntingLineup *GameHuntingLineup
- MonsterFormat *GameMonsterFormat
- Link *GameLink
- GetResource *GameGetResource
- Affix *GameAffix
- VikingBossSkill *GameVikingBossSkill
- LibraryFetter *GameLibraryFetter
- LibraryStory *GameLibraryStory
- FavorNum *GameFavorNum
- LibraryHero *GameLibraryHero
- LibraryHistory *GameLibraryHistory
- LibraryFavor *GameLibraryFavor
- LibraryFavorlv *GameLibraryFavorlv
- LibraryPlayBack *GameLibraryPlayBack
- Robot *GameRobot
- Ip *GameIp
- GameColor *GameGameColor
- NameLibrary *GameNameLibrary
- HeroConvertdata *GameHeroConvertdata
- SubplotTimeLine *GameSubplotTimeLine
- SubplotTaskLine *GameSubplotTaskLine
- SubplotMainTask *GameSubplotMainTask
- SubplotSubTask *GameSubplotSubTask
- Captaintext *GameCaptaintext
- Herofusion *GameHerofusion
- PlayerInfor *GamePlayerInfor
- HeroTalent *GameHeroTalent
- TalentSkill *GameTalentSkill
- ItemBox *GameItemBox
- TrollRule *GameTrollRule
- TrollGoods *GameTrollGoods
- TrollTrain *GameTrollTrain
- TrollLv *GameTrollLv
- TrollCoefficient *GameTrollCoefficient
- PrivilegeCard *GamePrivilegeCard
- Privilege *GamePrivilege
- Sign *GameSign
- SignReset *GameSignReset
- PassCheck *GamePassCheck
+ Global *GameGlobal
+ Extservers *GameExtservers
+ SkillAtk *GameSkillAtk
+ SkillAfteratk *GameSkillAfteratk
+ SkillBuff *GameSkillBuff
+ SkillPassive *GameSkillPassive
+ Hero *GameHero
+ HeroStargrow *GameHeroStargrow
+ HeroLevelgrow *GameHeroLevelgrow
+ HeroStarup *GameHeroStarup
+ HeroExp *GameHeroExp
+ HeroLevelup *GameHeroLevelup
+ Equip *GameEquip
+ EquipAttrlibrary *GameEquipAttrlibrary
+ EquipSuit *GameEquipSuit
+ EquipColor *GameEquipColor
+ EquipIntensify *GameEquipIntensify
+ EquipSCompose *GameEquipSCompose
+ EquipAttribute *GameEquipAttribute
+ EquipEnchanting *GameEquipEnchanting
+ Item *GameItem
+ HeroSkillLevel *GameHeroSkillLevel
+ HeroResonance *GameHeroResonance
+ HeroAwaken *GameHeroAwaken
+ HeroMethod *GameHeroMethod
+ Shop *GameShop
+ Shopitem *GameShopitem
+ ActiveReward *GameActiveReward
+ Model *GameModel
+ MainlineChapter *GameMainlineChapter
+ Mainline *GameMainline
+ DrawCard *GameDrawCard
+ ChatChannel *GameChatChannel
+ ChatSystem *GameChatSystem
+ ChatServerGroup *GameChatServerGroup
+ ChatChannelCom *GameChatChannelCom
+ ChatExpression *GameChatExpression
+ TaskRound *GameTaskRound
+ TaskActiveReward *GameTaskActiveReward
+ Coin *GameCoin
+ Initial *GameInitial
+ Monster *GameMonster
+ EquipPos *GameEquipPos
+ Playerlv *GamePlayerlv
+ Facemod *GameFacemod
+ Msgdistrib *GameMsgdistrib
+ Opencond *GameOpencond
+ Stroy *GameStroy
+ Pagoda *GamePagoda
+ PagodaTaskReward *GamePagodaTaskReward
+ SeasonLoop *GameSeasonLoop
+ PagodaSeasonReward *GamePagodaSeasonReward
+ Rdtask *GameRdtask
+ RdtaskCondi *GameRdtaskCondi
+ RdtaskChoose *GameRdtaskChoose
+ RdtaskSide *GameRdtaskSide
+ RdtaskBattle *GameRdtaskBattle
+ KungfuUnlock *GameKungfuUnlock
+ KungfuMasterworker *GameKungfuMasterworker
+ Gourmet *GameGourmet
+ Drop *GameDrop
+ Smithy *GameSmithy
+ SmithyStove *GameSmithyStove
+ SmithyText *GameSmithyText
+ VikingBoss *GameVikingBoss
+ VikingChallenge *GameVikingChallenge
+ VikingLineup *GameVikingLineup
+ VikingEntrance *GameVikingEntrance
+ DreamlandBoos *GameDreamlandBoos
+ DreamlandChallenge *GameDreamlandChallenge
+ DreamlandTrigger *GameDreamlandTrigger
+ HuntingBoss *GameHuntingBoss
+ HuntingChallenge *GameHuntingChallenge
+ HuntingOpenTime *GameHuntingOpenTime
+ HuntingLineup *GameHuntingLineup
+ MonsterFormat *GameMonsterFormat
+ Link *GameLink
+ GetResource *GameGetResource
+ Affix *GameAffix
+ VikingBossSkill *GameVikingBossSkill
+ LibraryFetter *GameLibraryFetter
+ LibraryStory *GameLibraryStory
+ FavorNum *GameFavorNum
+ LibraryHero *GameLibraryHero
+ LibraryHistory *GameLibraryHistory
+ LibraryFavor *GameLibraryFavor
+ LibraryFavorlv *GameLibraryFavorlv
+ LibraryBubble *GameLibraryBubble
+ LibraryPlayBack *GameLibraryPlayBack
+ Robot *GameRobot
+ Ip *GameIp
+ GameColor *GameGameColor
+ NameLibrary *GameNameLibrary
+ HeroConvertdata *GameHeroConvertdata
+ LinestoryTimeLine *GameLinestoryTimeLine
+ LinestoryMainTask *GameLinestoryMainTask
+ Captaintext *GameCaptaintext
+ Herofusion *GameHerofusion
+ PlayerInfor *GamePlayerInfor
+ HeroTalent *GameHeroTalent
+ TalentSkill *GameTalentSkill
+ ArenaBuyChallenge *GameArenaBuyChallenge
+ ArenaActiveReward *GameArenaActiveReward
+ ArenaRobot *GameArenaRobot
+ ArenaRankReward *GameArenaRankReward
+ ArenaChallengeNpc *GameArenaChallengeNpc
+ ItemBox *GameItemBox
+ Show *GameShow
+ GuildLv *GameGuildLv
+ GuildPng *GameGuildPng
+ GuildActivity *GameGuildActivity
+ GuildSign *GameGuildSign
+ GuildTask *GameGuildTask
+ TrollRule *GameTrollRule
+ TrollGoods *GameTrollGoods
+ TrollTrain *GameTrollTrain
+ TrollLv *GameTrollLv
+ TrollCoefficient *GameTrollCoefficient
+ ProBoss *GameProBoss
+ ProChallenge *GameProChallenge
+ ProLineup *GameProLineup
+ ProBossskill *GameProBossskill
+ Horoscope *GameHoroscope
+ Sign *GameSign
+ SignReset *GameSignReset
+ GrowTask *GameGrowTask
+ GrowReward *GameGrowReward
+ Recharge *GameRecharge
+ PrivilegeCard *GamePrivilegeCard
+ Privilege *GamePrivilege
+ WorldTask *GameWorldTask
+ TaskCond *GameTaskCond
+ TaskType *GameTaskType
+ Teaching *GameTeaching
+ HeroStrategy *GameHeroStrategy
+ TeachTask *GameTeachTask
+ PayPackage *GamePayPackage
+ WorldBattle *GameWorldBattle
+ RedDot *GameRedDot
+ RedDotTalkid *GameRedDotTalkid
+ PassCheck *GamePassCheck
+ Mail *GameMail
+ CombatLevel *GameCombatLevel
+ CombatManster *GameCombatManster
}
func NewTables(loader JsonLoader) (*Tables, error) {
- var err error
- var buf []map[string]interface{}
+ var err error
+ var buf []map[string]interface{}
- tables := &Tables{}
- if buf, err = loader("game_global"); err != nil {
- return nil, err
- }
- if tables.Global, err = NewGameGlobal(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_plot"); err != nil {
- return nil, err
- }
- if tables.Plot, err = NewGamePlot(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_extservers"); err != nil {
- return nil, err
- }
- if tables.Extservers, err = NewGameExtservers(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_skillatk"); err != nil {
- return nil, err
- }
- if tables.SkillAtk, err = NewGameSkillAtk(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_skillafteratk"); err != nil {
- return nil, err
- }
- if tables.SkillAfteratk, err = NewGameSkillAfteratk(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_skillbuff"); err != nil {
- return nil, err
- }
- if tables.SkillBuff, err = NewGameSkillBuff(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_skillpassive"); err != nil {
- return nil, err
- }
- if tables.SkillPassive, err = NewGameSkillPassive(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_hero"); err != nil {
- return nil, err
- }
- if tables.Hero, err = NewGameHero(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_herostargrow"); err != nil {
- return nil, err
- }
- if tables.HeroStargrow, err = NewGameHeroStargrow(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_herolevelgrow"); err != nil {
- return nil, err
- }
- if tables.HeroLevelgrow, err = NewGameHeroLevelgrow(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_herostarup"); err != nil {
- return nil, err
- }
- if tables.HeroStarup, err = NewGameHeroStarup(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_herostarupsp"); err != nil {
- return nil, err
- }
- if tables.HeroStarupSp, err = NewGameHeroStarupSp(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_heroexp"); err != nil {
- return nil, err
- }
- if tables.HeroExp, err = NewGameHeroExp(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_herolevelup"); err != nil {
- return nil, err
- }
- if tables.HeroLevelup, err = NewGameHeroLevelup(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_equip"); err != nil {
- return nil, err
- }
- if tables.Equip, err = NewGameEquip(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_equipattrlibrary"); err != nil {
- return nil, err
- }
- if tables.EquipAttrlibrary, err = NewGameEquipAttrlibrary(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_equipsuit"); err != nil {
- return nil, err
- }
- if tables.EquipSuit, err = NewGameEquipSuit(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_equipcolor"); err != nil {
- return nil, err
- }
- if tables.EquipColor, err = NewGameEquipColor(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_equipintensify"); err != nil {
- return nil, err
- }
- if tables.EquipIntensify, err = NewGameEquipIntensify(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_item"); err != nil {
- return nil, err
- }
- if tables.Item, err = NewGameItem(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_heroskilllevel"); err != nil {
- return nil, err
- }
- if tables.HeroSkillLevel, err = NewGameHeroSkillLevel(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_heroresonance"); err != nil {
- return nil, err
- }
- if tables.HeroResonance, err = NewGameHeroResonance(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_comatn"); err != nil {
- return nil, err
- }
- if tables.ComAtn, err = NewGameComAtn(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_heroawaken"); err != nil {
- return nil, err
- }
- if tables.HeroAwaken, err = NewGameHeroAwaken(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_heromethod"); err != nil {
- return nil, err
- }
- if tables.HeroMethod, err = NewGameHeroMethod(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_shop"); err != nil {
- return nil, err
- }
- if tables.Shop, err = NewGameShop(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_shopitem"); err != nil {
- return nil, err
- }
- if tables.Shopitem, err = NewGameShopitem(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_activereward"); err != nil {
- return nil, err
- }
- if tables.ActiveReward, err = NewGameActiveReward(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_model"); err != nil {
- return nil, err
- }
- if tables.Model, err = NewGameModel(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_mainlinechapter"); err != nil {
- return nil, err
- }
- if tables.MainlineChapter, err = NewGameMainlineChapter(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_mainline"); err != nil {
- return nil, err
- }
- if tables.Mainline, err = NewGameMainline(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_rdmainlinechapter"); err != nil {
- return nil, err
- }
- if tables.RDMainlineChapter, err = NewGameRDMainlineChapter(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_rdmainline"); err != nil {
- return nil, err
- }
- if tables.RDMainline, err = NewGameRDMainline(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_drawcard"); err != nil {
- return nil, err
- }
- if tables.DrawCard, err = NewGameDrawCard(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_chatchannel"); err != nil {
- return nil, err
- }
- if tables.ChatChannel, err = NewGameChatChannel(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_chatsystem"); err != nil {
- return nil, err
- }
- if tables.ChatSystem, err = NewGameChatSystem(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_chatservergroup"); err != nil {
- return nil, err
- }
- if tables.ChatServerGroup, err = NewGameChatServerGroup(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_chatchannelcom"); err != nil {
- return nil, err
- }
- if tables.ChatChannelCom, err = NewGameChatChannelCom(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_chatexpression"); err != nil {
- return nil, err
- }
- if tables.ChatExpression, err = NewGameChatExpression(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_taskround"); err != nil {
- return nil, err
- }
- if tables.TaskRound, err = NewGameTaskRound(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_taskactivereward"); err != nil {
- return nil, err
- }
- if tables.TaskActiveReward, err = NewGameTaskActiveReward(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_coin"); err != nil {
- return nil, err
- }
- if tables.Coin, err = NewGameCoin(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_initial"); err != nil {
- return nil, err
- }
- if tables.Initial, err = NewGameInitial(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_monster"); err != nil {
- return nil, err
- }
- if tables.Monster, err = NewGameMonster(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_equippos"); err != nil {
- return nil, err
- }
- if tables.EquipPos, err = NewGameEquipPos(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_playerlv"); err != nil {
- return nil, err
- }
- if tables.Playerlv, err = NewGamePlayerlv(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_propsgroup"); err != nil {
- return nil, err
- }
- if tables.Propsgroup, err = NewGamePropsgroup(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_facemod"); err != nil {
- return nil, err
- }
- if tables.Facemod, err = NewGameFacemod(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_msgdistrib"); err != nil {
- return nil, err
- }
- if tables.Msgdistrib, err = NewGameMsgdistrib(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_opencond"); err != nil {
- return nil, err
- }
- if tables.Opencond, err = NewGameOpencond(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_stroy"); err != nil {
- return nil, err
- }
- if tables.Stroy, err = NewGameStroy(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_pagoda"); err != nil {
- return nil, err
- }
- if tables.Pagoda, err = NewGamePagoda(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_seasonloop"); err != nil {
- return nil, err
- }
- if tables.SeasonLoop, err = NewGameSeasonLoop(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_pagodataskreward"); err != nil {
- return nil, err
- }
- if tables.PagodaTaskReward, err = NewGamePagodaTaskReward(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_pagodaseasonreward"); err != nil {
- return nil, err
- }
- if tables.PagodaSeasonReward, err = NewGamePagodaSeasonReward(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_rdtask"); err != nil {
- return nil, err
- }
- if tables.Rdtask, err = NewGameRdtask(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_rdtaskcondi"); err != nil {
- return nil, err
- }
- if tables.RdtaskCondi, err = NewGameRdtaskCondi(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_rdtaskchoose"); err != nil {
- return nil, err
- }
- if tables.RdtaskChoose, err = NewGameRdtaskChoose(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_rdtaskside"); err != nil {
- return nil, err
- }
- if tables.RdtaskSide, err = NewGameRdtaskSide(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_rdtaskbattle"); err != nil {
- return nil, err
- }
- if tables.RdtaskBattle, err = NewGameRdtaskBattle(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_kungfuunlock"); err != nil {
- return nil, err
- }
- if tables.KungfuUnlock, err = NewGameKungfuUnlock(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_kungfumasterworker"); err != nil {
- return nil, err
- }
- if tables.KungfuMasterworker, err = NewGameKungfuMasterworker(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_gourmet"); err != nil {
- return nil, err
- }
- if tables.Gourmet, err = NewGameGourmet(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_drop"); err != nil {
- return nil, err
- }
- if tables.Drop, err = NewGameDrop(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_smithy"); err != nil {
- return nil, err
- }
- if tables.Smithy, err = NewGameSmithy(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_smithystove"); err != nil {
- return nil, err
- }
- if tables.SmithyStove, err = NewGameSmithyStove(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_smithytext"); err != nil {
- return nil, err
- }
- if tables.SmithyText, err = NewGameSmithyText(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_vikingboss"); err != nil {
- return nil, err
- }
- if tables.VikingBoss, err = NewGameVikingBoss(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_vikingchallenge"); err != nil {
- return nil, err
- }
- if tables.VikingChallenge, err = NewGameVikingChallenge(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_dreamlandboos"); err != nil {
- return nil, err
- }
- if tables.DreamlandBoos, err = NewGameDreamlandBoos(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_dreamlandchallenge"); err != nil {
- return nil, err
- }
- if tables.DreamlandChallenge, err = NewGameDreamlandChallenge(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_dreamlandtrigger"); err != nil {
- return nil, err
- }
- if tables.DreamlandTrigger, err = NewGameDreamlandTrigger(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_huntingboss"); err != nil {
- return nil, err
- }
- if tables.HuntingBoss, err = NewGameHuntingBoss(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_huntingchallenge"); err != nil {
- return nil, err
- }
- if tables.HuntingChallenge, err = NewGameHuntingChallenge(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_huntingopentime"); err != nil {
- return nil, err
- }
- if tables.HuntingOpenTime, err = NewGameHuntingOpenTime(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_huntinglineup"); err != nil {
- return nil, err
- }
- if tables.HuntingLineup, err = NewGameHuntingLineup(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_monsterformat"); err != nil {
- return nil, err
- }
- if tables.MonsterFormat, err = NewGameMonsterFormat(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_link"); err != nil {
- return nil, err
- }
- if tables.Link, err = NewGameLink(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_getresource"); err != nil {
- return nil, err
- }
- if tables.GetResource, err = NewGameGetResource(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_affix"); err != nil {
- return nil, err
- }
- if tables.Affix, err = NewGameAffix(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_vikingbossskill"); err != nil {
- return nil, err
- }
- if tables.VikingBossSkill, err = NewGameVikingBossSkill(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_libraryfetter"); err != nil {
- return nil, err
- }
- if tables.LibraryFetter, err = NewGameLibraryFetter(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_librarystory"); err != nil {
- return nil, err
- }
- if tables.LibraryStory, err = NewGameLibraryStory(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_favornum"); err != nil {
- return nil, err
- }
- if tables.FavorNum, err = NewGameFavorNum(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_libraryhero"); err != nil {
- return nil, err
- }
- if tables.LibraryHero, err = NewGameLibraryHero(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_libraryhistory"); err != nil {
- return nil, err
- }
- if tables.LibraryHistory, err = NewGameLibraryHistory(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_libraryfavor"); err != nil {
- return nil, err
- }
- if tables.LibraryFavor, err = NewGameLibraryFavor(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_libraryfavorlv"); err != nil {
- return nil, err
- }
- if tables.LibraryFavorlv, err = NewGameLibraryFavorlv(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_libraryplayback"); err != nil {
- return nil, err
- }
- if tables.LibraryPlayBack, err = NewGameLibraryPlayBack(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_robot"); err != nil {
- return nil, err
- }
- if tables.Robot, err = NewGameRobot(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_ip"); err != nil {
- return nil, err
- }
- if tables.Ip, err = NewGameIp(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_gamecolor"); err != nil {
- return nil, err
- }
- 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
- }
- if buf, err = loader("game_heroconvertdata"); err != nil {
- return nil, err
- }
- if tables.HeroConvertdata, err = NewGameHeroConvertdata(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_subplottimeline"); err != nil {
- return nil, err
- }
- if tables.SubplotTimeLine, err = NewGameSubplotTimeLine(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_subplottaskline"); err != nil {
- return nil, err
- }
- if tables.SubplotTaskLine, err = NewGameSubplotTaskLine(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_subplotmaintask"); err != nil {
- return nil, err
- }
- if tables.SubplotMainTask, err = NewGameSubplotMainTask(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_subplotsubtask"); err != nil {
- return nil, err
- }
- if tables.SubplotSubTask, err = NewGameSubplotSubTask(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_captaintext"); err != nil {
- return nil, err
- }
- if tables.Captaintext, err = NewGameCaptaintext(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_herofusion"); err != nil {
- return nil, err
- }
- if tables.Herofusion, err = NewGameHerofusion(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_playerinfor"); err != nil {
- return nil, err
- }
- if tables.PlayerInfor, err = NewGamePlayerInfor(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_herotalent"); err != nil {
- return nil, err
- }
- if tables.HeroTalent, err = NewGameHeroTalent(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_talentskill"); err != nil {
- return nil, err
- }
- if tables.TalentSkill, err = NewGameTalentSkill(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_itembox"); err != nil {
- return nil, err
- }
- if tables.ItemBox, err = NewGameItemBox(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_trollrule"); err != nil {
- return nil, err
- }
- if tables.TrollRule, err = NewGameTrollRule(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_trollgoods"); err != nil {
- return nil, err
- }
- if tables.TrollGoods, err = NewGameTrollGoods(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_trolltrain"); err != nil {
- return nil, err
- }
- if tables.TrollTrain, err = NewGameTrollTrain(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_trolllv"); err != nil {
- return nil, err
- }
- if tables.TrollLv, err = NewGameTrollLv(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_trollcoefficient"); err != nil {
- return nil, err
- }
- if tables.TrollCoefficient, err = NewGameTrollCoefficient(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_privilegecard"); err != nil {
- return nil, err
- }
- if tables.PrivilegeCard, err = NewGamePrivilegeCard(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_privilege"); err != nil {
- return nil, err
- }
- if tables.Privilege, err = NewGamePrivilege(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_sign"); err != nil {
- return nil, err
- }
- if tables.Sign, err = NewGameSign(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_signreset"); err != nil {
- return nil, err
- }
- if tables.SignReset, err = NewGameSignReset(buf); err != nil {
- return nil, err
- }
- if buf, err = loader("game_passcheck") ; err != nil {
+ tables := &Tables{}
+ if buf, err = loader("game_global") ; err != nil {
+ return nil, err
+ }
+ if tables.Global, err = NewGameGlobal(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_extservers") ; err != nil {
+ return nil, err
+ }
+ if tables.Extservers, err = NewGameExtservers(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_skillatk") ; err != nil {
+ return nil, err
+ }
+ if tables.SkillAtk, err = NewGameSkillAtk(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_skillafteratk") ; err != nil {
+ return nil, err
+ }
+ if tables.SkillAfteratk, err = NewGameSkillAfteratk(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_skillbuff") ; err != nil {
+ return nil, err
+ }
+ if tables.SkillBuff, err = NewGameSkillBuff(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_skillpassive") ; err != nil {
+ return nil, err
+ }
+ if tables.SkillPassive, err = NewGameSkillPassive(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_hero") ; err != nil {
+ return nil, err
+ }
+ if tables.Hero, err = NewGameHero(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_herostargrow") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroStargrow, err = NewGameHeroStargrow(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_herolevelgrow") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroLevelgrow, err = NewGameHeroLevelgrow(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_herostarup") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroStarup, err = NewGameHeroStarup(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_heroexp") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroExp, err = NewGameHeroExp(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_herolevelup") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroLevelup, err = NewGameHeroLevelup(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_equip") ; err != nil {
+ return nil, err
+ }
+ if tables.Equip, err = NewGameEquip(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_equipattrlibrary") ; err != nil {
+ return nil, err
+ }
+ if tables.EquipAttrlibrary, err = NewGameEquipAttrlibrary(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_equipsuit") ; err != nil {
+ return nil, err
+ }
+ if tables.EquipSuit, err = NewGameEquipSuit(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_equipcolor") ; err != nil {
+ return nil, err
+ }
+ if tables.EquipColor, err = NewGameEquipColor(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_equipintensify") ; err != nil {
+ return nil, err
+ }
+ if tables.EquipIntensify, err = NewGameEquipIntensify(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_equipscompose") ; err != nil {
+ return nil, err
+ }
+ if tables.EquipSCompose, err = NewGameEquipSCompose(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_equipattribute") ; err != nil {
+ return nil, err
+ }
+ if tables.EquipAttribute, err = NewGameEquipAttribute(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_equipenchanting") ; err != nil {
+ return nil, err
+ }
+ if tables.EquipEnchanting, err = NewGameEquipEnchanting(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_item") ; err != nil {
+ return nil, err
+ }
+ if tables.Item, err = NewGameItem(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_heroskilllevel") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroSkillLevel, err = NewGameHeroSkillLevel(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_heroresonance") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroResonance, err = NewGameHeroResonance(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_heroawaken") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroAwaken, err = NewGameHeroAwaken(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_heromethod") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroMethod, err = NewGameHeroMethod(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_shop") ; err != nil {
+ return nil, err
+ }
+ if tables.Shop, err = NewGameShop(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_shopitem") ; err != nil {
+ return nil, err
+ }
+ if tables.Shopitem, err = NewGameShopitem(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_activereward") ; err != nil {
+ return nil, err
+ }
+ if tables.ActiveReward, err = NewGameActiveReward(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_model") ; err != nil {
+ return nil, err
+ }
+ if tables.Model, err = NewGameModel(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_mainlinechapter") ; err != nil {
+ return nil, err
+ }
+ if tables.MainlineChapter, err = NewGameMainlineChapter(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_mainline") ; err != nil {
+ return nil, err
+ }
+ if tables.Mainline, err = NewGameMainline(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_drawcard") ; err != nil {
+ return nil, err
+ }
+ if tables.DrawCard, err = NewGameDrawCard(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_chatchannel") ; err != nil {
+ return nil, err
+ }
+ if tables.ChatChannel, err = NewGameChatChannel(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_chatsystem") ; err != nil {
+ return nil, err
+ }
+ if tables.ChatSystem, err = NewGameChatSystem(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_chatservergroup") ; err != nil {
+ return nil, err
+ }
+ if tables.ChatServerGroup, err = NewGameChatServerGroup(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_chatchannelcom") ; err != nil {
+ return nil, err
+ }
+ if tables.ChatChannelCom, err = NewGameChatChannelCom(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_chatexpression") ; err != nil {
+ return nil, err
+ }
+ if tables.ChatExpression, err = NewGameChatExpression(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_taskround") ; err != nil {
+ return nil, err
+ }
+ if tables.TaskRound, err = NewGameTaskRound(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_taskactivereward") ; err != nil {
+ return nil, err
+ }
+ if tables.TaskActiveReward, err = NewGameTaskActiveReward(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_coin") ; err != nil {
+ return nil, err
+ }
+ if tables.Coin, err = NewGameCoin(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_initial") ; err != nil {
+ return nil, err
+ }
+ if tables.Initial, err = NewGameInitial(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_monster") ; err != nil {
+ return nil, err
+ }
+ if tables.Monster, err = NewGameMonster(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_equippos") ; err != nil {
+ return nil, err
+ }
+ if tables.EquipPos, err = NewGameEquipPos(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_playerlv") ; err != nil {
+ return nil, err
+ }
+ if tables.Playerlv, err = NewGamePlayerlv(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_facemod") ; err != nil {
+ return nil, err
+ }
+ if tables.Facemod, err = NewGameFacemod(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_msgdistrib") ; err != nil {
+ return nil, err
+ }
+ if tables.Msgdistrib, err = NewGameMsgdistrib(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_opencond") ; err != nil {
+ return nil, err
+ }
+ if tables.Opencond, err = NewGameOpencond(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_stroy") ; err != nil {
+ return nil, err
+ }
+ if tables.Stroy, err = NewGameStroy(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_pagoda") ; err != nil {
+ return nil, err
+ }
+ if tables.Pagoda, err = NewGamePagoda(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_pagodataskreward") ; err != nil {
+ return nil, err
+ }
+ if tables.PagodaTaskReward, err = NewGamePagodaTaskReward(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_seasonloop") ; err != nil {
+ return nil, err
+ }
+ if tables.SeasonLoop, err = NewGameSeasonLoop(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_pagodaseasonreward") ; err != nil {
+ return nil, err
+ }
+ if tables.PagodaSeasonReward, err = NewGamePagodaSeasonReward(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_rdtask") ; err != nil {
+ return nil, err
+ }
+ if tables.Rdtask, err = NewGameRdtask(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_rdtaskcondi") ; err != nil {
+ return nil, err
+ }
+ if tables.RdtaskCondi, err = NewGameRdtaskCondi(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_rdtaskchoose") ; err != nil {
+ return nil, err
+ }
+ if tables.RdtaskChoose, err = NewGameRdtaskChoose(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_rdtaskside") ; err != nil {
+ return nil, err
+ }
+ if tables.RdtaskSide, err = NewGameRdtaskSide(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_rdtaskbattle") ; err != nil {
+ return nil, err
+ }
+ if tables.RdtaskBattle, err = NewGameRdtaskBattle(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_kungfuunlock") ; err != nil {
+ return nil, err
+ }
+ if tables.KungfuUnlock, err = NewGameKungfuUnlock(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_kungfumasterworker") ; err != nil {
+ return nil, err
+ }
+ if tables.KungfuMasterworker, err = NewGameKungfuMasterworker(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_gourmet") ; err != nil {
+ return nil, err
+ }
+ if tables.Gourmet, err = NewGameGourmet(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_drop") ; err != nil {
+ return nil, err
+ }
+ if tables.Drop, err = NewGameDrop(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_smithy") ; err != nil {
+ return nil, err
+ }
+ if tables.Smithy, err = NewGameSmithy(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_smithystove") ; err != nil {
+ return nil, err
+ }
+ if tables.SmithyStove, err = NewGameSmithyStove(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_smithytext") ; err != nil {
+ return nil, err
+ }
+ if tables.SmithyText, err = NewGameSmithyText(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_vikingboss") ; err != nil {
+ return nil, err
+ }
+ if tables.VikingBoss, err = NewGameVikingBoss(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_vikingchallenge") ; err != nil {
+ return nil, err
+ }
+ if tables.VikingChallenge, err = NewGameVikingChallenge(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_vikinglineup") ; err != nil {
+ return nil, err
+ }
+ if tables.VikingLineup, err = NewGameVikingLineup(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_vikingentrance") ; err != nil {
+ return nil, err
+ }
+ if tables.VikingEntrance, err = NewGameVikingEntrance(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_dreamlandboos") ; err != nil {
+ return nil, err
+ }
+ if tables.DreamlandBoos, err = NewGameDreamlandBoos(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_dreamlandchallenge") ; err != nil {
+ return nil, err
+ }
+ if tables.DreamlandChallenge, err = NewGameDreamlandChallenge(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_dreamlandtrigger") ; err != nil {
+ return nil, err
+ }
+ if tables.DreamlandTrigger, err = NewGameDreamlandTrigger(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_huntingboss") ; err != nil {
+ return nil, err
+ }
+ if tables.HuntingBoss, err = NewGameHuntingBoss(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_huntingchallenge") ; err != nil {
+ return nil, err
+ }
+ if tables.HuntingChallenge, err = NewGameHuntingChallenge(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_huntingopentime") ; err != nil {
+ return nil, err
+ }
+ if tables.HuntingOpenTime, err = NewGameHuntingOpenTime(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_huntinglineup") ; err != nil {
+ return nil, err
+ }
+ if tables.HuntingLineup, err = NewGameHuntingLineup(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_monsterformat") ; err != nil {
+ return nil, err
+ }
+ if tables.MonsterFormat, err = NewGameMonsterFormat(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_link") ; err != nil {
+ return nil, err
+ }
+ if tables.Link, err = NewGameLink(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_getresource") ; err != nil {
+ return nil, err
+ }
+ if tables.GetResource, err = NewGameGetResource(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_affix") ; err != nil {
+ return nil, err
+ }
+ if tables.Affix, err = NewGameAffix(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_vikingbossskill") ; err != nil {
+ return nil, err
+ }
+ if tables.VikingBossSkill, err = NewGameVikingBossSkill(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_libraryfetter") ; err != nil {
+ return nil, err
+ }
+ if tables.LibraryFetter, err = NewGameLibraryFetter(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_librarystory") ; err != nil {
+ return nil, err
+ }
+ if tables.LibraryStory, err = NewGameLibraryStory(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_favornum") ; err != nil {
+ return nil, err
+ }
+ if tables.FavorNum, err = NewGameFavorNum(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_libraryhero") ; err != nil {
+ return nil, err
+ }
+ if tables.LibraryHero, err = NewGameLibraryHero(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_libraryhistory") ; err != nil {
+ return nil, err
+ }
+ if tables.LibraryHistory, err = NewGameLibraryHistory(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_libraryfavor") ; err != nil {
+ return nil, err
+ }
+ if tables.LibraryFavor, err = NewGameLibraryFavor(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_libraryfavorlv") ; err != nil {
+ return nil, err
+ }
+ if tables.LibraryFavorlv, err = NewGameLibraryFavorlv(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_librarybubble") ; err != nil {
+ return nil, err
+ }
+ if tables.LibraryBubble, err = NewGameLibraryBubble(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_libraryplayback") ; err != nil {
+ return nil, err
+ }
+ if tables.LibraryPlayBack, err = NewGameLibraryPlayBack(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_robot") ; err != nil {
+ return nil, err
+ }
+ if tables.Robot, err = NewGameRobot(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_ip") ; err != nil {
+ return nil, err
+ }
+ if tables.Ip, err = NewGameIp(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_gamecolor") ; err != nil {
+ return nil, err
+ }
+ 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
+ }
+ if buf, err = loader("game_heroconvertdata") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroConvertdata, err = NewGameHeroConvertdata(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_linestorytimeline") ; err != nil {
+ return nil, err
+ }
+ if tables.LinestoryTimeLine, err = NewGameLinestoryTimeLine(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_linestorymaintask") ; err != nil {
+ return nil, err
+ }
+ if tables.LinestoryMainTask, err = NewGameLinestoryMainTask(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_captaintext") ; err != nil {
+ return nil, err
+ }
+ if tables.Captaintext, err = NewGameCaptaintext(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_herofusion") ; err != nil {
+ return nil, err
+ }
+ if tables.Herofusion, err = NewGameHerofusion(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_playerinfor") ; err != nil {
+ return nil, err
+ }
+ if tables.PlayerInfor, err = NewGamePlayerInfor(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_herotalent") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroTalent, err = NewGameHeroTalent(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_talentskill") ; err != nil {
+ return nil, err
+ }
+ if tables.TalentSkill, err = NewGameTalentSkill(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_arenabuychallenge") ; err != nil {
+ return nil, err
+ }
+ if tables.ArenaBuyChallenge, err = NewGameArenaBuyChallenge(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_arenaactivereward") ; err != nil {
+ return nil, err
+ }
+ if tables.ArenaActiveReward, err = NewGameArenaActiveReward(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_arenarobot") ; err != nil {
+ return nil, err
+ }
+ if tables.ArenaRobot, err = NewGameArenaRobot(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_arenarankreward") ; err != nil {
+ return nil, err
+ }
+ if tables.ArenaRankReward, err = NewGameArenaRankReward(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_arenachallengenpc") ; err != nil {
+ return nil, err
+ }
+ if tables.ArenaChallengeNpc, err = NewGameArenaChallengeNpc(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_itembox") ; err != nil {
+ return nil, err
+ }
+ if tables.ItemBox, err = NewGameItemBox(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_show") ; err != nil {
+ return nil, err
+ }
+ if tables.Show, err = NewGameShow(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_guildlv") ; err != nil {
+ return nil, err
+ }
+ if tables.GuildLv, err = NewGameGuildLv(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_guildpng") ; err != nil {
+ return nil, err
+ }
+ if tables.GuildPng, err = NewGameGuildPng(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_guildactivity") ; err != nil {
+ return nil, err
+ }
+ if tables.GuildActivity, err = NewGameGuildActivity(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_guildsign") ; err != nil {
+ return nil, err
+ }
+ if tables.GuildSign, err = NewGameGuildSign(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_guildtask") ; err != nil {
+ return nil, err
+ }
+ if tables.GuildTask, err = NewGameGuildTask(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_trollrule") ; err != nil {
+ return nil, err
+ }
+ if tables.TrollRule, err = NewGameTrollRule(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_trollgoods") ; err != nil {
+ return nil, err
+ }
+ if tables.TrollGoods, err = NewGameTrollGoods(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_trolltrain") ; err != nil {
+ return nil, err
+ }
+ if tables.TrollTrain, err = NewGameTrollTrain(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_trolllv") ; err != nil {
+ return nil, err
+ }
+ if tables.TrollLv, err = NewGameTrollLv(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_trollcoefficient") ; err != nil {
+ return nil, err
+ }
+ if tables.TrollCoefficient, err = NewGameTrollCoefficient(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_proboss") ; err != nil {
+ return nil, err
+ }
+ if tables.ProBoss, err = NewGameProBoss(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_prochallenge") ; err != nil {
+ return nil, err
+ }
+ if tables.ProChallenge, err = NewGameProChallenge(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_prolineup") ; err != nil {
+ return nil, err
+ }
+ if tables.ProLineup, err = NewGameProLineup(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_probossskill") ; err != nil {
+ return nil, err
+ }
+ if tables.ProBossskill, err = NewGameProBossskill(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_horoscope") ; err != nil {
+ return nil, err
+ }
+ if tables.Horoscope, err = NewGameHoroscope(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_sign") ; err != nil {
+ return nil, err
+ }
+ if tables.Sign, err = NewGameSign(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_signreset") ; err != nil {
+ return nil, err
+ }
+ if tables.SignReset, err = NewGameSignReset(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_growtask") ; err != nil {
+ return nil, err
+ }
+ if tables.GrowTask, err = NewGameGrowTask(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_growreward") ; err != nil {
+ return nil, err
+ }
+ if tables.GrowReward, err = NewGameGrowReward(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_recharge") ; err != nil {
+ return nil, err
+ }
+ if tables.Recharge, err = NewGameRecharge(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_privilegecard") ; err != nil {
+ return nil, err
+ }
+ if tables.PrivilegeCard, err = NewGamePrivilegeCard(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_privilege") ; err != nil {
+ return nil, err
+ }
+ if tables.Privilege, err = NewGamePrivilege(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_worldtask") ; err != nil {
+ return nil, err
+ }
+ if tables.WorldTask, err = NewGameWorldTask(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_taskcond") ; err != nil {
+ return nil, err
+ }
+ if tables.TaskCond, err = NewGameTaskCond(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_tasktype") ; err != nil {
+ return nil, err
+ }
+ if tables.TaskType, err = NewGameTaskType(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_teaching") ; err != nil {
+ return nil, err
+ }
+ if tables.Teaching, err = NewGameTeaching(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_herostrategy") ; err != nil {
+ return nil, err
+ }
+ if tables.HeroStrategy, err = NewGameHeroStrategy(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_teachtask") ; err != nil {
+ return nil, err
+ }
+ if tables.TeachTask, err = NewGameTeachTask(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_paypackage") ; err != nil {
+ return nil, err
+ }
+ if tables.PayPackage, err = NewGamePayPackage(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_worldbattle") ; err != nil {
+ return nil, err
+ }
+ if tables.WorldBattle, err = NewGameWorldBattle(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_reddot") ; err != nil {
+ return nil, err
+ }
+ if tables.RedDot, err = NewGameRedDot(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_reddottalkid") ; err != nil {
+ return nil, err
+ }
+ if tables.RedDotTalkid, err = NewGameRedDotTalkid(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_passcheck") ; err != nil {
return nil, err
}
if tables.PassCheck, err = NewGamePassCheck(buf) ; err != nil {
return nil, err
}
- return tables, nil
+ if buf, err = loader("game_mail") ; err != nil {
+ return nil, err
+ }
+ if tables.Mail, err = NewGameMail(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_combatlevel") ; err != nil {
+ return nil, err
+ }
+ if tables.CombatLevel, err = NewGameCombatLevel(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_combatmanster") ; err != nil {
+ return nil, err
+ }
+ if tables.CombatManster, err = NewGameCombatManster(buf) ; err != nil {
+ return nil, err
+ }
+ return tables, nil
}
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index f285f8767..b82e4b2f7 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -126,6 +126,7 @@ type GameGlobalData struct {
RunHorsetime2 int32
BoyHeadPortrait string
GirlHeadPortrait string
+ Namecolor string
}
const TypeId_GameGlobalData = 477542761
@@ -497,6 +498,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["run_horsetime2"].(float64); !_ok_ { err = errors.New("run_horsetime2 error"); return }; _v.RunHorsetime2 = int32(_tempNum_) }
{ var _ok_ bool; if _v.BoyHeadPortrait, _ok_ = _buf["boy_headPortrait"].(string); !_ok_ { err = errors.New("boy_headPortrait error"); return } }
{ var _ok_ bool; if _v.GirlHeadPortrait, _ok_ = _buf["girl_headPortrait"].(string); !_ok_ { err = errors.New("girl_headPortrait error"); return } }
+ { var _ok_ bool; if _v.Namecolor, _ok_ = _buf["namecolor"].(string); !_ok_ { err = errors.New("namecolor error"); return } }
return
}
diff --git a/sys/configure/structs/game.heroAwakenData.go b/sys/configure/structs/game.heroAwakenData.go
index 5366f5e7b..bf3c695a2 100644
--- a/sys/configure/structs/game.heroAwakenData.go
+++ b/sys/configure/structs/game.heroAwakenData.go
@@ -18,6 +18,7 @@ type GameHeroAwakenData struct {
Icon string
Condition int32
Phaseneed []*Gameatn
+ Awakenup []*Gameatn
}
const TypeId_GameHeroAwakenData = -1145673751
@@ -60,6 +61,20 @@ func (_v *GameHeroAwakenData)Deserialize(_buf map[string]interface{}) (err error
}
}
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["awakenup"].([]interface{}); !_ok_ { err = errors.New("awakenup error"); return }
+
+ _v.Awakenup = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Awakenup = append(_v.Awakenup, _list_v_)
+ }
+ }
+
return
}
diff --git a/sys/configure/structs/game.shopitemData.go b/sys/configure/structs/game.shopitemData.go
index 789e31f4d..bc47bec17 100644
--- a/sys/configure/structs/game.shopitemData.go
+++ b/sys/configure/structs/game.shopitemData.go
@@ -11,223 +11,92 @@ package cfg
import "errors"
type GameShopitemData struct {
- Key int32
- Id int32
- Iteminfo []*Gameatn
- Preview bool
- Probability int32
- Need []*Gameatn
- Sale int32
- Salelist []int32
- Buyminnum int32
- Buymaxnum int32
- Vip int32
- Lvmin int32
- Lvmax int32
- Mapidmin int32
- Mapidmax int32
+ Key int32
+ Id int32
+ Iteminfo []*Gameatn
+ Preview bool
+ Probability int32
+ Need []*Gameatn
+ Sale int32
+ Salelist []int32
+ Buyminnum int32
+ Buymaxnum int32
+ Vip int32
+ Lvmin int32
+ Lvmax int32
+ Mapidmin int32
+ Mapidmax int32
}
const TypeId_GameShopitemData = 491491023
func (*GameShopitemData) GetTypeId() int32 {
- return 491491023
+ return 491491023
}
-func (_v *GameShopitemData) Deserialize(_buf map[string]interface{}) (err error) {
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ {
- err = errors.New("key error")
- return
- }
- _v.Key = int32(_tempNum_)
- }
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ {
- err = errors.New("id error")
- return
- }
- _v.Id = int32(_tempNum_)
- }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["iteminfo"].([]interface{}); !_ok_ {
- err = errors.New("iteminfo error")
- return
- }
+func (_v *GameShopitemData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["iteminfo"].([]interface{}); !_ok_ { err = errors.New("iteminfo error"); return }
- _v.Iteminfo = make([]*Gameatn, 0, len(_arr_))
+ _v.Iteminfo = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Iteminfo = append(_v.Iteminfo, _list_v_)
+ }
+ }
- for _, _e_ := range _arr_ {
- var _list_v_ *Gameatn
- {
- var _ok_ bool
- var _x_ map[string]interface{}
- if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ {
- err = errors.New("_list_v_ error")
- return
- }
- if _list_v_, err = DeserializeGameatn(_x_); err != nil {
- return
- }
- }
- _v.Iteminfo = append(_v.Iteminfo, _list_v_)
- }
- }
+ { var _ok_ bool; if _v.Preview, _ok_ = _buf["preview"].(bool); !_ok_ { err = errors.New("preview error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["need"].([]interface{}); !_ok_ { err = errors.New("need error"); return }
- {
- var _ok_ bool
- if _v.Preview, _ok_ = _buf["preview"].(bool); !_ok_ {
- err = errors.New("preview error")
- return
- }
- }
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ {
- err = errors.New("probability error")
- return
- }
- _v.Probability = int32(_tempNum_)
- }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["need"].([]interface{}); !_ok_ {
- err = errors.New("need error")
- return
- }
+ _v.Need = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Need = append(_v.Need, _list_v_)
+ }
+ }
- _v.Need = make([]*Gameatn, 0, len(_arr_))
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sale"].(float64); !_ok_ { err = errors.New("sale error"); return }; _v.Sale = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["salelist"].([]interface{}); !_ok_ { err = errors.New("salelist error"); return }
- for _, _e_ := range _arr_ {
- var _list_v_ *Gameatn
- {
- var _ok_ bool
- var _x_ map[string]interface{}
- if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ {
- err = errors.New("_list_v_ error")
- return
- }
- if _list_v_, err = DeserializeGameatn(_x_); err != nil {
- return
- }
- }
- _v.Need = append(_v.Need, _list_v_)
- }
- }
+ _v.Salelist = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Salelist = append(_v.Salelist, _list_v_)
+ }
+ }
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["sale"].(float64); !_ok_ {
- err = errors.New("sale error")
- return
- }
- _v.Sale = int32(_tempNum_)
- }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["salelist"].([]interface{}); !_ok_ {
- err = errors.New("salelist error")
- return
- }
-
- _v.Salelist = make([]int32, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ int32
- {
- var _ok_ bool
- var _x_ float64
- if _x_, _ok_ = _e_.(float64); !_ok_ {
- err = errors.New("_list_v_ error")
- return
- }
- _list_v_ = int32(_x_)
- }
- _v.Salelist = append(_v.Salelist, _list_v_)
- }
- }
-
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["buyminnum"].(float64); !_ok_ {
- err = errors.New("buyminnum error")
- return
- }
- _v.Buyminnum = int32(_tempNum_)
- }
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["buymaxnum"].(float64); !_ok_ {
- err = errors.New("buymaxnum error")
- return
- }
- _v.Buymaxnum = int32(_tempNum_)
- }
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["vip"].(float64); !_ok_ {
- err = errors.New("vip error")
- return
- }
- _v.Vip = int32(_tempNum_)
- }
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["lvmin"].(float64); !_ok_ {
- err = errors.New("lvmin error")
- return
- }
- _v.Lvmin = int32(_tempNum_)
- }
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["lvmax"].(float64); !_ok_ {
- err = errors.New("lvmax error")
- return
- }
- _v.Lvmax = int32(_tempNum_)
- }
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["mapidmin"].(float64); !_ok_ {
- err = errors.New("mapidmin error")
- return
- }
- _v.Mapidmin = int32(_tempNum_)
- }
- {
- var _ok_ bool
- var _tempNum_ float64
- if _tempNum_, _ok_ = _buf["mapidmax"].(float64); !_ok_ {
- err = errors.New("mapidmax error")
- return
- }
- _v.Mapidmax = int32(_tempNum_)
- }
- return
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buyminnum"].(float64); !_ok_ { err = errors.New("buyminnum error"); return }; _v.Buyminnum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buymaxnum"].(float64); !_ok_ { err = errors.New("buymaxnum error"); return }; _v.Buymaxnum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["vip"].(float64); !_ok_ { err = errors.New("vip error"); return }; _v.Vip = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lvmin"].(float64); !_ok_ { err = errors.New("lvmin error"); return }; _v.Lvmin = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lvmax"].(float64); !_ok_ { err = errors.New("lvmax error"); return }; _v.Lvmax = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mapidmin"].(float64); !_ok_ { err = errors.New("mapidmin error"); return }; _v.Mapidmin = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mapidmax"].(float64); !_ok_ { err = errors.New("mapidmax error"); return }; _v.Mapidmax = int32(_tempNum_) }
+ return
}
func DeserializeGameShopitemData(_buf map[string]interface{}) (*GameShopitemData, error) {
- v := &GameShopitemData{}
- if err := v.Deserialize(_buf); err == nil {
- return v, nil
- } else {
- return nil, err
- }
+ v := &GameShopitemData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
}
diff --git a/sys/configure/structs/game.skillAfteratkData.go b/sys/configure/structs/game.skillAfteratkData.go
index b91e3df99..76831e39d 100644
--- a/sys/configure/structs/game.skillAfteratkData.go
+++ b/sys/configure/structs/game.skillAfteratkData.go
@@ -14,7 +14,7 @@ type GameSkillAfteratkData struct {
Id int32
EmitPR int32
From int32
- Where string
+ Where []string
Order string
Limit int32
ExecuteCnt int32
@@ -36,7 +36,20 @@ func (_v *GameSkillAfteratkData)Deserialize(_buf map[string]interface{}) (err er
{ 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["EmitPR"].(float64); !_ok_ { err = errors.New("EmitPR error"); return }; _v.EmitPR = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["From"].(float64); !_ok_ { err = errors.New("From error"); return }; _v.From = int32(_tempNum_) }
- { var _ok_ bool; if _v.Where, _ok_ = _buf["Where"].(string); !_ok_ { err = errors.New("Where error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["Where"].([]interface{}); !_ok_ { err = errors.New("Where error"); return }
+
+ _v.Where = make([]string, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+ _v.Where = append(_v.Where, _list_v_)
+ }
+ }
+
{ var _ok_ bool; if _v.Order, _ok_ = _buf["Order"].(string); !_ok_ { err = errors.New("Order error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Limit"].(float64); !_ok_ { err = errors.New("Limit error"); return }; _v.Limit = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ExecuteCnt"].(float64); !_ok_ { err = errors.New("ExecuteCnt error"); return }; _v.ExecuteCnt = int32(_tempNum_) }
diff --git a/sys/configure/structs/game.skillAtkData.go b/sys/configure/structs/game.skillAtkData.go
index 4667cdad8..789bb5ae2 100644
--- a/sys/configure/structs/game.skillAtkData.go
+++ b/sys/configure/structs/game.skillAtkData.go
@@ -17,6 +17,7 @@ type GameSkillAtkData struct {
UnavailablePlayTypes []int32
Name string
Ico string
+ CorrectPos int32
Act string
Type int32
CD int32
@@ -53,6 +54,7 @@ func (_v *GameSkillAtkData)Deserialize(_buf map[string]interface{}) (err error)
{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 } } }
{ var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CorrectPos"].(float64); !_ok_ { err = errors.New("CorrectPos error"); return }; _v.CorrectPos = int32(_tempNum_) }
{ var _ok_ bool; if _v.Act, _ok_ = _buf["act"].(string); !_ok_ { err = errors.New("act error"); return } }
{ 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["CD"].(float64); !_ok_ { err = errors.New("CD error"); return }; _v.CD = int32(_tempNum_) }