From f65b1441cd96ba937d90c68803be28f681f842b0 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 26 May 2023 17:26:06 +0800 Subject: [PATCH 1/2] update config --- bin/json/game_rdtaskcondi.json | 132 ++++++++++++++++----------------- bin/json/game_worldtask.json | 122 +++++++++++++++--------------- 2 files changed, 127 insertions(+), 127 deletions(-) diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index 9049fe6fd..d9dfb8292 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -7603,8 +7603,8 @@ "data": 2, "type_sp": 1, "tasktxt": { - "key": "连续战斗3次", - "text": "连续战斗3次" + "key": "维京连续战斗3次", + "text": "维京连续战斗3次" }, "type": 172, "valid": 0, @@ -7654,8 +7654,8 @@ "data": 2, "type_sp": 1, "tasktxt": { - "key": "使用星象1次", - "text": "使用星象1次" + "key": "使用主角星象1次", + "text": "使用主角星象1次" }, "type": 173, "valid": 0, @@ -7863,7 +7863,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10141, "data1": 1, "data2": 1, "data3": 1, @@ -7880,7 +7880,7 @@ }, "type": 148, "valid": 0, - "NPC": 0, + "NPC": 10151, "data1": 3, "data2": 0, "data3": 0, @@ -7897,7 +7897,7 @@ }, "type": 148, "valid": 0, - "NPC": 0, + "NPC": 10161, "data1": 3, "data2": 0, "data3": 0, @@ -7914,7 +7914,7 @@ }, "type": 175, "valid": 0, - "NPC": 0, + "NPC": 10171, "data1": 100, "data2": 0, "data3": 0, @@ -7931,7 +7931,7 @@ }, "type": 166, "valid": 0, - "NPC": 0, + "NPC": 10181, "data1": 3, "data2": 0, "data3": 0, @@ -7948,7 +7948,7 @@ }, "type": 166, "valid": 0, - "NPC": 0, + "NPC": 10191, "data1": 6, "data2": 0, "data3": 0, @@ -7965,7 +7965,7 @@ }, "type": 177, "valid": 0, - "NPC": 0, + "NPC": 10201, "data1": 1, "data2": 0, "data3": 0, @@ -7982,7 +7982,7 @@ }, "type": 177, "valid": 0, - "NPC": 0, + "NPC": 10211, "data1": 4, "data2": 0, "data3": 0, @@ -7999,7 +7999,7 @@ }, "type": 177, "valid": 0, - "NPC": 0, + "NPC": 10221, "data1": 6, "data2": 0, "data3": 0, @@ -8016,7 +8016,7 @@ }, "type": 179, "valid": 0, - "NPC": 0, + "NPC": 10231, "data1": 1, "data2": 2, "data3": 0, @@ -8033,7 +8033,7 @@ }, "type": 179, "valid": 0, - "NPC": 0, + "NPC": 10241, "data1": 2, "data2": 3, "data3": 0, @@ -8050,7 +8050,7 @@ }, "type": 179, "valid": 0, - "NPC": 0, + "NPC": 10251, "data1": 3, "data2": 5, "data3": 0, @@ -8067,7 +8067,7 @@ }, "type": 50, "valid": 0, - "NPC": 0, + "NPC": 10261, "data1": 10, "data2": 3, "data3": 0, @@ -8084,7 +8084,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10271, "data1": 1, "data2": 11, "data3": 3, @@ -8101,7 +8101,7 @@ }, "type": 180, "valid": 0, - "NPC": 0, + "NPC": 10281, "data1": 1, "data2": 1, "data3": 0, @@ -8118,7 +8118,7 @@ }, "type": 93, "valid": 0, - "NPC": 0, + "NPC": 10291, "data1": 6, "data2": 1, "data3": 0, @@ -8135,7 +8135,7 @@ }, "type": 93, "valid": 0, - "NPC": 0, + "NPC": 10301, "data1": 6, "data2": 2, "data3": 0, @@ -8152,7 +8152,7 @@ }, "type": 50, "valid": 0, - "NPC": 0, + "NPC": 10311, "data1": 10, "data2": 4, "data3": 0, @@ -8169,7 +8169,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10321, "data1": 1, "data2": 11, "data3": 6, @@ -8186,7 +8186,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10331, "data1": 1, "data2": 21, "data3": 5, @@ -8203,7 +8203,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10341, "data1": 1, "data2": 11, "data3": 7, @@ -8220,7 +8220,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10351, "data1": 1, "data2": 21, "data3": 6, @@ -8237,7 +8237,7 @@ }, "type": 50, "valid": 0, - "NPC": 0, + "NPC": 10361, "data1": 12, "data2": 5, "data3": 0, @@ -8254,7 +8254,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10371, "data1": 1, "data2": 11, "data3": 8, @@ -8271,7 +8271,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10381, "data1": 1, "data2": 21, "data3": 7, @@ -8288,7 +8288,7 @@ }, "type": 50, "valid": 0, - "NPC": 0, + "NPC": 10391, "data1": 3, "data2": 6, "data3": 0, @@ -8305,7 +8305,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10401, "data1": 1, "data2": 11, "data3": 9, @@ -8322,7 +8322,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10411, "data1": 1, "data2": 21, "data3": 8, @@ -8339,7 +8339,7 @@ }, "type": 50, "valid": 0, - "NPC": 0, + "NPC": 10421, "data1": 8, "data2": 6, "data3": 0, @@ -8356,7 +8356,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10431, "data1": 1, "data2": 11, "data3": 10, @@ -8373,7 +8373,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10441, "data1": 1, "data2": 21, "data3": 9, @@ -8390,7 +8390,7 @@ }, "type": 50, "valid": 0, - "NPC": 0, + "NPC": 10451, "data1": 15, "data2": 6, "data3": 0, @@ -8407,7 +8407,7 @@ }, "type": 181, "valid": 0, - "NPC": 0, + "NPC": 10461, "data1": 1, "data2": 11, "data3": 2, @@ -8424,7 +8424,7 @@ }, "type": 181, "valid": 0, - "NPC": 0, + "NPC": 10471, "data1": 1, "data2": 11, "data3": 3, @@ -8441,7 +8441,7 @@ }, "type": 50, "valid": 0, - "NPC": 0, + "NPC": 10481, "data1": 30, "data2": 6, "data3": 0, @@ -8458,7 +8458,7 @@ }, "type": 152, "valid": 0, - "NPC": 0, + "NPC": 10491, "data1": 1, "data2": 0, "data3": 0, @@ -8475,7 +8475,7 @@ }, "type": 152, "valid": 0, - "NPC": 0, + "NPC": 10501, "data1": 2, "data2": 0, "data3": 0, @@ -8492,7 +8492,7 @@ }, "type": 152, "valid": 0, - "NPC": 0, + "NPC": 10511, "data1": 3, "data2": 0, "data3": 0, @@ -8509,7 +8509,7 @@ }, "type": 182, "valid": 0, - "NPC": 0, + "NPC": 10521, "data1": 2, "data2": 0, "data3": 0, @@ -8526,7 +8526,7 @@ }, "type": 182, "valid": 0, - "NPC": 0, + "NPC": 10531, "data1": 4, "data2": 0, "data3": 0, @@ -8543,7 +8543,7 @@ }, "type": 182, "valid": 0, - "NPC": 0, + "NPC": 10541, "data1": 6, "data2": 0, "data3": 0, @@ -8560,7 +8560,7 @@ }, "type": 183, "valid": 0, - "NPC": 0, + "NPC": 10551, "data1": 1, "data2": 0, "data3": 0, @@ -8577,7 +8577,7 @@ }, "type": 184, "valid": 0, - "NPC": 0, + "NPC": 10561, "data1": 1, "data2": 0, "data3": 0, @@ -8594,7 +8594,7 @@ }, "type": 185, "valid": 0, - "NPC": 0, + "NPC": 10571, "data1": 1, "data2": 0, "data3": 0, @@ -8611,7 +8611,7 @@ }, "type": 185, "valid": 0, - "NPC": 0, + "NPC": 10581, "data1": 3, "data2": 0, "data3": 0, @@ -8628,7 +8628,7 @@ }, "type": 185, "valid": 0, - "NPC": 0, + "NPC": 10591, "data1": 5, "data2": 0, "data3": 0, @@ -8645,7 +8645,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10601, "data1": 1, "data2": 31, "data3": 2, @@ -8662,7 +8662,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10611, "data1": 1, "data2": 31, "data3": 3, @@ -8679,7 +8679,7 @@ }, "type": 111, "valid": 0, - "NPC": 0, + "NPC": 10621, "data1": 5, "data2": 25, "data3": 0, @@ -8696,7 +8696,7 @@ }, "type": 111, "valid": 0, - "NPC": 0, + "NPC": 10631, "data1": 5, "data2": 40, "data3": 0, @@ -8713,7 +8713,7 @@ }, "type": 111, "valid": 0, - "NPC": 0, + "NPC": 10641, "data1": 5, "data2": 50, "data3": 0, @@ -8730,7 +8730,7 @@ }, "type": 186, "valid": 0, - "NPC": 0, + "NPC": 10651, "data1": 3, "data2": 0, "data3": 0, @@ -8747,7 +8747,7 @@ }, "type": 186, "valid": 0, - "NPC": 0, + "NPC": 10661, "data1": 8, "data2": 0, "data3": 0, @@ -8764,7 +8764,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10671, "data1": 1, "data2": 31, "data3": 4, @@ -8781,7 +8781,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10681, "data1": 1, "data2": 31, "data3": 5, @@ -8798,7 +8798,7 @@ }, "type": 186, "valid": 0, - "NPC": 0, + "NPC": 10691, "data1": 10, "data2": 0, "data3": 0, @@ -8815,7 +8815,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10701, "data1": 1, "data2": 31, "data3": 6, @@ -8832,7 +8832,7 @@ }, "type": 111, "valid": 0, - "NPC": 0, + "NPC": 10711, "data1": 10, "data2": 0, "data3": 0, @@ -8849,7 +8849,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10721, "data1": 1, "data2": 31, "data3": 7, @@ -8866,7 +8866,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10731, "data1": 1, "data2": 31, "data3": 8, @@ -8883,7 +8883,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10741, "data1": 1, "data2": 31, "data3": 9, @@ -8900,7 +8900,7 @@ }, "type": 73, "valid": 0, - "NPC": 0, + "NPC": 10751, "data1": 1, "data2": 31, "data3": 10, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index e89b16042..b267cf9ff 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -3663,7 +3663,7 @@ }, { "key": 30010, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20010, "id_after": 0, @@ -3707,7 +3707,7 @@ }, { "key": 30020, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20030, "id_after": 0, @@ -3751,7 +3751,7 @@ }, { "key": 30030, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20090, "id_after": 30040, @@ -3795,7 +3795,7 @@ }, { "key": 30040, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30030, "id_after": 0, @@ -3839,7 +3839,7 @@ }, { "key": 30050, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 200600, "id_after": 30060, @@ -3883,7 +3883,7 @@ }, { "key": 30060, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30050, "id_after": 0, @@ -3927,7 +3927,7 @@ }, { "key": 30070, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20100, "id_after": 0, @@ -3971,7 +3971,7 @@ }, { "key": 30080, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20120, "id_after": 0, @@ -4015,7 +4015,7 @@ }, { "key": 30090, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 200600, "id_after": 0, @@ -4059,7 +4059,7 @@ }, { "key": 30100, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20010, "id_after": 30110, @@ -4103,7 +4103,7 @@ }, { "key": 30110, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30100, "id_after": 30120, @@ -4147,7 +4147,7 @@ }, { "key": 30120, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30110, "id_after": 0, @@ -4191,7 +4191,7 @@ }, { "key": 30130, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20020, "id_after": 30140, @@ -4235,7 +4235,7 @@ }, { "key": 30140, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30130, "id_after": 30150, @@ -4279,7 +4279,7 @@ }, { "key": 30150, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30140, "id_after": 30160, @@ -4323,7 +4323,7 @@ }, { "key": 30160, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30150, "id_after": 30170, @@ -4367,7 +4367,7 @@ }, { "key": 30170, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30160, "id_after": 30180, @@ -4411,7 +4411,7 @@ }, { "key": 30180, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30170, "id_after": 0, @@ -4455,7 +4455,7 @@ }, { "key": 30190, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20010, "id_after": 30200, @@ -4499,7 +4499,7 @@ }, { "key": 30200, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30190, "id_after": 30210, @@ -4543,7 +4543,7 @@ }, { "key": 30210, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30200, "id_after": 0, @@ -4587,7 +4587,7 @@ }, { "key": 30220, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20030, "id_after": 0, @@ -4631,7 +4631,7 @@ }, { "key": 30230, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20040, "id_after": 0, @@ -4675,7 +4675,7 @@ }, { "key": 30240, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20050, "id_after": 0, @@ -4719,7 +4719,7 @@ }, { "key": 30250, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20060, "id_after": 0, @@ -4763,7 +4763,7 @@ }, { "key": 30260, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20020, "id_after": 30270, @@ -4807,7 +4807,7 @@ }, { "key": 30270, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30260, "id_after": 30280, @@ -4851,7 +4851,7 @@ }, { "key": 30280, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30270, "id_after": 0, @@ -4895,7 +4895,7 @@ }, { "key": 30290, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20030, "id_after": 0, @@ -4939,7 +4939,7 @@ }, { "key": 30300, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20030, "id_after": 0, @@ -4983,7 +4983,7 @@ }, { "key": 30310, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20100, "id_after": 30320, @@ -5027,7 +5027,7 @@ }, { "key": 30320, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30310, "id_after": 30330, @@ -5071,7 +5071,7 @@ }, { "key": 30330, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 30320, "id_after": 0, @@ -5115,7 +5115,7 @@ }, { "key": 30340, - "lock": 1, + "lock": 999, "lockend": 0, "ontxe": 20110, "id_after": 0, @@ -6699,7 +6699,7 @@ }, { "key": 30700, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 20010, "id_after": 30710, @@ -6743,7 +6743,7 @@ }, { "key": 30710, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30700, "id_after": 30720, @@ -6787,7 +6787,7 @@ }, { "key": 30720, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30710, "id_after": 0, @@ -6831,7 +6831,7 @@ }, { "key": 30730, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 20010, "id_after": 30740, @@ -6875,7 +6875,7 @@ }, { "key": 30740, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30730, "id_after": 30750, @@ -6919,7 +6919,7 @@ }, { "key": 30750, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30740, "id_after": 0, @@ -6963,7 +6963,7 @@ }, { "key": 30760, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 20010, "id_after": 30770, @@ -7007,7 +7007,7 @@ }, { "key": 30770, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30760, "id_after": 0, @@ -7051,7 +7051,7 @@ }, { "key": 30780, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 20010, "id_after": 30790, @@ -7095,7 +7095,7 @@ }, { "key": 30790, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30780, "id_after": 30800, @@ -7139,7 +7139,7 @@ }, { "key": 30800, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30790, "id_after": 0, @@ -7183,7 +7183,7 @@ }, { "key": 30810, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 20010, "id_after": 30820, @@ -7227,7 +7227,7 @@ }, { "key": 30820, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30810, "id_after": 30830, @@ -7271,7 +7271,7 @@ }, { "key": 30830, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30820, "id_after": 30840, @@ -7315,7 +7315,7 @@ }, { "key": 30840, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30830, "id_after": 30850, @@ -7359,7 +7359,7 @@ }, { "key": 30850, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30840, "id_after": 30860, @@ -7403,7 +7403,7 @@ }, { "key": 30860, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30850, "id_after": 30870, @@ -7447,7 +7447,7 @@ }, { "key": 30870, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30860, "id_after": 30880, @@ -7491,7 +7491,7 @@ }, { "key": 30880, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30870, "id_after": 30890, @@ -7535,7 +7535,7 @@ }, { "key": 30890, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30880, "id_after": 0, @@ -7579,7 +7579,7 @@ }, { "key": 30900, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 20010, "id_after": 30910, @@ -7623,7 +7623,7 @@ }, { "key": 30910, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30900, "id_after": 30920, @@ -7667,7 +7667,7 @@ }, { "key": 30920, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30910, "id_after": 30930, @@ -7711,7 +7711,7 @@ }, { "key": 30930, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30920, "id_after": 0, @@ -7755,7 +7755,7 @@ }, { "key": 30940, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 20010, "id_after": 30950, @@ -7799,7 +7799,7 @@ }, { "key": 30950, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30940, "id_after": 30960, @@ -7843,7 +7843,7 @@ }, { "key": 30960, - "lock": 999, + "lock": 1, "lockend": 0, "ontxe": 30950, "id_after": 0, From 108932467754e6fc94f8f7361dce359b611ac4d9 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 26 May 2023 18:30:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_buy.go | 62 +++--------------------------- modules/practice/api_getgymbuff.go | 1 + modules/practice/api_gymrefresh.go | 2 +- modules/shop/api_buy.go | 54 +++++++++++++++++++++++++- 4 files changed, 60 insertions(+), 59 deletions(-) diff --git a/modules/hero/api_buy.go b/modules/hero/api_buy.go index 322db29bc..f680a2533 100644 --- a/modules/hero/api_buy.go +++ b/modules/hero/api_buy.go @@ -115,62 +115,12 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb } } - for _, v := range need { - if v.A == comm.AttrType && (v.T == comm.ResGold || v.T == comm.ResDiamond) { - // this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T)) - switch v.T { - case comm.ResGold: - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 1)) - break - case comm.ResExp: - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 3)) - break - case comm.ResDiamond: - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) - break - case comm.VipExp: - // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) - break - case comm.ResTaskActive: - // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) - break - case comm.ResFriend: - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 4)) - break - case comm.StarCoin: - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 9)) - break - case comm.SociatyCoin: - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 8)) - break - case comm.ArenaCoin: - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 11)) - break - case comm.ResPs: - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 12)) - break - case comm.Moongold: - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 14)) - break - case comm.Talent1: - // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) - break - case comm.Talent2: - // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) - break - case comm.Talent3: - // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) - break - case comm.Talent4: - // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) - break - case comm.Merchantmoney: - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 15)) - break - } - - } - } + // for _, v := range need { + // if v.A == comm.AttrType && (v.T == comm.ResGold || v.T == comm.ResDiamond) { + // // this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T)) + // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, utils.ToInt32(v.T))) + // } + // } go this.module.ModuleRtask.TriggerTask(session.GetUserId(), tasks...) session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{ IsSucc: true, diff --git a/modules/practice/api_getgymbuff.go b/modules/practice/api_getgymbuff.go index 801a64f41..8bdb29197 100644 --- a/modules/practice/api_getgymbuff.go +++ b/modules/practice/api_getgymbuff.go @@ -28,6 +28,7 @@ func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGy code = pb.ErrorCode_ConfigNoFound return } + go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype185, 1)) session.SendMsg(string(this.module.GetType()), "getgymbuff", &pb.PracticeGetGymBuffResp{Buffid: buff.Id}) return } diff --git a/modules/practice/api_gymrefresh.go b/modules/practice/api_gymrefresh.go index de43dfffc..0774edd2d 100644 --- a/modules/practice/api_gymrefresh.go +++ b/modules/practice/api_gymrefresh.go @@ -67,7 +67,7 @@ func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRe "gymrefresh": room.Gymrefresh, "lastrefresh": room.Lastrefresh, }) - go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype185, 1)) + session.SendMsg(string(this.module.GetType()), "gymrefresh", &pb.PracticeGymRefreshResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh}) return } diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index 9d473f9ba..cccd6b15d 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -127,8 +127,58 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb tasks = append(tasks, comm.GettaskParam(comm.Rtype66, 1, int32(req.ShopType))) // this.module.ModuleRtask.SendToRtask(session, comm.Rtype66, 1, int32(req.ShopType)) for _, v := range need { - if v.A == comm.AttrType && (v.T == comm.ResGold || v.T == comm.ResDiamond) { - tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, utils.ToInt32(v.T))) + if v.A == comm.AttrType { + // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, utils.ToInt32(v.T))) + switch v.T { + case comm.ResGold: + tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 1)) + break + case comm.ResExp: + tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 3)) + break + case comm.ResDiamond: + tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) + break + case comm.VipExp: + // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) + break + case comm.ResTaskActive: + // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) + break + case comm.ResFriend: + tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 4)) + break + case comm.StarCoin: + tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 9)) + break + case comm.SociatyCoin: + tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 8)) + break + case comm.ArenaCoin: + tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 11)) + break + case comm.ResPs: + tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 12)) + break + case comm.Moongold: + tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 14)) + break + case comm.Talent1: + // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) + break + case comm.Talent2: + // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) + break + case comm.Talent3: + // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) + break + case comm.Talent4: + // tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2)) + break + case comm.Merchantmoney: + tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 15)) + break + } // this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T)) } }