diff --git a/bin/json/game_buzkashifm.json b/bin/json/game_buzkashifm.json
new file mode 100644
index 000000000..682df8df7
--- /dev/null
+++ b/bin/json/game_buzkashifm.json
@@ -0,0 +1,102 @@
+[
+ {
+ "num": 1,
+ "type": 1,
+ "stime": "碰撞障碍时",
+ "broadcast": {
+ "key": "itemname_30001",
+ "text": "这招太狠了，希望没有人受伤"
+ },
+ "icon": ""
+ },
+ {
+ "num": 2,
+ "type": 1,
+ "stime": "碰撞障碍时",
+ "broadcast": {
+ "key": "itemname_30001",
+ "text": "这招太狠了，希望没有人受伤"
+ },
+ "icon": ""
+ },
+ {
+ "num": 3,
+ "type": 2,
+ "stime": "闪避障碍时",
+ "broadcast": {
+ "key": "itemname_30002",
+ "text": "大放异彩！"
+ },
+ "icon": ""
+ },
+ {
+ "num": 4,
+ "type": 3,
+ "stime": "射门成功",
+ "broadcast": {
+ "key": "itemname_30003",
+ "text": "完美的配合！"
+ },
+ "icon": ""
+ },
+ {
+ "num": 5,
+ "type": 4,
+ "stime": "射门失败",
+ "broadcast": {
+ "key": "itemname_30004",
+ "text": "这招太狠了，希望没有人受伤"
+ },
+ "icon": ""
+ },
+ {
+ "num": 6,
+ "type": 5,
+ "stime": "使用药剂",
+ "broadcast": {
+ "key": "itemname_30005",
+ "text": "大放异彩！"
+ },
+ "icon": ""
+ },
+ {
+ "num": 7,
+ "type": 6,
+ "stime": "团队冲刺",
+ "broadcast": {
+ "key": "itemname_50001",
+ "text": "完美的配合！"
+ },
+ "icon": ""
+ },
+ {
+ "num": 8,
+ "type": 7,
+ "stime": "死亡",
+ "broadcast": {
+ "key": "itemname_50001",
+ "text": "这招太狠了，希望没有人受伤"
+ },
+ "icon": ""
+ },
+ {
+ "num": 9,
+ "type": 8,
+ "stime": "使用道具",
+ "broadcast": {
+ "key": "itemname_50001",
+ "text": "大放异彩！"
+ },
+ "icon": ""
+ },
+ {
+ "num": 10,
+ "type": 9,
+ "stime": "射门时",
+ "broadcast": {
+ "key": "itemname_50001",
+ "text": "完美的配合！"
+ },
+ "icon": ""
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_buzkashigrade.json b/bin/json/game_buzkashigrade.json
index a673dd940..5777e7c27 100644
--- a/bin/json/game_buzkashigrade.json
+++ b/bin/json/game_buzkashigrade.json
@@ -2,21 +2,21 @@
{
"num": 1,
"distance": "1",
- "value": 2
+ "value": 8
},
{
"num": 2,
"distance": "2",
- "value": 4
+ "value": 6
},
{
"num": 3,
"distance": "3",
- "value": 6
+ "value": 4
},
{
"num": 4,
"distance": "4",
- "value": 8
+ "value": 2
}
]
\ No newline at end of file
diff --git a/bin/json/game_buzkashiopen.json b/bin/json/game_buzkashiopen.json
index f005ec1ee..cac0a1795 100644
--- a/bin/json/game_buzkashiopen.json
+++ b/bin/json/game_buzkashiopen.json
@@ -1,122 +1,170 @@
[
{
"num": 1,
- "stime": "1899/12/31 0:30:00",
- "etime": "1899/12/31 0:50:00"
+ "shtime": 0,
+ "smtime": 30,
+ "ehtime": 0,
+ "emtime": 50
},
{
"num": 2,
- "stime": "1899/12/31 1:30:00",
- "etime": "1899/12/31 1:50:00"
+ "shtime": 1,
+ "smtime": 30,
+ "ehtime": 1,
+ "emtime": 50
},
{
"num": 3,
- "stime": "1899/12/31 2:30:00",
- "etime": "1899/12/31 2:50:00"
+ "shtime": 2,
+ "smtime": 30,
+ "ehtime": 2,
+ "emtime": 50
},
{
"num": 4,
- "stime": "1899/12/31 3:30:00",
- "etime": "1899/12/31 3:50:00"
+ "shtime": 3,
+ "smtime": 30,
+ "ehtime": 3,
+ "emtime": 50
},
{
"num": 5,
- "stime": "1899/12/31 4:30:00",
- "etime": "1899/12/31 4:50:00"
+ "shtime": 4,
+ "smtime": 30,
+ "ehtime": 4,
+ "emtime": 50
},
{
"num": 6,
- "stime": "1899/12/31 5:30:00",
- "etime": "1899/12/31 5:50:00"
+ "shtime": 5,
+ "smtime": 30,
+ "ehtime": 5,
+ "emtime": 50
},
{
"num": 7,
- "stime": "1899/12/31 6:30:00",
- "etime": "1899/12/31 6:50:00"
+ "shtime": 6,
+ "smtime": 30,
+ "ehtime": 6,
+ "emtime": 50
},
{
"num": 8,
- "stime": "1899/12/31 7:30:00",
- "etime": "1899/12/31 7:50:00"
+ "shtime": 7,
+ "smtime": 30,
+ "ehtime": 7,
+ "emtime": 50
},
{
"num": 9,
- "stime": "1899/12/31 8:30:00",
- "etime": "1899/12/31 8:50:00"
+ "shtime": 8,
+ "smtime": 30,
+ "ehtime": 8,
+ "emtime": 50
},
{
"num": 10,
- "stime": "1899/12/31 9:30:00",
- "etime": "1899/12/31 9:50:00"
+ "shtime": 9,
+ "smtime": 30,
+ "ehtime": 9,
+ "emtime": 50
},
{
"num": 11,
- "stime": "1899/12/31 10:30:00",
- "etime": "1899/12/31 10:50:00"
+ "shtime": 10,
+ "smtime": 30,
+ "ehtime": 10,
+ "emtime": 50
},
{
"num": 12,
- "stime": "1899/12/31 11:30:00",
- "etime": "1899/12/31 11:50:00"
+ "shtime": 11,
+ "smtime": 30,
+ "ehtime": 11,
+ "emtime": 50
},
{
"num": 13,
- "stime": "1899/12/31 12:30:00",
- "etime": "1899/12/31 12:50:00"
+ "shtime": 12,
+ "smtime": 30,
+ "ehtime": 12,
+ "emtime": 50
},
{
"num": 14,
- "stime": "1899/12/31 13:30:00",
- "etime": "1899/12/31 13:50:00"
+ "shtime": 13,
+ "smtime": 30,
+ "ehtime": 13,
+ "emtime": 50
},
{
"num": 15,
- "stime": "1899/12/31 14:30:00",
- "etime": "1899/12/31 14:50:00"
+ "shtime": 14,
+ "smtime": 30,
+ "ehtime": 14,
+ "emtime": 50
},
{
"num": 16,
- "stime": "1899/12/31 15:30:00",
- "etime": "1899/12/31 15:50:00"
+ "shtime": 15,
+ "smtime": 30,
+ "ehtime": 15,
+ "emtime": 50
},
{
"num": 17,
- "stime": "1899/12/31 16:30:00",
- "etime": "1899/12/31 16:50:00"
+ "shtime": 16,
+ "smtime": 30,
+ "ehtime": 16,
+ "emtime": 50
},
{
"num": 18,
- "stime": "1899/12/31 17:30:00",
- "etime": "1899/12/31 17:50:00"
+ "shtime": 17,
+ "smtime": 30,
+ "ehtime": 17,
+ "emtime": 50
},
{
"num": 19,
- "stime": "1899/12/31 18:30:00",
- "etime": "1899/12/31 18:50:00"
+ "shtime": 18,
+ "smtime": 30,
+ "ehtime": 18,
+ "emtime": 50
},
{
"num": 20,
- "stime": "1899/12/31 19:30:00",
- "etime": "1899/12/31 19:50:00"
+ "shtime": 19,
+ "smtime": 30,
+ "ehtime": 19,
+ "emtime": 50
},
{
"num": 21,
- "stime": "1899/12/31 20:30:00",
- "etime": "1899/12/31 20:50:00"
+ "shtime": 20,
+ "smtime": 30,
+ "ehtime": 20,
+ "emtime": 50
},
{
"num": 22,
- "stime": "1899/12/31 21:30:00",
- "etime": "1899/12/31 21:50:00"
+ "shtime": 21,
+ "smtime": 30,
+ "ehtime": 21,
+ "emtime": 50
},
{
"num": 23,
- "stime": "1899/12/31 22:30:00",
- "etime": "1899/12/31 22:50:00"
+ "shtime": 22,
+ "smtime": 30,
+ "ehtime": 22,
+ "emtime": 50
},
{
"num": 24,
- "stime": "1899/12/31 23:30:00",
- "etime": "1899/12/31 23:50:00"
+ "shtime": 23,
+ "smtime": 30,
+ "ehtime": 23,
+ "emtime": 50
}
]
\ No newline at end of file
diff --git a/bin/json/game_camplv.json b/bin/json/game_camplv.json
index b7178514d..adad29886 100644
--- a/bin/json/game_camplv.json
+++ b/bin/json/game_camplv.json
@@ -1,9 +1,9 @@
[
{
"id": 1,
- "reputation_lv": 0,
+ "reputation_lv": 1,
"raceType": 1,
- "reputation_exp": 0,
+ "reputation_exp": 20,
"Reward": {
"a": "attr",
"t": "talent1",
@@ -12,9 +12,9 @@
},
{
"id": 2,
- "reputation_lv": 1,
+ "reputation_lv": 2,
"raceType": 1,
- "reputation_exp": 20,
+ "reputation_exp": 30,
"Reward": {
"a": "attr",
"t": "talent1",
@@ -23,9 +23,9 @@
},
{
"id": 3,
- "reputation_lv": 2,
+ "reputation_lv": 3,
"raceType": 1,
- "reputation_exp": 30,
+ "reputation_exp": 40,
"Reward": {
"a": "attr",
"t": "talent1",
@@ -34,9 +34,9 @@
},
{
"id": 4,
- "reputation_lv": 3,
+ "reputation_lv": 4,
"raceType": 1,
- "reputation_exp": 40,
+ "reputation_exp": 50,
"Reward": {
"a": "attr",
"t": "talent1",
@@ -45,9 +45,9 @@
},
{
"id": 5,
- "reputation_lv": 4,
+ "reputation_lv": 5,
"raceType": 1,
- "reputation_exp": 50,
+ "reputation_exp": 60,
"Reward": {
"a": "attr",
"t": "talent1",
@@ -56,9 +56,9 @@
},
{
"id": 6,
- "reputation_lv": 5,
+ "reputation_lv": 6,
"raceType": 1,
- "reputation_exp": 60,
+ "reputation_exp": 70,
"Reward": {
"a": "attr",
"t": "talent1",
@@ -67,9 +67,9 @@
},
{
"id": 7,
- "reputation_lv": 6,
+ "reputation_lv": 7,
"raceType": 1,
- "reputation_exp": 70,
+ "reputation_exp": 80,
"Reward": {
"a": "attr",
"t": "talent1",
@@ -78,20 +78,20 @@
},
{
"id": 8,
- "reputation_lv": 7,
+ "reputation_lv": 8,
"raceType": 1,
- "reputation_exp": 80,
+ "reputation_exp": 90,
"Reward": {
"a": "attr",
- "t": "talent1",
+ "t": "talent2",
"n": 1
}
},
{
"id": 9,
- "reputation_lv": 8,
+ "reputation_lv": 9,
"raceType": 1,
- "reputation_exp": 90,
+ "reputation_exp": 100,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -100,9 +100,9 @@
},
{
"id": 10,
- "reputation_lv": 9,
+ "reputation_lv": 10,
"raceType": 1,
- "reputation_exp": 100,
+ "reputation_exp": 110,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -111,9 +111,9 @@
},
{
"id": 11,
- "reputation_lv": 10,
+ "reputation_lv": 11,
"raceType": 1,
- "reputation_exp": 110,
+ "reputation_exp": 120,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -122,9 +122,9 @@
},
{
"id": 12,
- "reputation_lv": 11,
+ "reputation_lv": 12,
"raceType": 1,
- "reputation_exp": 120,
+ "reputation_exp": 130,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -133,9 +133,9 @@
},
{
"id": 13,
- "reputation_lv": 12,
+ "reputation_lv": 13,
"raceType": 1,
- "reputation_exp": 130,
+ "reputation_exp": 140,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -144,9 +144,9 @@
},
{
"id": 14,
- "reputation_lv": 13,
+ "reputation_lv": 14,
"raceType": 1,
- "reputation_exp": 140,
+ "reputation_exp": 150,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -155,9 +155,9 @@
},
{
"id": 15,
- "reputation_lv": 14,
+ "reputation_lv": 15,
"raceType": 1,
- "reputation_exp": 150,
+ "reputation_exp": 160,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -166,9 +166,9 @@
},
{
"id": 16,
- "reputation_lv": 15,
+ "reputation_lv": 16,
"raceType": 1,
- "reputation_exp": 160,
+ "reputation_exp": 170,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -177,9 +177,9 @@
},
{
"id": 17,
- "reputation_lv": 16,
+ "reputation_lv": 17,
"raceType": 1,
- "reputation_exp": 170,
+ "reputation_exp": 180,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -188,9 +188,9 @@
},
{
"id": 18,
- "reputation_lv": 17,
+ "reputation_lv": 18,
"raceType": 1,
- "reputation_exp": 180,
+ "reputation_exp": 190,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -199,9 +199,9 @@
},
{
"id": 19,
- "reputation_lv": 18,
+ "reputation_lv": 19,
"raceType": 1,
- "reputation_exp": 190,
+ "reputation_exp": 200,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -210,9 +210,9 @@
},
{
"id": 20,
- "reputation_lv": 19,
+ "reputation_lv": 20,
"raceType": 1,
- "reputation_exp": 200,
+ "reputation_exp": 210,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -221,9 +221,9 @@
},
{
"id": 21,
- "reputation_lv": 20,
- "raceType": 1,
- "reputation_exp": 210,
+ "reputation_lv": 1,
+ "raceType": 2,
+ "reputation_exp": 20,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -232,9 +232,9 @@
},
{
"id": 22,
- "reputation_lv": 0,
+ "reputation_lv": 2,
"raceType": 2,
- "reputation_exp": 0,
+ "reputation_exp": 30,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -243,9 +243,9 @@
},
{
"id": 23,
- "reputation_lv": 1,
+ "reputation_lv": 3,
"raceType": 2,
- "reputation_exp": 20,
+ "reputation_exp": 40,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -254,9 +254,9 @@
},
{
"id": 24,
- "reputation_lv": 2,
+ "reputation_lv": 4,
"raceType": 2,
- "reputation_exp": 30,
+ "reputation_exp": 50,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -265,9 +265,9 @@
},
{
"id": 25,
- "reputation_lv": 3,
+ "reputation_lv": 5,
"raceType": 2,
- "reputation_exp": 40,
+ "reputation_exp": 60,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -276,9 +276,9 @@
},
{
"id": 26,
- "reputation_lv": 4,
+ "reputation_lv": 6,
"raceType": 2,
- "reputation_exp": 50,
+ "reputation_exp": 70,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -287,9 +287,9 @@
},
{
"id": 27,
- "reputation_lv": 5,
+ "reputation_lv": 7,
"raceType": 2,
- "reputation_exp": 60,
+ "reputation_exp": 80,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -298,9 +298,9 @@
},
{
"id": 28,
- "reputation_lv": 6,
+ "reputation_lv": 8,
"raceType": 2,
- "reputation_exp": 70,
+ "reputation_exp": 90,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -309,9 +309,9 @@
},
{
"id": 29,
- "reputation_lv": 7,
+ "reputation_lv": 9,
"raceType": 2,
- "reputation_exp": 80,
+ "reputation_exp": 100,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -320,9 +320,9 @@
},
{
"id": 30,
- "reputation_lv": 8,
+ "reputation_lv": 10,
"raceType": 2,
- "reputation_exp": 90,
+ "reputation_exp": 110,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -331,9 +331,9 @@
},
{
"id": 31,
- "reputation_lv": 9,
+ "reputation_lv": 11,
"raceType": 2,
- "reputation_exp": 100,
+ "reputation_exp": 120,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -342,9 +342,9 @@
},
{
"id": 32,
- "reputation_lv": 10,
+ "reputation_lv": 12,
"raceType": 2,
- "reputation_exp": 110,
+ "reputation_exp": 130,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -353,9 +353,9 @@
},
{
"id": 33,
- "reputation_lv": 11,
+ "reputation_lv": 13,
"raceType": 2,
- "reputation_exp": 120,
+ "reputation_exp": 140,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -364,9 +364,9 @@
},
{
"id": 34,
- "reputation_lv": 12,
+ "reputation_lv": 14,
"raceType": 2,
- "reputation_exp": 130,
+ "reputation_exp": 150,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -375,9 +375,9 @@
},
{
"id": 35,
- "reputation_lv": 13,
+ "reputation_lv": 15,
"raceType": 2,
- "reputation_exp": 140,
+ "reputation_exp": 160,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -386,9 +386,9 @@
},
{
"id": 36,
- "reputation_lv": 14,
+ "reputation_lv": 16,
"raceType": 2,
- "reputation_exp": 150,
+ "reputation_exp": 170,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -397,9 +397,9 @@
},
{
"id": 37,
- "reputation_lv": 15,
+ "reputation_lv": 17,
"raceType": 2,
- "reputation_exp": 160,
+ "reputation_exp": 180,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -408,9 +408,9 @@
},
{
"id": 38,
- "reputation_lv": 16,
+ "reputation_lv": 18,
"raceType": 2,
- "reputation_exp": 170,
+ "reputation_exp": 190,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -419,9 +419,9 @@
},
{
"id": 39,
- "reputation_lv": 17,
+ "reputation_lv": 19,
"raceType": 2,
- "reputation_exp": 180,
+ "reputation_exp": 200,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -430,9 +430,9 @@
},
{
"id": 40,
- "reputation_lv": 18,
+ "reputation_lv": 20,
"raceType": 2,
- "reputation_exp": 190,
+ "reputation_exp": 210,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -441,9 +441,9 @@
},
{
"id": 41,
- "reputation_lv": 19,
- "raceType": 2,
- "reputation_exp": 200,
+ "reputation_lv": 1,
+ "raceType": 3,
+ "reputation_exp": 20,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -452,9 +452,9 @@
},
{
"id": 42,
- "reputation_lv": 20,
- "raceType": 2,
- "reputation_exp": 210,
+ "reputation_lv": 2,
+ "raceType": 3,
+ "reputation_exp": 30,
"Reward": {
"a": "attr",
"t": "talent2",
@@ -463,39 +463,6 @@
},
{
"id": 43,
- "reputation_lv": 0,
- "raceType": 3,
- "reputation_exp": 0,
- "Reward": {
- "a": "attr",
- "t": "talent2",
- "n": 1
- }
- },
- {
- "id": 44,
- "reputation_lv": 1,
- "raceType": 3,
- "reputation_exp": 20,
- "Reward": {
- "a": "attr",
- "t": "talent2",
- "n": 1
- }
- },
- {
- "id": 45,
- "reputation_lv": 2,
- "raceType": 3,
- "reputation_exp": 30,
- "Reward": {
- "a": "attr",
- "t": "talent2",
- "n": 1
- }
- },
- {
- "id": 46,
"reputation_lv": 3,
"raceType": 3,
"reputation_exp": 40,
@@ -506,7 +473,7 @@
}
},
{
- "id": 47,
+ "id": 44,
"reputation_lv": 4,
"raceType": 3,
"reputation_exp": 50,
@@ -517,7 +484,7 @@
}
},
{
- "id": 48,
+ "id": 45,
"reputation_lv": 5,
"raceType": 3,
"reputation_exp": 60,
@@ -528,7 +495,7 @@
}
},
{
- "id": 49,
+ "id": 46,
"reputation_lv": 6,
"raceType": 3,
"reputation_exp": 70,
@@ -539,7 +506,7 @@
}
},
{
- "id": 50,
+ "id": 47,
"reputation_lv": 7,
"raceType": 3,
"reputation_exp": 80,
@@ -550,7 +517,7 @@
}
},
{
- "id": 51,
+ "id": 48,
"reputation_lv": 8,
"raceType": 3,
"reputation_exp": 90,
@@ -561,7 +528,7 @@
}
},
{
- "id": 52,
+ "id": 49,
"reputation_lv": 9,
"raceType": 3,
"reputation_exp": 100,
@@ -572,7 +539,7 @@
}
},
{
- "id": 53,
+ "id": 50,
"reputation_lv": 10,
"raceType": 3,
"reputation_exp": 110,
@@ -583,7 +550,7 @@
}
},
{
- "id": 54,
+ "id": 51,
"reputation_lv": 11,
"raceType": 3,
"reputation_exp": 120,
@@ -594,7 +561,7 @@
}
},
{
- "id": 55,
+ "id": 52,
"reputation_lv": 12,
"raceType": 3,
"reputation_exp": 130,
@@ -605,7 +572,7 @@
}
},
{
- "id": 56,
+ "id": 53,
"reputation_lv": 13,
"raceType": 3,
"reputation_exp": 140,
@@ -616,7 +583,7 @@
}
},
{
- "id": 57,
+ "id": 54,
"reputation_lv": 14,
"raceType": 3,
"reputation_exp": 150,
@@ -627,7 +594,7 @@
}
},
{
- "id": 58,
+ "id": 55,
"reputation_lv": 15,
"raceType": 3,
"reputation_exp": 160,
@@ -638,7 +605,7 @@
}
},
{
- "id": 59,
+ "id": 56,
"reputation_lv": 16,
"raceType": 3,
"reputation_exp": 170,
@@ -649,7 +616,7 @@
}
},
{
- "id": 60,
+ "id": 57,
"reputation_lv": 17,
"raceType": 3,
"reputation_exp": 180,
@@ -660,7 +627,7 @@
}
},
{
- "id": 61,
+ "id": 58,
"reputation_lv": 18,
"raceType": 3,
"reputation_exp": 190,
@@ -671,7 +638,7 @@
}
},
{
- "id": 62,
+ "id": 59,
"reputation_lv": 19,
"raceType": 3,
"reputation_exp": 200,
@@ -682,7 +649,7 @@
}
},
{
- "id": 63,
+ "id": 60,
"reputation_lv": 20,
"raceType": 3,
"reputation_exp": 210,
@@ -693,18 +660,7 @@
}
},
{
- "id": 64,
- "reputation_lv": 0,
- "raceType": 4,
- "reputation_exp": 0,
- "Reward": {
- "a": "attr",
- "t": "talent2",
- "n": 1
- }
- },
- {
- "id": 65,
+ "id": 61,
"reputation_lv": 1,
"raceType": 4,
"reputation_exp": 20,
@@ -715,7 +671,7 @@
}
},
{
- "id": 66,
+ "id": 62,
"reputation_lv": 2,
"raceType": 4,
"reputation_exp": 30,
@@ -726,7 +682,7 @@
}
},
{
- "id": 67,
+ "id": 63,
"reputation_lv": 3,
"raceType": 4,
"reputation_exp": 40,
@@ -737,7 +693,7 @@
}
},
{
- "id": 68,
+ "id": 64,
"reputation_lv": 4,
"raceType": 4,
"reputation_exp": 50,
@@ -748,7 +704,7 @@
}
},
{
- "id": 69,
+ "id": 65,
"reputation_lv": 5,
"raceType": 4,
"reputation_exp": 60,
@@ -759,7 +715,7 @@
}
},
{
- "id": 70,
+ "id": 66,
"reputation_lv": 6,
"raceType": 4,
"reputation_exp": 70,
@@ -770,7 +726,7 @@
}
},
{
- "id": 71,
+ "id": 67,
"reputation_lv": 7,
"raceType": 4,
"reputation_exp": 80,
@@ -781,7 +737,7 @@
}
},
{
- "id": 72,
+ "id": 68,
"reputation_lv": 8,
"raceType": 4,
"reputation_exp": 90,
@@ -792,7 +748,7 @@
}
},
{
- "id": 73,
+ "id": 69,
"reputation_lv": 9,
"raceType": 4,
"reputation_exp": 100,
@@ -803,7 +759,7 @@
}
},
{
- "id": 74,
+ "id": 70,
"reputation_lv": 10,
"raceType": 4,
"reputation_exp": 110,
@@ -814,7 +770,7 @@
}
},
{
- "id": 75,
+ "id": 71,
"reputation_lv": 11,
"raceType": 4,
"reputation_exp": 120,
@@ -825,7 +781,7 @@
}
},
{
- "id": 76,
+ "id": 72,
"reputation_lv": 12,
"raceType": 4,
"reputation_exp": 130,
@@ -836,7 +792,7 @@
}
},
{
- "id": 77,
+ "id": 73,
"reputation_lv": 13,
"raceType": 4,
"reputation_exp": 140,
@@ -847,7 +803,7 @@
}
},
{
- "id": 78,
+ "id": 74,
"reputation_lv": 14,
"raceType": 4,
"reputation_exp": 150,
@@ -858,7 +814,7 @@
}
},
{
- "id": 79,
+ "id": 75,
"reputation_lv": 15,
"raceType": 4,
"reputation_exp": 160,
@@ -869,7 +825,7 @@
}
},
{
- "id": 80,
+ "id": 76,
"reputation_lv": 16,
"raceType": 4,
"reputation_exp": 170,
@@ -880,7 +836,7 @@
}
},
{
- "id": 81,
+ "id": 77,
"reputation_lv": 17,
"raceType": 4,
"reputation_exp": 180,
@@ -891,7 +847,7 @@
}
},
{
- "id": 82,
+ "id": 78,
"reputation_lv": 18,
"raceType": 4,
"reputation_exp": 190,
@@ -902,7 +858,7 @@
}
},
{
- "id": 83,
+ "id": 79,
"reputation_lv": 19,
"raceType": 4,
"reputation_exp": 200,
@@ -913,7 +869,7 @@
}
},
{
- "id": 84,
+ "id": 80,
"reputation_lv": 20,
"raceType": 4,
"reputation_exp": 210,
diff --git a/bin/json/game_favorability.json b/bin/json/game_favorability.json
index 07f09b7ac..457ef0b40 100644
--- a/bin/json/game_favorability.json
+++ b/bin/json/game_favorability.json
@@ -30,8 +30,13 @@
"key": "favorability_favorability_return_txt",
"text": "达到好感度{0}级可领取"
},
- "likes_food": [],
- "disliking_food": [],
+ "likes_food": [
+ "132000",
+ "132001"
+ ],
+ "disliking_food": [
+ "132002"
+ ],
"likes_txt": {
"key": "favorability_favorability_likes_txt_14002",
"text": "我很喜欢，谢谢！"
diff --git a/bin/json/game_friends.json b/bin/json/game_friends.json
index f4f50d05b..521416256 100644
--- a/bin/json/game_friends.json
+++ b/bin/json/game_friends.json
@@ -41,7 +41,7 @@
"png": "jiban_img_zu02",
"friends_lv": 1,
"favorability_lv": 1,
- "hid": "35001",
+ "hid": "14002",
"attribute": [
{
"a": "atk",
@@ -49,7 +49,7 @@
}
],
"attribute_txt": {
- "key": "favorability_friends_friend_name_350011",
+ "key": "favorability_friends_friend_name_140021",
"text": "攻击力+{0}"
}
},
@@ -95,7 +95,7 @@
"png": "jiban_img_zu02",
"friends_lv": 2,
"favorability_lv": 9,
- "hid": "35001",
+ "hid": "14002",
"attribute": [
{
"a": "atk",
@@ -103,7 +103,7 @@
}
],
"attribute_txt": {
- "key": "favorability_friends_friend_name_350012",
+ "key": "favorability_friends_friend_name_140022",
"text": "攻击力+{0}"
}
},
@@ -149,7 +149,7 @@
"png": "jiban_img_zu02",
"friends_lv": 3,
"favorability_lv": 15,
- "hid": "35001",
+ "hid": "14002",
"attribute": [
{
"a": "atk",
@@ -157,7 +157,7 @@
}
],
"attribute_txt": {
- "key": "favorability_friends_friend_name_350013",
+ "key": "favorability_friends_friend_name_140023",
"text": "攻击力+{0}"
}
},
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 4056f0c89..69c0a7839 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -7741,7 +7741,7 @@
"color": 1,
"bagtype": 1,
"index": 99,
- "special_type": 0,
+ "special_type": 1000,
"time": 0,
"reddottype": 0,
"effects": "",
@@ -7777,7 +7777,7 @@
"color": 3,
"bagtype": 1,
"index": 99,
- "special_type": 0,
+ "special_type": 800,
"time": 0,
"reddottype": 0,
"effects": "",
@@ -7813,7 +7813,7 @@
"color": 4,
"bagtype": 1,
"index": 1,
- "special_type": 0,
+ "special_type": 900,
"time": 0,
"reddottype": 0,
"effects": "",
diff --git a/bin/json/game_model.json b/bin/json/game_model.json
index caeee1b96..f2faeb998 100644
--- a/bin/json/game_model.json
+++ b/bin/json/game_model.json
@@ -22,6 +22,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -47,6 +57,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -72,6 +92,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -97,6 +127,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -122,6 +162,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -147,6 +197,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -172,6 +232,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -197,6 +267,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -222,6 +302,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -247,6 +337,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -272,6 +372,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -297,6 +407,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -322,6 +442,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -347,6 +477,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -372,6 +512,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -397,6 +547,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -422,6 +582,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -447,6 +617,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -472,6 +652,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -497,6 +687,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -522,6 +722,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -547,6 +757,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -572,6 +792,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -597,6 +827,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -622,6 +862,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -647,6 +897,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -672,6 +932,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -697,6 +967,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -722,6 +1002,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -747,6 +1037,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -772,6 +1072,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -797,6 +1107,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -822,6 +1142,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -847,6 +1177,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -872,6 +1212,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -897,6 +1247,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -922,6 +1282,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -947,6 +1317,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -972,6 +1352,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -997,6 +1387,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1022,6 +1422,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1047,6 +1457,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1072,6 +1492,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1097,6 +1527,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1122,6 +1562,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1147,6 +1597,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1172,6 +1632,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1197,6 +1667,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1222,6 +1702,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1247,6 +1737,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1272,6 +1772,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1297,6 +1807,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1322,6 +1842,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1347,6 +1877,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1372,6 +1912,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1397,6 +1947,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1422,6 +1982,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1447,6 +2017,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1472,6 +2052,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1497,6 +2087,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1522,6 +2122,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1547,6 +2157,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1572,6 +2192,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1597,6 +2227,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1622,6 +2262,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1647,6 +2297,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1672,6 +2332,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1697,6 +2367,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1722,6 +2402,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1747,6 +2437,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1772,6 +2472,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1797,6 +2507,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1822,6 +2542,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1847,6 +2577,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1872,6 +2612,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1897,6 +2647,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1922,6 +2682,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1947,6 +2717,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1972,6 +2752,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -1997,6 +2787,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2022,6 +2822,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2047,6 +2857,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2072,6 +2892,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2097,6 +2927,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2122,6 +2962,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2147,6 +2997,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2172,6 +3032,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2197,6 +3067,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2222,6 +3102,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2247,6 +3137,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2272,6 +3172,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2297,6 +3207,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2322,6 +3242,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2347,6 +3277,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2372,6 +3312,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2397,6 +3347,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2422,6 +3382,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2447,6 +3417,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2472,6 +3452,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2497,6 +3487,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2522,6 +3522,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2547,6 +3557,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2572,6 +3592,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2597,6 +3627,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2622,6 +3662,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2647,6 +3697,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2672,6 +3732,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2697,6 +3767,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2722,6 +3802,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2747,6 +3837,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2772,6 +3872,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2797,6 +3907,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2822,6 +3942,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2847,6 +3977,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2872,6 +4012,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2897,6 +4047,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2922,6 +4082,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2947,6 +4117,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2972,6 +4152,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -2997,6 +4187,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
},
{
@@ -3022,6 +4222,16 @@
"x": 0,
"y": 180,
"z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 0.5,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 1,
+ "y": 1,
+ "z": 1
}
}
]
\ No newline at end of file
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 1fbaedad5..8013080e0 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -52,7 +52,9 @@
"key": "skill_1250041111",
"text": "对敌方1个目标造成3次攻击力30%的伤害，有40%概率为自身附加2回合【免疫】状态"
},
- "buffid": [],
+ "buffid": [
+ 390001111
+ ],
"map": ""
},
{
@@ -222,7 +224,9 @@
"key": "skill_1250042111",
"text": "清除我方所有减益状态，并平均分配我方生命值，为我方全体附加2回合【攻击提升】状态"
},
- "buffid": [],
+ "buffid": [
+ 390001001
+ ],
"map": ""
},
{
@@ -310,7 +314,9 @@
"key": "skill_1250043111",
"text": "进入2回合【喜悦】状态，使我方全体收到伤害降低25%，且在每个队友行动前，为其驱散1个减益状态并回复其最大生命值20%的生命，效果持续期间自身无法行动"
},
- "buffid": [],
+ "buffid": [
+ 390001208
+ ],
"map": ""
},
{
@@ -479,7 +485,9 @@
"key": "skill_1350021111",
"text": "攻击一个敌方2次，伤害分别为自身攻击力30%和80%，每次向目标转嫁自身1个减益；转嫁成功时有50%的概率为目标附加1回合【眩晕】。"
},
- "buffid": [],
+ "buffid": [
+ 390001105
+ ],
"map": ""
},
{
@@ -1046,7 +1054,9 @@
"key": "skill_1240031111",
"text": "对敌方1个目标造成攻击力110%的伤害，并有70%的概率附加1回合【睡眠】状态。"
},
- "buffid": [],
+ "buffid": [
+ 390001118
+ ],
"map": ""
},
{
@@ -1191,7 +1201,9 @@
"key": "skill_1240032111",
"text": "为我方全体各净化1个减益状态，并附加2回合【速度提升】。"
},
- "buffid": [],
+ "buffid": [
+ 390001003
+ ],
"map": ""
},
{
@@ -1250,7 +1262,9 @@
"key": "skill_1240033111",
"text": "对敌方全体造成攻击力80%的伤害，使敌方目标各减少30%行动值，并有100%概率附加1回合【睡眠】状态。"
},
- "buffid": [],
+ "buffid": [
+ 390001118
+ ],
"map": ""
},
{
@@ -1428,7 +1442,10 @@
"key": "skill_9240034111",
"text": "为我方全体各净化1个减益状态，并附加2回合【速度提升】和1回合【防御提升】状态。"
},
- "buffid": [],
+ "buffid": [
+ 390001003,
+ 390001002
+ ],
"map": ""
},
{
@@ -1514,7 +1531,9 @@
"key": "skill_1340061111",
"text": "对敌方1个目标造成2次攻击力50%的伤害,有60%概率为目标附加2回合【速度下降】"
},
- "buffid": [],
+ "buffid": [
+ 390001008
+ ],
"map": ""
},
{
@@ -1794,7 +1813,10 @@
"key": "skill_1340063111",
"text": "攻击敌方全体，伤害为自身攻击力100%，90%概率为目标附加2回合【速度下降】和1回合【冰冻】"
},
- "buffid": [],
+ "buffid": [
+ 390001008,
+ 390001106
+ ],
"map": ""
},
{
@@ -1934,7 +1956,9 @@
"key": "skill_9340064111",
"text": "攻击全体敌方，伤害为自身攻击力70%，70%概率降低目标30%行动值；目标有【速度下降】时，降低行动值翻倍。"
},
- "buffid": [],
+ "buffid": [
+ 390001008
+ ],
"map": ""
},
{
@@ -2102,7 +2126,9 @@
"key": "skill_1250011111",
"text": "对敌方1个目标造成2次攻击力30%及防御力50%的伤害,有50%概率为目标附加2回合【攻击下降】"
},
- "buffid": [],
+ "buffid": [
+ 390001006
+ ],
"map": ""
},
{
@@ -2243,7 +2269,9 @@
"key": "skill_1250012111",
"text": "回合结束时获得1回合【玄御】，效果期间回合开始时攻击全体敌方，伤害为自身防御力90%。"
},
- "buffid": [],
+ "buffid": [
+ 390001210
+ ],
"map": ""
},
{
@@ -2529,7 +2557,10 @@
"key": "skill_1250013111",
"text": "攻击1个敌方，伤害为自身攻击力80%及防御力100%，为自身附加2回合【防御提升】和【免疫】。"
},
- "buffid": [],
+ "buffid": [
+ 390001002,
+ 390001111
+ ],
"map": ""
},
{
@@ -2550,9 +2581,9 @@
"Target": 2,
"ChildSkill": {
"Id": [
- 225001321,
+ 225001311,
225001312,
- 225001313
+ 225001321
]
},
"Desc": {
@@ -2580,9 +2611,9 @@
"Target": 2,
"ChildSkill": {
"Id": [
- 225001331,
+ 225001311,
225001312,
- 225001313
+ 225001331
]
},
"Desc": {
@@ -2610,9 +2641,9 @@
"Target": 2,
"ChildSkill": {
"Id": [
- 225001331,
+ 225001311,
225001312,
- 225001313
+ 225001341
]
},
"Desc": {
@@ -2640,9 +2671,9 @@
"Target": 2,
"ChildSkill": {
"Id": [
- 225001341,
+ 225001311,
225001312,
- 225001313
+ 225001341
]
},
"Desc": {
@@ -2678,7 +2709,9 @@
"key": "skill_9250014111",
"text": "回合结束时获得1回合【玄御】，效果期间回合开始时攻击全体敌方，伤害为自身防御力90%。任一技能暴击时减少此技能1回合冷却。"
},
- "buffid": [],
+ "buffid": [
+ 390001210
+ ],
"map": ""
},
{
@@ -2990,7 +3023,10 @@
"key": "skill_1440052111",
"text": "攻击1个敌方4次，每次伤害为自身攻击力45%，每次有30%概率为目标附加1回合【眩晕】。"
},
- "buffid": [],
+ "buffid": [
+ 390001105,
+ 390001105
+ ],
"map": ""
},
{
@@ -3465,7 +3501,11 @@
"key": "skill_1350011111",
"text": "攻击1个敌方，伤害为自身攻击力100%,攻击溅射随机2个敌方，伤害为自身攻击力70%。攻击前随机获得一种神力，持续1回合；神力包含【气】、【劲】、【法】。"
},
- "buffid": [],
+ "buffid": [
+ 390001119,
+ 390001120,
+ 390001121
+ ],
"map": ""
},
{
@@ -3791,7 +3831,11 @@
"key": "skill_1350013111",
"text": "攻击全体敌方2次，每次伤害为自身攻击50%。攻击前获得全部神力，持续2回合；神力包含【气】、【劲】、【法】。"
},
- "buffid": [],
+ "buffid": [
+ 390001119,
+ 390001120,
+ 390001121
+ ],
"map": ""
},
{
@@ -3915,7 +3959,9 @@
"key": "skill_9350014111",
"text": "攻击1个敌方，伤害为自身攻击力170%。为自身附加2回合【护盾】，护盾量为自身最大生命值10%。吸收所有神力恢复自身生命，每个神力提供自身最大生命值10%恢复量、最大生命值5%护盾量和10%额外伤害。"
},
- "buffid": [],
+ "buffid": [
+ 390001112
+ ],
"map": ""
},
{
@@ -4093,7 +4139,9 @@
"key": "skill_1240041111",
"text": "攻击1个敌方，伤害为自身攻击力100%，60%概率为目标附加2回合【禁疗】"
},
- "buffid": [],
+ "buffid": [
+ 390001107
+ ],
"map": ""
},
{
@@ -4263,7 +4311,10 @@
"key": "skill_1240043111",
"text": "攻击全体敌方，伤害为自身攻击力100%，为目标附加2回合【速度下降】和【中毒】。"
},
- "buffid": [],
+ "buffid": [
+ 390001008,
+ 390001401
+ ],
"map": ""
},
{
@@ -4471,7 +4522,9 @@
"key": "skill_9240044111",
"text": "攻击时为目标附加2回合【中毒】。附加【中毒】成功时，额外附加1回合【中毒】；每回合对每个目标仅触发1次。"
},
- "buffid": [],
+ "buffid": [
+ 390001401
+ ],
"map": ""
},
{
@@ -4727,7 +4780,10 @@
"key": "skill_1440063111",
"text": "驱散敌方1个目标的全部增益效果，随后对其造成攻击力230%的伤害，同时自身受到此伤害30%的效果附加伤害，但是自身不会因为该伤害死亡。自身获得【攻击提升】【暴击提升】效果，持续3回合"
},
- "buffid": [],
+ "buffid": [
+ 390001001,
+ 390001004
+ ],
"map": ""
},
{
@@ -4923,7 +4979,10 @@
"key": "skill_9440064111",
"text": "驱散敌方1个目标的全部增益效果，随后对其造成攻击力270%的伤害，同时自身受到此伤害30%的效果附加伤害，但是自身不会因为该伤害死亡。成功击杀敌人时，自身获得【攻击提升】【暴击提升】效果，持续3回合"
},
- "buffid": [],
+ "buffid": [
+ 390001001,
+ 390001004
+ ],
"map": ""
},
{
@@ -5335,7 +5394,9 @@
"key": "skill_1150053111",
"text": "提升全体友方20%行动值。治疗全体友方，治疗量为目标最大生命值35%。净化全体友方各1个减益，为无减益的目标附加1回合【免疫】。"
},
- "buffid": [],
+ "buffid": [
+ 390001111
+ ],
"map": ""
},
{
@@ -6521,7 +6582,9 @@
"key": "skill_1140071111",
"text": "攻击1个敌方，伤害为自身攻击力30%及防御力50%，50%概率为目标附加2回合【防御下降】。"
},
- "buffid": [],
+ "buffid": [
+ 390001007
+ ],
"map": ""
},
{
@@ -6690,7 +6753,9 @@
"key": "skill_1140072111",
"text": "受到致命伤害时，为自身附加1回合【对峙】，重置旋风霹雳舞冷却，目标防御比自身低时，自身伤害提升；每1%差值提供1%额外伤害，不超过40%。"
},
- "buffid": [],
+ "buffid": [
+ 390001104
+ ],
"map": ""
},
{
@@ -6779,7 +6844,9 @@
"key": "skill_1140073111",
"text": "攻击全体敌方，伤害为自身防御力80%，30%概率为目标附加1回合【挑衅】；目标防御比自身低时，概率翻倍。"
},
- "buffid": [],
+ "buffid": [
+ 390001110
+ ],
"map": ""
},
{
@@ -7131,7 +7198,10 @@
"key": "skill_1140032111",
"text": "攻击1个敌方，伤害为自身攻击150%，80%概率为目标附加2回合【速度下降】。暴击时为自身附加2回合【速度提升】。每点速度提供攻击0.33%。"
},
- "buffid": [],
+ "buffid": [
+ 390001008,
+ 390001003
+ ],
"map": ""
},
{
@@ -7471,7 +7541,9 @@
"key": "skill_1450032111",
"text": "自身死亡时，以15%最大生命值的状态复活全部已阵亡的队友，并为我方全体施加其最大生命值50%的【护盾】，持续1回合。随后提升我方全体目标50%的行动值。该被动效果一场战斗仅能触发一次"
},
- "buffid": [],
+ "buffid": [
+ 390001112
+ ],
"map": ""
},
{
@@ -7501,7 +7573,9 @@
"key": "skill_1450033111",
"text": "净化己方全部减益状态，并为己方全体目标回复35%最大生命值的生命，随后施加1回合【免疫】效果"
},
- "buffid": [],
+ "buffid": [
+ 390001111
+ ],
"map": ""
},
{
@@ -7586,7 +7660,9 @@
"key": "skill_1530013111",
"text": "对敌方全体发起3段攻击，每段攻击可造成攻击力的伤害，并附加3回合【速度下降】状态。"
},
- "buffid": [],
+ "buffid": [
+ 390001008
+ ],
"map": ""
},
{
@@ -7759,7 +7835,9 @@
"key": "skill_1510022111",
"text": "对敌方一个目标发起攻击，造成攻击力120%的伤害。并有50%概率附加2回合【防御下降】状态。"
},
- "buffid": [],
+ "buffid": [
+ 390001007
+ ],
"map": ""
},
{
@@ -7815,7 +7893,9 @@
"key": "skill_1510032111",
"text": "对敌方一个目标发起攻击，造成攻击力120%的伤害。并有25%概率附加1回合【眩晕】状态。"
},
- "buffid": [],
+ "buffid": [
+ 390001105
+ ],
"map": ""
},
{
@@ -7928,7 +8008,7 @@
"text": "对敌方1个目标发起攻击，造成攻击力180%的伤害，并附加2回合【攻击下降】状态。"
},
"buffid": [],
- "map": ""
+ "map": "390001006"
},
{
"id": 113003011,
@@ -8421,7 +8501,9 @@
"key": "skill_1140011111",
"text": "史图依克对敌方1个目标造成攻击力30%以及防御力65%的伤害，并有60%概率附加2回合【防御下降】效果。"
},
- "buffid": [],
+ "buffid": [
+ 390001007
+ ],
"map": ""
},
{
@@ -8450,7 +8532,9 @@
"key": "skill_1140012111",
"text": "史图依克每次受到攻击时，自身获得1层【酋长之怒】，每层可提升自身10%的基础防御力和5%的效果抵抗，最多可叠加10层。自身获得10层【酋长之怒】时将立即获得回合"
},
- "buffid": [],
+ "buffid": [
+ 390001202
+ ],
"map": ""
},
{
@@ -8481,7 +8565,10 @@
"key": "skill_1140013111",
"text": "史图依克对敌方1个目标造成攻击力80%以及防御力120%的伤害，并【挑衅】1名敌人2回合。若有10层【酋长之怒】，伤害提升50%。恢复自身生命，每层【酋长之怒】提供自身最大生命值4%恢复量；之后消耗全部【酋长之怒】"
},
- "buffid": [],
+ "buffid": [
+ 390001202,
+ 390001110
+ ],
"map": ""
},
{
@@ -8538,7 +8625,9 @@
"key": "skill_1240081111",
"text": "暴芙那特对敌方1个目标造成2次自身攻击力60%的伤害，并有40%概率附加2回合【烙印】效果。若某英雄在场，则本次攻击额外附加目标最大生命值5%的伤害，但最高无法超过自身攻击力的60%。"
},
- "buffid": [],
+ "buffid": [
+ 390001101
+ ],
"map": ""
},
{
@@ -8567,7 +8656,9 @@
"key": "skill_1240082111",
"text": "暴芙那特对敌方全体造成2次自身攻击力45%的伤害，并有40%概率附加2回合【速度下降】效果。若某英雄在场，则本次攻击额外造成两段伤害并附加同样效果"
},
- "buffid": [],
+ "buffid": [
+ 390001008
+ ],
"map": ""
},
{
@@ -8597,7 +8688,10 @@
"key": "skill_1240083111",
"text": "暴芙那特先为自身施加2回合【暴击提升】效果，之后对敌方1个目标造成3次自身攻击力80%的伤害，并附加2回合【防御下降】效果"
},
- "buffid": [],
+ "buffid": [
+ 390001004,
+ 390001007
+ ],
"map": ""
},
{
@@ -8652,7 +8746,7 @@
},
"Desc": {
"key": "skill_1340081111",
- "text": "悍夫那特对敌方一个目标造成1次自身攻击力100%的伤害，并有40%概率鸡腿目标10%行动值。若某英雄在场，则本次攻击额外随机攻击2个目标，造成同样伤害和效果"
+ "text": "悍夫那特对敌方一个目标造成1次自身攻击力100%的伤害，并有40%概率击退目标10%行动值。若某英雄在场，则本次攻击额外随机攻击2个目标，造成同样伤害和效果"
},
"buffid": [],
"map": ""
@@ -9111,7 +9205,10 @@
"key": "skill_1350062111",
"text": "平先生为我方全体附加2回合【攻击提升】和【速度提升】效果。"
},
- "buffid": [],
+ "buffid": [
+ 390001001,
+ 390001003
+ ],
"map": ""
},
{
@@ -9310,7 +9407,9 @@
"key": "skill_1240051111",
"text": "金猴对敌方1个目标造成攻击力120%的伤害，并有70%概率对自身附加2回合【速度提升】"
},
- "buffid": [],
+ "buffid": [
+ 390001003
+ ],
"map": ""
},
{
@@ -9338,7 +9437,9 @@
"key": "skill_1240052111",
"text": "金猴净化1名队友所有减益状态，并为其标记2回合【不败金身】"
},
- "buffid": [],
+ "buffid": [
+ 390001215
+ ],
"map": ""
},
{
@@ -9368,7 +9469,9 @@
"key": "skill_1240053111",
"text": "金猴对敌方全体造成攻击力120%的伤害，并附加2回合【速度下降】状态；同时能减少敌方全体30%行动值，并重置2技能的冷却时间"
},
- "buffid": [],
+ "buffid": [
+ 390001008
+ ],
"map": ""
},
{
@@ -10047,7 +10150,9 @@
"key": "skill_1340071111",
"text": "菲奥娜对敌方1个目标造成2次攻击力60%的伤害，若发生暴击，则为自身附加1回合【免疫】状态"
},
- "buffid": [],
+ "buffid": [
+ 390001111
+ ],
"map": ""
},
{
@@ -10077,7 +10182,9 @@
"key": "skill_1340072111",
"text": "菲奥娜对敌方1个目标发起3连击，共造成攻击力200%的伤害，每次攻击有60%概率驱散目标1个增益状态；若驱散成功，则对目标附加2回合【攻击下降】状态"
},
- "buffid": [],
+ "buffid": [
+ 390001006
+ ],
"map": ""
},
{
@@ -10106,7 +10213,9 @@
"key": "skill_1340073111",
"text": "菲奥娜对敌方1个目标造成攻击力280%的伤害，并为自身附加2回合生命值上限35%的【护盾】；若发生暴击，则次数伤害提升30%，并额外提升50%【护盾】"
},
- "buffid": [],
+ "buffid": [
+ 390001112
+ ],
"map": ""
},
{
@@ -10134,7 +10243,9 @@
"key": "skill_1430061111",
"text": "布里奇特对敌方1个目标造成攻击力130%的伤害，并有70%概率为目标附加2回合【攻击下降】状态"
},
- "buffid": [],
+ "buffid": [
+ 390001006
+ ],
"map": ""
},
{
@@ -15169,7 +15280,9 @@
"key": "skill_1440022111",
"text": "蛇先生我方全体回复各自最大生命在10%的生命和自身攻击力80%的生命，并附加1回合【复苏】状态。"
},
- "buffid": [],
+ "buffid": [
+ 390001127
+ ],
"map": ""
},
{
@@ -15197,7 +15310,9 @@
"key": "skill_1440023111",
"text": "蛇先生己方全体提升25%行动值，并施加【伪装】。己方每个【伪装】的触发，都会为自身提升20%的行动值。"
},
- "buffid": [],
+ "buffid": [
+ 390001436
+ ],
"map": ""
},
{
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index c59822aad..2d3963ce6 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -476,7 +476,7 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_zd_buff_j008",
- "buffeffect": "effect_jiaoxia_jiaobing",
+ "buffeffect": "effect_buff_bingdong",
"buffpos": "脚底"
},
{
@@ -3179,7 +3179,7 @@
"Id": 390001436,
"Name": {
"key": "skill_buff_390001436",
- "text": "伪装（减伤）"
+ "text": "伪装"
},
"Desc": {
"key": "skill_buffdes_390001436",
diff --git a/modules/parkour/configure.go b/modules/parkour/configure.go
index c2b72fe44..1488b9cab 100644
--- a/modules/parkour/configure.go
+++ b/modules/parkour/configure.go
@@ -52,7 +52,7 @@ func (this *configureComp) isopen() (open bool) {
return
} else {
for _, v := range config.GetDataList() {
- if currtime >= v.Stime && currtime < v.Etime {
+ if currtime >= fmt.Sprintf("%d:%d", v.Shtime, v.Smtime) && currtime < fmt.Sprintf("%d:%d", v.Ehtime, v.Emtime) {
open = true
return
}
diff --git a/sys/configure/structs/Game.BuzkashiFm.go b/sys/configure/structs/Game.BuzkashiFm.go
new file mode 100644
index 000000000..828a9568a
--- /dev/null
+++ b/sys/configure/structs/Game.BuzkashiFm.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 GameBuzkashiFm struct {
+ _dataMap map[int32]*GameBuzkashiFmData
+ _dataList []*GameBuzkashiFmData
+}
+
+func NewGameBuzkashiFm(_buf []map[string]interface{}) (*GameBuzkashiFm, error) {
+ _dataList := make([]*GameBuzkashiFmData, 0, len(_buf))
+ dataMap := make(map[int32]*GameBuzkashiFmData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameBuzkashiFmData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Num] = _v
+ }
+ }
+ return &GameBuzkashiFm{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameBuzkashiFm) GetDataMap() map[int32]*GameBuzkashiFmData {
+ return table._dataMap
+}
+
+func (table *GameBuzkashiFm) GetDataList() []*GameBuzkashiFmData {
+ return table._dataList
+}
+
+func (table *GameBuzkashiFm) Get(key int32) *GameBuzkashiFmData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.BuzkashiFmData.go b/sys/configure/structs/Game.BuzkashiFmData.go
new file mode 100644
index 000000000..d4270f2be
--- /dev/null
+++ b/sys/configure/structs/Game.BuzkashiFmData.go
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameBuzkashiFmData struct {
+ Num int32
+ Type int32
+ Stime string
+ Broadcast string
+ Icon string
+}
+
+const TypeId_GameBuzkashiFmData = -1288548636
+
+func (*GameBuzkashiFmData) GetTypeId() int32 {
+ return -1288548636
+}
+
+func (_v *GameBuzkashiFmData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = 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.Stime, _ok_ = _buf["stime"].(string); !_ok_ { err = errors.New("stime error"); return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["broadcast"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Broadcast error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Broadcast, _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 } }
+ return
+}
+
+func DeserializeGameBuzkashiFmData(_buf map[string]interface{}) (*GameBuzkashiFmData, error) {
+ v := &GameBuzkashiFmData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.FavorabilityData.go b/sys/configure/structs/Game.FavorabilityData.go
index bae6ca2f1..1b5549207 100644
--- a/sys/configure/structs/Game.FavorabilityData.go
+++ b/sys/configure/structs/Game.FavorabilityData.go
@@ -21,8 +21,8 @@ type GameFavorabilityData struct {
PrivilegeValue int32
ReturnReward []*Gameatn
ReturnTxt string
- LikesFood []int32
- DislikingFood []int32
+ LikesFood []string
+ DislikingFood []string
LikesTxt string
OrdinaryTxt string
DislikingTxt string
@@ -74,11 +74,11 @@ func (_v *GameFavorabilityData)Deserialize(_buf map[string]interface{}) (err err
var _ok_ bool
if _arr_, _ok_ = _buf["likes_food"].([]interface{}); !_ok_ { err = errors.New("likes_food error"); return }
- _v.LikesFood = make([]int32, 0, len(_arr_))
+ _v.LikesFood = make([]string, 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_) }
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
_v.LikesFood = append(_v.LikesFood, _list_v_)
}
}
@@ -88,11 +88,11 @@ func (_v *GameFavorabilityData)Deserialize(_buf map[string]interface{}) (err err
var _ok_ bool
if _arr_, _ok_ = _buf["disliking_food"].([]interface{}); !_ok_ { err = errors.New("disliking_food error"); return }
- _v.DislikingFood = make([]int32, 0, len(_arr_))
+ _v.DislikingFood = make([]string, 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_) }
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
_v.DislikingFood = append(_v.DislikingFood, _list_v_)
}
}
diff --git a/sys/configure/structs/Game.buzkashiOpenData.go b/sys/configure/structs/Game.buzkashiOpenData.go
index 980b5a756..3189a64c2 100644
--- a/sys/configure/structs/Game.buzkashiOpenData.go
+++ b/sys/configure/structs/Game.buzkashiOpenData.go
@@ -12,8 +12,10 @@ import "errors"
type GamebuzkashiOpenData struct {
Num int32
- Stime string
- Etime string
+ Shtime int32
+ Smtime int32
+ Ehtime int32
+ Emtime int32
}
const TypeId_GamebuzkashiOpenData = 1621393927
@@ -24,8 +26,10 @@ func (*GamebuzkashiOpenData) GetTypeId() int32 {
func (_v *GamebuzkashiOpenData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
- { var _ok_ bool; if _v.Stime, _ok_ = _buf["stime"].(string); !_ok_ { err = errors.New("stime error"); return } }
- { var _ok_ bool; if _v.Etime, _ok_ = _buf["etime"].(string); !_ok_ { err = errors.New("etime error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["shtime"].(float64); !_ok_ { err = errors.New("shtime error"); return }; _v.Shtime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["smtime"].(float64); !_ok_ { err = errors.New("smtime error"); return }; _v.Smtime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ehtime"].(float64); !_ok_ { err = errors.New("ehtime error"); return }; _v.Ehtime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["emtime"].(float64); !_ok_ { err = errors.New("emtime error"); return }; _v.Emtime = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index abe7c23b7..a2c92e40d 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -194,6 +194,7 @@ type Tables struct {
BuzkashiLv *GameBuzkashiLv
BuzkashiGrade *GameBuzkashiGrade
BuzkashiReward *GameBuzkashiReward
+ BuzkashiFm *GameBuzkashiFm
buzkashiOpen *GamebuzkashiOpen
}
@@ -1300,6 +1301,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.BuzkashiReward, err = NewGameBuzkashiReward(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_buzkashifm") ; err != nil {
+ return nil, err
+ }
+ if tables.BuzkashiFm, err = NewGameBuzkashiFm(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_buzkashiopen") ; err != nil {
return nil, err
}
diff --git a/sys/configure/structs/game.modelData.go b/sys/configure/structs/game.modelData.go
index 633f8ba0c..8d2478052 100644
--- a/sys/configure/structs/game.modelData.go
+++ b/sys/configure/structs/game.modelData.go
@@ -27,6 +27,8 @@ type GameModelData struct {
Bust string
Postxyz []float32
Rotation serialization.Vector3
+ BoxPos serialization.Vector3
+ BoxSize serialization.Vector3
}
const TypeId_GameModelData = -305436809
@@ -71,6 +73,22 @@ func (_v *GameModelData)Deserialize(_buf map[string]interface{}) (err error) {
_v.Rotation = serialization.NewVector3(_x_, _y_, _z_)
}
+ { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["boxPos"].(map[string]interface{}); !_ok_ { err = errors.New("boxPos error"); return }
+ var _x_, _y_, _z_ float32;
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
+ _v.BoxPos = serialization.NewVector3(_x_, _y_, _z_)
+ }
+
+ { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["boxSize"].(map[string]interface{}); !_ok_ { err = errors.New("boxSize error"); return }
+ var _x_, _y_, _z_ float32;
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
+ _v.BoxSize = serialization.NewVector3(_x_, _y_, _z_)
+ }
+
return
}