diff --git a/bin/json/game_circulate.json b/bin/json/game_circulate.json
index b9403668a..66bf27a4b 100644
--- a/bin/json/game_circulate.json
+++ b/bin/json/game_circulate.json
@@ -213,7 +213,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -438,7 +438,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -663,7 +663,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -881,14 +881,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -926,9 +926,9 @@
601001
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -1106,14 +1106,14 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -1151,9 +1151,9 @@
601006
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -1331,14 +1331,14 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -1376,9 +1376,9 @@
601011
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -1556,14 +1556,14 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -1646,9 +1646,9 @@
601017
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -1781,14 +1781,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -1871,9 +1871,9 @@
601002
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -2006,14 +2006,14 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -2096,9 +2096,9 @@
601007
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -2231,14 +2231,14 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -2366,9 +2366,9 @@
601013
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -2456,14 +2456,14 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -2591,9 +2591,9 @@
601018
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -2681,14 +2681,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -2816,9 +2816,9 @@
601003
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -2906,14 +2906,14 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -3086,9 +3086,9 @@
601009
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -3131,14 +3131,14 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -3311,9 +3311,9 @@
601014
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -3356,14 +3356,14 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -3536,9 +3536,9 @@
601019
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -3581,14 +3581,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -3813,7 +3813,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -4038,7 +4038,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -4263,7 +4263,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -4481,14 +4481,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -4526,9 +4526,9 @@
601001
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -4706,14 +4706,14 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -4751,9 +4751,9 @@
601006
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -4931,14 +4931,14 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -4976,9 +4976,9 @@
601011
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -5156,14 +5156,14 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -5246,9 +5246,9 @@
601017
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -5381,14 +5381,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -5471,9 +5471,9 @@
601002
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -5606,14 +5606,14 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -5696,9 +5696,9 @@
601007
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -5831,14 +5831,14 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -5966,9 +5966,9 @@
601013
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -6056,14 +6056,14 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -6191,9 +6191,9 @@
601018
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -6281,14 +6281,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -6416,9 +6416,9 @@
601003
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -6506,14 +6506,14 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -6686,9 +6686,9 @@
601009
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -6731,14 +6731,14 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -6911,9 +6911,9 @@
601014
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -6956,14 +6956,14 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -7136,9 +7136,9 @@
601019
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -7181,14 +7181,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -7413,7 +7413,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -7638,7 +7638,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -7863,7 +7863,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -8081,14 +8081,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -8126,9 +8126,9 @@
601001
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -8306,14 +8306,14 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -8351,9 +8351,9 @@
601006
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -8531,14 +8531,14 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -8576,9 +8576,9 @@
601011
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -8756,14 +8756,14 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -8846,9 +8846,9 @@
601017
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -8981,14 +8981,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -9071,9 +9071,9 @@
601002
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -9206,14 +9206,14 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -9296,9 +9296,9 @@
601007
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -9431,14 +9431,14 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -9566,9 +9566,9 @@
601013
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -9656,14 +9656,14 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -9791,9 +9791,9 @@
601018
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -9881,14 +9881,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -10016,9 +10016,9 @@
601003
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -10106,14 +10106,14 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -10286,9 +10286,9 @@
601009
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -10331,14 +10331,14 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -10511,9 +10511,9 @@
601014
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -10556,14 +10556,14 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -10736,9 +10736,9 @@
601019
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -10781,14 +10781,14 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000021",
+ "n": 1
},
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -11013,7 +11013,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -11238,7 +11238,7 @@
"reward": [
{
"a": "item",
- "t": "10000022",
+ "t": "10000021",
"n": 1
}
],
@@ -11457,7 +11457,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -11682,7 +11682,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -11907,7 +11907,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -12131,9 +12131,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -12176,9 +12176,9 @@
601001
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -12356,9 +12356,9 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -12401,9 +12401,9 @@
601006
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -12581,9 +12581,9 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -12626,9 +12626,9 @@
601011
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -12806,9 +12806,9 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -12896,9 +12896,9 @@
601017
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -13031,9 +13031,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -13121,9 +13121,9 @@
601002
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -13256,9 +13256,9 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -13346,9 +13346,9 @@
601007
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -13481,9 +13481,9 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -13616,9 +13616,9 @@
601013
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -13706,9 +13706,9 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -13841,9 +13841,9 @@
601018
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -13931,9 +13931,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -14066,9 +14066,9 @@
601003
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -14156,9 +14156,9 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -14336,9 +14336,9 @@
601009
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -14381,9 +14381,9 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -14561,9 +14561,9 @@
601014
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -14606,9 +14606,9 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -14786,9 +14786,9 @@
601019
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -14831,9 +14831,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -15057,7 +15057,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -15282,7 +15282,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -15507,7 +15507,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -15731,9 +15731,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -15776,9 +15776,9 @@
601001
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -15956,9 +15956,9 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -16001,9 +16001,9 @@
601006
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -16181,9 +16181,9 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -16226,9 +16226,9 @@
601011
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -16406,9 +16406,9 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -16496,9 +16496,9 @@
601017
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -16631,9 +16631,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -16721,9 +16721,9 @@
601002
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -16856,9 +16856,9 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -16946,9 +16946,9 @@
601007
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -17081,9 +17081,9 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -17216,9 +17216,9 @@
601013
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -17306,9 +17306,9 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -17441,9 +17441,9 @@
601018
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -17531,9 +17531,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -17666,9 +17666,9 @@
601003
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -17756,9 +17756,9 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -17936,9 +17936,9 @@
601009
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -17981,9 +17981,9 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -18161,9 +18161,9 @@
601014
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -18206,9 +18206,9 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -18386,9 +18386,9 @@
601019
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -18431,9 +18431,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -18657,7 +18657,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -18882,7 +18882,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -19107,7 +19107,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -19331,9 +19331,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -19376,9 +19376,9 @@
601001
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -19556,9 +19556,9 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -19601,9 +19601,9 @@
601006
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -19781,9 +19781,9 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -19826,9 +19826,9 @@
601011
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -20006,9 +20006,9 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -20096,9 +20096,9 @@
601017
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -20231,9 +20231,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -20321,9 +20321,9 @@
601002
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -20456,9 +20456,9 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -20546,9 +20546,9 @@
601007
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -20681,9 +20681,9 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -20816,9 +20816,9 @@
601013
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -20906,9 +20906,9 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -21041,9 +21041,9 @@
601018
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -21131,9 +21131,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -21266,9 +21266,9 @@
601003
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -21356,9 +21356,9 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -21536,9 +21536,9 @@
601009
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -21581,9 +21581,9 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -21761,9 +21761,9 @@
601014
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -21806,9 +21806,9 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -21986,9 +21986,9 @@
601019
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
@@ -22031,9 +22031,9 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000023",
+ "n": 1
},
"reward": [
{
@@ -22257,7 +22257,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -22482,7 +22482,7 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000023",
"n": 1
},
"reward": [
@@ -22707,13 +22707,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -22932,13 +22932,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -23157,13 +23157,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -23381,15 +23381,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -23426,15 +23426,15 @@
601001
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -23606,15 +23606,15 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -23651,15 +23651,15 @@
601006
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -23831,15 +23831,15 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -23876,15 +23876,15 @@
601011
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -24056,15 +24056,15 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -24146,15 +24146,15 @@
601017
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -24281,15 +24281,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -24371,15 +24371,15 @@
601002
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -24506,15 +24506,15 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -24596,15 +24596,15 @@
601007
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -24731,15 +24731,15 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -24866,15 +24866,15 @@
601013
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -24956,15 +24956,15 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -25091,15 +25091,15 @@
601018
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -25181,15 +25181,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -25316,15 +25316,15 @@
601003
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -25406,15 +25406,15 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -25586,15 +25586,15 @@
601009
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -25631,15 +25631,15 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -25811,15 +25811,15 @@
601014
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -25856,15 +25856,15 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -26036,15 +26036,15 @@
601019
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -26081,15 +26081,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -26307,13 +26307,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -26532,13 +26532,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -26757,13 +26757,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -26981,15 +26981,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -27026,15 +27026,15 @@
601001
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -27206,15 +27206,15 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -27251,15 +27251,15 @@
601006
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -27431,15 +27431,15 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -27476,15 +27476,15 @@
601011
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -27656,15 +27656,15 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -27746,15 +27746,15 @@
601017
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -27881,15 +27881,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -27971,15 +27971,15 @@
601002
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -28106,15 +28106,15 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -28196,15 +28196,15 @@
601007
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -28331,15 +28331,15 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -28466,15 +28466,15 @@
601013
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -28556,15 +28556,15 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -28691,15 +28691,15 @@
601018
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -28781,15 +28781,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -28916,15 +28916,15 @@
601003
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -29006,15 +29006,15 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -29186,15 +29186,15 @@
601009
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -29231,15 +29231,15 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -29411,15 +29411,15 @@
601014
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -29456,15 +29456,15 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -29636,15 +29636,15 @@
601019
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -29681,15 +29681,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -29907,13 +29907,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -30132,13 +30132,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -30357,13 +30357,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -30581,15 +30581,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -30626,15 +30626,15 @@
601001
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -30806,15 +30806,15 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -30851,15 +30851,15 @@
601006
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -31031,15 +31031,15 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -31076,15 +31076,15 @@
601011
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -31256,15 +31256,15 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -31346,15 +31346,15 @@
601017
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -31481,15 +31481,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -31571,15 +31571,15 @@
601002
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -31706,15 +31706,15 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -31796,15 +31796,15 @@
601007
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -31931,15 +31931,15 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -32066,15 +32066,15 @@
601013
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -32156,15 +32156,15 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -32291,15 +32291,15 @@
601018
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -32381,15 +32381,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -32516,15 +32516,15 @@
601003
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -32606,15 +32606,15 @@
601005
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -32786,15 +32786,15 @@
601009
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -32831,15 +32831,15 @@
601010
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -33011,15 +33011,15 @@
601014
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -33056,15 +33056,15 @@
601015
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -33236,15 +33236,15 @@
601019
],
"keyReward": {
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
},
"reward": [
{
- "a": "item",
- "t": "10000021",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 30
}
],
"exp": 100,
@@ -33281,15 +33281,15 @@
601020
],
"keyReward": {
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
},
"reward": [
{
- "a": "attr",
- "t": "diamond",
- "n": 30
+ "a": "item",
+ "t": "10000022",
+ "n": 1
}
],
"exp": 100,
@@ -33507,13 +33507,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -33732,13 +33732,13 @@
],
"keyReward": {
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
},
"reward": [
{
"a": "item",
- "t": "10000021",
+ "t": "10000022",
"n": 1
}
],
@@ -33776,7 +33776,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -33819,7 +33819,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -33862,7 +33862,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -33905,7 +33905,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -33947,13 +33947,13 @@
],
"keyReward": {
"a": "item",
- "t": "13000002",
+ "t": "13000001",
"n": 2
},
"reward": [
{
"a": "item",
- "t": "13000002",
+ "t": "13000001",
"n": 2
}
],
@@ -33991,7 +33991,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34034,7 +34034,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34077,7 +34077,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34120,7 +34120,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34206,7 +34206,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34249,7 +34249,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34292,7 +34292,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34335,7 +34335,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34421,7 +34421,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34464,7 +34464,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34507,7 +34507,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34550,7 +34550,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34636,7 +34636,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34679,7 +34679,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34722,7 +34722,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34765,7 +34765,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34849,15 +34849,15 @@
604051
],
"keyReward": {
- "a": "item",
- "t": "10000001",
- "n": 2
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
},
"reward": [
{
- "a": "item",
- "t": "10000001",
- "n": 2
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"exp": 100,
@@ -34894,7 +34894,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34937,7 +34937,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -34980,7 +34980,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35022,13 +35022,13 @@
],
"keyReward": {
"a": "item",
- "t": "13000002",
+ "t": "13000001",
"n": 2
},
"reward": [
{
"a": "item",
- "t": "13000002",
+ "t": "13000001",
"n": 2
}
],
@@ -35064,15 +35064,15 @@
604056
],
"keyReward": {
- "a": "item",
- "t": "10000012",
- "n": 2
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
},
"reward": [
{
- "a": "item",
- "t": "10000012",
- "n": 2
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"exp": 100,
@@ -35109,7 +35109,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35152,7 +35152,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35195,7 +35195,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35279,15 +35279,15 @@
604061
],
"keyReward": {
- "a": "item",
- "t": "10000006",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
},
"reward": [
{
- "a": "item",
- "t": "10000006",
- "n": 1
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"exp": 100,
@@ -35324,7 +35324,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35367,7 +35367,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35410,7 +35410,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35494,15 +35494,15 @@
604066
],
"keyReward": {
- "a": "item",
- "t": "10000001",
- "n": 2
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
},
"reward": [
{
- "a": "item",
- "t": "10000001",
- "n": 2
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"exp": 100,
@@ -35539,7 +35539,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35582,7 +35582,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35625,7 +35625,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35709,15 +35709,15 @@
604071
],
"keyReward": {
- "a": "item",
- "t": "10000012",
- "n": 2
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
},
"reward": [
{
- "a": "item",
- "t": "10000012",
- "n": 2
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
}
],
"exp": 100,
@@ -35754,7 +35754,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35797,7 +35797,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
@@ -35840,7 +35840,7 @@
"keyReward": {
"a": "attr",
"t": "diamond",
- "n": 30
+ "n": 50
},
"reward": [
{
diff --git a/bin/json/game_heroawaken.json b/bin/json/game_heroawaken.json
index 1e5fa3983..3a0d1de3b 100644
--- a/bin/json/game_heroawaken.json
+++ b/bin/json/game_heroawaken.json
@@ -19,10 +19,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -66,10 +62,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -113,10 +105,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -160,10 +148,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -207,10 +191,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -254,10 +234,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -301,10 +277,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -348,10 +320,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -395,10 +363,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -442,10 +406,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -489,10 +449,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -536,10 +492,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -583,10 +535,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -630,10 +578,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -677,10 +621,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -724,10 +664,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -771,10 +707,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -818,10 +750,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -865,10 +793,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -912,10 +836,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -959,10 +879,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -1006,10 +922,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -1053,10 +965,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -1100,10 +1008,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -1147,10 +1051,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -1194,10 +1094,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -1241,10 +1137,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -1288,10 +1180,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -1335,10 +1223,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -1382,10 +1266,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -1429,10 +1309,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -1476,10 +1352,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -1523,10 +1395,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -1570,10 +1438,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -1617,10 +1481,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -1664,10 +1524,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -1711,10 +1567,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -1758,10 +1610,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -1805,10 +1653,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -1852,10 +1696,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -1899,10 +1739,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -1946,10 +1782,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -1993,10 +1825,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -2040,10 +1868,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -2087,10 +1911,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -2134,10 +1954,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -2181,10 +1997,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -2228,10 +2040,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -2275,10 +2083,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -2322,10 +2126,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -2369,10 +2169,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -2416,10 +2212,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -2463,10 +2255,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -2510,10 +2298,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -2557,10 +2341,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -2604,10 +2384,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -2651,10 +2427,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -2698,10 +2470,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -2745,10 +2513,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -2792,10 +2556,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -2839,10 +2599,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -2886,10 +2642,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -2933,10 +2685,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -2980,10 +2728,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -3027,10 +2771,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -3074,10 +2814,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -3121,10 +2857,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -3168,10 +2900,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -3215,10 +2943,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -3262,10 +2986,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -3309,10 +3029,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -3356,10 +3072,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -3403,10 +3115,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -3450,10 +3158,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -3497,10 +3201,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -3544,10 +3244,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -3591,10 +3287,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -3638,10 +3330,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -3685,10 +3373,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -3732,10 +3416,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -3779,10 +3459,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -3826,10 +3502,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -3873,10 +3545,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -3920,10 +3588,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -3967,10 +3631,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -4014,10 +3674,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -4061,10 +3717,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -4108,10 +3760,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -4155,10 +3803,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -4202,10 +3846,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -4249,10 +3889,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -4296,10 +3932,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -4343,10 +3975,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -4390,10 +4018,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -4437,10 +4061,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -4484,10 +4104,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -4531,10 +4147,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -4578,10 +4190,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -4625,10 +4233,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -4672,10 +4276,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -4719,10 +4319,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -4766,10 +4362,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -4813,10 +4405,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -4860,10 +4448,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -4907,10 +4491,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -4954,10 +4534,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -5001,10 +4577,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -5048,10 +4620,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -5095,10 +4663,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -5142,10 +4706,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -5189,10 +4749,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -5236,10 +4792,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -5283,10 +4835,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -5330,10 +4878,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -5377,10 +4921,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -5424,10 +4964,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -5471,10 +5007,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -5518,10 +5050,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -5565,10 +5093,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -5612,10 +5136,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -5659,10 +5179,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -5706,10 +5222,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -5753,10 +5265,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -5800,10 +5308,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -5847,10 +5351,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -5894,10 +5394,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -5941,10 +5437,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -5988,10 +5480,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -6035,10 +5523,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -6082,10 +5566,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -6129,10 +5609,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -6176,10 +5652,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -6223,10 +5695,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -6270,10 +5738,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -6317,10 +5781,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -6364,10 +5824,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -6411,10 +5867,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -6458,10 +5910,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -6505,10 +5953,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -6552,10 +5996,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -6599,10 +6039,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -6646,10 +6082,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -6693,10 +6125,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -6740,10 +6168,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -6787,10 +6211,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -6834,10 +6254,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -6881,10 +6297,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -6928,10 +6340,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -6975,10 +6383,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -7022,10 +6426,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -7069,10 +6469,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -7116,10 +6512,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -7163,10 +6555,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -7210,10 +6598,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -7257,10 +6641,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -7304,10 +6684,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -7351,10 +6727,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -7398,10 +6770,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -7445,10 +6813,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -7492,10 +6856,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -7539,10 +6899,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -7586,10 +6942,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -7633,10 +6985,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -7680,10 +7028,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -7727,10 +7071,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -7774,10 +7114,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -7821,10 +7157,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -7868,10 +7200,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -7915,10 +7243,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -7962,10 +7286,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -8009,10 +7329,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -8056,10 +7372,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -8103,10 +7415,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -8150,10 +7458,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -8197,10 +7501,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -8244,10 +7544,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -8291,10 +7587,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -8338,10 +7630,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -8385,10 +7673,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -8432,10 +7716,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -8479,10 +7759,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -8526,10 +7802,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -8573,10 +7845,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -8620,10 +7888,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -8667,10 +7931,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -8714,10 +7974,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -8761,10 +8017,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -8808,10 +8060,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -8855,10 +8103,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -8902,10 +8146,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -8949,10 +8189,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -8996,10 +8232,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -9043,10 +8275,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -9090,10 +8318,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -9137,10 +8361,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -9184,10 +8404,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -9231,10 +8447,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -9278,10 +8490,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -9325,10 +8533,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -9372,10 +8576,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -9419,10 +8619,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -9466,10 +8662,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -9513,10 +8705,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -9560,10 +8748,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -9607,10 +8791,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -9654,10 +8834,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -9701,10 +8877,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -9748,10 +8920,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -9795,10 +8963,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -9842,10 +9006,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -9889,10 +9049,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -9936,10 +9092,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -9983,10 +9135,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -10030,10 +9178,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -10077,10 +9221,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -10124,10 +9264,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -10171,10 +9307,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -10218,10 +9350,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -10265,10 +9393,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -10312,10 +9436,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -10359,10 +9479,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -10406,10 +9522,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -10453,10 +9565,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -10500,10 +9608,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -10547,10 +9651,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -10594,10 +9694,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -10641,10 +9737,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -10688,10 +9780,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -10735,10 +9823,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -10782,10 +9866,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -10829,10 +9909,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -10876,10 +9952,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -10923,10 +9995,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -10970,10 +10038,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -11017,10 +10081,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -11064,10 +10124,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -11111,10 +10167,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -11158,10 +10210,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -11205,10 +10253,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -11252,10 +10296,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -11299,10 +10339,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -11346,10 +10382,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -11393,10 +10425,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -11440,10 +10468,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -11487,10 +10511,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -11534,10 +10554,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -11581,10 +10597,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -11628,10 +10640,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -11675,10 +10683,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -11722,10 +10726,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -11769,10 +10769,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -11816,10 +10812,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -11863,10 +10855,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -11910,10 +10898,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -11957,10 +10941,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -12004,10 +10984,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -12051,10 +11027,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -12098,10 +11070,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -12145,10 +11113,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -12192,10 +11156,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -12239,10 +11199,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -12286,10 +11242,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -12333,10 +11285,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -12380,10 +11328,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -12427,10 +11371,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -12474,10 +11414,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -12521,10 +11457,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -12568,10 +11500,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -12615,10 +11543,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -12662,10 +11586,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -12709,10 +11629,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -12756,10 +11672,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -12803,10 +11715,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -12850,10 +11758,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -12897,10 +11801,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -12944,10 +11844,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -12991,10 +11887,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -13038,10 +11930,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -13085,10 +11973,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -13132,10 +12016,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -13179,10 +12059,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -13226,10 +12102,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -13273,10 +12145,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -13320,10 +12188,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -13367,10 +12231,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -13414,10 +12274,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -13461,10 +12317,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -13508,10 +12360,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -13555,10 +12403,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -13602,10 +12446,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -13649,10 +12489,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -13696,10 +12532,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -13743,10 +12575,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -13790,10 +12618,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -13837,10 +12661,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -13884,10 +12704,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -13931,10 +12747,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -13978,10 +12790,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -14025,10 +12833,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -14072,10 +12876,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -14119,10 +12919,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -14166,10 +12962,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -14213,10 +13005,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -14260,10 +13048,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -14307,10 +13091,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -14354,10 +13134,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -14401,10 +13177,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -14448,10 +13220,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -14495,10 +13263,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -14542,10 +13306,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -14589,10 +13349,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -14636,10 +13392,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -14683,10 +13435,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -14730,10 +13478,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -14777,10 +13521,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -14824,10 +13564,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -14871,10 +13607,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -14918,10 +13650,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -14965,10 +13693,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -15012,10 +13736,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -15059,10 +13779,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -15106,10 +13822,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -15153,10 +13865,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -15200,10 +13908,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -15247,10 +13951,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -15294,10 +13994,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -15341,10 +14037,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -15388,10 +14080,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -15435,10 +14123,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -15482,10 +14166,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -15529,10 +14209,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -15576,10 +14252,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -15623,10 +14295,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -15670,10 +14338,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -15717,10 +14381,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -15764,10 +14424,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -15811,10 +14467,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -15858,10 +14510,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -15905,10 +14553,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -15952,10 +14596,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -15999,10 +14639,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -16046,10 +14682,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -16093,10 +14725,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -16140,10 +14768,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -16187,10 +14811,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -16234,10 +14854,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -16281,10 +14897,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -16328,10 +14940,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -16375,10 +14983,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -16422,10 +15026,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -16469,10 +15069,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -16516,10 +15112,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -16563,10 +15155,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -16610,10 +15198,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -16657,10 +15241,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -16704,10 +15284,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -16751,10 +15327,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -16798,10 +15370,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -16845,10 +15413,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -16892,10 +15456,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -16939,10 +15499,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -16986,10 +15542,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -17033,10 +15585,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -17080,10 +15628,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -17127,10 +15671,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -17174,10 +15714,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -17221,10 +15757,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -17268,10 +15800,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -17315,10 +15843,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -17362,10 +15886,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -17409,10 +15929,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -17456,10 +15972,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -17503,10 +16015,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -17550,10 +16058,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -17597,10 +16101,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -17644,10 +16144,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -17691,10 +16187,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -17738,10 +16230,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -17785,10 +16273,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -17832,10 +16316,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -17879,10 +16359,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -17926,10 +16402,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -17973,10 +16445,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -18020,10 +16488,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -18067,10 +16531,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -18114,10 +16574,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -18161,10 +16617,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -18208,10 +16660,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -18255,10 +16703,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -18302,10 +16746,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -18349,10 +16789,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -18396,10 +16832,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -18443,10 +16875,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -18490,10 +16918,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -18537,10 +16961,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -18584,10 +17004,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -18631,10 +17047,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -18678,10 +17090,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -18725,10 +17133,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -18772,10 +17176,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -18819,10 +17219,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -18866,10 +17262,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -18913,10 +17305,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -18960,10 +17348,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -19007,10 +17391,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -19054,10 +17434,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -19101,10 +17477,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -19148,10 +17520,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -19195,10 +17563,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -19242,10 +17606,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -19289,10 +17649,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -19336,10 +17692,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -19383,10 +17735,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -19430,10 +17778,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -19477,10 +17821,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -19524,10 +17864,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -19571,10 +17907,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -19618,10 +17950,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -19665,10 +17993,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -19712,10 +18036,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
@@ -19759,10 +18079,6 @@
{
"s": "hppro",
"d": 60
- },
- {
- "s": "speed",
- "d": 60
}
],
"skill": 0,
@@ -19806,10 +18122,6 @@
{
"s": "hppro",
"d": 80
- },
- {
- "s": "speed",
- "d": 80
}
],
"skill": 0,
@@ -19853,10 +18165,6 @@
{
"s": "hppro",
"d": 120
- },
- {
- "s": "speed",
- "d": 120
}
],
"skill": 0,
@@ -19900,10 +18208,6 @@
{
"s": "hppro",
"d": 140
- },
- {
- "s": "speed",
- "d": 140
}
],
"skill": 0,
@@ -19947,10 +18251,6 @@
{
"s": "hppro",
"d": 180
- },
- {
- "s": "speed",
- "d": 180
}
],
"skill": 0,
@@ -19994,10 +18294,6 @@
{
"s": "hppro",
"d": 200
- },
- {
- "s": "speed",
- "d": 200
}
],
"skill": 0,
diff --git a/bin/json/game_mainachievement.json b/bin/json/game_mainachievement.json
new file mode 100644
index 000000000..f5dff989e
--- /dev/null
+++ b/bin/json/game_mainachievement.json
@@ -0,0 +1,155 @@
+[
+ {
+ "key": 110001,
+ "id": 11001,
+ "title": {
+ "key": "mainchapter_main_achievement_title_1",
+ "text": "碎片1"
+ },
+ "taskid": 11001001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "icon": "item_50013001"
+ },
+ {
+ "key": 110002,
+ "id": 11001,
+ "title": {
+ "key": "mainchapter_main_achievement_title_2",
+ "text": "碎片2"
+ },
+ "taskid": 11001001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1001
+ }
+ ],
+ "icon": "item_50013001"
+ },
+ {
+ "key": 110003,
+ "id": 11001,
+ "title": {
+ "key": "mainchapter_main_achievement_title_3",
+ "text": "碎片3"
+ },
+ "taskid": 11001001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1002
+ }
+ ],
+ "icon": "item_50013001"
+ },
+ {
+ "key": 110004,
+ "id": 11001,
+ "title": {
+ "key": "mainchapter_main_achievement_title_4",
+ "text": "碎片4"
+ },
+ "taskid": 11001001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1003
+ }
+ ],
+ "icon": "item_50013001"
+ },
+ {
+ "key": 110005,
+ "id": 11001,
+ "title": {
+ "key": "mainchapter_main_achievement_title_5",
+ "text": "碎片5"
+ },
+ "taskid": 11001001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1004
+ }
+ ],
+ "icon": "item_50013001"
+ },
+ {
+ "key": 110006,
+ "id": 11001,
+ "title": {
+ "key": "mainchapter_main_achievement_title_6",
+ "text": "碎片6"
+ },
+ "taskid": 11001001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1005
+ }
+ ],
+ "icon": "item_50013001"
+ },
+ {
+ "key": 110007,
+ "id": 11001,
+ "title": {
+ "key": "mainchapter_main_achievement_title_7",
+ "text": "碎片7"
+ },
+ "taskid": 11001001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1006
+ }
+ ],
+ "icon": "item_50013001"
+ },
+ {
+ "key": 110008,
+ "id": 11001,
+ "title": {
+ "key": "mainchapter_main_achievement_title_8",
+ "text": "碎片8"
+ },
+ "taskid": 11001001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1007
+ }
+ ],
+ "icon": "item_50013001"
+ },
+ {
+ "key": 110009,
+ "id": 11001,
+ "title": {
+ "key": "mainchapter_main_achievement_title_9",
+ "text": "碎片9"
+ },
+ "taskid": 11001001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1008
+ }
+ ],
+ "icon": "item_50013001"
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json
index 88fa38d32..625174d66 100644
--- a/bin/json/game_mainchapter.json
+++ b/bin/json/game_mainchapter.json
@@ -1,6 +1,21 @@
[
{
"id": 11001,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_1",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_1",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_1",
"text": "预言之声"
@@ -25,6 +40,21 @@
},
{
"id": 11002,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_2",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_2",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_2",
"text": "大龙复仇记"
@@ -49,6 +79,21 @@
},
{
"id": 11003,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_3",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_3",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_3",
"text": "小偷与大盗"
@@ -73,6 +118,21 @@
},
{
"id": 11004,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_4",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_4",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_4",
"text": "智取邀请函"
@@ -97,6 +157,21 @@
},
{
"id": 11005,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_5",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_5",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_5",
"text": "黑市风波"
@@ -121,6 +196,21 @@
},
{
"id": 11006,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_6",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_6",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_6",
"text": "小马王 · 一路向北"
@@ -145,6 +235,21 @@
},
{
"id": 11007,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_7",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_7",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_7",
"text": "海洋之歌"
@@ -169,6 +274,21 @@
},
{
"id": 11008,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_8",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_8",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_8",
"text": "布兰奇的逃亡"
@@ -193,6 +313,21 @@
},
{
"id": 11009,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_9",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_9",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_9",
"text": "配方奶工厂"
@@ -217,6 +352,21 @@
},
{
"id": 11010,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_10",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_10",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_10",
"text": "预言之声"
@@ -241,6 +391,21 @@
},
{
"id": 11011,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_11",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_11",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_11",
"text": "大龙复仇记"
@@ -265,6 +430,21 @@
},
{
"id": 11012,
+ "reward": {
+ "a": "hero",
+ "t": "44005",
+ "n": 1
+ },
+ "describe": {
+ "key": "mainchapter_main_chapter_describe_12",
+ "text": "获得小伊"
+ },
+ "achunlock": 11001001,
+ "shopname": {
+ "key": "mainchapter_main_chapter_shopname_12",
+ "text": "特色商店"
+ },
+ "shopunlock": 11001001,
"name": {
"key": "mainchapter_main_chapter_name_12",
"text": "小偷与大盗"
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index a37a7a4eb..955568505 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -69,7 +69,7 @@
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
- "venturemodel": "",
+ "venturemodel": "Person/badcar/badcar.prefab",
"bubbletalk": {
"key": "",
"text": ""
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
index 40b2c696b..56e548e86 100644
--- a/bin/json/game_rdtasknpc.json
+++ b/bin/json/game_rdtasknpc.json
@@ -6319,12 +6319,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 12890
+ 10000390
],
"goto": 0
},
@@ -6349,12 +6349,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 13010
+ 10000420
],
"goto": 0
},
@@ -6364,12 +6364,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 12890
+ 10000390
],
"goto": 0
},
@@ -6394,12 +6394,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 13010
+ 10000420
],
"goto": 0
},
@@ -6409,12 +6409,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 12890
+ 10000390
],
"goto": 0
},
@@ -6439,12 +6439,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 13010
+ 10000420
],
"goto": 0
},
@@ -6454,12 +6454,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 12890
+ 10000390
],
"goto": 0
},
@@ -6484,12 +6484,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 13010
+ 10000420
],
"goto": 0
},
@@ -6499,12 +6499,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 12890
+ 10000390
],
"goto": 0
},
@@ -6529,12 +6529,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 13010
+ 10000420
],
"goto": 0
},
@@ -6544,12 +6544,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 12890
+ 10000390
],
"goto": 0
},
@@ -6574,12 +6574,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 13010
+ 10000420
],
"goto": 0
},
@@ -6589,12 +6589,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 12890
+ 10000390
],
"goto": 0
},
@@ -6619,12 +6619,12 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-招募",
+ "功能入口-浇水拼图",
"901"
],
"event": [
2,
- 13010
+ 10000420
],
"goto": 0
},
@@ -6859,7 +6859,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-竞技场",
+ "功能入口-浇水拼图",
"901"
],
"event": [
@@ -6882,7 +6882,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-竞技场",
+ "功能入口-浇水拼图",
"901"
],
"event": [
@@ -6897,7 +6897,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-竞技场",
+ "功能入口-维京远征",
"901"
],
"event": [
@@ -6920,7 +6920,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-竞技场",
+ "功能入口-维京远征",
"901"
],
"event": [
@@ -6935,7 +6935,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-竞技场",
+ "功能入口-魔药",
"901"
],
"event": [
@@ -6958,7 +6958,7 @@
"Levelid": 0,
"datas": [
"GameMain",
- "功能入口-竞技场",
+ "功能入口-魔药",
"901"
],
"event": [
@@ -6972,9 +6972,9 @@
"heroid": 25001,
"Levelid": 0,
"datas": [
- "GameMain",
- "功能入口-竞技场",
- "901"
+ "SmithyScene",
+ "打造",
+ "139"
],
"event": [
2,
@@ -6995,9 +6995,9 @@
"heroid": 25001,
"Levelid": 0,
"datas": [
- "GameMain",
- "功能入口-竞技场",
- "901"
+ "SmithyScene",
+ "打造",
+ "139"
],
"event": [
2,
diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json
index 5bac45b8c..fbd878601 100644
--- a/bin/json/game_ruledesc.json
+++ b/bin/json/game_ruledesc.json
@@ -51,7 +51,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_5",
- "text": "这里可以查看各种功夫陪练，完成陪练可以获得高额奖励。
完成3/6/9次的陪练还有额外奖励可以领取。"
+ "text": "这里可以查看各种功夫陪练，完成陪练可以获得高额奖励。
完成4/8/12次的陪练还有额外奖励可以领取。"
}
},
{
diff --git a/comm/const.go b/comm/const.go
index 88124d59e..3bd829b21 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -354,6 +354,8 @@ const (
//新主线商店数据表
TableMainlineShop = "mainlineshop"
+
+ TableMainlinetask = "mlinetask"
)
// RPC服务接口定义处
diff --git a/modules/mainline/api_info.go b/modules/mainline/api_info.go
index 6e890573b..28dc3ed2d 100644
--- a/modules/mainline/api_info.go
+++ b/modules/mainline/api_info.go
@@ -6,24 +6,24 @@ import (
)
// 参数校验
-func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.MainlineInfoReq) (errdata *pb.ErrorData) {
+func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.MainlineTaskInfoReq) (errdata *pb.ErrorData) {
+
return
}
-// /获取主线关卡信息
-func (this *apiComp) Info(session comm.IUserSession, req *pb.MainlineInfoReq) (errdata *pb.ErrorData) {
+func (this *apiComp) Info(session comm.IUserSession, req *pb.MainlineTaskInfoReq) (errdata *pb.ErrorData) {
var (
- info *pb.DBMainline
- err error
+ dtask *pb.DBMainTask
+ tasks map[int32]struct{}
+ condiIds []int32
+ progress []*pb.ConIProgress
+ err error
)
-
- errdata = this.InfoCheck(session, req)
- if errdata != nil {
- return // 参数校验失败直接返回
+ if errdata = this.InfoCheck(session, req); errdata != nil {
+ return
}
- info, err = this.module.modelMline.getMainlineData(session.GetUserId())
- if err != nil {
+ if dtask, err = this.module.modelTask.getUserDTasks(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
@@ -31,6 +31,16 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.MainlineInfoReq) (e
}
return
}
- session.SendMsg(string(this.module.GetType()), "info", &pb.MainlineInfoResp{Info: info})
+ tasks = this.module.configure.gettasks()
+ condiIds = make([]int32, 0, len(tasks))
+ for k, _ := range tasks {
+ condiIds = append(condiIds, k)
+ }
+
+ if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil {
+ return
+ }
+
+ session.SendMsg(string(this.module.GetType()), "info", &pb.MainlineTaskInfoResp{Conlds: progress, Tasks: dtask.Tasks})
return
}
diff --git a/modules/mainline/api_taskreceive.go b/modules/mainline/api_taskreceive.go
new file mode 100644
index 000000000..9f418982a
--- /dev/null
+++ b/modules/mainline/api_taskreceive.go
@@ -0,0 +1,81 @@
+package mainline
+
+import (
+ "fmt"
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+)
+
+// 参数校验
+func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.MainlineTaskReceiveReq) (errdata *pb.ErrorData) {
+
+ return
+}
+
+// /获取自己的排行榜信息
+func (this *apiComp) Receive(session comm.IUserSession, req *pb.MainlineTaskReceiveReq) (errdata *pb.ErrorData) {
+ var (
+ dtask *pb.DBMainTask
+ conf *cfg.GameMainAchievementData
+
+ progress []*pb.ConIProgress
+ award []*pb.UserAtno
+ err error
+ )
+ if errdata = this.ReceiveCheck(session, req); errdata != nil {
+ return
+ }
+
+ if conf, err = this.module.configure.getGameVenturegiftsTask(req.Id); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ if dtask, err = this.module.modelTask.getUserDTasks(session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if dtask.Tasks[req.Id] == 1 {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ Message: fmt.Sprintf("%d received", req.Id),
+ }
+ return
+ }
+
+ if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Id); err != nil {
+ return
+ }
+
+ for _, v := range progress {
+ if v.State == pb.BuriedItemFinishState_buried_unfinish {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ Message: "task no finish",
+ }
+ return
+ }
+ }
+
+ if errdata, award = this.module.DispenseAtno(session, conf.Reword, true); errdata != nil {
+ return
+ }
+
+ dtask.Tasks[req.Id] = 1
+ this.module.modelTask.Change(session.GetUserId(), map[string]interface{}{
+ "tasks": dtask.Tasks,
+ })
+ session.SendMsg(string(this.module.GetType()), "receive", &pb.MainlineTaskReceiveResp{Id: req.Id, Award: award})
+ return
+}
diff --git a/modules/mainline/comp_configure.go b/modules/mainline/comp_configure.go
index 3c48cb2e5..20aabcbfd 100644
--- a/modules/mainline/comp_configure.go
+++ b/modules/mainline/comp_configure.go
@@ -11,10 +11,11 @@ import (
const moduleName = "mline"
const (
- game_mainchapter = "game_mainchapter.json"
- game_mainstage = "game_mainstage.json"
- game_mainstarreward = "game_mainstarreward.json"
- game_mainshopitem = "game_mainshopitem.json"
+ game_mainchapter = "game_mainchapter.json"
+ game_mainstage = "game_mainstage.json"
+ game_mainstarreward = "game_mainstarreward.json"
+ game_mainshopitem = "game_mainshopitem.json"
+ game_mainachievement = "game_mainachievement.json"
)
// /配置管理基础组件
@@ -24,6 +25,9 @@ type configureComp struct {
lock sync.RWMutex
chapterMap map[int32][]*cfg.GameMainStageData
rewardMap map[int32][]*cfg.GameMainStarrewardData
+
+ tasks map[int32]struct{}
+ groupTasks map[int32][]*cfg.GameMainAchievementData //key 条件ID
}
// 组件初始化接口
@@ -37,7 +41,9 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.chapterMap = make(map[int32][]*cfg.GameMainStageData)
configure.RegisterConfigure(game_mainstage, cfg.NewGameMainStage, this.updateMlineStage)
configure.RegisterConfigure(game_mainstarreward, cfg.NewGameMainStarreward, this.updateMlineReward)
+ configure.RegisterConfigure(game_mainachievement, cfg.NewGameMainAchievement, this.GameMainAchievement)
+ this.gettasks()
return
}
@@ -178,3 +184,56 @@ func (this *configureComp) GetMlineShopConfById(cid int32) (conf *cfg.GameMainSh
err = comm.NewNotFoundConfErr(moduleName, game_mainstage, cid)
return
}
+
+// 更新任务配置表
+func (this *configureComp) GameMainAchievement() {
+ var (
+ v interface{}
+ conf *cfg.GameMainAchievement
+ ok bool
+ err error
+ )
+ if v, err = this.GetConfigure(game_mainachievement); err != nil {
+ return
+ }
+ if conf, ok = v.(*cfg.GameMainAchievement); !ok {
+ this.module.Error("日常任务配置异常!")
+ return
+ }
+ tasks := make(map[int32]struct{})
+ groupTasksConf := make(map[int32][]*cfg.GameMainAchievementData)
+
+ for _, v := range conf.GetDataList() {
+
+ if _, ok := groupTasksConf[v.Id]; !ok {
+ groupTasksConf[v.Id] = make([]*cfg.GameMainAchievementData, 0)
+ }
+ groupTasksConf[v.Id] = append(groupTasksConf[v.Id], v)
+ tasks[v.Taskid] = struct{}{}
+ }
+
+ this.lock.Lock()
+ this.groupTasks = groupTasksConf
+ this.tasks = tasks
+ this.lock.Unlock()
+}
+func (this *configureComp) gettasks() map[int32]struct{} {
+ this.lock.RLock()
+ defer this.lock.RUnlock()
+ return this.tasks
+}
+func (this *configureComp) getGameVenturegiftsTask(id int32) (conf *cfg.GameMainAchievementData, err error) {
+ var (
+ v interface{}
+ ok bool
+ )
+ if v, err = this.GetConfigure(game_mainachievement); err != nil {
+ return
+ }
+ if conf, ok = v.(*cfg.GameMainAchievement).GetDataMap()[id]; !ok {
+ err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_mainachievement, id)
+ this.module.Errorln(err)
+ return
+ }
+ return
+}
diff --git a/modules/mainline/modeltask.go b/modules/mainline/modeltask.go
new file mode 100644
index 000000000..bf4990953
--- /dev/null
+++ b/modules/mainline/modeltask.go
@@ -0,0 +1,46 @@
+package mainline
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/lego/sys/mgo"
+ "go_dreamfactory/modules"
+ "go_dreamfactory/pb"
+
+ "go.mongodb.org/mongo-driver/bson/primitive"
+ "go.mongodb.org/mongo-driver/mongo"
+ "go.mongodb.org/mongo-driver/x/bsonx"
+)
+
+type Modeltask struct {
+ modules.MCompModel
+ module *Mainline
+}
+
+func (this *Modeltask) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ err = this.MCompModel.Init(service, module, comp, options)
+ this.TableName = comm.TableMainlinetask
+ this.module = module.(*Mainline)
+ this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
+ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
+ })
+ return
+}
+
+// 获取用户全部的埋点数据
+func (this *Modeltask) getUserDTasks(uid string) (results *pb.DBMainTask, err error) {
+ results = &pb.DBMainTask{}
+ if err = this.Get(uid, results); err != nil && err != mgo.MongodbNil {
+ this.module.Errorln(err)
+ return
+ }
+ if err == mgo.MongodbNil {
+ results = &pb.DBMainTask{
+ Id: primitive.NewObjectID().Hex(),
+ Uid: uid,
+ Tasks: make(map[int32]int32),
+ }
+ err = this.Add(uid, results)
+ }
+ return
+}
diff --git a/modules/mainline/module.go b/modules/mainline/module.go
index 167a2a71e..d6e83fd78 100644
--- a/modules/mainline/module.go
+++ b/modules/mainline/module.go
@@ -17,6 +17,7 @@ type Mainline struct {
configure *configureComp
battle comm.IBattle
modelShop *ModelShop
+ modelTask *Modeltask
}
func NewModule() core.IModule {
@@ -38,6 +39,7 @@ func (this *Mainline) OnInstallComp() {
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
this.modelMline = this.RegisterComp(new(ModelMline)).(*ModelMline)
this.modelShop = this.RegisterComp(new(ModelShop)).(*ModelShop)
+ this.modelTask = this.RegisterComp(new(Modeltask)).(*Modeltask)
this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
}
diff --git a/modules/robot/modulerobot_pagoda.go b/modules/robot/modulerobot_pagoda.go
index 6dd9b89ce..bc1b05446 100644
--- a/modules/robot/modulerobot_pagoda.go
+++ b/modules/robot/modulerobot_pagoda.go
@@ -14,9 +14,11 @@ import (
//爬塔模块 机器人
type ModuleRobot_Pagoda struct {
pagoda *pb.DBPagoda
+ c *configureComp
}
func (this *ModuleRobot_Pagoda) Init() (err error) {
+ this.c = new(configureComp)
return
}
@@ -27,7 +29,12 @@ func (this *ModuleRobot_Pagoda) Receive(robot IRobot, stype string, message prot
resp := message.(*pb.PagodaGetListResp)
this.pagoda = resp.Data
break
+ case "challengeover": // 更新塔信息
+ resp := message.(*pb.PagodaChallengeOverResp)
+ this.pagoda = resp.Data
+ break
}
+
return
}
diff --git a/pb/mainline_db.pb.go b/pb/mainline_db.pb.go
index 9f85403c3..eeb0d293d 100644
--- a/pb/mainline_db.pb.go
+++ b/pb/mainline_db.pb.go
@@ -250,6 +250,69 @@ func (x *DBMainlineShop) GetUnlock() map[int32]int32 {
return nil
}
+type DBMainTask struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`
+ Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
+ Tasks map[int32]int32 `protobuf:"bytes,3,rep,name=tasks,proto3" json:"tasks" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+}
+
+func (x *DBMainTask) Reset() {
+ *x = DBMainTask{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_mainline_mainline_db_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBMainTask) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBMainTask) ProtoMessage() {}
+
+func (x *DBMainTask) ProtoReflect() protoreflect.Message {
+ mi := &file_mainline_mainline_db_proto_msgTypes[3]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use DBMainTask.ProtoReflect.Descriptor instead.
+func (*DBMainTask) Descriptor() ([]byte, []int) {
+ return file_mainline_mainline_db_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *DBMainTask) GetId() string {
+ if x != nil {
+ return x.Id
+ }
+ return ""
+}
+
+func (x *DBMainTask) GetUid() string {
+ if x != nil {
+ return x.Uid
+ }
+ return ""
+}
+
+func (x *DBMainTask) GetTasks() map[int32]int32 {
+ if x != nil {
+ return x.Tasks
+ }
+ return nil
+}
+
var File_mainline_mainline_db_proto protoreflect.FileDescriptor
var file_mainline_mainline_db_proto_rawDesc = []byte{
@@ -332,8 +395,17 @@ var file_mainline_mainline_db_proto_rawDesc = []byte{
0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
- 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x33,
+ 0x02, 0x38, 0x01, 0x22, 0x96, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61,
+ 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
+ 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b,
+ 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x61, 0x73,
+ 0x6b, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
+ 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04,
+ 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -348,39 +420,42 @@ func file_mainline_mainline_db_proto_rawDescGZIP() []byte {
return file_mainline_mainline_db_proto_rawDescData
}
-var file_mainline_mainline_db_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_mainline_mainline_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
var file_mainline_mainline_db_proto_goTypes = []interface{}{
(*DBMainline)(nil), // 0: DBMainline
(*DBMainlineAward)(nil), // 1: DBMainlineAward
(*DBMainlineShop)(nil), // 2: DBMainlineShop
- nil, // 3: DBMainline.LastlevelEntry
- nil, // 4: DBMainline.LevelEntry
- nil, // 5: DBMainline.ChapterawardEntry
- nil, // 6: DBMainline.ExploreawardEntry
- nil, // 7: DBMainline.GroupawardEntry
- nil, // 8: DBMainline.PsEntry
- nil, // 9: DBMainlineAward.AwardEntry
- nil, // 10: DBMainlineShop.BuytimeEntry
- nil, // 11: DBMainlineShop.UnlockEntry
+ (*DBMainTask)(nil), // 3: DBMainTask
+ nil, // 4: DBMainline.LastlevelEntry
+ nil, // 5: DBMainline.LevelEntry
+ nil, // 6: DBMainline.ChapterawardEntry
+ nil, // 7: DBMainline.ExploreawardEntry
+ nil, // 8: DBMainline.GroupawardEntry
+ nil, // 9: DBMainline.PsEntry
+ nil, // 10: DBMainlineAward.AwardEntry
+ nil, // 11: DBMainlineShop.BuytimeEntry
+ nil, // 12: DBMainlineShop.UnlockEntry
+ nil, // 13: DBMainTask.TasksEntry
}
var file_mainline_mainline_db_proto_depIdxs = []int32{
- 3, // 0: DBMainline.lastlevel:type_name -> DBMainline.LastlevelEntry
- 4, // 1: DBMainline.level:type_name -> DBMainline.LevelEntry
- 5, // 2: DBMainline.chapteraward:type_name -> DBMainline.ChapterawardEntry
- 6, // 3: DBMainline.exploreaward:type_name -> DBMainline.ExploreawardEntry
- 7, // 4: DBMainline.groupaward:type_name -> DBMainline.GroupawardEntry
- 8, // 5: DBMainline.ps:type_name -> DBMainline.PsEntry
- 9, // 6: DBMainlineAward.award:type_name -> DBMainlineAward.AwardEntry
- 10, // 7: DBMainlineShop.buytime:type_name -> DBMainlineShop.BuytimeEntry
- 11, // 8: DBMainlineShop.unlock:type_name -> DBMainlineShop.UnlockEntry
- 1, // 9: DBMainline.ChapterawardEntry.value:type_name -> DBMainlineAward
- 1, // 10: DBMainline.ExploreawardEntry.value:type_name -> DBMainlineAward
- 1, // 11: DBMainline.GroupawardEntry.value:type_name -> DBMainlineAward
- 12, // [12:12] is the sub-list for method output_type
- 12, // [12:12] is the sub-list for method input_type
- 12, // [12:12] is the sub-list for extension type_name
- 12, // [12:12] is the sub-list for extension extendee
- 0, // [0:12] is the sub-list for field type_name
+ 4, // 0: DBMainline.lastlevel:type_name -> DBMainline.LastlevelEntry
+ 5, // 1: DBMainline.level:type_name -> DBMainline.LevelEntry
+ 6, // 2: DBMainline.chapteraward:type_name -> DBMainline.ChapterawardEntry
+ 7, // 3: DBMainline.exploreaward:type_name -> DBMainline.ExploreawardEntry
+ 8, // 4: DBMainline.groupaward:type_name -> DBMainline.GroupawardEntry
+ 9, // 5: DBMainline.ps:type_name -> DBMainline.PsEntry
+ 10, // 6: DBMainlineAward.award:type_name -> DBMainlineAward.AwardEntry
+ 11, // 7: DBMainlineShop.buytime:type_name -> DBMainlineShop.BuytimeEntry
+ 12, // 8: DBMainlineShop.unlock:type_name -> DBMainlineShop.UnlockEntry
+ 13, // 9: DBMainTask.tasks:type_name -> DBMainTask.TasksEntry
+ 1, // 10: DBMainline.ChapterawardEntry.value:type_name -> DBMainlineAward
+ 1, // 11: DBMainline.ExploreawardEntry.value:type_name -> DBMainlineAward
+ 1, // 12: DBMainline.GroupawardEntry.value:type_name -> DBMainlineAward
+ 13, // [13:13] is the sub-list for method output_type
+ 13, // [13:13] is the sub-list for method input_type
+ 13, // [13:13] is the sub-list for extension type_name
+ 13, // [13:13] is the sub-list for extension extendee
+ 0, // [0:13] is the sub-list for field type_name
}
func init() { file_mainline_mainline_db_proto_init() }
@@ -425,6 +500,18 @@ func file_mainline_mainline_db_proto_init() {
return nil
}
}
+ file_mainline_mainline_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBMainTask); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
}
type x struct{}
out := protoimpl.TypeBuilder{
@@ -432,7 +519,7 @@ func file_mainline_mainline_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_mainline_mainline_db_proto_rawDesc,
NumEnums: 0,
- NumMessages: 12,
+ NumMessages: 14,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/mainline_msg.pb.go b/pb/mainline_msg.pb.go
index 29af47210..ffdb6d2d5 100644
--- a/pb/mainline_msg.pb.go
+++ b/pb/mainline_msg.pb.go
@@ -868,92 +868,311 @@ func (x *MainlineShopChangePush) GetCid() []int32 {
return nil
}
+type MainlineTaskInfoReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *MainlineTaskInfoReq) Reset() {
+ *x = MainlineTaskInfoReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[15]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *MainlineTaskInfoReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MainlineTaskInfoReq) ProtoMessage() {}
+
+func (x *MainlineTaskInfoReq) ProtoReflect() protoreflect.Message {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[15]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use MainlineTaskInfoReq.ProtoReflect.Descriptor instead.
+func (*MainlineTaskInfoReq) Descriptor() ([]byte, []int) {
+ return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{15}
+}
+
+type MainlineTaskInfoResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Conlds []*ConIProgress `protobuf:"bytes,1,rep,name=conlds,proto3" json:"conlds"` //子任务进度数据
+ Tasks map[int32]int32 `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+}
+
+func (x *MainlineTaskInfoResp) Reset() {
+ *x = MainlineTaskInfoResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[16]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *MainlineTaskInfoResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MainlineTaskInfoResp) ProtoMessage() {}
+
+func (x *MainlineTaskInfoResp) ProtoReflect() protoreflect.Message {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[16]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use MainlineTaskInfoResp.ProtoReflect.Descriptor instead.
+func (*MainlineTaskInfoResp) Descriptor() ([]byte, []int) {
+ return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *MainlineTaskInfoResp) GetConlds() []*ConIProgress {
+ if x != nil {
+ return x.Conlds
+ }
+ return nil
+}
+
+func (x *MainlineTaskInfoResp) GetTasks() map[int32]int32 {
+ if x != nil {
+ return x.Tasks
+ }
+ return nil
+}
+
+//领奖 请求
+type MainlineTaskReceiveReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
+}
+
+func (x *MainlineTaskReceiveReq) Reset() {
+ *x = MainlineTaskReceiveReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[17]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *MainlineTaskReceiveReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MainlineTaskReceiveReq) ProtoMessage() {}
+
+func (x *MainlineTaskReceiveReq) ProtoReflect() protoreflect.Message {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[17]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use MainlineTaskReceiveReq.ProtoReflect.Descriptor instead.
+func (*MainlineTaskReceiveReq) Descriptor() ([]byte, []int) {
+ return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *MainlineTaskReceiveReq) GetId() int32 {
+ if x != nil {
+ return x.Id
+ }
+ return 0
+}
+
+//领奖 请求回应
+type MainlineTaskReceiveResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
+ Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
+}
+
+func (x *MainlineTaskReceiveResp) Reset() {
+ *x = MainlineTaskReceiveResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[18]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *MainlineTaskReceiveResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MainlineTaskReceiveResp) ProtoMessage() {}
+
+func (x *MainlineTaskReceiveResp) ProtoReflect() protoreflect.Message {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[18]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use MainlineTaskReceiveResp.ProtoReflect.Descriptor instead.
+func (*MainlineTaskReceiveResp) Descriptor() ([]byte, []int) {
+ return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *MainlineTaskReceiveResp) GetId() int32 {
+ if x != nil {
+ return x.Id
+ }
+ return 0
+}
+
+func (x *MainlineTaskReceiveResp) GetAward() []*UserAtno {
+ if x != nil {
+ return x.Award
+ }
+ return nil
+}
+
var File_mainline_mainline_msg_proto protoreflect.FileDescriptor
var file_mainline_mainline_msg_proto_rawDesc = []byte{
0x0a, 0x1b, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x6c,
0x69, 0x6e, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x6d,
0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
- 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x11,
- 0x0a, 0x0f, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
- 0x71, 0x22, 0x33, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x6e, 0x66,
- 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
- 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x56, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
- 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14,
- 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
- 0x65, 0x76, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72,
- 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x4e,
- 0x0a, 0x15, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
- 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e,
- 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65,
- 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x57,
- 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
- 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65,
- 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c,
- 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52,
- 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x9c, 0x01, 0x0a, 0x19, 0x4d, 0x61, 0x69, 0x6e,
- 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65,
- 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73,
- 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12,
- 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61,
- 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a, 0x07,
- 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68,
- 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x22, 0x2c, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
- 0x6e, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14,
- 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
- 0x65, 0x76, 0x65, 0x6c, 0x22, 0x98, 0x01, 0x0a, 0x15, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
- 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14,
- 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
- 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61,
- 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
- 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75,
- 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73,
- 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70,
- 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x22,
- 0x75, 0x0a, 0x17, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69,
- 0x76, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74,
- 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65,
- 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72,
- 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70,
- 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x22, 0x99, 0x01, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, 0x6c,
+ 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65,
+ 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
+ 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x11, 0x0a, 0x0f, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
+ 0x6e, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x10, 0x4d, 0x61, 0x69,
+ 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a,
+ 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42,
+ 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x56,
+ 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
+ 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x06,
+ 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
+ 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x4e, 0x0a, 0x15, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
+ 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
+ 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+ 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x57, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
+ 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52,
+ 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f,
+ 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22,
+ 0x9c, 0x01, 0x0a, 0x19, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c,
+ 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
+ 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65,
+ 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72,
+ 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
+ 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73,
+ 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65,
+ 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x18,
+ 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x22, 0x2c,
+ 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50,
+ 0x61, 0x73, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x98, 0x01, 0x0a,
+ 0x15, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61,
+ 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04,
+ 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72,
+ 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77,
+ 0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a,
+ 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+ 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x22, 0x75, 0x0a, 0x17, 0x4d, 0x61, 0x69, 0x6e, 0x6c,
0x69, 0x6e, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52,
- 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61,
- 0x70, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, 0x70,
- 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61,
- 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12,
- 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61,
- 0x72, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68,
- 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
- 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66,
- 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e,
- 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x26,
- 0x0a, 0x12, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75,
- 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x59, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
- 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a,
- 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42,
- 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x04, 0x69, 0x6e,
- 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x69, 0x74, 0x65,
- 0x6d, 0x22, 0x2a, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f,
- 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x63,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x42, 0x06, 0x5a,
- 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x70,
+ 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74,
+ 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67,
+ 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x22, 0x99,
+ 0x01, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69,
+ 0x76, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72,
+ 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70,
+ 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x67,
+ 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75,
+ 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72,
+ 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
+ 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x4d, 0x61,
+ 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a,
+ 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x73,
+ 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x0f, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70,
+ 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x26, 0x0a, 0x12, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
+ 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03,
+ 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x59,
+ 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75,
+ 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
+ 0x53, 0x68, 0x6f, 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x69, 0x74,
+ 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
+ 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x2a, 0x0a, 0x16, 0x4d, 0x61, 0x69,
+ 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50,
+ 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
+ 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
+ 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0xaf, 0x01, 0x0a,
+ 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66,
+ 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18,
+ 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67,
+ 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x12, 0x36, 0x0a, 0x05,
+ 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x4d, 0x61,
+ 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
+ 0x73, 0x70, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74,
+ 0x61, 0x73, 0x6b, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74,
+ 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x28,
+ 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
+ 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x17, 0x4d, 0x61, 0x69, 0x6e,
+ 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61,
+ 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -968,7 +1187,7 @@ func file_mainline_mainline_msg_proto_rawDescGZIP() []byte {
return file_mainline_mainline_msg_proto_rawDescData
}
-var file_mainline_mainline_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
+var file_mainline_mainline_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 20)
var file_mainline_mainline_msg_proto_goTypes = []interface{}{
(*MainlineInfoReq)(nil), // 0: MainlineInfoReq
(*MainlineInfoResp)(nil), // 1: MainlineInfoResp
@@ -985,29 +1204,38 @@ var file_mainline_mainline_msg_proto_goTypes = []interface{}{
(*MainlineShopBuyReq)(nil), // 12: MainlineShopBuyReq
(*MainlineShopBuyResp)(nil), // 13: MainlineShopBuyResp
(*MainlineShopChangePush)(nil), // 14: MainlineShopChangePush
- (*DBMainline)(nil), // 15: DBMainline
- (*BattleFormation)(nil), // 16: BattleFormation
- (*BattleInfo)(nil), // 17: BattleInfo
- (*BattleReport)(nil), // 18: BattleReport
- (*UserAtno)(nil), // 19: UserAtno
- (*DBMainlineShop)(nil), // 20: DBMainlineShop
+ (*MainlineTaskInfoReq)(nil), // 15: MainlineTaskInfoReq
+ (*MainlineTaskInfoResp)(nil), // 16: MainlineTaskInfoResp
+ (*MainlineTaskReceiveReq)(nil), // 17: MainlineTaskReceiveReq
+ (*MainlineTaskReceiveResp)(nil), // 18: MainlineTaskReceiveResp
+ nil, // 19: MainlineTaskInfoResp.TasksEntry
+ (*DBMainline)(nil), // 20: DBMainline
+ (*BattleFormation)(nil), // 21: BattleFormation
+ (*BattleInfo)(nil), // 22: BattleInfo
+ (*BattleReport)(nil), // 23: BattleReport
+ (*UserAtno)(nil), // 24: UserAtno
+ (*DBMainlineShop)(nil), // 25: DBMainlineShop
+ (*ConIProgress)(nil), // 26: ConIProgress
}
var file_mainline_mainline_msg_proto_depIdxs = []int32{
- 15, // 0: MainlineInfoResp.info:type_name -> DBMainline
- 16, // 1: MainlineChallengeReq.battle:type_name -> BattleFormation
- 17, // 2: MainlineChallengeResp.info:type_name -> BattleInfo
- 18, // 3: MainlineChallengeOverReq.report:type_name -> BattleReport
- 19, // 4: MainlineChallengeOverResp.reward:type_name -> UserAtno
- 19, // 5: MainlineLevelPassResp.reward:type_name -> UserAtno
- 19, // 6: MainlineReceiveAwardResp.reward:type_name -> UserAtno
- 20, // 7: MainlineShopResp.info:type_name -> DBMainlineShop
- 20, // 8: MainlineShopBuyResp.info:type_name -> DBMainlineShop
- 19, // 9: MainlineShopBuyResp.item:type_name -> UserAtno
- 10, // [10:10] is the sub-list for method output_type
- 10, // [10:10] is the sub-list for method input_type
- 10, // [10:10] is the sub-list for extension type_name
- 10, // [10:10] is the sub-list for extension extendee
- 0, // [0:10] is the sub-list for field type_name
+ 20, // 0: MainlineInfoResp.info:type_name -> DBMainline
+ 21, // 1: MainlineChallengeReq.battle:type_name -> BattleFormation
+ 22, // 2: MainlineChallengeResp.info:type_name -> BattleInfo
+ 23, // 3: MainlineChallengeOverReq.report:type_name -> BattleReport
+ 24, // 4: MainlineChallengeOverResp.reward:type_name -> UserAtno
+ 24, // 5: MainlineLevelPassResp.reward:type_name -> UserAtno
+ 24, // 6: MainlineReceiveAwardResp.reward:type_name -> UserAtno
+ 25, // 7: MainlineShopResp.info:type_name -> DBMainlineShop
+ 25, // 8: MainlineShopBuyResp.info:type_name -> DBMainlineShop
+ 24, // 9: MainlineShopBuyResp.item:type_name -> UserAtno
+ 26, // 10: MainlineTaskInfoResp.conlds:type_name -> ConIProgress
+ 19, // 11: MainlineTaskInfoResp.tasks:type_name -> MainlineTaskInfoResp.TasksEntry
+ 24, // 12: MainlineTaskReceiveResp.award:type_name -> UserAtno
+ 13, // [13:13] is the sub-list for method output_type
+ 13, // [13:13] is the sub-list for method input_type
+ 13, // [13:13] is the sub-list for extension type_name
+ 13, // [13:13] is the sub-list for extension extendee
+ 0, // [0:13] is the sub-list for field type_name
}
func init() { file_mainline_mainline_msg_proto_init() }
@@ -1016,6 +1244,7 @@ func file_mainline_mainline_msg_proto_init() {
return
}
file_mainline_mainline_db_proto_init()
+ file_buried_buried_db_proto_init()
file_battle_battle_msg_proto_init()
file_comm_proto_init()
if !protoimpl.UnsafeEnabled {
@@ -1199,6 +1428,54 @@ func file_mainline_mainline_msg_proto_init() {
return nil
}
}
+ file_mainline_mainline_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*MainlineTaskInfoReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_mainline_mainline_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*MainlineTaskInfoResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_mainline_mainline_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*MainlineTaskReceiveReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_mainline_mainline_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*MainlineTaskReceiveResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
}
type x struct{}
out := protoimpl.TypeBuilder{
@@ -1206,7 +1483,7 @@ func file_mainline_mainline_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_mainline_mainline_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 15,
+ NumMessages: 20,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/sys/configure/structs/Game.MainAchievement.go b/sys/configure/structs/Game.MainAchievement.go
new file mode 100644
index 000000000..8650b5e1e
--- /dev/null
+++ b/sys/configure/structs/Game.MainAchievement.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 GameMainAchievement struct {
+ _dataMap map[int32]*GameMainAchievementData
+ _dataList []*GameMainAchievementData
+}
+
+func NewGameMainAchievement(_buf []map[string]interface{}) (*GameMainAchievement, error) {
+ _dataList := make([]*GameMainAchievementData, 0, len(_buf))
+ dataMap := make(map[int32]*GameMainAchievementData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameMainAchievementData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Key] = _v
+ }
+ }
+ return &GameMainAchievement{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameMainAchievement) GetDataMap() map[int32]*GameMainAchievementData {
+ return table._dataMap
+}
+
+func (table *GameMainAchievement) GetDataList() []*GameMainAchievementData {
+ return table._dataList
+}
+
+func (table *GameMainAchievement) Get(key int32) *GameMainAchievementData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.MainAchievementData.go b/sys/configure/structs/Game.MainAchievementData.go
new file mode 100644
index 000000000..fc07f855a
--- /dev/null
+++ b/sys/configure/structs/Game.MainAchievementData.go
@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameMainAchievementData struct {
+ Key int32
+ Id int32
+ Title string
+ Taskid int32
+ Reword []*Gameatn
+ Icon string
+}
+
+const TypeId_GameMainAchievementData = 587955332
+
+func (*GameMainAchievementData) GetTypeId() int32 {
+ return 587955332
+}
+
+func (_v *GameMainAchievementData)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 _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["taskid"].(float64); !_ok_ { err = errors.New("taskid error"); return }; _v.Taskid = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reword"].([]interface{}); !_ok_ { err = errors.New("reword error"); return }
+
+ _v.Reword = 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.Reword = append(_v.Reword, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
+ return
+}
+
+func DeserializeGameMainAchievementData(_buf map[string]interface{}) (*GameMainAchievementData, error) {
+ v := &GameMainAchievementData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.MainChapterData.go b/sys/configure/structs/Game.MainChapterData.go
index f065000d5..eafb322d8 100644
--- a/sys/configure/structs/Game.MainChapterData.go
+++ b/sys/configure/structs/Game.MainChapterData.go
@@ -12,6 +12,11 @@ import "errors"
type GameMainChapterData struct {
Id int32
+ Reward *Gameatn
+ Describe string
+ Achunlock int32
+ Shopname string
+ Shopunlock int32
Name string
Worldname string
ChapterType int32
@@ -31,6 +36,11 @@ func (*GameMainChapterData) GetTypeId() int32 {
func (_v *GameMainChapterData)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 _x_ map[string]interface{}; if _x_, _ok_ = _buf["reward"].(map[string]interface{}); !_ok_ { err = errors.New("reward error"); return }; if _v.Reward, err = DeserializeGameatn(_x_); err != nil { return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["achunlock"].(float64); !_ok_ { err = errors.New("achunlock error"); return }; _v.Achunlock = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["shopname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Shopname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Shopname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["shopunlock"].(float64); !_ok_ { err = errors.New("shopunlock error"); return }; _v.Shopunlock = 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["worldname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Worldname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Worldname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter_type"].(float64); !_ok_ { err = errors.New("chapter_type error"); return }; _v.ChapterType = int32(_tempNum_) }
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index f522c833d..3b24ce1c4 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -252,6 +252,7 @@ type Tables struct {
UiGameConsum *GameUiGameConsum
TopUIConfig *GameTopUIConfig
MainShopItem *GameMainShopItem
+ MainAchievement *GameMainAchievement
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1705,5 +1706,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.MainShopItem, err = NewGameMainShopItem(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_mainachievement") ; err != nil {
+ return nil, err
+ }
+ if tables.MainAchievement, err = NewGameMainAchievement(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}