From a3713940402ad5827160101ecb4057991893f444 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Fri, 14 Jul 2023 20:17:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0pb=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_mainstage.json | 576 +++++++++++++++++------------------ bin/json/game_worldtask.json | 20 +- modules/wtask/api_finish.go | 43 ++- pb/wtask_msg.pb.go | 96 +++--- 4 files changed, 378 insertions(+), 357 deletions(-) diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index af51a6abf..66b5aeab8 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -8552,7 +8552,7 @@ "id": 1200101, "chapterid": 12001, "previoustage": 0, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -8641,7 +8641,7 @@ "id": 1200102, "chapterid": 12001, "previoustage": 1200101, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -8730,7 +8730,7 @@ "id": 1200103, "chapterid": 12001, "previoustage": 1200102, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -8819,7 +8819,7 @@ "id": 1200104, "chapterid": 12001, "previoustage": 1200103, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -8908,7 +8908,7 @@ "id": 1200105, "chapterid": 12001, "previoustage": 1200104, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -8997,7 +8997,7 @@ "id": 1200106, "chapterid": 12001, "previoustage": 1200105, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9086,7 +9086,7 @@ "id": 1200107, "chapterid": 12001, "previoustage": 1200106, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9175,7 +9175,7 @@ "id": 1200108, "chapterid": 12001, "previoustage": 1200107, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9264,7 +9264,7 @@ "id": 1200201, "chapterid": 12002, "previoustage": 1200108, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9353,7 +9353,7 @@ "id": 1200202, "chapterid": 12002, "previoustage": 1200201, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9442,7 +9442,7 @@ "id": 1200203, "chapterid": 12002, "previoustage": 1200202, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9531,7 +9531,7 @@ "id": 1200204, "chapterid": 12002, "previoustage": 1200203, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9620,7 +9620,7 @@ "id": 1200205, "chapterid": 12002, "previoustage": 1200204, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9709,7 +9709,7 @@ "id": 1200206, "chapterid": 12002, "previoustage": 1200205, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9798,7 +9798,7 @@ "id": 1200207, "chapterid": 12002, "previoustage": 1200206, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9887,7 +9887,7 @@ "id": 1200208, "chapterid": 12002, "previoustage": 1200207, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -9976,7 +9976,7 @@ "id": 1200301, "chapterid": 12003, "previoustage": 1200208, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10065,7 +10065,7 @@ "id": 1200302, "chapterid": 12003, "previoustage": 1200301, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10154,7 +10154,7 @@ "id": 1200303, "chapterid": 12003, "previoustage": 1200302, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10243,7 +10243,7 @@ "id": 1200304, "chapterid": 12003, "previoustage": 1200303, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10332,7 +10332,7 @@ "id": 1200305, "chapterid": 12003, "previoustage": 1200304, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10421,7 +10421,7 @@ "id": 1200306, "chapterid": 12003, "previoustage": 1200305, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10510,7 +10510,7 @@ "id": 1200307, "chapterid": 12003, "previoustage": 1200306, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10599,7 +10599,7 @@ "id": 1200308, "chapterid": 12003, "previoustage": 1200307, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10688,7 +10688,7 @@ "id": 1200401, "chapterid": 12004, "previoustage": 1200308, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10777,7 +10777,7 @@ "id": 1200402, "chapterid": 12004, "previoustage": 1200401, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10866,7 +10866,7 @@ "id": 1200403, "chapterid": 12004, "previoustage": 1200402, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -10955,7 +10955,7 @@ "id": 1200404, "chapterid": 12004, "previoustage": 1200403, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11044,7 +11044,7 @@ "id": 1200405, "chapterid": 12004, "previoustage": 1200404, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11133,7 +11133,7 @@ "id": 1200406, "chapterid": 12004, "previoustage": 1200405, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11222,7 +11222,7 @@ "id": 1200407, "chapterid": 12004, "previoustage": 1200406, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11311,7 +11311,7 @@ "id": 1200408, "chapterid": 12004, "previoustage": 1200407, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11400,7 +11400,7 @@ "id": 1200501, "chapterid": 12005, "previoustage": 1200408, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11489,7 +11489,7 @@ "id": 1200502, "chapterid": 12005, "previoustage": 1200501, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11578,7 +11578,7 @@ "id": 1200503, "chapterid": 12005, "previoustage": 1200502, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11667,7 +11667,7 @@ "id": 1200504, "chapterid": 12005, "previoustage": 1200503, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11756,7 +11756,7 @@ "id": 1200505, "chapterid": 12005, "previoustage": 1200504, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11845,7 +11845,7 @@ "id": 1200506, "chapterid": 12005, "previoustage": 1200505, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -11934,7 +11934,7 @@ "id": 1200507, "chapterid": 12005, "previoustage": 1200506, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12023,7 +12023,7 @@ "id": 1200508, "chapterid": 12005, "previoustage": 1200507, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12112,7 +12112,7 @@ "id": 1200601, "chapterid": 12006, "previoustage": 1200508, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12201,7 +12201,7 @@ "id": 1200602, "chapterid": 12006, "previoustage": 1200601, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12290,7 +12290,7 @@ "id": 1200603, "chapterid": 12006, "previoustage": 1200602, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12379,7 +12379,7 @@ "id": 1200604, "chapterid": 12006, "previoustage": 1200603, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12468,7 +12468,7 @@ "id": 1200605, "chapterid": 12006, "previoustage": 1200604, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12557,7 +12557,7 @@ "id": 1200606, "chapterid": 12006, "previoustage": 1200605, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12646,7 +12646,7 @@ "id": 1200607, "chapterid": 12006, "previoustage": 1200606, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12735,7 +12735,7 @@ "id": 1200608, "chapterid": 12006, "previoustage": 1200607, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12824,7 +12824,7 @@ "id": 1200701, "chapterid": 12007, "previoustage": 1200608, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -12913,7 +12913,7 @@ "id": 1200702, "chapterid": 12007, "previoustage": 1200701, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13002,7 +13002,7 @@ "id": 1200703, "chapterid": 12007, "previoustage": 1200702, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13091,7 +13091,7 @@ "id": 1200704, "chapterid": 12007, "previoustage": 1200703, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13180,7 +13180,7 @@ "id": 1200705, "chapterid": 12007, "previoustage": 1200704, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13269,7 +13269,7 @@ "id": 1200706, "chapterid": 12007, "previoustage": 1200705, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13358,7 +13358,7 @@ "id": 1200707, "chapterid": 12007, "previoustage": 1200706, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13447,7 +13447,7 @@ "id": 1200708, "chapterid": 12007, "previoustage": 1200707, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13536,7 +13536,7 @@ "id": 1200801, "chapterid": 12008, "previoustage": 1200708, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13625,7 +13625,7 @@ "id": 1200802, "chapterid": 12008, "previoustage": 1200801, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13714,7 +13714,7 @@ "id": 1200803, "chapterid": 12008, "previoustage": 1200802, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13803,7 +13803,7 @@ "id": 1200804, "chapterid": 12008, "previoustage": 1200803, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13892,7 +13892,7 @@ "id": 1200805, "chapterid": 12008, "previoustage": 1200804, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -13981,7 +13981,7 @@ "id": 1200806, "chapterid": 12008, "previoustage": 1200805, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14070,7 +14070,7 @@ "id": 1200807, "chapterid": 12008, "previoustage": 1200806, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14159,7 +14159,7 @@ "id": 1200808, "chapterid": 12008, "previoustage": 1200807, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14248,7 +14248,7 @@ "id": 1200901, "chapterid": 12009, "previoustage": 1200808, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14337,7 +14337,7 @@ "id": 1200902, "chapterid": 12009, "previoustage": 1200901, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14426,7 +14426,7 @@ "id": 1200903, "chapterid": 12009, "previoustage": 1200902, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14515,7 +14515,7 @@ "id": 1200904, "chapterid": 12009, "previoustage": 1200903, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14604,7 +14604,7 @@ "id": 1200905, "chapterid": 12009, "previoustage": 1200904, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14693,7 +14693,7 @@ "id": 1200906, "chapterid": 12009, "previoustage": 1200905, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14782,7 +14782,7 @@ "id": 1200907, "chapterid": 12009, "previoustage": 1200906, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14871,7 +14871,7 @@ "id": 1200908, "chapterid": 12009, "previoustage": 1200907, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -14960,7 +14960,7 @@ "id": 1201001, "chapterid": 12010, "previoustage": 1200908, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15049,7 +15049,7 @@ "id": 1201002, "chapterid": 12010, "previoustage": 1201001, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15138,7 +15138,7 @@ "id": 1201003, "chapterid": 12010, "previoustage": 1201002, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15227,7 +15227,7 @@ "id": 1201004, "chapterid": 12010, "previoustage": 1201003, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15316,7 +15316,7 @@ "id": 1201005, "chapterid": 12010, "previoustage": 1201004, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15405,7 +15405,7 @@ "id": 1201006, "chapterid": 12010, "previoustage": 1201005, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15494,7 +15494,7 @@ "id": 1201007, "chapterid": 12010, "previoustage": 1201006, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15583,7 +15583,7 @@ "id": 1201008, "chapterid": 12010, "previoustage": 1201007, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15672,7 +15672,7 @@ "id": 1201101, "chapterid": 12011, "previoustage": 1201008, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15761,7 +15761,7 @@ "id": 1201102, "chapterid": 12011, "previoustage": 1201101, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15850,7 +15850,7 @@ "id": 1201103, "chapterid": 12011, "previoustage": 1201102, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -15939,7 +15939,7 @@ "id": 1201104, "chapterid": 12011, "previoustage": 1201103, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16028,7 +16028,7 @@ "id": 1201105, "chapterid": 12011, "previoustage": 1201104, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16117,7 +16117,7 @@ "id": 1201106, "chapterid": 12011, "previoustage": 1201105, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16206,7 +16206,7 @@ "id": 1201107, "chapterid": 12011, "previoustage": 1201106, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16295,7 +16295,7 @@ "id": 1201108, "chapterid": 12011, "previoustage": 1201107, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16384,7 +16384,7 @@ "id": 1201201, "chapterid": 12012, "previoustage": 1201108, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16473,7 +16473,7 @@ "id": 1201202, "chapterid": 12012, "previoustage": 1201201, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16562,7 +16562,7 @@ "id": 1201203, "chapterid": 12012, "previoustage": 1201202, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16651,7 +16651,7 @@ "id": 1201204, "chapterid": 12012, "previoustage": 1201203, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16740,7 +16740,7 @@ "id": 1201205, "chapterid": 12012, "previoustage": 1201204, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16829,7 +16829,7 @@ "id": 1201206, "chapterid": 12012, "previoustage": 1201205, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -16918,7 +16918,7 @@ "id": 1201207, "chapterid": 12012, "previoustage": 1201206, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17007,7 +17007,7 @@ "id": 1201208, "chapterid": 12012, "previoustage": 1201207, - "Episodetype": 2, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17096,7 +17096,7 @@ "id": 1300101, "chapterid": 13001, "previoustage": 0, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17185,7 +17185,7 @@ "id": 1300102, "chapterid": 13001, "previoustage": 1300101, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17274,7 +17274,7 @@ "id": 1300103, "chapterid": 13001, "previoustage": 1300102, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17363,7 +17363,7 @@ "id": 1300104, "chapterid": 13001, "previoustage": 1300103, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17452,7 +17452,7 @@ "id": 1300105, "chapterid": 13001, "previoustage": 1300104, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17541,7 +17541,7 @@ "id": 1300106, "chapterid": 13001, "previoustage": 1300105, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17630,7 +17630,7 @@ "id": 1300107, "chapterid": 13001, "previoustage": 1300106, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17719,7 +17719,7 @@ "id": 1300108, "chapterid": 13001, "previoustage": 1300107, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17808,7 +17808,7 @@ "id": 1300201, "chapterid": 13002, "previoustage": 1300108, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17897,7 +17897,7 @@ "id": 1300202, "chapterid": 13002, "previoustage": 1300201, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -17986,7 +17986,7 @@ "id": 1300203, "chapterid": 13002, "previoustage": 1300202, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18075,7 +18075,7 @@ "id": 1300204, "chapterid": 13002, "previoustage": 1300203, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18164,7 +18164,7 @@ "id": 1300205, "chapterid": 13002, "previoustage": 1300204, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18253,7 +18253,7 @@ "id": 1300206, "chapterid": 13002, "previoustage": 1300205, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18342,7 +18342,7 @@ "id": 1300207, "chapterid": 13002, "previoustage": 1300206, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18431,7 +18431,7 @@ "id": 1300208, "chapterid": 13002, "previoustage": 1300207, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18520,7 +18520,7 @@ "id": 1300301, "chapterid": 13003, "previoustage": 1300208, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18609,7 +18609,7 @@ "id": 1300302, "chapterid": 13003, "previoustage": 1300301, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18698,7 +18698,7 @@ "id": 1300303, "chapterid": 13003, "previoustage": 1300302, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18787,7 +18787,7 @@ "id": 1300304, "chapterid": 13003, "previoustage": 1300303, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18876,7 +18876,7 @@ "id": 1300305, "chapterid": 13003, "previoustage": 1300304, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -18965,7 +18965,7 @@ "id": 1300306, "chapterid": 13003, "previoustage": 1300305, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19054,7 +19054,7 @@ "id": 1300307, "chapterid": 13003, "previoustage": 1300306, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19143,7 +19143,7 @@ "id": 1300308, "chapterid": 13003, "previoustage": 1300307, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19232,7 +19232,7 @@ "id": 1300401, "chapterid": 13004, "previoustage": 1300308, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19321,7 +19321,7 @@ "id": 1300402, "chapterid": 13004, "previoustage": 1300401, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19410,7 +19410,7 @@ "id": 1300403, "chapterid": 13004, "previoustage": 1300402, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19499,7 +19499,7 @@ "id": 1300404, "chapterid": 13004, "previoustage": 1300403, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19588,7 +19588,7 @@ "id": 1300405, "chapterid": 13004, "previoustage": 1300404, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19677,7 +19677,7 @@ "id": 1300406, "chapterid": 13004, "previoustage": 1300405, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19766,7 +19766,7 @@ "id": 1300407, "chapterid": 13004, "previoustage": 1300406, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19855,7 +19855,7 @@ "id": 1300408, "chapterid": 13004, "previoustage": 1300407, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -19944,7 +19944,7 @@ "id": 1300501, "chapterid": 13005, "previoustage": 1300408, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20033,7 +20033,7 @@ "id": 1300502, "chapterid": 13005, "previoustage": 1300501, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20122,7 +20122,7 @@ "id": 1300503, "chapterid": 13005, "previoustage": 1300502, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20211,7 +20211,7 @@ "id": 1300504, "chapterid": 13005, "previoustage": 1300503, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20300,7 +20300,7 @@ "id": 1300505, "chapterid": 13005, "previoustage": 1300504, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20389,7 +20389,7 @@ "id": 1300506, "chapterid": 13005, "previoustage": 1300505, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20478,7 +20478,7 @@ "id": 1300507, "chapterid": 13005, "previoustage": 1300506, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20567,7 +20567,7 @@ "id": 1300508, "chapterid": 13005, "previoustage": 1300507, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20656,7 +20656,7 @@ "id": 1300601, "chapterid": 13006, "previoustage": 1300508, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20745,7 +20745,7 @@ "id": 1300602, "chapterid": 13006, "previoustage": 1300601, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20834,7 +20834,7 @@ "id": 1300603, "chapterid": 13006, "previoustage": 1300602, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -20923,7 +20923,7 @@ "id": 1300604, "chapterid": 13006, "previoustage": 1300603, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21012,7 +21012,7 @@ "id": 1300605, "chapterid": 13006, "previoustage": 1300604, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21101,7 +21101,7 @@ "id": 1300606, "chapterid": 13006, "previoustage": 1300605, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21190,7 +21190,7 @@ "id": 1300607, "chapterid": 13006, "previoustage": 1300606, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21279,7 +21279,7 @@ "id": 1300608, "chapterid": 13006, "previoustage": 1300607, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21368,7 +21368,7 @@ "id": 1300701, "chapterid": 13007, "previoustage": 1300608, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21457,7 +21457,7 @@ "id": 1300702, "chapterid": 13007, "previoustage": 1300701, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21546,7 +21546,7 @@ "id": 1300703, "chapterid": 13007, "previoustage": 1300702, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21635,7 +21635,7 @@ "id": 1300704, "chapterid": 13007, "previoustage": 1300703, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21724,7 +21724,7 @@ "id": 1300705, "chapterid": 13007, "previoustage": 1300704, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21813,7 +21813,7 @@ "id": 1300706, "chapterid": 13007, "previoustage": 1300705, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21902,7 +21902,7 @@ "id": 1300707, "chapterid": 13007, "previoustage": 1300706, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -21991,7 +21991,7 @@ "id": 1300708, "chapterid": 13007, "previoustage": 1300707, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22080,7 +22080,7 @@ "id": 1300801, "chapterid": 13008, "previoustage": 1300708, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22169,7 +22169,7 @@ "id": 1300802, "chapterid": 13008, "previoustage": 1300801, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22258,7 +22258,7 @@ "id": 1300803, "chapterid": 13008, "previoustage": 1300802, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22347,7 +22347,7 @@ "id": 1300804, "chapterid": 13008, "previoustage": 1300803, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22436,7 +22436,7 @@ "id": 1300805, "chapterid": 13008, "previoustage": 1300804, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22525,7 +22525,7 @@ "id": 1300806, "chapterid": 13008, "previoustage": 1300805, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22614,7 +22614,7 @@ "id": 1300807, "chapterid": 13008, "previoustage": 1300806, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22703,7 +22703,7 @@ "id": 1300808, "chapterid": 13008, "previoustage": 1300807, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22792,7 +22792,7 @@ "id": 1300901, "chapterid": 13009, "previoustage": 1300808, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22881,7 +22881,7 @@ "id": 1300902, "chapterid": 13009, "previoustage": 1300901, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -22970,7 +22970,7 @@ "id": 1300903, "chapterid": 13009, "previoustage": 1300902, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23059,7 +23059,7 @@ "id": 1300904, "chapterid": 13009, "previoustage": 1300903, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23148,7 +23148,7 @@ "id": 1300905, "chapterid": 13009, "previoustage": 1300904, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23237,7 +23237,7 @@ "id": 1300906, "chapterid": 13009, "previoustage": 1300905, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23326,7 +23326,7 @@ "id": 1300907, "chapterid": 13009, "previoustage": 1300906, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23415,7 +23415,7 @@ "id": 1300908, "chapterid": 13009, "previoustage": 1300907, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23504,7 +23504,7 @@ "id": 1301001, "chapterid": 13010, "previoustage": 1300908, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23593,7 +23593,7 @@ "id": 1301002, "chapterid": 13010, "previoustage": 1301001, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23682,7 +23682,7 @@ "id": 1301003, "chapterid": 13010, "previoustage": 1301002, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23771,7 +23771,7 @@ "id": 1301004, "chapterid": 13010, "previoustage": 1301003, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23860,7 +23860,7 @@ "id": 1301005, "chapterid": 13010, "previoustage": 1301004, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -23949,7 +23949,7 @@ "id": 1301006, "chapterid": 13010, "previoustage": 1301005, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24038,7 +24038,7 @@ "id": 1301007, "chapterid": 13010, "previoustage": 1301006, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24127,7 +24127,7 @@ "id": 1301008, "chapterid": 13010, "previoustage": 1301007, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24216,7 +24216,7 @@ "id": 1301101, "chapterid": 13011, "previoustage": 1301008, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24305,7 +24305,7 @@ "id": 1301102, "chapterid": 13011, "previoustage": 1301101, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24394,7 +24394,7 @@ "id": 1301103, "chapterid": 13011, "previoustage": 1301102, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24483,7 +24483,7 @@ "id": 1301104, "chapterid": 13011, "previoustage": 1301103, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24572,7 +24572,7 @@ "id": 1301105, "chapterid": 13011, "previoustage": 1301104, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24661,7 +24661,7 @@ "id": 1301106, "chapterid": 13011, "previoustage": 1301105, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24750,7 +24750,7 @@ "id": 1301107, "chapterid": 13011, "previoustage": 1301106, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24839,7 +24839,7 @@ "id": 1301108, "chapterid": 13011, "previoustage": 1301107, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -24928,7 +24928,7 @@ "id": 1301201, "chapterid": 13012, "previoustage": 1301108, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25017,7 +25017,7 @@ "id": 1301202, "chapterid": 13012, "previoustage": 1301201, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25106,7 +25106,7 @@ "id": 1301203, "chapterid": 13012, "previoustage": 1301202, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25195,7 +25195,7 @@ "id": 1301204, "chapterid": 13012, "previoustage": 1301203, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25284,7 +25284,7 @@ "id": 1301205, "chapterid": 13012, "previoustage": 1301204, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25373,7 +25373,7 @@ "id": 1301206, "chapterid": 13012, "previoustage": 1301205, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25462,7 +25462,7 @@ "id": 1301207, "chapterid": 13012, "previoustage": 1301206, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25551,7 +25551,7 @@ "id": 1301208, "chapterid": 13012, "previoustage": 1301207, - "Episodetype": 3, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25640,7 +25640,7 @@ "id": 1400101, "chapterid": 14001, "previoustage": 0, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25729,7 +25729,7 @@ "id": 1400102, "chapterid": 14001, "previoustage": 1400101, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25818,7 +25818,7 @@ "id": 1400103, "chapterid": 14001, "previoustage": 1400102, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25907,7 +25907,7 @@ "id": 1400104, "chapterid": 14001, "previoustage": 1400103, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -25996,7 +25996,7 @@ "id": 1400105, "chapterid": 14001, "previoustage": 1400104, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26085,7 +26085,7 @@ "id": 1400106, "chapterid": 14001, "previoustage": 1400105, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26174,7 +26174,7 @@ "id": 1400107, "chapterid": 14001, "previoustage": 1400106, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26263,7 +26263,7 @@ "id": 1400108, "chapterid": 14001, "previoustage": 1400107, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26352,7 +26352,7 @@ "id": 1400201, "chapterid": 14002, "previoustage": 1400108, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26441,7 +26441,7 @@ "id": 1400202, "chapterid": 14002, "previoustage": 1400201, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26530,7 +26530,7 @@ "id": 1400203, "chapterid": 14002, "previoustage": 1400202, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26619,7 +26619,7 @@ "id": 1400204, "chapterid": 14002, "previoustage": 1400203, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26708,7 +26708,7 @@ "id": 1400205, "chapterid": 14002, "previoustage": 1400204, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26797,7 +26797,7 @@ "id": 1400206, "chapterid": 14002, "previoustage": 1400205, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26886,7 +26886,7 @@ "id": 1400207, "chapterid": 14002, "previoustage": 1400206, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -26975,7 +26975,7 @@ "id": 1400208, "chapterid": 14002, "previoustage": 1400207, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27064,7 +27064,7 @@ "id": 1400301, "chapterid": 14003, "previoustage": 1400208, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27153,7 +27153,7 @@ "id": 1400302, "chapterid": 14003, "previoustage": 1400301, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27242,7 +27242,7 @@ "id": 1400303, "chapterid": 14003, "previoustage": 1400302, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27331,7 +27331,7 @@ "id": 1400304, "chapterid": 14003, "previoustage": 1400303, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27420,7 +27420,7 @@ "id": 1400305, "chapterid": 14003, "previoustage": 1400304, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27509,7 +27509,7 @@ "id": 1400306, "chapterid": 14003, "previoustage": 1400305, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27598,7 +27598,7 @@ "id": 1400307, "chapterid": 14003, "previoustage": 1400306, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27687,7 +27687,7 @@ "id": 1400308, "chapterid": 14003, "previoustage": 1400307, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27776,7 +27776,7 @@ "id": 1400401, "chapterid": 14004, "previoustage": 1400308, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27865,7 +27865,7 @@ "id": 1400402, "chapterid": 14004, "previoustage": 1400401, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -27954,7 +27954,7 @@ "id": 1400403, "chapterid": 14004, "previoustage": 1400402, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28043,7 +28043,7 @@ "id": 1400404, "chapterid": 14004, "previoustage": 1400403, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28132,7 +28132,7 @@ "id": 1400405, "chapterid": 14004, "previoustage": 1400404, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28221,7 +28221,7 @@ "id": 1400406, "chapterid": 14004, "previoustage": 1400405, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28310,7 +28310,7 @@ "id": 1400407, "chapterid": 14004, "previoustage": 1400406, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28399,7 +28399,7 @@ "id": 1400408, "chapterid": 14004, "previoustage": 1400407, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28488,7 +28488,7 @@ "id": 1400501, "chapterid": 14005, "previoustage": 1400408, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28577,7 +28577,7 @@ "id": 1400502, "chapterid": 14005, "previoustage": 1400501, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28666,7 +28666,7 @@ "id": 1400503, "chapterid": 14005, "previoustage": 1400502, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28755,7 +28755,7 @@ "id": 1400504, "chapterid": 14005, "previoustage": 1400503, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28844,7 +28844,7 @@ "id": 1400505, "chapterid": 14005, "previoustage": 1400504, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -28933,7 +28933,7 @@ "id": 1400506, "chapterid": 14005, "previoustage": 1400505, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29022,7 +29022,7 @@ "id": 1400507, "chapterid": 14005, "previoustage": 1400506, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29111,7 +29111,7 @@ "id": 1400508, "chapterid": 14005, "previoustage": 1400507, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29200,7 +29200,7 @@ "id": 1400601, "chapterid": 14006, "previoustage": 1400508, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29289,7 +29289,7 @@ "id": 1400602, "chapterid": 14006, "previoustage": 1400601, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29378,7 +29378,7 @@ "id": 1400603, "chapterid": 14006, "previoustage": 1400602, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29467,7 +29467,7 @@ "id": 1400604, "chapterid": 14006, "previoustage": 1400603, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29556,7 +29556,7 @@ "id": 1400605, "chapterid": 14006, "previoustage": 1400604, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29645,7 +29645,7 @@ "id": 1400606, "chapterid": 14006, "previoustage": 1400605, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29734,7 +29734,7 @@ "id": 1400607, "chapterid": 14006, "previoustage": 1400606, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29823,7 +29823,7 @@ "id": 1400608, "chapterid": 14006, "previoustage": 1400607, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -29912,7 +29912,7 @@ "id": 1400701, "chapterid": 14007, "previoustage": 1400608, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30001,7 +30001,7 @@ "id": 1400702, "chapterid": 14007, "previoustage": 1400701, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30090,7 +30090,7 @@ "id": 1400703, "chapterid": 14007, "previoustage": 1400702, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30179,7 +30179,7 @@ "id": 1400704, "chapterid": 14007, "previoustage": 1400703, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30268,7 +30268,7 @@ "id": 1400705, "chapterid": 14007, "previoustage": 1400704, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30357,7 +30357,7 @@ "id": 1400706, "chapterid": 14007, "previoustage": 1400705, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30446,7 +30446,7 @@ "id": 1400707, "chapterid": 14007, "previoustage": 1400706, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30535,7 +30535,7 @@ "id": 1400708, "chapterid": 14007, "previoustage": 1400707, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30624,7 +30624,7 @@ "id": 1400801, "chapterid": 14008, "previoustage": 1400708, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30713,7 +30713,7 @@ "id": 1400802, "chapterid": 14008, "previoustage": 1400801, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30802,7 +30802,7 @@ "id": 1400803, "chapterid": 14008, "previoustage": 1400802, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30891,7 +30891,7 @@ "id": 1400804, "chapterid": 14008, "previoustage": 1400803, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -30980,7 +30980,7 @@ "id": 1400805, "chapterid": 14008, "previoustage": 1400804, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31069,7 +31069,7 @@ "id": 1400806, "chapterid": 14008, "previoustage": 1400805, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31158,7 +31158,7 @@ "id": 1400807, "chapterid": 14008, "previoustage": 1400806, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31247,7 +31247,7 @@ "id": 1400808, "chapterid": 14008, "previoustage": 1400807, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31336,7 +31336,7 @@ "id": 1400901, "chapterid": 14009, "previoustage": 1400808, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31425,7 +31425,7 @@ "id": 1400902, "chapterid": 14009, "previoustage": 1400901, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31514,7 +31514,7 @@ "id": 1400903, "chapterid": 14009, "previoustage": 1400902, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31603,7 +31603,7 @@ "id": 1400904, "chapterid": 14009, "previoustage": 1400903, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31692,7 +31692,7 @@ "id": 1400905, "chapterid": 14009, "previoustage": 1400904, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31781,7 +31781,7 @@ "id": 1400906, "chapterid": 14009, "previoustage": 1400905, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31870,7 +31870,7 @@ "id": 1400907, "chapterid": 14009, "previoustage": 1400906, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -31959,7 +31959,7 @@ "id": 1400908, "chapterid": 14009, "previoustage": 1400907, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32048,7 +32048,7 @@ "id": 1401001, "chapterid": 14010, "previoustage": 1400908, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32137,7 +32137,7 @@ "id": 1401002, "chapterid": 14010, "previoustage": 1401001, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32226,7 +32226,7 @@ "id": 1401003, "chapterid": 14010, "previoustage": 1401002, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32315,7 +32315,7 @@ "id": 1401004, "chapterid": 14010, "previoustage": 1401003, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32404,7 +32404,7 @@ "id": 1401005, "chapterid": 14010, "previoustage": 1401004, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32493,7 +32493,7 @@ "id": 1401006, "chapterid": 14010, "previoustage": 1401005, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32582,7 +32582,7 @@ "id": 1401007, "chapterid": 14010, "previoustage": 1401006, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32671,7 +32671,7 @@ "id": 1401008, "chapterid": 14010, "previoustage": 1401007, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32760,7 +32760,7 @@ "id": 1401101, "chapterid": 14011, "previoustage": 1401008, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32849,7 +32849,7 @@ "id": 1401102, "chapterid": 14011, "previoustage": 1401101, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -32938,7 +32938,7 @@ "id": 1401103, "chapterid": 14011, "previoustage": 1401102, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33027,7 +33027,7 @@ "id": 1401104, "chapterid": 14011, "previoustage": 1401103, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33116,7 +33116,7 @@ "id": 1401105, "chapterid": 14011, "previoustage": 1401104, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33205,7 +33205,7 @@ "id": 1401106, "chapterid": 14011, "previoustage": 1401105, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33294,7 +33294,7 @@ "id": 1401107, "chapterid": 14011, "previoustage": 1401106, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33383,7 +33383,7 @@ "id": 1401108, "chapterid": 14011, "previoustage": 1401107, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33472,7 +33472,7 @@ "id": 1401201, "chapterid": 14012, "previoustage": 1401108, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33561,7 +33561,7 @@ "id": 1401202, "chapterid": 14012, "previoustage": 1401201, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33650,7 +33650,7 @@ "id": 1401203, "chapterid": 14012, "previoustage": 1401202, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33739,7 +33739,7 @@ "id": 1401204, "chapterid": 14012, "previoustage": 1401203, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33828,7 +33828,7 @@ "id": 1401205, "chapterid": 14012, "previoustage": 1401204, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -33917,7 +33917,7 @@ "id": 1401206, "chapterid": 14012, "previoustage": 1401205, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -34006,7 +34006,7 @@ "id": 1401207, "chapterid": 14012, "previoustage": 1401206, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, @@ -34095,7 +34095,7 @@ "id": 1401208, "chapterid": 14012, "previoustage": 1401207, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "Episodelocation": { "x": 0, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 1f1aab636..c5c63b534 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -4911,7 +4911,7 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 500010, + "id_after": 0, "group": 510, "des": 5, "icon": "25001", @@ -4934,7 +4934,7 @@ "deliver_npc": 50018, "taskend_removeitem": [], "auto_accept": 0, - "lock_add": 0, + "lock_add": 1, "reword": [ { "a": "attr", @@ -4952,7 +4952,7 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 500020, + "id_after": 0, "group": 520, "des": 5, "icon": "25001", @@ -4975,7 +4975,7 @@ "deliver_npc": 50028, "taskend_removeitem": [], "auto_accept": 0, - "lock_add": 0, + "lock_add": 1, "reword": [ { "a": "attr", @@ -4993,7 +4993,7 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 500030, + "id_after": 0, "group": 530, "des": 5, "icon": "25001", @@ -5016,7 +5016,7 @@ "deliver_npc": 50038, "taskend_removeitem": [], "auto_accept": 0, - "lock_add": 0, + "lock_add": 1, "reword": [ { "a": "attr", @@ -5034,7 +5034,7 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 500040, + "id_after": 0, "group": 540, "des": 5, "icon": "25001", @@ -5057,7 +5057,7 @@ "deliver_npc": 50048, "taskend_removeitem": [], "auto_accept": 0, - "lock_add": 0, + "lock_add": 1, "reword": [ { "a": "attr", @@ -5075,7 +5075,7 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 500050, + "id_after": 0, "group": 550, "des": 5, "icon": "25001", @@ -5098,7 +5098,7 @@ "deliver_npc": 50058, "taskend_removeitem": [], "auto_accept": 0, - "lock_add": 0, + "lock_add": 1, "reword": [ { "a": "attr", diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go index 9eb1499ee..83e002468 100644 --- a/modules/wtask/api_finish.go +++ b/modules/wtask/api_finish.go @@ -17,13 +17,14 @@ func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WTaskFinishR // /获取系统公告 func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (errdata *pb.ErrorData) { var ( - conf *cfg.GameWorldTaskData - wtask *pb.DBWTask - condis []*pb.ConIProgress - award []*pb.UserAssets - err error - isfinsh bool - ok bool + conf *cfg.GameWorldTaskData + wtask *pb.DBWTask + condis []*pb.ConIProgress + award []*pb.UserAssets + completesMap map[int32]struct{} = make(map[int32]struct{}) + err error + isfinsh bool + ok bool ) if errdata = this.FinishCheck(session, req); errdata != nil { return @@ -110,17 +111,27 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( break } } - wtask.Completes = append(wtask.Completes, req.Tid) - - if conf.Des == 5 { //商队任务 完成任务时 移除下一个任务的完成条件 方便顺序获取任务 - for i, v := range wtask.Completes { - if conf.IdAfter != 0 && conf.IdAfter == v { - wtask.Completes = append(wtask.Completes[0:i], wtask.Completes[i+1:]...) - } - } + for _, v := range wtask.Completes { + completesMap[v] = struct{}{} } - session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award}) + if conf.Des == 5 && conf.IdAfter == 0 { //商队任务 一组任务完成后 重置 + tasks, _ := this.module.configure.getgroupTask()[conf.Group] + completes := make([]int32, 0, len(wtask.Completes)) + for _, task := range tasks { + if _, ok := completesMap[task.Key]; ok { + delete(completesMap, task.Key) + } + } + for k, _ := range completesMap { + completes = append(completes, k) + } + wtask.Completes = completes + } else { + wtask.Completes = append(wtask.Completes, req.Tid) + } + + session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award, Completes: wtask.Completes}) this.module.checkgroupState(session, wtask, conf.Group) this.module.fishtask(session, wtask, true) if err = this.module.modelwtask.updateUserWTasks(session.GetUserId(), wtask); err != nil { diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go index 4441b8533..bd6779a5b 100644 --- a/pb/wtask_msg.pb.go +++ b/pb/wtask_msg.pb.go @@ -401,8 +401,9 @@ type WTaskFinishResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"` - Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 + Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"` + Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 + Completes []int32 `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表 } func (x *WTaskFinishResp) Reset() { @@ -451,6 +452,13 @@ func (x *WTaskFinishResp) GetAward() []*UserAssets { return nil } +func (x *WTaskFinishResp) GetCompletes() []int32 { + if x != nil { + return x.Completes + } + return nil +} + // 章节奖励 请求 type WTaskChapterRewardReq struct { state protoimpl.MessageState @@ -905,50 +913,52 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{ 0x74, 0x65, 0x6d, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, - 0x64, 0x22, 0x46, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, + 0x64, 0x22, 0x64, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, - 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x2d, 0x0a, 0x15, 0x57, 0x54, 0x61, - 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, - 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x51, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, - 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, - 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, - 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x57, - 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, - 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3f, 0x0a, 0x15, 0x57, - 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, - 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x63, 0x0a, 0x13, - 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, - 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, - 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x22, 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x1f, 0x0a, - 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, - 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, - 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, - 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, + 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x22, 0x2d, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, + 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, + 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x51, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, + 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, + 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x57, 0x54, 0x61, + 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, 0x68, 0x61, + 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, + 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3f, 0x0a, 0x15, 0x57, 0x54, 0x61, + 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, + 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, + 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x63, 0x0a, 0x13, 0x57, 0x54, + 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, + 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, + 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, + 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, + 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, + 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, + 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, 0x0a, 0x14, + 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, + 0x68, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, + 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, + 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, + 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, + 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( From e0c946a7dfd7fa2963c8fc72d7ad28808fb4801b Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Fri, 14 Jul 2023 21:02:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/wtask/api_finish.go | 3 +- modules/wtask/module.go | 2 +- pb/wtask_msg.pb.go | 161 ++++++++++++++++++++---------------- 3 files changed, 91 insertions(+), 75 deletions(-) diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go index 83e002468..9793c6ec6 100644 --- a/modules/wtask/api_finish.go +++ b/modules/wtask/api_finish.go @@ -130,9 +130,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( } else { wtask.Completes = append(wtask.Completes, req.Tid) } - - session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award, Completes: wtask.Completes}) this.module.checkgroupState(session, wtask, conf.Group) + session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award, Completes: wtask.Completes, Groups: wtask.Groups}) this.module.fishtask(session, wtask, true) if err = this.module.modelwtask.updateUserWTasks(session.GetUserId(), wtask); err != nil { errdata = &pb.ErrorData{ diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 1b0102f90..729b38662 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -443,7 +443,7 @@ func (this *WTask) checkgroupState(session comm.IUserSession, wtask *pb.DBWTask, } for _, v := range groupTask[group] { if _, ok = completeMap[v.Key]; !ok { - break + return } des = v.Des } diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go index bd6779a5b..2ada7f219 100644 --- a/pb/wtask_msg.pb.go +++ b/pb/wtask_msg.pb.go @@ -401,9 +401,10 @@ type WTaskFinishResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"` - Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 - Completes []int32 `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表 + Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"` + Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 + Completes []int32 `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表 + Groups map[int32]int32 `protobuf:"bytes,4,rep,name=groups,proto3" json:"groups" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //任务组状态 key表示组id value:0 任务组未完成 1:任务组已完成 2:任务组奖励已领取 } func (x *WTaskFinishResp) Reset() { @@ -459,6 +460,13 @@ func (x *WTaskFinishResp) GetCompletes() []int32 { return nil } +func (x *WTaskFinishResp) GetGroups() map[int32]int32 { + if x != nil { + return x.Groups + } + return nil +} + // 章节奖励 请求 type WTaskChapterRewardReq struct { state protoimpl.MessageState @@ -913,52 +921,59 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{ 0x74, 0x65, 0x6d, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, - 0x64, 0x22, 0x64, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, - 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, - 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x22, 0x2d, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, - 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, - 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x51, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, - 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, - 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x57, 0x54, 0x61, - 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, 0x68, 0x61, - 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, - 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3f, 0x0a, 0x15, 0x57, 0x54, 0x61, - 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, - 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, - 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x63, 0x0a, 0x13, 0x57, 0x54, - 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, - 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, - 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, - 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, - 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, - 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, - 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, 0x0a, 0x14, - 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, - 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, - 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, - 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, - 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, - 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x22, 0xd5, 0x01, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, + 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, + 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x06, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x57, 0x54, 0x61, 0x73, 0x6b, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x39, + 0x0a, 0x0b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2d, 0x0a, 0x15, 0x57, 0x54, 0x61, + 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, + 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x51, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, + 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, + 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x57, + 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, + 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3f, 0x0a, 0x15, 0x57, + 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, + 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, + 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x22, 0x63, 0x0a, 0x13, + 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, + 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, + 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x22, 0x5b, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x1f, 0x0a, + 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x61, + 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, + 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, + 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -973,7 +988,7 @@ func file_wtask_wtask_msg_proto_rawDescGZIP() []byte { return file_wtask_wtask_msg_proto_rawDescData } -var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17) var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*WTaskInfoReq)(nil), // 0: WTaskInfoReq (*WTaskInfoResp)(nil), // 1: WTaskInfoResp @@ -991,29 +1006,31 @@ var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*WTaskBattleStartResp)(nil), // 13: WTaskBattleStartResp (*WTaskBattleFinishReq)(nil), // 14: WTaskBattleFinishReq (*WTaskBattleFinishResp)(nil), // 15: WTaskBattleFinishResp - (*DBWTask)(nil), // 16: DBWTask - (*DBWTaskItem)(nil), // 17: DBWTaskItem - (*UserAssets)(nil), // 18: UserAssets - (*BattleFormation)(nil), // 19: BattleFormation - (*BattleInfo)(nil), // 20: BattleInfo - (*BattleReport)(nil), // 21: BattleReport + nil, // 16: WTaskFinishResp.GroupsEntry + (*DBWTask)(nil), // 17: DBWTask + (*DBWTaskItem)(nil), // 18: DBWTaskItem + (*UserAssets)(nil), // 19: UserAssets + (*BattleFormation)(nil), // 20: BattleFormation + (*BattleInfo)(nil), // 21: BattleInfo + (*BattleReport)(nil), // 22: BattleReport } var file_wtask_wtask_msg_proto_depIdxs = []int32{ - 16, // 0: WTaskInfoResp.info:type_name -> DBWTask - 17, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem - 17, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem - 17, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem - 18, // 4: WTaskFinishResp.award:type_name -> UserAssets - 18, // 5: WTaskChapterRewardResp.award:type_name -> UserAssets - 17, // 6: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem - 19, // 7: WTaskBattleStartReq.battle:type_name -> BattleFormation - 20, // 8: WTaskBattleStartResp.info:type_name -> BattleInfo - 21, // 9: WTaskBattleFinishReq.report:type_name -> BattleReport - 10, // [10:10] is the sub-list for method output_type - 10, // [10:10] is the sub-list for method input_type - 10, // [10:10] is the sub-list for extension type_name - 10, // [10:10] is the sub-list for extension extendee - 0, // [0:10] is the sub-list for field type_name + 17, // 0: WTaskInfoResp.info:type_name -> DBWTask + 18, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem + 18, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem + 18, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem + 19, // 4: WTaskFinishResp.award:type_name -> UserAssets + 16, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry + 19, // 6: WTaskChapterRewardResp.award:type_name -> UserAssets + 18, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem + 20, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation + 21, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo + 22, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport + 11, // [11:11] is the sub-list for method output_type + 11, // [11:11] is the sub-list for method input_type + 11, // [11:11] is the sub-list for extension type_name + 11, // [11:11] is the sub-list for extension extendee + 0, // [0:11] is the sub-list for field type_name } func init() { file_wtask_wtask_msg_proto_init() } @@ -1224,7 +1241,7 @@ func file_wtask_wtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_wtask_wtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 16, + NumMessages: 17, NumExtensions: 0, NumServices: 0, },