diff --git a/bin/json/game_activereward.json b/bin/json/game_activereward.json
index f5a02e58f..75a654bd5 100644
--- a/bin/json/game_activereward.json
+++ b/bin/json/game_activereward.json
@@ -10,7 +10,7 @@
"n": 1
}
],
- "action": "ceshi",
+ "action": "main_weektask_action_1_act",
"stage": 1
},
{
@@ -24,7 +24,7 @@
"n": 2
}
],
- "action": "ceshi",
+ "action": "main_weektask_action_1_act",
"stage": 2
},
{
@@ -38,7 +38,7 @@
"n": 3
}
],
- "action": "ceshi",
+ "action": "main_weektask_action_1_act",
"stage": 3
},
{
@@ -52,7 +52,7 @@
"n": 4
}
],
- "action": "ceshi",
- "stage": 3
+ "action": "main_weektask_action_1_act",
+ "stage": 4
}
]
\ No newline at end of file
diff --git a/bin/json/game_herolevelgrow.json b/bin/json/game_herolevelgrow.json
index 58f1e8488..c52d4393a 100644
--- a/bin/json/game_herolevelgrow.json
+++ b/bin/json/game_herolevelgrow.json
@@ -9,6 +9,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -24,6 +31,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -39,6 +53,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -54,6 +75,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -69,6 +97,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -84,6 +119,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -99,6 +141,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -114,6 +163,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -129,6 +185,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -144,6 +207,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -159,6 +229,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -174,6 +251,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -189,6 +273,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -204,6 +295,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -219,6 +317,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -234,6 +339,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -249,6 +361,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -264,6 +383,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -279,6 +405,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -294,6 +427,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -309,6 +449,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -324,6 +471,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -339,6 +493,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -354,6 +515,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -369,6 +537,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -384,6 +559,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -399,6 +581,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -414,6 +603,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -429,6 +625,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -444,6 +647,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -459,6 +669,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -474,6 +691,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -489,6 +713,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -504,6 +735,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -519,6 +757,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -534,6 +779,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -549,6 +801,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -564,6 +823,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -579,6 +845,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -594,6 +867,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -609,6 +889,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -624,6 +911,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -639,6 +933,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -654,6 +955,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -669,6 +977,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -684,6 +999,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -699,6 +1021,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -714,6 +1043,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -729,6 +1065,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -744,6 +1087,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -759,6 +1109,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -774,6 +1131,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -789,6 +1153,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -804,6 +1175,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -819,6 +1197,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -834,6 +1219,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -849,6 +1241,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -864,6 +1263,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -879,6 +1285,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -894,6 +1307,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -909,6 +1329,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -924,6 +1351,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -939,6 +1373,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -954,6 +1395,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -969,6 +1417,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -984,6 +1439,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -999,6 +1461,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1014,6 +1483,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -1029,6 +1505,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -1044,6 +1527,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -1059,6 +1549,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1074,6 +1571,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -1089,6 +1593,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1104,6 +1615,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -1119,6 +1637,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -1134,6 +1659,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -1149,6 +1681,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1164,6 +1703,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1179,6 +1725,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -1194,6 +1747,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -1209,6 +1769,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -1224,6 +1791,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1239,6 +1813,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1500,
"defgrow": 1250,
@@ -1254,6 +1835,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1269,6 +1857,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -1284,6 +1879,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -1299,6 +1901,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -1314,6 +1923,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1329,6 +1945,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1344,6 +1967,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -1359,6 +1989,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -1374,6 +2011,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -1389,6 +2033,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1404,6 +2055,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -1419,6 +2077,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1434,6 +2099,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1100,
"atkgrow": 1300,
"defgrow": 1150,
@@ -1449,6 +2121,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1150,
"atkgrow": 1100,
"defgrow": 1300,
@@ -1464,6 +2143,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -1479,6 +2165,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 2000,
"atkgrow": 1300,
"defgrow": 2000,
@@ -1494,6 +2187,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 2000,
"atkgrow": 1300,
"defgrow": 1500,
@@ -1509,6 +2209,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 2250,
"atkgrow": 1300,
"defgrow": 1500,
@@ -1524,6 +2231,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 2000,
"atkgrow": 1300,
"defgrow": 2000,
@@ -1539,6 +2253,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 2000,
"atkgrow": 1300,
"defgrow": 1500,
@@ -1554,6 +2275,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 2250,
"atkgrow": 1300,
"defgrow": 1500,
@@ -1569,6 +2297,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"defgrow": 1250,
@@ -1584,6 +2319,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"defgrow": 1250,
@@ -1599,6 +2341,13 @@
"cridam": 1500,
"effhit": 0,
"effre": 200,
+ "losthold": 0,
+ "understand": 0,
+ "damre": 0,
+ "causedam": 0,
+ "treadd": 0,
+ "betreadd": 0,
+ "suckblood": 0,
"hpgrow": 1900,
"atkgrow": 1700,
"defgrow": 1700,
diff --git a/bin/json/game_itinerant_battle.json b/bin/json/game_itinerant_battle.json
new file mode 100644
index 000000000..bb8eb93a8
--- /dev/null
+++ b/bin/json/game_itinerant_battle.json
@@ -0,0 +1,184 @@
+[
+ {
+ "id": 101,
+ "FormatList": [
+ 700011
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 102,
+ "FormatList": [
+ 700012
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 103,
+ "FormatList": [
+ 700013
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 104,
+ "FormatList": [
+ 700014
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 105,
+ "FormatList": [
+ 700015
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 106,
+ "FormatList": [
+ 700016
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 107,
+ "FormatList": [
+ 700017
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 108,
+ "FormatList": [
+ 700018
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 109,
+ "FormatList": [
+ 700019
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 110,
+ "FormatList": [
+ 700020
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 111,
+ "FormatList": [
+ 700021
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 112,
+ "FormatList": [
+ 700022
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 113,
+ "FormatList": [
+ 700023
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ },
+ {
+ "id": 114,
+ "FormatList": [
+ 700024
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "playexp": {
+ "a": "attr",
+ "t": "exp",
+ "n": 1000
+ }
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_itinerant_city.json b/bin/json/game_itinerant_city.json
index 86646b9da..7770d8ddf 100644
--- a/bin/json/game_itinerant_city.json
+++ b/bin/json/game_itinerant_city.json
@@ -1,11 +1,22 @@
[
{
"id": 101,
- "cityticket": 1,
- "citylvlock": 0,
- "citymainlock": [
- 11001
+ "citylink": [
+ 102
],
+ "cityticket": [
+ {
+ "a": "item",
+ "t": "141002",
+ "n": 1
+ }
+ ],
+ "cityexlock": [
+ 0
+ ],
+ "citylvlock": 1,
+ "citymainlock": 11001,
+ "cityman": 25001,
"cityname": {
"key": "shopname1",
"text": "功夫熊猫城市"
@@ -31,15 +42,33 @@
6
],
"exspecialnum": 2000000,
- "Orspecial": 100000
+ "Orspecial": 100000,
+ "checktime": 180,
+ "cityeventpro": 50000,
+ "cityevent": [
+ 1001
+ ]
},
{
"id": 102,
- "cityticket": 1,
- "citylvlock": 0,
- "citymainlock": [
- 11001
+ "citylink": [
+ 101,
+ 103,
+ 104
],
+ "cityticket": [
+ {
+ "a": "item",
+ "t": "141002",
+ "n": 1
+ }
+ ],
+ "cityexlock": [
+ 0
+ ],
+ "citylvlock": 2,
+ "citymainlock": 11002,
+ "cityman": 25001,
"cityname": {
"key": "shopname2",
"text": "圣桃树山脉"
@@ -52,7 +81,7 @@
"key": "shopname2",
"text": "哀伤山脉长年被一股胀气笼罩,这里的人们长年吸入这些气息,不知不觉已经产生了异变,他们自己称之为兽化病,年长的居民,会随着兽化病的加重,变成熊猫的模样,他们的人性会逐渐的被兽性所代替,最后彻底沦为一只只知道吃包子的直立行走的熊猫。\n\n山脉的长者为了避免失去理智的自己误伤后代,会在晚年独自一人前往山脉深处。\n\n当旅行者在山脉的深处看到那些整日吃包子的熊猫,大概率就是有山脉的居民演化而来。\n\n也正因如此,这里的居民对于包子,竹子等熊猫喜爱的食物需求量很大,也很乐意高价收购外来的那些优秀的竹笋和上好的白面。\n\n不仅仅是对于那些已经彻底兽化的长辈,在时间的流逝下,熊猫的本性已经遗留在当地居民的血脉,新生孩子以及那些山脉之中的年轻人,也会对这些食物有着近乎病态的追求。"
},
- "citytype": 2,
+ "citytype": 1,
"citytypenum": 3,
"special": [
3,
@@ -66,6 +95,11 @@
2
],
"exspecialnum": 2000000,
- "Orspecial": 100000
+ "Orspecial": 100000,
+ "checktime": 180,
+ "cityeventpro": 100000,
+ "cityevent": [
+ 1001
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_itinerant_event.json b/bin/json/game_itinerant_event.json
new file mode 100644
index 000000000..71b8a4c80
--- /dev/null
+++ b/bin/json/game_itinerant_event.json
@@ -0,0 +1,33 @@
+[
+ {
+ "id": 1001,
+ "eventtype": 1,
+ "mustdo": 1,
+ "citystory": 101,
+ "citynormal": 102,
+ "cityabnormal": 103,
+ "worldtask": 210,
+ "traintips": {
+ "key": "txt",
+ "text": "列车上来了外人,这个人看上去有很急切的事情,我们必须先解决这个再离开这里。"
+ },
+ "trainstory": 888,
+ "trainstorybad": 777,
+ "trainstorygood": 888,
+ "reword": [
+ {
+ "a": "item",
+ "t": "141001",
+ "n": 10
+ }
+ ],
+ "exreword": [
+ 1
+ ],
+ "unreword": [
+ 1,
+ 40
+ ],
+ "eventtime": 500
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_itinerant_lv.json b/bin/json/game_itinerant_lv.json
index 7b7a0d7c4..f845d6881 100644
--- a/bin/json/game_itinerant_lv.json
+++ b/bin/json/game_itinerant_lv.json
@@ -2,11 +2,37 @@
{
"lv": 0,
"newmoneyexp": 0,
+ "bagtop": 20,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 40
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 1000
+ },
+ "bargainpro": 10000,
+ "bargainnum": 1,
"reward": []
},
{
"lv": 1,
"newmoneyexp": 100000,
+ "bagtop": 24,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 45
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 2000
+ },
+ "bargainpro": 12000,
+ "bargainnum": 1,
"reward": [
{
"a": "attr",
@@ -18,6 +44,19 @@
{
"lv": 2,
"newmoneyexp": 200000,
+ "bagtop": 28,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 50
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 3000
+ },
+ "bargainpro": 14000,
+ "bargainnum": 1,
"reward": [
{
"a": "attr",
@@ -29,6 +68,19 @@
{
"lv": 3,
"newmoneyexp": 300000,
+ "bagtop": 32,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 55
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 4000
+ },
+ "bargainpro": 16000,
+ "bargainnum": 2,
"reward": [
{
"a": "attr",
@@ -40,6 +92,19 @@
{
"lv": 4,
"newmoneyexp": 400000,
+ "bagtop": 36,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 60
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 5000
+ },
+ "bargainpro": 20000,
+ "bargainnum": 2,
"reward": [
{
"a": "attr",
@@ -51,6 +116,19 @@
{
"lv": 5,
"newmoneyexp": 500000,
+ "bagtop": 40,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 65
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 6000
+ },
+ "bargainpro": 25000,
+ "bargainnum": 2,
"reward": [
{
"a": "attr",
@@ -62,6 +140,19 @@
{
"lv": 6,
"newmoneyexp": 600000,
+ "bagtop": 44,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 70
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 7000
+ },
+ "bargainpro": 30000,
+ "bargainnum": 3,
"reward": [
{
"a": "attr",
@@ -73,6 +164,19 @@
{
"lv": 7,
"newmoneyexp": 700000,
+ "bagtop": 48,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 75
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 8000
+ },
+ "bargainpro": 35000,
+ "bargainnum": 3,
"reward": [
{
"a": "attr",
@@ -84,6 +188,19 @@
{
"lv": 8,
"newmoneyexp": 800000,
+ "bagtop": 52,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 80
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 9000
+ },
+ "bargainpro": 40000,
+ "bargainnum": 3,
"reward": [
{
"a": "attr",
@@ -95,6 +212,19 @@
{
"lv": 9,
"newmoneyexp": 900000,
+ "bagtop": 56,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 85
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 10000
+ },
+ "bargainpro": 45000,
+ "bargainnum": 4,
"reward": [
{
"a": "attr",
@@ -106,6 +236,19 @@
{
"lv": 10,
"newmoneyexp": 1000000,
+ "bagtop": 60,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 90
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 11000
+ },
+ "bargainpro": 50000,
+ "bargainnum": 4,
"reward": [
{
"a": "attr",
@@ -117,6 +260,19 @@
{
"lv": 11,
"newmoneyexp": 1100000,
+ "bagtop": 64,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 95
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 12000
+ },
+ "bargainpro": 55000,
+ "bargainnum": 4,
"reward": [
{
"a": "attr",
@@ -128,6 +284,19 @@
{
"lv": 12,
"newmoneyexp": 1200000,
+ "bagtop": 68,
+ "tickettop": {
+ "a": "item",
+ "t": "141002",
+ "n": 100
+ },
+ "moneynumtop": {
+ "a": "item",
+ "t": "141001",
+ "n": 13000
+ },
+ "bargainpro": 60000,
+ "bargainnum": 5,
"reward": [
{
"a": "attr",
diff --git a/bin/json/game_itinerant_rank.json b/bin/json/game_itinerant_rank.json
new file mode 100644
index 000000000..3cde2bbce
--- /dev/null
+++ b/bin/json/game_itinerant_rank.json
@@ -0,0 +1,343 @@
+[
+ {
+ "id": 1,
+ "group": 1,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 3000
+ }
+ ]
+ },
+ {
+ "id": 2,
+ "group": 2,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 2000
+ }
+ ]
+ },
+ {
+ "id": 3,
+ "group": 3,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ]
+ },
+ {
+ "id": 4,
+ "group": 4,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 500
+ }
+ ]
+ },
+ {
+ "id": 5,
+ "group": 4,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 500
+ }
+ ]
+ },
+ {
+ "id": 6,
+ "group": 4,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 500
+ }
+ ]
+ },
+ {
+ "id": 7,
+ "group": 4,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 500
+ }
+ ]
+ },
+ {
+ "id": 8,
+ "group": 4,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 500
+ }
+ ]
+ },
+ {
+ "id": 9,
+ "group": 4,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 500
+ }
+ ]
+ },
+ {
+ "id": 10,
+ "group": 4,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 500
+ }
+ ]
+ },
+ {
+ "id": 11,
+ "group": 11,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300
+ }
+ ]
+ },
+ {
+ "id": 12,
+ "group": 11,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300
+ }
+ ]
+ },
+ {
+ "id": 13,
+ "group": 11,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300
+ }
+ ]
+ },
+ {
+ "id": 14,
+ "group": 11,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300
+ }
+ ]
+ },
+ {
+ "id": 15,
+ "group": 11,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300
+ }
+ ]
+ },
+ {
+ "id": 16,
+ "group": 11,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300
+ }
+ ]
+ },
+ {
+ "id": 17,
+ "group": 11,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300
+ }
+ ]
+ },
+ {
+ "id": 18,
+ "group": 11,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300
+ }
+ ]
+ },
+ {
+ "id": 19,
+ "group": 11,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300
+ }
+ ]
+ },
+ {
+ "id": 20,
+ "group": 11,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 300
+ }
+ ]
+ },
+ {
+ "id": 21,
+ "group": 21,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 22,
+ "group": 21,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 23,
+ "group": 21,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 24,
+ "group": 21,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 25,
+ "group": 21,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 26,
+ "group": 21,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 27,
+ "group": 21,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 28,
+ "group": 21,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 29,
+ "group": 21,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 30,
+ "group": 21,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 31,
+ "group": 0,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 10
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_itinerant_reward.json b/bin/json/game_itinerant_reward.json
index 4ddf83cb1..f42bf5256 100644
--- a/bin/json/game_itinerant_reward.json
+++ b/bin/json/game_itinerant_reward.json
@@ -1,6 +1,18 @@
[
+ {
+ "num": 0,
+ "type": 1,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100
+ }
+ ]
+ },
{
"num": 10000,
+ "type": 1,
"reward": [
{
"a": "attr",
@@ -11,6 +23,7 @@
},
{
"num": 20000,
+ "type": 1,
"reward": [
{
"a": "attr",
@@ -21,6 +34,7 @@
},
{
"num": 30000,
+ "type": 1,
"reward": [
{
"a": "attr",
@@ -28,5 +42,16 @@
"n": 3000
}
]
+ },
+ {
+ "num": 1000,
+ "type": 2,
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 9999
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json
new file mode 100644
index 000000000..e453a8d6f
--- /dev/null
+++ b/bin/json/game_loading.json
@@ -0,0 +1,146 @@
+[
+ {
+ "id": 1001,
+ "scene": "GameMain",
+ "image": "loading_2",
+ "prompt": {
+ "key": "prompt1001",
+ "text": "这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语"
+ }
+ },
+ {
+ "id": 1002,
+ "scene": "CommandScene",
+ "image": "ld_5v5_bg1",
+ "prompt": {
+ "key": "prompt1002",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1003,
+ "scene": "WuGuanScene",
+ "image": "ld_boss_bg",
+ "prompt": {
+ "key": "prompt1003",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1004,
+ "scene": "SmithyScene",
+ "image": "ld_5v5_bg",
+ "prompt": {
+ "key": "prompt1004",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1005,
+ "scene": "ParkourScene",
+ "image": "loading_2",
+ "prompt": {
+ "key": "prompt1005",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1006,
+ "scene": "GuildScene",
+ "image": "ld_5v5_bg1",
+ "prompt": {
+ "key": "prompt1006",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1007,
+ "scene": "ArenaScene",
+ "image": "ld_boss_bg",
+ "prompt": {
+ "key": "prompt1007",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1008,
+ "scene": "businessScene",
+ "image": "ld_5v5_bg",
+ "prompt": {
+ "key": "prompt1008",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1009,
+ "scene": "DrawCardScene",
+ "image": "loading_2",
+ "prompt": {
+ "key": "prompt1009",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1010,
+ "scene": "CombatLevelScene",
+ "image": "ld_5v5_bg1",
+ "prompt": {
+ "key": "prompt1010",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1011,
+ "scene": "WorldMapScene",
+ "image": "ld_boss_bg",
+ "prompt": {
+ "key": "prompt1011",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1012,
+ "scene": "scenesfight_06",
+ "image": "ld_5v5_bg",
+ "prompt": {
+ "key": "prompt1012",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1013,
+ "scene": "scenesfight_05_01",
+ "image": "loading_2",
+ "prompt": {
+ "key": "prompt1013",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1014,
+ "scene": "scenesfight_07",
+ "image": "ld_5v5_bg1",
+ "prompt": {
+ "key": "prompt1014",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1015,
+ "scene": "bossfight_naturetitan_01",
+ "image": "ld_boss_bg",
+ "prompt": {
+ "key": "prompt1015",
+ "text": "这里是提示语"
+ }
+ },
+ {
+ "id": 1016,
+ "scene": "bossfight_spinymandrilla_02",
+ "image": "ld_boss_bg",
+ "prompt": {
+ "key": "prompt1016",
+ "text": "这里是提示语"
+ }
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 5d8778a97..fa0336934 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -27,7 +27,7 @@
"text": "洞穴前,香蕉树上的香蕉被猴子们疯狂抢夺,原始人一家加入抢夺战。"
},
"exp": 100,
- "hero_exp": 0,
+ "hero_exp": 300,
"ps_consume": [
{
"a": "attr",
@@ -285,8 +285,8 @@
"key": "mainline_desc_10010",
"text": "原始人一家误入奇幻雨林,遭到各种奇幻生物袭击。"
},
- "exp": 400,
- "hero_exp": 0,
+ "exp": 600,
+ "hero_exp": 1500,
"ps_consume": [
{
"a": "attr",
@@ -373,7 +373,7 @@
"key": "mainline_desc_10011",
"text": "瓜哥一家逃到一个山洞前,大批外来世界的人也涌向这里,似乎寻找着什么……"
},
- "exp": 500,
+ "exp": 700,
"hero_exp": 2100,
"ps_consume": [
{
@@ -461,7 +461,7 @@
"key": "mainline_desc_10012",
"text": "原来猩猩怪意外获得月光原石,这才导致地质突变,一群人进入抢夺月光原石的混战。"
},
- "exp": 600,
+ "exp": 800,
"hero_exp": 3150,
"ps_consume": [
{
@@ -549,8 +549,8 @@
"key": "mainline_desc_10001",
"text": "参加气功训练营,打探月光原石消息。"
},
- "exp": 100,
- "hero_exp": 0,
+ "exp": 900,
+ "hero_exp": 3500,
"ps_consume": [
{
"a": "attr",
@@ -637,7 +637,7 @@
"key": "mainline_desc_10002",
"text": "结识新伙伴,一起去平先生面馆打卡吃美食吧!"
},
- "exp": 200,
+ "exp": 1000,
"hero_exp": 3825,
"ps_consume": [
{
@@ -725,7 +725,7 @@
"key": "mainline_desc_10003",
"text": "翡翠宫前人满为患,遇到刺头,那就友好切磋一下。"
},
- "exp": 300,
+ "exp": 1100,
"hero_exp": 5045,
"ps_consume": [
{
@@ -814,7 +814,7 @@
"key": "mainline_desc_10004",
"text": "训练营学员行迹可疑,深夜跟踪调查。"
},
- "exp": 400,
+ "exp": 1200,
"hero_exp": 7140,
"ps_consume": [
{
@@ -903,8 +903,8 @@
"key": "mainline_desc_10005",
"text": "气功卷轴被盗!竟然是学员依靠月光原石的力量偷走。"
},
- "exp": 500,
- "hero_exp": 0,
+ "exp": 1300,
+ "hero_exp": 7500,
"ps_consume": [
{
"a": "attr",
@@ -992,7 +992,7 @@
"key": "mainline_desc_10006",
"text": "历史重现,气功卷轴真谛究竟是什么?月光原石能否顺利收回?"
},
- "exp": 600,
+ "exp": 1400,
"hero_exp": 8540,
"ps_consume": [
{
@@ -1081,7 +1081,7 @@
"key": "mainline_desc_10013",
"text": "寻找接头人史莱克,偶遇史莱克的小屋遭抢占,和史莱克合力赶走其他童话人物。"
},
- "exp": 100,
+ "exp": 1500,
"hero_exp": 10200,
"ps_consume": [
{
@@ -1169,8 +1169,8 @@
"key": "mainline_desc_10014",
"text": "史莱克来到童话王国,希望国王能够把大沼泽的所有权给他,但国王出尔反尔,命令士兵抓捕史莱克。"
},
- "exp": 200,
- "hero_exp": 0,
+ "exp": 1600,
+ "hero_exp": 13000,
"ps_consume": [
{
"a": "attr",
@@ -1257,7 +1257,7 @@
"key": "mainline_desc_10015",
"text": "史莱克答应国王来到恶龙守卫的城堡营救公主,趁恶龙不注意,史莱克成功救出公主。"
},
- "exp": 300,
+ "exp": 1700,
"hero_exp": 18030,
"ps_consume": [
{
@@ -1346,7 +1346,7 @@
"key": "mainline_desc_10016",
"text": "史莱克和公主途经毒苹果酒吧,卷入黑市交易。"
},
- "exp": 400,
+ "exp": 1800,
"hero_exp": 21060,
"ps_consume": [
{
@@ -1435,7 +1435,7 @@
"key": "mainline_desc_10017",
"text": "史莱克和公主乔装打扮逃出毒苹果酒吧,却在女巫森林遭到赏金猎人围堵。原来他们不小心带走了月光原石。"
},
- "exp": 500,
+ "exp": 1900,
"hero_exp": 24510,
"ps_consume": [
{
@@ -1524,8 +1524,8 @@
"key": "mainline_desc_10018",
"text": "关键时刻,公主吻上史莱克化身女武士,两人一起击败赏金猎人,并把原石交给守护者。"
},
- "exp": 600,
- "hero_exp": 0,
+ "exp": 2000,
+ "hero_exp": 26000,
"ps_consume": [
{
"a": "attr",
@@ -1613,7 +1613,7 @@
"key": "mainline_desc_10019",
"text": "寻找接头人史莱克,偶遇史莱克的小屋遭抢占,和史莱克合力赶走其他童话人物。"
},
- "exp": 100,
+ "exp": 2100,
"hero_exp": 28800,
"ps_consume": [
{
@@ -1701,7 +1701,7 @@
"key": "mainline_desc_10020",
"text": "史莱克来到童话王国,希望国王能够把大沼泽的所有权给他,但国王出尔反尔,命令士兵抓捕史莱克。"
},
- "exp": 200,
+ "exp": 2200,
"hero_exp": 34200,
"ps_consume": [
{
@@ -1789,8 +1789,8 @@
"key": "mainline_desc_10021",
"text": "史莱克答应国王来到恶龙守卫的城堡营救公主,趁恶龙不注意,史莱克成功救出公主。"
},
- "exp": 300,
- "hero_exp": 0,
+ "exp": 2300,
+ "hero_exp": 34200,
"ps_consume": [
{
"a": "attr",
@@ -1878,8 +1878,8 @@
"key": "mainline_desc_10022",
"text": "史莱克和公主途经毒苹果酒吧,卷入黑市交易。"
},
- "exp": 400,
- "hero_exp": 0,
+ "exp": 2400,
+ "hero_exp": 34200,
"ps_consume": [
{
"a": "attr",
@@ -1967,8 +1967,8 @@
"key": "mainline_desc_10023",
"text": "史莱克和公主乔装打扮逃出毒苹果酒吧,却在女巫森林遭到赏金猎人围堵。原来他们不小心带走了月光原石。"
},
- "exp": 500,
- "hero_exp": 0,
+ "exp": 2500,
+ "hero_exp": 34200,
"ps_consume": [
{
"a": "attr",
@@ -2056,8 +2056,8 @@
"key": "mainline_desc_10024",
"text": "关键时刻,公主吻上史莱克化身女武士,两人一起击败赏金猎人,并把原石交给守护者。"
},
- "exp": 600,
- "hero_exp": 0,
+ "exp": 2600,
+ "hero_exp": 34200,
"ps_consume": [
{
"a": "attr",
diff --git a/bin/json/game_taskactivereward.json b/bin/json/game_taskactivereward.json
index f5a02e58f..75a654bd5 100644
--- a/bin/json/game_taskactivereward.json
+++ b/bin/json/game_taskactivereward.json
@@ -10,7 +10,7 @@
"n": 1
}
],
- "action": "ceshi",
+ "action": "main_weektask_action_1_act",
"stage": 1
},
{
@@ -24,7 +24,7 @@
"n": 2
}
],
- "action": "ceshi",
+ "action": "main_weektask_action_1_act",
"stage": 2
},
{
@@ -38,7 +38,7 @@
"n": 3
}
],
- "action": "ceshi",
+ "action": "main_weektask_action_1_act",
"stage": 3
},
{
@@ -52,7 +52,7 @@
"n": 4
}
],
- "action": "ceshi",
- "stage": 3
+ "action": "main_weektask_action_1_act",
+ "stage": 4
}
]
\ No newline at end of file
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 1f15f0cde..969089715 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -446,14 +446,21 @@ func (this *ModelHero) PropertyCompute(hero *pb.DBHero) {
var hp = (this.StarHpAddition(hero.Star) + lvCfg.Hp + float32(growCfg.Hp)) * (growCfg.Hpgrow / 1000.0)
speed := growCfg.Speed
hero.Property = map[string]int32{
- comm.Hp: int32(math.Floor(float64(hp))),
- comm.Atk: int32(math.Floor(float64(atk))),
- comm.Def: int32(math.Floor(float64(def))),
- comm.Speed: int32(math.Floor(float64(speed))),
- comm.Cri: int32(growCfg.Cri), //暴击
- comm.Effhit: int32(growCfg.Effhit), //效果命中
- comm.Cridam: int32(growCfg.Cridam), //暴击伤害
- comm.Effre: int32(growCfg.Effre), //效果抵抗
+ comm.Hp: int32(math.Floor(float64(hp))),
+ comm.Atk: int32(math.Floor(float64(atk))),
+ comm.Def: int32(math.Floor(float64(def))),
+ comm.Speed: int32(math.Floor(float64(speed))),
+ comm.Cri: int32(growCfg.Cri), //暴击
+ comm.Cridam: int32(growCfg.Cridam), //暴击伤害
+ comm.Effhit: int32(growCfg.Effhit), //效果命中
+ comm.Effre: int32(growCfg.Effre), //效果抵抗
+ comm.LostHold: int32(growCfg.Losthold), //失手率%
+ comm.UnderStand: int32(growCfg.Understand), //会心率%
+ comm.DamRe: int32(growCfg.Damre), //伤害减免%
+ comm.CauseDam: int32(growCfg.Causedam), //伤害提升%
+ comm.TreAdd: int32(growCfg.Treadd), //治疗加成%
+ comm.BeTreAdd: int32(growCfg.Betreadd), //受疗加成%
+ comm.SuckBlood: int32(growCfg.Suckblood), //吸血加成%
}
if hero.Id != "" { // objID 为空表示是怪物对象 不享受天赋属性加成
diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index 082ed9b02..1fb53797a 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -105,11 +105,11 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
lavaCost := &cfg.Gameatn{
A: exemption.A,
T: exemption.T,
- N: exemption.N * req.Lava,
- }
- if code = this.module.CheckRes(session, []*cfg.Gameatn{lavaCost}); code != pb.ErrorCode_Success {
- return
+ N: exemption.N,
}
+ // if code = this.module.CheckRes(session, []*cfg.Gameatn{lavaCost}); code != pb.ErrorCode_Success {
+ // return
+ // }
costRes = append(costRes, lavaCost)
} else {
// 检查炉温 是否够
diff --git a/sys/configure/structs/Game.Loading.go b/sys/configure/structs/Game.Loading.go
new file mode 100644
index 000000000..d66df253b
--- /dev/null
+++ b/sys/configure/structs/Game.Loading.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 GameLoading struct {
+ _dataMap map[int32]*GameLoadingData
+ _dataList []*GameLoadingData
+}
+
+func NewGameLoading(_buf []map[string]interface{}) (*GameLoading, error) {
+ _dataList := make([]*GameLoadingData, 0, len(_buf))
+ dataMap := make(map[int32]*GameLoadingData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameLoadingData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameLoading{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameLoading) GetDataMap() map[int32]*GameLoadingData {
+ return table._dataMap
+}
+
+func (table *GameLoading) GetDataList() []*GameLoadingData {
+ return table._dataList
+}
+
+func (table *GameLoading) Get(key int32) *GameLoadingData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.LoadingData.go b/sys/configure/structs/Game.LoadingData.go
new file mode 100644
index 000000000..d4d8829aa
--- /dev/null
+++ b/sys/configure/structs/Game.LoadingData.go
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameLoadingData struct {
+ Id int32
+ Scene string
+ Image string
+ Prompt string
+}
+
+const TypeId_GameLoadingData = -1741432054
+
+func (*GameLoadingData) GetTypeId() int32 {
+ return -1741432054
+}
+
+func (_v *GameLoadingData)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; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } }
+ { var _ok_ bool; if _v.Image, _ok_ = _buf["image"].(string); !_ok_ { err = errors.New("image error"); return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prompt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Prompt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Prompt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ return
+}
+
+func DeserializeGameLoadingData(_buf map[string]interface{}) (*GameLoadingData, error) {
+ v := &GameLoadingData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.itinerant_battle.go b/sys/configure/structs/Game.itinerant_battle.go
new file mode 100644
index 000000000..dbcb560ba
--- /dev/null
+++ b/sys/configure/structs/Game.itinerant_battle.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 Gameitinerant_battle struct {
+ _dataMap map[int32]*Gameitinerant_battleData
+ _dataList []*Gameitinerant_battleData
+}
+
+func NewGameitinerant_battle(_buf []map[string]interface{}) (*Gameitinerant_battle, error) {
+ _dataList := make([]*Gameitinerant_battleData, 0, len(_buf))
+ dataMap := make(map[int32]*Gameitinerant_battleData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameitinerant_battleData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &Gameitinerant_battle{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *Gameitinerant_battle) GetDataMap() map[int32]*Gameitinerant_battleData {
+ return table._dataMap
+}
+
+func (table *Gameitinerant_battle) GetDataList() []*Gameitinerant_battleData {
+ return table._dataList
+}
+
+func (table *Gameitinerant_battle) Get(key int32) *Gameitinerant_battleData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.itinerant_battleData.go b/sys/configure/structs/Game.itinerant_battleData.go
new file mode 100644
index 000000000..4d57c5fb5
--- /dev/null
+++ b/sys/configure/structs/Game.itinerant_battleData.go
@@ -0,0 +1,69 @@
+//------------------------------------------------------------------------------
+//
+// 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 Gameitinerant_battleData struct {
+ Id int32
+ FormatList []int32
+ BattleReadyID int32
+ EventList []int32
+ Playexp *Gameatn
+}
+
+const TypeId_Gameitinerant_battleData = -635912269
+
+func (*Gameitinerant_battleData) GetTypeId() int32 {
+ return -635912269
+}
+
+func (_v *Gameitinerant_battleData)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 _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["FormatList"].([]interface{}); !_ok_ { err = errors.New("FormatList error"); return }
+
+ _v.FormatList = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.FormatList = append(_v.FormatList, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["EventList"].([]interface{}); !_ok_ { err = errors.New("EventList error"); return }
+
+ _v.EventList = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.EventList = append(_v.EventList, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["playexp"].(map[string]interface{}); !_ok_ { err = errors.New("playexp error"); return }; if _v.Playexp, err = DeserializeGameatn(_x_); err != nil { return } }
+ return
+}
+
+func DeserializeGameitinerant_battleData(_buf map[string]interface{}) (*Gameitinerant_battleData, error) {
+ v := &Gameitinerant_battleData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.itinerant_cityData.go b/sys/configure/structs/Game.itinerant_cityData.go
index 153633687..f4cb4b609 100644
--- a/sys/configure/structs/Game.itinerant_cityData.go
+++ b/sys/configure/structs/Game.itinerant_cityData.go
@@ -12,9 +12,12 @@ import "errors"
type Gameitinerant_cityData struct {
Id int32
- Cityticket int32
+ Citylink []int32
+ Cityticket []*Gameatn
+ Cityexlock []int32
Citylvlock int32
- Citymainlock []int32
+ Citymainlock int32
+ Cityman int32
Cityname string
Cityinformation string
Citytxt string
@@ -25,6 +28,9 @@ type Gameitinerant_cityData struct {
Exspecial []int32
Exspecialnum int32
Orspecial int32
+ Checktime int32
+ Cityeventpro int32
+ Cityevent []int32
}
const TypeId_Gameitinerant_cityData = 675778342
@@ -35,22 +41,51 @@ func (*Gameitinerant_cityData) GetTypeId() int32 {
func (_v *Gameitinerant_cityData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityticket"].(float64); !_ok_ { err = errors.New("cityticket error"); return }; _v.Cityticket = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citylvlock"].(float64); !_ok_ { err = errors.New("citylvlock error"); return }; _v.Citylvlock = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
- if _arr_, _ok_ = _buf["citymainlock"].([]interface{}); !_ok_ { err = errors.New("citymainlock error"); return }
+ if _arr_, _ok_ = _buf["citylink"].([]interface{}); !_ok_ { err = errors.New("citylink error"); return }
- _v.Citymainlock = make([]int32, 0, len(_arr_))
+ _v.Citylink = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
- _v.Citymainlock = append(_v.Citymainlock, _list_v_)
+ _v.Citylink = append(_v.Citylink, _list_v_)
}
}
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["cityticket"].([]interface{}); !_ok_ { err = errors.New("cityticket error"); return }
+
+ _v.Cityticket = 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.Cityticket = append(_v.Cityticket, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["cityexlock"].([]interface{}); !_ok_ { err = errors.New("cityexlock error"); return }
+
+ _v.Cityexlock = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Cityexlock = append(_v.Cityexlock, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citylvlock"].(float64); !_ok_ { err = errors.New("citylvlock error"); return }; _v.Citylvlock = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citymainlock"].(float64); !_ok_ { err = errors.New("citymainlock error"); return }; _v.Citymainlock = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityman"].(float64); !_ok_ { err = errors.New("cityman error"); return }; _v.Cityman = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["cityname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Cityname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Cityname, _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["cityinformation"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Cityinformation error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Cityinformation, _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["citytxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Citytxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Citytxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
@@ -87,6 +122,22 @@ func (_v *Gameitinerant_cityData)Deserialize(_buf map[string]interface{}) (err e
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exspecialnum"].(float64); !_ok_ { err = errors.New("exspecialnum error"); return }; _v.Exspecialnum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Orspecial"].(float64); !_ok_ { err = errors.New("Orspecial error"); return }; _v.Orspecial = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["checktime"].(float64); !_ok_ { err = errors.New("checktime error"); return }; _v.Checktime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityeventpro"].(float64); !_ok_ { err = errors.New("cityeventpro error"); return }; _v.Cityeventpro = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["cityevent"].([]interface{}); !_ok_ { err = errors.New("cityevent error"); return }
+
+ _v.Cityevent = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Cityevent = append(_v.Cityevent, _list_v_)
+ }
+ }
+
return
}
diff --git a/sys/configure/structs/Game.itinerant_event.go b/sys/configure/structs/Game.itinerant_event.go
new file mode 100644
index 000000000..3e427a2a9
--- /dev/null
+++ b/sys/configure/structs/Game.itinerant_event.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 Gameitinerant_event struct {
+ _dataMap map[int32]*Gameitinerant_eventData
+ _dataList []*Gameitinerant_eventData
+}
+
+func NewGameitinerant_event(_buf []map[string]interface{}) (*Gameitinerant_event, error) {
+ _dataList := make([]*Gameitinerant_eventData, 0, len(_buf))
+ dataMap := make(map[int32]*Gameitinerant_eventData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameitinerant_eventData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &Gameitinerant_event{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *Gameitinerant_event) GetDataMap() map[int32]*Gameitinerant_eventData {
+ return table._dataMap
+}
+
+func (table *Gameitinerant_event) GetDataList() []*Gameitinerant_eventData {
+ return table._dataList
+}
+
+func (table *Gameitinerant_event) Get(key int32) *Gameitinerant_eventData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.itinerant_eventData.go b/sys/configure/structs/Game.itinerant_eventData.go
new file mode 100644
index 000000000..d78ab1858
--- /dev/null
+++ b/sys/configure/structs/Game.itinerant_eventData.go
@@ -0,0 +1,102 @@
+//------------------------------------------------------------------------------
+//
+// 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 Gameitinerant_eventData struct {
+ Id int32
+ Eventtype int32
+ Mustdo int32
+ Citystory int32
+ Citynormal int32
+ Cityabnormal int32
+ Worldtask int32
+ Traintips string
+ Trainstory int32
+ Trainstorybad int32
+ Trainstorygood int32
+ Reword []*Gameatn
+ Exreword []int32
+ Unreword []int32
+ Eventtime int32
+}
+
+const TypeId_Gameitinerant_eventData = 636921875
+
+func (*Gameitinerant_eventData) GetTypeId() int32 {
+ return 636921875
+}
+
+func (_v *Gameitinerant_eventData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventtype"].(float64); !_ok_ { err = errors.New("eventtype error"); return }; _v.Eventtype = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mustdo"].(float64); !_ok_ { err = errors.New("mustdo error"); return }; _v.Mustdo = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citystory"].(float64); !_ok_ { err = errors.New("citystory error"); return }; _v.Citystory = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citynormal"].(float64); !_ok_ { err = errors.New("citynormal error"); return }; _v.Citynormal = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityabnormal"].(float64); !_ok_ { err = errors.New("cityabnormal error"); return }; _v.Cityabnormal = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["worldtask"].(float64); !_ok_ { err = errors.New("worldtask error"); return }; _v.Worldtask = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["traintips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Traintips error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Traintips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trainstory"].(float64); !_ok_ { err = errors.New("trainstory error"); return }; _v.Trainstory = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trainstorybad"].(float64); !_ok_ { err = errors.New("trainstorybad error"); return }; _v.Trainstorybad = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trainstorygood"].(float64); !_ok_ { err = errors.New("trainstorygood error"); return }; _v.Trainstorygood = 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 _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["exreword"].([]interface{}); !_ok_ { err = errors.New("exreword error"); return }
+
+ _v.Exreword = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Exreword = append(_v.Exreword, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["unreword"].([]interface{}); !_ok_ { err = errors.New("unreword error"); return }
+
+ _v.Unreword = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Unreword = append(_v.Unreword, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventtime"].(float64); !_ok_ { err = errors.New("eventtime error"); return }; _v.Eventtime = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameitinerant_eventData(_buf map[string]interface{}) (*Gameitinerant_eventData, error) {
+ v := &Gameitinerant_eventData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.itinerant_lvData.go b/sys/configure/structs/Game.itinerant_lvData.go
index e2edeac67..b3380cb06 100644
--- a/sys/configure/structs/Game.itinerant_lvData.go
+++ b/sys/configure/structs/Game.itinerant_lvData.go
@@ -13,6 +13,11 @@ import "errors"
type Gameitinerant_lvData struct {
Lv int32
Newmoneyexp int32
+ Bagtop int32
+ Tickettop *Gameatn
+ Moneynumtop *Gameatn
+ Bargainpro int32
+ Bargainnum int32
Reward []*Gameatn
}
@@ -25,6 +30,11 @@ func (*Gameitinerant_lvData) GetTypeId() int32 {
func (_v *Gameitinerant_lvData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["newmoneyexp"].(float64); !_ok_ { err = errors.New("newmoneyexp error"); return }; _v.Newmoneyexp = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bagtop"].(float64); !_ok_ { err = errors.New("bagtop error"); return }; _v.Bagtop = int32(_tempNum_) }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["tickettop"].(map[string]interface{}); !_ok_ { err = errors.New("tickettop error"); return }; if _v.Tickettop, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["moneynumtop"].(map[string]interface{}); !_ok_ { err = errors.New("moneynumtop error"); return }; if _v.Moneynumtop, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bargainpro"].(float64); !_ok_ { err = errors.New("bargainpro error"); return }; _v.Bargainpro = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bargainnum"].(float64); !_ok_ { err = errors.New("bargainnum error"); return }; _v.Bargainnum = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
diff --git a/sys/configure/structs/Game.itinerant_rank.go b/sys/configure/structs/Game.itinerant_rank.go
new file mode 100644
index 000000000..1c40bef74
--- /dev/null
+++ b/sys/configure/structs/Game.itinerant_rank.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 Gameitinerant_rank struct {
+ _dataMap map[int32]*Gameitinerant_rankData
+ _dataList []*Gameitinerant_rankData
+}
+
+func NewGameitinerant_rank(_buf []map[string]interface{}) (*Gameitinerant_rank, error) {
+ _dataList := make([]*Gameitinerant_rankData, 0, len(_buf))
+ dataMap := make(map[int32]*Gameitinerant_rankData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameitinerant_rankData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &Gameitinerant_rank{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *Gameitinerant_rank) GetDataMap() map[int32]*Gameitinerant_rankData {
+ return table._dataMap
+}
+
+func (table *Gameitinerant_rank) GetDataList() []*Gameitinerant_rankData {
+ return table._dataList
+}
+
+func (table *Gameitinerant_rank) Get(key int32) *Gameitinerant_rankData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.itinerant_rankData.go b/sys/configure/structs/Game.itinerant_rankData.go
new file mode 100644
index 000000000..aec3a7ac8
--- /dev/null
+++ b/sys/configure/structs/Game.itinerant_rankData.go
@@ -0,0 +1,52 @@
+//------------------------------------------------------------------------------
+//
+// 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 Gameitinerant_rankData struct {
+ Id int32
+ Group int32
+ Reward []*Gameatn
+}
+
+const TypeId_Gameitinerant_rankData = -1941636761
+
+func (*Gameitinerant_rankData) GetTypeId() int32 {
+ return -1941636761
+}
+
+func (_v *Gameitinerant_rankData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
+
+ _v.Reward = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Reward = append(_v.Reward, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameitinerant_rankData(_buf map[string]interface{}) (*Gameitinerant_rankData, error) {
+ v := &Gameitinerant_rankData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.itinerant_rewardData.go b/sys/configure/structs/Game.itinerant_rewardData.go
index 91c28fdb4..984d59c08 100644
--- a/sys/configure/structs/Game.itinerant_rewardData.go
+++ b/sys/configure/structs/Game.itinerant_rewardData.go
@@ -12,6 +12,7 @@ import "errors"
type Gameitinerant_rewardData struct {
Num int32
+ Type int32
Reward []*Gameatn
}
@@ -23,6 +24,7 @@ func (*Gameitinerant_rewardData) GetTypeId() int32 {
func (_v *Gameitinerant_rewardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index ea9d5877e..4293a60ac 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -176,6 +176,9 @@ type Tables struct {
itinerant_thing *Gameitinerant_thing
itinerant_lv *Gameitinerant_lv
itinerant_reward *Gameitinerant_reward
+ itinerant_rank *Gameitinerant_rank
+ itinerant_battle *Gameitinerant_battle
+ itinerant_event *Gameitinerant_event
NewRedDot *GameNewRedDot
Talent *GameTalent
Favorability *GameFavorability
@@ -189,6 +192,7 @@ type Tables struct {
BuzkashiFm *GameBuzkashiFm
BuzkashiOpen *GameBuzkashiOpen
Pricegroup *GamePricegroup
+ Loading *GameLoading
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1186,6 +1190,24 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.itinerant_reward, err = NewGameitinerant_reward(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_itinerant_rank") ; err != nil {
+ return nil, err
+ }
+ if tables.itinerant_rank, err = NewGameitinerant_rank(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_itinerant_battle") ; err != nil {
+ return nil, err
+ }
+ if tables.itinerant_battle, err = NewGameitinerant_battle(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_itinerant_event") ; err != nil {
+ return nil, err
+ }
+ if tables.itinerant_event, err = NewGameitinerant_event(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_newreddot") ; err != nil {
return nil, err
}
@@ -1264,5 +1286,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.Pricegroup, err = NewGamePricegroup(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_loading") ; err != nil {
+ return nil, err
+ }
+ if tables.Loading, err = NewGameLoading(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.heroLevelgrowData.go b/sys/configure/structs/game.heroLevelgrowData.go
index 2a1409b85..3d4bed109 100644
--- a/sys/configure/structs/game.heroLevelgrowData.go
+++ b/sys/configure/structs/game.heroLevelgrowData.go
@@ -20,6 +20,13 @@ type GameHeroLevelgrowData struct {
Cridam int32
Effhit int32
Effre int32
+ Losthold int32
+ Understand int32
+ Damre int32
+ Causedam int32
+ Treadd int32
+ Betreadd int32
+ Suckblood int32
Hpgrow float32
Atkgrow float32
Defgrow float32
@@ -42,6 +49,13 @@ func (_v *GameHeroLevelgrowData)Deserialize(_buf map[string]interface{}) (err er
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cridam"].(float64); !_ok_ { err = errors.New("cridam error"); return }; _v.Cridam = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["effhit"].(float64); !_ok_ { err = errors.New("effhit error"); return }; _v.Effhit = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["effre"].(float64); !_ok_ { err = errors.New("effre error"); return }; _v.Effre = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["losthold"].(float64); !_ok_ { err = errors.New("losthold error"); return }; _v.Losthold = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["understand"].(float64); !_ok_ { err = errors.New("understand error"); return }; _v.Understand = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["damre"].(float64); !_ok_ { err = errors.New("damre error"); return }; _v.Damre = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["causedam"].(float64); !_ok_ { err = errors.New("causedam error"); return }; _v.Causedam = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["treadd"].(float64); !_ok_ { err = errors.New("treadd error"); return }; _v.Treadd = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["betreadd"].(float64); !_ok_ { err = errors.New("betreadd error"); return }; _v.Betreadd = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suckblood"].(float64); !_ok_ { err = errors.New("suckblood error"); return }; _v.Suckblood = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hpgrow"].(float64); !_ok_ { err = errors.New("hpgrow error"); return }; _v.Hpgrow = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atkgrow"].(float64); !_ok_ { err = errors.New("atkgrow error"); return }; _v.Atkgrow = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["defgrow"].(float64); !_ok_ { err = errors.New("defgrow error"); return }; _v.Defgrow = float32(_tempNum_) }