From b81923bda4a5644a0c29ab8d29817902e4b2ada8 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 5 Sep 2023 17:50:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_mainstage.json | 274 ++-- bin/json/game_skillafteratk.json | 2157 +++++++++++++++++------------- bin/json/game_skillatk.json | 43 +- bin/json/game_skillbuff.json | 4 +- bin/json/game_skillpassive.json | 180 ++- 5 files changed, 1557 insertions(+), 1101 deletions(-) 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_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 From d6c56bbb166b7bb6051a5fac5a0801373d5de285 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 5 Sep 2023 18:10:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BB=E7=BA=BFbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mainline/model_mainline.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/mainline/model_mainline.go b/modules/mainline/model_mainline.go index 8ccd3d6a5..265e4df4c 100644 --- a/modules/mainline/model_mainline.go +++ b/modules/mainline/model_mainline.go @@ -178,6 +178,9 @@ func (this *ModelMline) randomboos(data *pb.DBMainline) (err error) { } } } + if !ok { + continue + } chapters = append(chapters, k) } if len(chapters) == 0 { From dfd123190c5c51c358957a3263377e9982796ac9 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 5 Sep 2023 18:44:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E4=BA=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/robot/modulerobot_sys.go | 1 + modules/robot/options.go | 1 + modules/robot/robotmgrcomp.go | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/robot/modulerobot_sys.go b/modules/robot/modulerobot_sys.go index 903136061..7e452694f 100644 --- a/modules/robot/modulerobot_sys.go +++ b/modules/robot/modulerobot_sys.go @@ -74,6 +74,7 @@ func (this *ModuleRobot_Sys) funcactivate(tid, sid int32, robot IRobot, cid stri if _, errdata = robot.SendTaskMessage(tid, sid, "sys", "funcactivate", &pb.SysFuncActivateReq{Cid: cid}); errdata != nil { if errdata.Code == pb.ErrorCode_OpenCondActivate { + this.cmd[cid] = 2 return } err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message)) diff --git a/modules/robot/options.go b/modules/robot/options.go index 3845d8517..7206bc190 100644 --- a/modules/robot/options.go +++ b/modules/robot/options.go @@ -13,6 +13,7 @@ type ( RobotTotalNum int32 //机器人总数 RobotSingleNum int32 //单词机器人进入数量 Intervals int32 //间隔时间 单位秒 + RobotName string //机器人名称 Pipeline []string //执行流水线 } ) diff --git a/modules/robot/robotmgrcomp.go b/modules/robot/robotmgrcomp.go index 1cb5e26e9..f62d1dbed 100644 --- a/modules/robot/robotmgrcomp.go +++ b/modules/robot/robotmgrcomp.go @@ -43,7 +43,7 @@ locp: for { select { case <-timer.C: - if this.currRobotNum < this.module.options.RobotSingleNum { + if this.currRobotNum < this.module.options.RobotTotalNum { for i := 0; i < int(this.module.options.RobotSingleNum); i++ { this.createRobot(this.currRobotNum) this.currRobotNum++ @@ -63,7 +63,7 @@ func (this *robotmgrComp) createRobot(index int32) { robot = &Robot{ robotmgrComp: this, index: index, - account: fmt.Sprintf("it_%d", index), + account: fmt.Sprintf("%s_%d", this.module.options.RobotName, index), serverId: this.module.options.ServerID, pipeline: this.module.options.Pipeline, } From 46db315d4a35aba9b5af1b598dea30884ae0395a Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 5 Sep 2023 19:02:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0boos=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mainline/api_booschallenge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mainline/api_booschallenge.go b/modules/mainline/api_booschallenge.go index 36e86b0ea..bdfbca7b1 100644 --- a/modules/mainline/api_booschallenge.go +++ b/modules/mainline/api_booschallenge.go @@ -75,7 +75,7 @@ func (this *apiComp) BoosChallenge(session comm.IUserSession, req *pb.MainlineBo if errdata != nil { return } - session.SendMsg(string(this.module.GetType()), "challenge", &pb.MainlineBoosChallengeResp{ + session.SendMsg(string(this.module.GetType()), "booschallenge", &pb.MainlineBoosChallengeResp{ Info: &pb.BattleInfo{ Id: record.Id, Title: record.Title, From 3a82a419f242482a68432274e68eee99ad12ed4d Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 5 Sep 2023 19:03:28 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0boos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mainline/api_info.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mainline/api_info.go b/modules/mainline/api_info.go index 5ca84f866..956f30a1c 100644 --- a/modules/mainline/api_info.go +++ b/modules/mainline/api_info.go @@ -46,6 +46,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.MainlineInfoReq) (e } if err = this.module.modelMline.Change(session.GetUserId(), map[string]interface{}{ "currbooschapter": info.Currbooschapter, + "currboosmodel": info.Currboosmodel, "lastboosrefresh": info.Lastboosrefresh, }); err != nil { errdata = &pb.ErrorData{