diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 2d63c8b14..4c0d57d33 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -12182,7 +12182,9 @@ "id": 1100415, "chapterid": 11005, "group_id": 100501, - "previous_group_id": [], + "previous_group_id": [ + 100413 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -12294,7 +12296,9 @@ "id": 1100416, "chapterid": 11005, "group_id": 100502, - "previous_group_id": [], + "previous_group_id": [ + 100413 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -12406,7 +12410,9 @@ "id": 1100417, "chapterid": 11005, "group_id": 100503, - "previous_group_id": [], + "previous_group_id": [ + 100502 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -12518,7 +12524,9 @@ "id": 1100418, "chapterid": 11005, "group_id": 100504, - "previous_group_id": [], + "previous_group_id": [ + 100503 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -12630,7 +12638,9 @@ "id": 1100419, "chapterid": 11005, "group_id": 100505, - "previous_group_id": [], + "previous_group_id": [ + 100504 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -12742,7 +12752,9 @@ "id": 1100420, "chapterid": 11005, "group_id": 100506, - "previous_group_id": [], + "previous_group_id": [ + 100505 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -12854,7 +12866,9 @@ "id": 1100421, "chapterid": 11005, "group_id": 100507, - "previous_group_id": [], + "previous_group_id": [ + 100506 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -12965,8 +12979,10 @@ { "id": 1100422, "chapterid": 11007, - "group_id": 0, - "previous_group_id": [], + "group_id": 100508, + "previous_group_id": [ + 100507 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -13077,8 +13093,10 @@ { "id": 1100423, "chapterid": 11008, - "group_id": 0, - "previous_group_id": [], + "group_id": 100509, + "previous_group_id": [ + 100508 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -13189,8 +13207,10 @@ { "id": 1100424, "chapterid": 11008, - "group_id": 0, - "previous_group_id": [], + "group_id": 100510, + "previous_group_id": [ + 100509 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -13301,8 +13321,10 @@ { "id": 1100425, "chapterid": 11008, - "group_id": 0, - "previous_group_id": [], + "group_id": 100511, + "previous_group_id": [ + 100510 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -13413,8 +13435,10 @@ { "id": 1100426, "chapterid": 11008, - "group_id": 0, - "previous_group_id": [], + "group_id": 100512, + "previous_group_id": [ + 100511 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -13525,8 +13549,10 @@ { "id": 1100427, "chapterid": 11008, - "group_id": 0, - "previous_group_id": [], + "group_id": 100513, + "previous_group_id": [ + 100512 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -13637,8 +13663,10 @@ { "id": 1100428, "chapterid": 11008, - "group_id": 0, - "previous_group_id": [], + "group_id": 100514, + "previous_group_id": [ + 100513 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -13749,8 +13777,10 @@ { "id": 1100429, "chapterid": 11008, - "group_id": 0, - "previous_group_id": [], + "group_id": 100515, + "previous_group_id": [ + 100514 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -13861,8 +13891,10 @@ { "id": 1100430, "chapterid": 11008, - "group_id": 0, - "previous_group_id": [], + "group_id": 100516, + "previous_group_id": [ + 100515 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -13973,8 +14005,10 @@ { "id": 1100431, "chapterid": 11009, - "group_id": 0, - "previous_group_id": [], + "group_id": 100517, + "previous_group_id": [ + 100516 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -14085,8 +14119,10 @@ { "id": 1100432, "chapterid": 11009, - "group_id": 0, - "previous_group_id": [], + "group_id": 100518, + "previous_group_id": [ + 100517 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -14197,8 +14233,10 @@ { "id": 1100433, "chapterid": 11009, - "group_id": 0, - "previous_group_id": [], + "group_id": 100519, + "previous_group_id": [ + 100518 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -14309,8 +14347,10 @@ { "id": 1100434, "chapterid": 11009, - "group_id": 0, - "previous_group_id": [], + "group_id": 100520, + "previous_group_id": [ + 100519 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -14421,8 +14461,10 @@ { "id": 1100435, "chapterid": 11009, - "group_id": 0, - "previous_group_id": [], + "group_id": 100521, + "previous_group_id": [ + 100520 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -14533,8 +14575,10 @@ { "id": 1100436, "chapterid": 11009, - "group_id": 0, - "previous_group_id": [], + "group_id": 100522, + "previous_group_id": [ + 100521 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -14645,8 +14689,10 @@ { "id": 1100437, "chapterid": 11009, - "group_id": 0, - "previous_group_id": [], + "group_id": 100523, + "previous_group_id": [ + 100522 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -14757,8 +14803,10 @@ { "id": 1100438, "chapterid": 11009, - "group_id": 0, - "previous_group_id": [], + "group_id": 100524, + "previous_group_id": [ + 100523 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -14869,8 +14917,10 @@ { "id": 1100439, "chapterid": 11010, - "group_id": 0, - "previous_group_id": [], + "group_id": 100525, + "previous_group_id": [ + 100524 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -14981,8 +15031,10 @@ { "id": 1100440, "chapterid": 11010, - "group_id": 0, - "previous_group_id": [], + "group_id": 100526, + "previous_group_id": [ + 100525 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -15093,8 +15145,10 @@ { "id": 1100441, "chapterid": 11010, - "group_id": 0, - "previous_group_id": [], + "group_id": 100527, + "previous_group_id": [ + 100526 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -15205,8 +15259,10 @@ { "id": 1100442, "chapterid": 11010, - "group_id": 0, - "previous_group_id": [], + "group_id": 100528, + "previous_group_id": [ + 100527 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -15317,8 +15373,10 @@ { "id": 1100443, "chapterid": 11010, - "group_id": 0, - "previous_group_id": [], + "group_id": 100529, + "previous_group_id": [ + 100528 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -15429,8 +15487,10 @@ { "id": 1100444, "chapterid": 11010, - "group_id": 0, - "previous_group_id": [], + "group_id": 100530, + "previous_group_id": [ + 100529 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -15541,8 +15601,10 @@ { "id": 1100445, "chapterid": 11010, - "group_id": 0, - "previous_group_id": [], + "group_id": 100531, + "previous_group_id": [ + 100530 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -15653,8 +15715,10 @@ { "id": 1100446, "chapterid": 11010, - "group_id": 0, - "previous_group_id": [], + "group_id": 100532, + "previous_group_id": [ + 100531 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -15765,8 +15829,10 @@ { "id": 1100447, "chapterid": 11011, - "group_id": 0, - "previous_group_id": [], + "group_id": 100533, + "previous_group_id": [ + 100532 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -15877,8 +15943,10 @@ { "id": 1100448, "chapterid": 11011, - "group_id": 0, - "previous_group_id": [], + "group_id": 100534, + "previous_group_id": [ + 100533 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -15989,8 +16057,10 @@ { "id": 1100449, "chapterid": 11011, - "group_id": 0, - "previous_group_id": [], + "group_id": 100535, + "previous_group_id": [ + 100534 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -16101,8 +16171,10 @@ { "id": 1100450, "chapterid": 11011, - "group_id": 0, - "previous_group_id": [], + "group_id": 100536, + "previous_group_id": [ + 100535 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -16213,8 +16285,10 @@ { "id": 1100451, "chapterid": 11011, - "group_id": 0, - "previous_group_id": [], + "group_id": 100537, + "previous_group_id": [ + 100536 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -16325,8 +16399,10 @@ { "id": 1100452, "chapterid": 11011, - "group_id": 0, - "previous_group_id": [], + "group_id": 100538, + "previous_group_id": [ + 100537 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -16437,8 +16513,10 @@ { "id": 1100453, "chapterid": 11011, - "group_id": 0, - "previous_group_id": [], + "group_id": 100539, + "previous_group_id": [ + 100538 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -16549,8 +16627,10 @@ { "id": 1100454, "chapterid": 11011, - "group_id": 0, - "previous_group_id": [], + "group_id": 100540, + "previous_group_id": [ + 100539 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -16661,8 +16741,10 @@ { "id": 1100455, "chapterid": 11012, - "group_id": 0, - "previous_group_id": [], + "group_id": 100541, + "previous_group_id": [ + 100540 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -16773,8 +16855,10 @@ { "id": 1100456, "chapterid": 11012, - "group_id": 0, - "previous_group_id": [], + "group_id": 100542, + "previous_group_id": [ + 100541 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -16885,8 +16969,10 @@ { "id": 1100457, "chapterid": 11012, - "group_id": 0, - "previous_group_id": [], + "group_id": 100543, + "previous_group_id": [ + 100542 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -16997,8 +17083,10 @@ { "id": 1100458, "chapterid": 11012, - "group_id": 0, - "previous_group_id": [], + "group_id": 100544, + "previous_group_id": [ + 100543 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -17109,8 +17197,10 @@ { "id": 1100459, "chapterid": 11012, - "group_id": 0, - "previous_group_id": [], + "group_id": 100545, + "previous_group_id": [ + 100544 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -17221,8 +17311,10 @@ { "id": 1100460, "chapterid": 11012, - "group_id": 0, - "previous_group_id": [], + "group_id": 100546, + "previous_group_id": [ + 100545 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -17333,8 +17425,10 @@ { "id": 1100461, "chapterid": 11012, - "group_id": 0, - "previous_group_id": [], + "group_id": 100547, + "previous_group_id": [ + 100546 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, @@ -17445,8 +17539,10 @@ { "id": 1100462, "chapterid": 11012, - "group_id": 0, - "previous_group_id": [], + "group_id": 100548, + "previous_group_id": [ + 100547 + ], "previoustage": 0, "Episodetype": 1, "is_near": 0, diff --git a/bin/json/game_qualifying.json b/bin/json/game_qualifying.json index 2ba560fe8..46a93c8a8 100644 --- a/bin/json/game_qualifying.json +++ b/bin/json/game_qualifying.json @@ -7,15 +7,44 @@ "key": "arena_active_reward_name_1", "text": "黑铁" }, - "win_reward": [ + "matewin_reward": [ { "a": "attr", "t": "arenacoin", "n": 10 } ], - "png": "smithy_atk_1", - "k_value": 30 + "matefail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "rankwin_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "rankfail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "win_value": 30, + "fail_value": 30, + "settlement_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "png": "smithy_atk_1" }, { "lv_id": 2, @@ -25,15 +54,44 @@ "key": "arena_active_reward_name_2", "text": "青铜" }, - "win_reward": [ + "matewin_reward": [ { "a": "attr", "t": "arenacoin", "n": 12 } ], - "png": "smithy_def_4", - "k_value": 30 + "matefail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 12 + } + ], + "rankwin_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 12 + } + ], + "rankfail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 12 + } + ], + "win_value": 30, + "fail_value": 30, + "settlement_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "png": "smithy_def_4" }, { "lv_id": 3, @@ -43,15 +101,44 @@ "key": "arena_active_reward_name_3", "text": "白银" }, - "win_reward": [ + "matewin_reward": [ { "a": "attr", "t": "arenacoin", "n": 14 } ], - "png": "smithy_def_1", - "k_value": 30 + "matefail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 14 + } + ], + "rankwin_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 14 + } + ], + "rankfail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 14 + } + ], + "win_value": 30, + "fail_value": 30, + "settlement_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "png": "smithy_def_1" }, { "lv_id": 4, @@ -61,15 +148,44 @@ "key": "arena_active_reward_name_4", "text": "黄金" }, - "win_reward": [ + "matewin_reward": [ { "a": "attr", "t": "arenacoin", "n": 16 } ], - "png": "smithy_atk_3", - "k_value": 30 + "matefail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 16 + } + ], + "rankwin_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 16 + } + ], + "rankfail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 16 + } + ], + "win_value": 30, + "fail_value": 30, + "settlement_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "png": "smithy_atk_3" }, { "lv_id": 5, @@ -79,15 +195,44 @@ "key": "arena_active_reward_name_5", "text": "铂金" }, - "win_reward": [ + "matewin_reward": [ { "a": "attr", "t": "arenacoin", "n": 18 } ], - "png": "smithy_def_2", - "k_value": 30 + "matefail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 18 + } + ], + "rankwin_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 18 + } + ], + "rankfail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 18 + } + ], + "win_value": 30, + "fail_value": 30, + "settlement_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "png": "smithy_def_2" }, { "lv_id": 6, @@ -97,15 +242,44 @@ "key": "arena_active_reward_name_6", "text": "钻石" }, - "win_reward": [ + "matewin_reward": [ { "a": "attr", "t": "arenacoin", "n": 20 } ], - "png": "smithy_sup_4", - "k_value": 30 + "matefail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 20 + } + ], + "rankwin_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 20 + } + ], + "rankfail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 20 + } + ], + "win_value": 30, + "fail_value": 30, + "settlement_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "png": "smithy_sup_4" }, { "lv_id": 7, @@ -115,15 +289,44 @@ "key": "arena_active_reward_name_7", "text": "大师" }, - "win_reward": [ + "matewin_reward": [ { "a": "attr", "t": "arenacoin", "n": 22 } ], - "png": "smithy_atk_4", - "k_value": 30 + "matefail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 22 + } + ], + "rankwin_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 22 + } + ], + "rankfail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 22 + } + ], + "win_value": 30, + "fail_value": 30, + "settlement_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "png": "smithy_atk_4" }, { "lv_id": 8, @@ -133,14 +336,43 @@ "key": "arena_active_reward_name_8", "text": "王者" }, - "win_reward": [ + "matewin_reward": [ { "a": "attr", "t": "arenacoin", "n": 22 } ], - "png": "smithy_atk_5", - "k_value": 30 + "matefail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 22 + } + ], + "rankwin_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 22 + } + ], + "rankfail_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 22 + } + ], + "win_value": 30, + "fail_value": 30, + "settlement_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "png": "smithy_atk_5" } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index ad11b1ffc..cd393e7cd 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -21976,10 +21976,10 @@ 4, 5000 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 213001312 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -22025,10 +22025,10 @@ 4, 5300 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 213001312 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -22050,10 +22050,10 @@ 4, 5600 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 213001312 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -22075,10 +22075,10 @@ 4, 5900 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 213001312 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -22100,10 +22100,10 @@ 4, 6300 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 213001312 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -24175,6 +24175,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 215002321, + "EmitPR": 1000, + "From": 0, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 39, + "Argu": [ + 215002322, + 215002313, + 215002314 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 215002322, "EmitPR": 1000, @@ -24198,6 +24221,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 215002331, + "EmitPR": 1000, + "From": 0, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 39, + "Argu": [ + 215002332, + 215002313, + 215002314 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 215002332, "EmitPR": 1000, @@ -24221,6 +24267,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 215002341, + "EmitPR": 1000, + "From": 0, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 39, + "Argu": [ + 215002342, + 215002313, + 215002314 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 215002342, "EmitPR": 1000, @@ -24244,6 +24313,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 215002351, + "EmitPR": 1000, + "From": 0, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 39, + "Argu": [ + 215002352, + 215002313, + 215002314 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 215002352, "EmitPR": 1000, @@ -33662,10 +33754,10 @@ 4, 5300 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 244001212 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -33687,10 +33779,10 @@ 4, 5400 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 244001212 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -33712,10 +33804,10 @@ 4, 5500 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 244001212 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -33737,10 +33829,10 @@ 4, 5600 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 244001212 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -33762,10 +33854,10 @@ 4, 5700 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 244001212 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -33809,7 +33901,7 @@ "Argu": [ 444001213, 1, - 1 + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -49237,6 +49329,881 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 275001111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 275001112, + 275001113 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275001112, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001008, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275001113, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 300, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275001211, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 275001212, + 275001213 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275001212, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001102, + 500, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275001213, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001006, + 500, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275001311, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000065, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275002111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 275002112, + 275002113 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275002112, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001008, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275002113, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001544, + 300, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275002211, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 275002212, + 275002213 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275002212, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001401, + 500, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275002213, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001404, + 500, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275002311, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001550, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275002312, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001508, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275004111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "Type=Rand", + "Limit": 3, + "ExecuteCnt": 3, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 275003112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275004112, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001102, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275004211, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 275003212 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275004212, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 10, + "Argu": [ + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275004311, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 8, + "Argu": [ + 1, + -1, + 1000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275004312, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 105, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [ + 1, + 50 + ] + }, + { + "Id": 275003111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "Type=Rand", + "Limit": 3, + "ExecuteCnt": 3, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 101, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [ + 200 + ] + }, + { + "Id": 275003211, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 475003211, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275003212, + "EmitPR": 1000, + "From": 12, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001001, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275003213, + "EmitPR": 1000, + "From": 12, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001002, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275003214, + "EmitPR": 1000, + "From": 12, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001420, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275003311, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 108, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [ + 3, + 50 + ] + }, + { + "Id": 275005111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 2, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [ + 275005112, + 275005113 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275005112, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 10, + "Argu": [ + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275005113, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 12, + "Argu": [ + -300 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275005211, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 3000 + ], + "FollowSK": [], + "SucFollowSK": [ + 275005212, + 275005213 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275005212, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001404, + 500, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275005213, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 2, + "Type": 28, + "Argu": [ + 1, + 391000066, + 1, + 4, + 200 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275005311, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000068, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275005312, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "PropertyUp=5", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000068, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 275005313, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000067, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 291000111, "EmitPR": 1000, @@ -52873,8 +53840,8 @@ "RevisiParams": [] }, { - "Id": 943001313, - "EmitPR": 500, + "Id": 843001313, + "EmitPR": 300, "From": 4, "Where": [], "Order": "", @@ -52882,7 +53849,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001101, + 390001008, 1000, 1, 2 @@ -53340,30 +54307,6 @@ "RevisiCondition": "", "RevisiParams": [] }, - { - "Id": 943006215, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 391000056, - 1000, - 1, - -1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, { "Id": 813001211, "EmitPR": 300, @@ -55286,6 +56229,30 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 935002314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 493500231, + -1, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 924003311, "EmitPR": 1000, @@ -55665,6 +56632,30 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 944005317, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 494400531, + -1, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 935001311, "EmitPR": 1000, @@ -56821,6 +57812,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 935005314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 493500531, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 945001311, "EmitPR": 1000, @@ -57244,6 +58258,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 934008315, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 493400831, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 924004311, "EmitPR": 1000, @@ -57434,6 +58471,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 943002314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 494300231, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 935006311, "EmitPR": 1000, @@ -57501,6 +58561,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 935006314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 493500631, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 934002311, "EmitPR": 1000, @@ -57595,6 +58678,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 934002315, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 493400231, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 924005311, "EmitPR": 1000, @@ -57864,7 +58970,7 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 483300322, + 493300331, -1, -1 ], @@ -57926,8 +59032,8 @@ "RevisiParams": [] }, { - "Id": 843001313, - "EmitPR": 300, + "Id": 943001313, + "EmitPR": 500, "From": 4, "Where": [], "Order": "", @@ -57935,7 +59041,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001008, + 390001101, 1000, 1, 2 @@ -57949,6 +59055,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 943001314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 494300131, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 934003311, "EmitPR": 1000, @@ -58329,6 +59458,30 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 943006215, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000056, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 913001311, "EmitPR": 1000, @@ -58765,7 +59918,7 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 484300321, + 494300331, -1, -1 ], @@ -59922,29 +61075,6 @@ "RevisiCondition": "", "RevisiParams": [] }, - { - "Id": 935004313, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 2, - "Argu": [ - 424006211, - -1, - 1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, { "Id": 935004314, "EmitPR": 1000, @@ -60063,880 +61193,5 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [] - }, - { - "Id": 275001111, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [ - 275001112, - 275001113 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275001112, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001008, - 1000, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275001113, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001105, - 300, - 1, - 1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275001211, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 2, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [ - 275001212, - 275001213 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275001212, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001102, - 500, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275001213, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001006, - 500, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275001311, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 391000065, - 1000, - 1, - -1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275002111, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [ - 275002112, - 275002113 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275002112, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001008, - 1000, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275002113, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001544, - 300, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275002211, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 2, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [ - 275002212, - 275002213 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275002212, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001401, - 500, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275002213, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001404, - 500, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275002311, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001550, - 1000, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275002312, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001508, - 1000, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275004111, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "Type=Rand", - "Limit": 3, - "ExecuteCnt": 3, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [ - 275003112 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275004112, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001102, - 1000, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275004211, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [ - 275003212 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275004212, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 10, - "Argu": [ - 1, - 1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275004311, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 8, - "Argu": [ - 1, - -1, - 1000 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275004312, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 105, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [ - 1, - 50 - ] - }, - { - "Id": 275003111, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "Type=Rand", - "Limit": 3, - "ExecuteCnt": 3, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 101, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [ - 200 - ] - }, - { - "Id": 275003211, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 2, - "Argu": [ - 475003211, - -1, - 1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275003212, - "EmitPR": 1000, - "From": 12, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001001, - 1000, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275003213, - "EmitPR": 1000, - "From": 12, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001002, - 1000, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275003214, - "EmitPR": 1000, - "From": 12, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001420, - 1000, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275003311, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 2, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 108, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [ - 3, - 50 - ] - }, - { - "Id": 275005111, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 2, - "ExecuteCnt": 2, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [ - 275005112, - 275005113 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275005112, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 10, - "Argu": [ - 1, - 1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275005113, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 12, - "Argu": [ - -300 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275005211, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 2, - "Type": 1, - "Argu": [ - 1, - 4, - 3000 - ], - "FollowSK": [], - "SucFollowSK": [ - 275005212, - 275005213 - ], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275005212, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 390001404, - 500, - 1, - 2 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275005213, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 2, - "Type": 28, - "Argu": [ - 1, - 391000066, - 1, - 4, - 200 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275005311, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 391000068, - 1000, - 1, - -1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275005312, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "PropertyUp=5", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 391000068, - 1000, - 1, - -1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 275005313, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 3, - "Argu": [ - 391000067, - 1000, - 1, - -1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 6e93207c2..0d5bc65cc 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -18610,10 +18610,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 215002311, - 215002312, - 215002313, - 215002314 + 215002311 ] }, "passSkill": [], @@ -18643,10 +18640,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 215002311, - 215002322, - 215002313, - 215002314 + 215002321 ] }, "passSkill": [], @@ -18676,10 +18670,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 215002311, - 215002332, - 215002313, - 215002314 + 215002331 ] }, "passSkill": [], @@ -18709,10 +18700,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 215002311, - 215002342, - 215002313, - 215002314 + 215002341 ] }, "passSkill": [], @@ -18742,10 +18730,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 215002311, - 215002352, - 215002313, - 215002314 + 215002351 ] }, "passSkill": [], @@ -41901,7 +41886,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 933001313 + 933001314 ] }, "passSkill": [], @@ -42441,7 +42426,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 934002314 + 934002315 ] }, "passSkill": [], @@ -43342,7 +43327,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 934008313 + 934008315 ] }, "passSkill": [], @@ -43704,7 +43689,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 935002313 + 935002314 ] }, "passSkill": [], @@ -44065,7 +44050,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 935005313 + 935005314 ] }, "passSkill": [], @@ -44245,7 +44230,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 935006313 + 935006314 ] }, "passSkill": [], @@ -44425,7 +44410,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 943001313 + 943001314 ] }, "passSkill": [], @@ -44605,7 +44590,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 943002313 + 943002314 ] }, "passSkill": [], @@ -45506,7 +45491,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 944005316 + 944005317 ] }, "passSkill": [], diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index b71544f8d..b7bbb550d 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -10242,7 +10242,7 @@ "Id": 391000056, "Name": { "key": "skill_skill_buff_Name_391000055", - "text": "3技能最终治疗量增加" + "text": "2技能最终治疗量增加" }, "Desc": { "key": "skill_skill_buff_Desc_391000055", @@ -10527,7 +10527,7 @@ "RemoveType": true, "Priority": 0, "NotOverlay": 0, - "OverlayTimes": 99, + "OverlayTimes": 10, "SameID": false, "golbalbufficon": "", "buffIcon": "", diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index d37626031..cdfec8f26 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -6402,7 +6402,7 @@ "When": 3, "FromCheck": "Target=3,NoBuff=1", "TargetCheck": "", - "MainSkillCheck": "MainSkillID=133002211", + "MainSkillCheck": "SkillPos=2", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -6422,7 +6422,7 @@ "When": 16, "FromCheck": "Target=3", "TargetCheck": "", - "MainSkillCheck": "MainSkillID=133003111", + "MainSkillCheck": "SkillPos=1", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -6463,7 +6463,7 @@ "When": 16, "FromCheck": "Target=3", "TargetCheck": "", - "MainSkillCheck": "MainSkillID=133002111", + "MainSkillCheck": "SkillPos=2", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7685,26 +7685,6 @@ 99 ] }, - { - "Id": 493400231, - "When": 1, - "FromCheck": "", - "TargetCheck": "Target=3", - "MainSkillCheck": "", - "AfterSkillCheck": "", - "BuffCheck": "", - "DpsCheck": "", - "AddCon": [], - "PasPr": 1000, - "PasCorrection": 0, - "Type": "CallSkillPas", - "MaxEmitTimesInRoundByRole": 0, - "MaxEmitTimes": 1, - "MaxEmitTimesInRound": 0, - "Callback": [ - 834002313 - ] - }, { "Id": 493400331, "When": 4, @@ -7730,7 +7710,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "Target=2,HasBuff=390001401", - "MainSkillCheck": "", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7811,7 +7791,7 @@ "When": 30, "FromCheck": "Target=3", "TargetCheck": "", - "MainSkillCheck": "MainSkillID=143003311", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -7970,8 +7950,8 @@ "Id": 494500131, "When": 28, "FromCheck": "Target=3", - "TargetCheck": "Target=2,HasBuff=1", - "MainSkillCheck": "", + "TargetCheck": "Target=2,HasBuff=3", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "Succ=1", "DpsCheck": "", @@ -7989,9 +7969,9 @@ { "Id": 494500132, "When": 28, - "FromCheck": "Target=3,HasBuff=1", - "TargetCheck": "Target=2", - "MainSkillCheck": "", + "FromCheck": "Target=3", + "TargetCheck": "Target=1,HasBuff=1", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "Succ=1", "DpsCheck": "", @@ -8490,5 +8470,145 @@ "Callback": [ 933001313 ] + }, + { + "Id": 493400231, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 934002314 + ] + }, + { + "Id": 493400831, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 934008313 + ] + }, + { + "Id": 493500231, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 935002313 + ] + }, + { + "Id": 493500531, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 935005313 + ] + }, + { + "Id": 493500631, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 935006313 + ] + }, + { + "Id": 494300131, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 943001313 + ] + }, + { + "Id": 494300231, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 943002313 + ] } ] \ No newline at end of file diff --git a/modules/dragon/model_dragon.go b/modules/dragon/model_dragon.go index af81204e0..c300bfd02 100644 --- a/modules/dragon/model_dragon.go +++ b/modules/dragon/model_dragon.go @@ -141,6 +141,7 @@ func (this *ModelDragon) CreateDragon(session comm.IUserSession, dragons map[str // 获取坐骑列表 func (this *ModelDragon) GetDragonList(uid string) (dragon []*pb.DBDragon, err error) { + dragon = make([]*pb.DBDragon, 0) if this.module.IsCross() { if dbModel, err1 := this.module.GetDBModelByUid(uid, this.TableName); err1 == nil { if err = dbModel.GetList(uid, &dragon); err != nil { diff --git a/modules/smithy/api_refuse.go b/modules/smithy/api_refuse.go index 33cb3d991..f9820a327 100644 --- a/modules/smithy/api_refuse.go +++ b/modules/smithy/api_refuse.go @@ -26,11 +26,6 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SmithyRefuseReq) var errCustom = new(comm.CustomError) if errors.As(err, &errCustom) { this.module.Debug(errCustom.Code.String()) - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_SmithyCustomerLimit, - Title: pb.ErrorCode_SmithyCustomerLimit.ToString(), - Message: err.Error(), - } } else { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/sys/configure/structs/Game.QualifyingData.go b/sys/configure/structs/Game.QualifyingData.go index 7796cd39c..1e404ade9 100644 --- a/sys/configure/structs/Game.QualifyingData.go +++ b/sys/configure/structs/Game.QualifyingData.go @@ -15,9 +15,14 @@ type GameQualifyingData struct { ScoreLow int32 ScoreUp int32 Name string - WinReward []*Gameatn + MatewinReward []*Gameatn + MatefailReward []*Gameatn + RankwinReward []*Gameatn + RankfailReward []*Gameatn + WinValue float32 + FailValue float32 + SettlementReward []*Gameatn Png string - KValue float32 } const TypeId_GameQualifyingData = 141547579 @@ -34,19 +39,76 @@ func (_v *GameQualifyingData)Deserialize(_buf map[string]interface{}) (err error { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["win_reward"].([]interface{}); !_ok_ { err = errors.New("win_reward error"); return } + if _arr_, _ok_ = _buf["matewin_reward"].([]interface{}); !_ok_ { err = errors.New("matewin_reward error"); return } - _v.WinReward = make([]*Gameatn, 0, len(_arr_)) + _v.MatewinReward = 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.WinReward = append(_v.WinReward, _list_v_) + _v.MatewinReward = append(_v.MatewinReward, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["matefail_reward"].([]interface{}); !_ok_ { err = errors.New("matefail_reward error"); return } + + _v.MatefailReward = 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.MatefailReward = append(_v.MatefailReward, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["rankwin_reward"].([]interface{}); !_ok_ { err = errors.New("rankwin_reward error"); return } + + _v.RankwinReward = 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.RankwinReward = append(_v.RankwinReward, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["rankfail_reward"].([]interface{}); !_ok_ { err = errors.New("rankfail_reward error"); return } + + _v.RankfailReward = 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.RankfailReward = append(_v.RankfailReward, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["win_value"].(float64); !_ok_ { err = errors.New("win_value error"); return }; _v.WinValue = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fail_value"].(float64); !_ok_ { err = errors.New("fail_value error"); return }; _v.FailValue = float32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["settlement_reward"].([]interface{}); !_ok_ { err = errors.New("settlement_reward error"); return } + + _v.SettlementReward = 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.SettlementReward = append(_v.SettlementReward, _list_v_) } } { var _ok_ bool; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["k_value"].(float64); !_ok_ { err = errors.New("k_value error"); return }; _v.KValue = float32(_tempNum_) } return }