From e97b35ed32c1627bdda64d33135a8aaafc5f028f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Sat, 31 Dec 2022 11:48:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E6=89=A3=E4=BD=93=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_mainline.json | 2488 +++++++++++++++++++- modules/mainline/api_challenge.go | 16 +- modules/mainline/api_challengeover.go | 13 +- modules/viking/api_challengeover.go | 16 +- pb/mainline_db.pb.go | 13 +- sys/configure/structs/Game.MainlineData.go | 15 + 6 files changed, 2537 insertions(+), 24 deletions(-) diff --git a/bin/json/game_mainline.json b/bin/json/game_mainline.json index 70f8407c0..54be5a140 100644 --- a/bin/json/game_mainline.json +++ b/bin/json/game_mainline.json @@ -34,7 +34,8 @@ "condition": [ -1 ], - "ps_consume": [] + "ps_consume": [], + "ps_mg": [] }, { "id": 101, @@ -95,6 +96,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -156,6 +164,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -209,7 +224,8 @@ "condition": [ -1 ], - "ps_consume": [] + "ps_consume": [], + "ps_mg": [] }, { "id": 104, @@ -270,6 +286,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -331,6 +354,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -384,7 +414,8 @@ "condition": [ -1 ], - "ps_consume": [] + "ps_consume": [], + "ps_mg": [] }, { "id": 107, @@ -446,6 +477,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -508,6 +546,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -570,6 +615,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -607,7 +659,8 @@ "condition": [ -1 ], - "ps_consume": [] + "ps_consume": [], + "ps_mg": [] }, { "id": 201, @@ -669,6 +722,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -731,6 +791,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -784,7 +851,8 @@ "condition": [ -1 ], - "ps_consume": [] + "ps_consume": [], + "ps_mg": [] }, { "id": 204, @@ -846,6 +914,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -908,6 +983,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -970,6 +1052,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1023,7 +1112,8 @@ "condition": [ -1 ], - "ps_consume": [] + "ps_consume": [], + "ps_mg": [] }, { "id": 208, @@ -1085,6 +1175,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1148,6 +1245,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1185,7 +1289,8 @@ "condition": [ -1 ], - "ps_consume": [] + "ps_consume": [], + "ps_mg": [] }, { "id": 301, @@ -1247,6 +1352,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1309,6 +1421,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1362,7 +1481,8 @@ "condition": [ -1 ], - "ps_consume": [] + "ps_consume": [], + "ps_mg": [] }, { "id": 304, @@ -1424,6 +1544,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1486,6 +1613,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1548,6 +1682,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1610,6 +1751,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1672,6 +1820,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1735,6 +1890,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1780,6 +1942,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1831,6 +2000,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1882,6 +2058,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1934,6 +2117,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -1986,6 +2176,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2038,6 +2235,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2090,6 +2294,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2142,6 +2353,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2194,6 +2412,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2247,6 +2472,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2298,6 +2530,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2349,6 +2588,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2400,6 +2646,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2452,6 +2705,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2504,6 +2764,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2556,6 +2823,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2608,6 +2882,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2660,6 +2941,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2712,6 +3000,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2765,6 +3060,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2816,6 +3118,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2867,6 +3176,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2918,6 +3234,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -2970,6 +3293,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3022,6 +3352,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3074,6 +3411,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3126,6 +3470,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3178,6 +3529,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3230,6 +3588,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3283,6 +3648,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3334,6 +3706,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3385,6 +3764,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3436,6 +3822,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3488,6 +3881,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3540,6 +3940,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3592,6 +3999,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3644,6 +4058,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3696,6 +4117,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3748,6 +4176,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3801,6 +4236,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3852,6 +4294,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3903,6 +4352,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -3954,6 +4410,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4006,6 +4469,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4058,6 +4528,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4110,6 +4587,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4162,6 +4646,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4214,6 +4705,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4266,6 +4764,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4319,6 +4824,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4370,6 +4882,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4421,6 +4940,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4472,6 +4998,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4524,6 +5057,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4576,6 +5116,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4628,6 +5175,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4680,6 +5234,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4732,6 +5293,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4784,6 +5352,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4837,6 +5412,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4888,6 +5470,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4939,6 +5528,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -4990,6 +5586,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5042,6 +5645,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5094,6 +5704,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5146,6 +5763,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5198,6 +5822,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5250,6 +5881,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5302,6 +5940,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5355,6 +6000,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5406,6 +6058,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5457,6 +6116,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5508,6 +6174,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5560,6 +6233,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5612,6 +6292,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5664,6 +6351,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5716,6 +6410,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5768,6 +6469,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5820,6 +6528,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5873,6 +6588,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5924,6 +6646,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -5975,6 +6704,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6026,6 +6762,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6078,6 +6821,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6130,6 +6880,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6182,6 +6939,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6234,6 +6998,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6286,6 +7057,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6338,6 +7116,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6391,6 +7176,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6442,6 +7234,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6493,6 +7292,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6544,6 +7350,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6596,6 +7409,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6648,6 +7468,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6700,6 +7527,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6752,6 +7586,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6804,6 +7645,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6856,6 +7704,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6909,6 +7764,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -6960,6 +7822,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7011,6 +7880,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7062,6 +7938,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7114,6 +7997,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7166,6 +8056,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7218,6 +8115,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7270,6 +8174,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7322,6 +8233,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7374,6 +8292,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7427,6 +8352,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7478,6 +8410,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7529,6 +8468,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7580,6 +8526,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7632,6 +8585,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7684,6 +8644,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7736,6 +8703,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7788,6 +8762,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7840,6 +8821,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7892,6 +8880,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7945,6 +8940,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -7996,6 +8998,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8047,6 +9056,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8098,6 +9114,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8150,6 +9173,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8202,6 +9232,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8254,6 +9291,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8306,6 +9350,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8358,6 +9409,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8410,6 +9468,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8463,6 +9528,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8514,6 +9586,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8565,6 +9644,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8616,6 +9702,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8668,6 +9761,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8720,6 +9820,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8772,6 +9879,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8824,6 +9938,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8876,6 +9997,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8928,6 +10056,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -8981,6 +10116,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9032,6 +10174,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9083,6 +10232,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9134,6 +10290,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9186,6 +10349,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9238,6 +10408,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9290,6 +10467,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9342,6 +10526,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9394,6 +10585,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9446,6 +10644,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9499,6 +10704,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9550,6 +10762,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9601,6 +10820,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9652,6 +10878,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9704,6 +10937,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9756,6 +10996,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9808,6 +11055,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9860,6 +11114,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9912,6 +11173,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -9964,6 +11232,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10017,6 +11292,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10068,6 +11350,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10119,6 +11408,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10170,6 +11466,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10222,6 +11525,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10274,6 +11584,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10326,6 +11643,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10378,6 +11702,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10430,6 +11761,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10482,6 +11820,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10535,6 +11880,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10586,6 +11938,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10637,6 +11996,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10688,6 +12054,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10740,6 +12113,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10792,6 +12172,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10844,6 +12231,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10896,6 +12290,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -10948,6 +12349,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11000,6 +12408,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11053,6 +12468,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11104,6 +12526,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11155,6 +12584,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11206,6 +12642,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11258,6 +12701,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11310,6 +12760,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11362,6 +12819,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11414,6 +12878,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11466,6 +12937,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11518,6 +12996,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11571,6 +13056,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11622,6 +13114,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11673,6 +13172,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11724,6 +13230,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11776,6 +13289,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11828,6 +13348,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11880,6 +13407,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11932,6 +13466,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -11984,6 +13525,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12036,6 +13584,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12089,6 +13644,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12140,6 +13702,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12191,6 +13760,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12242,6 +13818,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12294,6 +13877,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12346,6 +13936,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12398,6 +13995,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12450,6 +14054,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12502,6 +14113,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12554,6 +14172,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12607,6 +14232,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12658,6 +14290,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12709,6 +14348,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12760,6 +14406,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12812,6 +14465,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12864,6 +14524,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12916,6 +14583,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -12968,6 +14642,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13020,6 +14701,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13072,6 +14760,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13125,6 +14820,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13176,6 +14878,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13227,6 +14936,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13278,6 +14994,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13330,6 +15053,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13382,6 +15112,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13434,6 +15171,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13486,6 +15230,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13538,6 +15289,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13590,6 +15348,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13643,6 +15408,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13694,6 +15466,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13745,6 +15524,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13796,6 +15582,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13848,6 +15641,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13900,6 +15700,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -13952,6 +15759,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14004,6 +15818,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14056,6 +15877,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14108,6 +15936,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14161,6 +15996,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14212,6 +16054,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14263,6 +16112,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14314,6 +16170,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14366,6 +16229,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14418,6 +16288,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14470,6 +16347,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14522,6 +16406,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14574,6 +16465,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14626,6 +16524,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14679,6 +16584,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14730,6 +16642,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14781,6 +16700,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14832,6 +16758,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14884,6 +16817,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14936,6 +16876,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -14988,6 +16935,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15040,6 +16994,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15092,6 +17053,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15144,6 +17112,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15197,6 +17172,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15248,6 +17230,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15299,6 +17288,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15350,6 +17346,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15402,6 +17405,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15454,6 +17464,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15506,6 +17523,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15558,6 +17582,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15610,6 +17641,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15662,6 +17700,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15715,6 +17760,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15766,6 +17818,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15817,6 +17876,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15868,6 +17934,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15920,6 +17993,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -15972,6 +18052,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16024,6 +18111,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16076,6 +18170,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16128,6 +18229,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16180,6 +18288,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16233,6 +18348,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16284,6 +18406,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16335,6 +18464,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16386,6 +18522,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16438,6 +18581,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16490,6 +18640,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16542,6 +18699,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16594,6 +18758,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16646,6 +18817,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16698,6 +18876,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16751,6 +18936,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16802,6 +18994,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16853,6 +19052,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16904,6 +19110,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -16956,6 +19169,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17008,6 +19228,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17060,6 +19287,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17112,6 +19346,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17164,6 +19405,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17216,6 +19464,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17269,6 +19524,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17320,6 +19582,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17371,6 +19640,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17422,6 +19698,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17474,6 +19757,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17526,6 +19816,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17578,6 +19875,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17630,6 +19934,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17682,6 +19993,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17734,6 +20052,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17787,6 +20112,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17838,6 +20170,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17889,6 +20228,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17940,6 +20286,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -17992,6 +20345,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18044,6 +20404,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18096,6 +20463,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18148,6 +20522,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18200,6 +20581,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18252,6 +20640,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18305,6 +20700,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18356,6 +20758,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18407,6 +20816,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18458,6 +20874,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18510,6 +20933,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18562,6 +20992,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18614,6 +21051,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18666,6 +21110,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18718,6 +21169,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18770,6 +21228,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] }, { @@ -18823,6 +21288,13 @@ "t": "ps", "n": 5 } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } ] } ] \ No newline at end of file diff --git a/modules/mainline/api_challenge.go b/modules/mainline/api_challenge.go index 85b15dceb..64bd1ccdb 100644 --- a/modules/mainline/api_challenge.go +++ b/modules/mainline/api_challenge.go @@ -48,10 +48,20 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle break } } - // 消耗 - if code = this.module.CheckRes(session, node.PsConsume); code != pb.ErrorCode_Success { - return + if curChapter.Ps != 0 { + + if code = this.module.CheckRes(session, node.PsMg); code != pb.ErrorCode_Success { // 扣1点 + return + } + } else { + if code = this.module.CheckRes(session, node.PsConsume); code != pb.ErrorCode_Success { + return + } + if code = this.module.CheckRes(session, node.PsMg); code != pb.ErrorCode_Success { + return + } } + code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{ Ptype: pb.PlayType_mainline, Title: "", diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index 203d86e63..ff58e55c0 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -49,9 +49,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh return } // 消耗 - if code = this.module.ConsumeRes(session, node.PsConsume, true); code != pb.ErrorCode_Success { - return - } + // if code = this.module.ConsumeRes(session, node.PsConsume, true); code != pb.ErrorCode_Success { + // return + // } // 校验通过 code, isWin = this.module.battle.CheckBattleReport(session, req.Report) if code != pb.ErrorCode_Success { @@ -61,6 +61,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh code = pb.ErrorCode_BattleNoWin return } + // 胜利返回 + if code = this.module.DispenseRes(session, node.PsConsume, true); code != pb.ErrorCode_Success { // 扣1点 + return + } + for _, v := range mainline.BranchID { if v == int32(req.MainlineId) { // 重复挑战 code = pb.ErrorCode_MainlineNotFindChapter @@ -87,10 +92,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh user = this.module.ModuleUser.GetUser(session.GetUserId()) mainline.MainlineId = int32(req.MainlineId) mainline.BranchID = append(mainline.BranchID, int32(req.MainlineId)) + mainline.Ps = 0 // 重置预扣体力 update := map[string]interface{}{ "mainlineId": req.MainlineId, "chapterId": mainline.ChapterId, "branchID": mainline.BranchID, + "ps": 0, } if node.Episodetype == comm.MainLineBoss { // 打完boss 设置领奖状态 update["awaredID"] = pb.AwaredType_TypeAvailable diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 40429dc61..34d551356 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -121,14 +121,14 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal } mapData["bossTime"] = viking.BossTime // 更新时间 - if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { - for _, v := range req.Report.Info.Redflist[0].Team { - if !v.Ishelp { // 助战英雄不加经验 - addExp, _ := this.module.ModuleHero.AddHeroExp(session, v.Oid, 500) // - changExp[v.Oid] = addExp - } - } - } + // if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { + // for _, v := range req.Report.Info.Redflist[0].Team { + // if !v.Ishelp { // 助战英雄不加经验 + // addExp, _ := this.module.ModuleHero.AddHeroExp(session, v.Oid, 500) //临时加500 后面等配置 + // changExp[v.Oid] = addExp + // } + // } + // } code = this.module.ModifyVikingData(session.GetUserId(), mapData) session.SendMsg(string(this.module.GetType()), VikingChallengeOverResp, &pb.VikingChallengeOverResp{ Data: viking, diff --git a/pb/mainline_db.pb.go b/pb/mainline_db.pb.go index 02f1c91a4..bfe805936 100644 --- a/pb/mainline_db.pb.go +++ b/pb/mainline_db.pb.go @@ -81,6 +81,7 @@ type DBMainline struct { AwaredID AwaredType `protobuf:"varint,5,opt,name=awaredID,proto3,enum=AwaredType" json:"awaredID" bson:"awaredID"` //是否领奖(设置int是考虑后续扩展有多个宝箱情况) BranchID []int32 `protobuf:"varint,6,rep,packed,name=branchID,proto3" json:"branchID" bson:"branchID"` // 记录所有通关的关卡数据 Intensity int32 `protobuf:"varint,7,opt,name=intensity,proto3" json:"intensity"` // 难度 + Ps int32 `protobuf:"varint,8,opt,name=ps,proto3" json:"ps"` // 预扣的体力 } func (x *DBMainline) Reset() { @@ -164,11 +165,18 @@ func (x *DBMainline) GetIntensity() int32 { return 0 } +func (x *DBMainline) GetPs() int32 { + if x != nil { + return x.Ps + } + return 0 +} + var File_mainline_mainline_db_proto protoreflect.FileDescriptor var file_mainline_mainline_db_proto_rawDesc = []byte{ 0x0a, 0x1a, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x01, 0x0a, + 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdf, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, @@ -181,7 +189,8 @@ var file_mainline_mainline_db_proto_rawDesc = []byte{ 0x65, 0x64, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x49, 0x44, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x79, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x79, 0x2a, 0x3e, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x79, 0x12, 0x0e, + 0x0a, 0x02, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x2a, 0x3e, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x79, 0x70, 0x65, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, diff --git a/sys/configure/structs/Game.MainlineData.go b/sys/configure/structs/Game.MainlineData.go index 4dbbeae36..bb24d36ab 100644 --- a/sys/configure/structs/Game.MainlineData.go +++ b/sys/configure/structs/Game.MainlineData.go @@ -31,6 +31,7 @@ type GameMainlineData struct { Stroyid []int32 Condition []int32 PsConsume []*Gameatn + PsMg []*Gameatn } const TypeId_GameMainlineData = -79093005 @@ -130,6 +131,20 @@ func (_v *GameMainlineData)Deserialize(_buf map[string]interface{}) (err error) } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ps_mg"].([]interface{}); !_ok_ { err = errors.New("ps_mg error"); return } + + _v.PsMg = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.PsMg = append(_v.PsMg, _list_v_) + } + } + return } From 53af65a711c0bcdce890e6e1eef2284d20f34cdf Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Sat, 31 Dec 2022 14:08:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=98=E6=96=97=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E4=BD=93=E5=8A=9B=E9=A2=84=E6=89=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mainline/api_challenge.go | 32 +++++++++++++++++++-- modules/mainline/api_challengeover.go | 41 +++++++++++---------------- 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/modules/mainline/api_challenge.go b/modules/mainline/api_challenge.go index 64bd1ccdb..ec05a5064 100644 --- a/modules/mainline/api_challenge.go +++ b/modules/mainline/api_challenge.go @@ -3,6 +3,7 @@ package mainline import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "google.golang.org/protobuf/proto" ) @@ -20,6 +21,8 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.MainlineC func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChallengeReq) (code pb.ErrorCode, data proto.Message) { var ( curChapter *pb.DBMainline // 当前章节信息 + ps int32 + psAnt *cfg.Gameatn ) code = this.ChallengeCheck(session, req) @@ -50,14 +53,37 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle } if curChapter.Ps != 0 { - if code = this.module.CheckRes(session, node.PsMg); code != pb.ErrorCode_Success { // 扣1点 + if code = this.module.ConsumeRes(session, node.PsMg, true); code != pb.ErrorCode_Success { // 扣1点 return } } else { - if code = this.module.CheckRes(session, node.PsConsume); code != pb.ErrorCode_Success { + for _, v := range node.PsConsume { + if v.A == "attr" && v.T == "ps" { + ps += v.N + } + } + for _, v := range node.PsMg { + if v.A == "attr" && v.T == "ps" { + ps += v.N + } + } + psAnt = &cfg.Gameatn{ + A: "attr", + T: "ps", + N: ps, + } + if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); code != pb.ErrorCode_Success { return } - if code = this.module.CheckRes(session, node.PsMg); code != pb.ErrorCode_Success { + + curChapter.Ps = ps + update := map[string]interface{}{ + "ps": ps, + } + + err := this.module.modelMainline.modifyMainlineData(session.GetUserId(), curChapter.Id, update) + if err != nil { + code = pb.ErrorCode_DBError return } } diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index ff58e55c0..0e88e6fee 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -48,35 +48,33 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh code = pb.ErrorCode_MainlineNotFindChapter return } - // 消耗 - // if code = this.module.ConsumeRes(session, node.PsConsume, true); code != pb.ErrorCode_Success { - // return - // } + for _, v := range mainline.BranchID { + if v == int32(req.MainlineId) { // 重复挑战 + code = pb.ErrorCode_MainlineNotFindChapter + return + } + } // 校验通过 code, isWin = this.module.battle.CheckBattleReport(session, req.Report) if code != pb.ErrorCode_Success { return } if !isWin { // 战斗失败直接返回 + // 返还 + mainline.Ps = 0 + this.module.modelMainline.modifyMainlineData(session.GetUserId(), mainline.Id, map[string]interface{}{ + "ps": 0, + }) + + if code = this.module.DispenseRes(session, node.PsConsume, true); code != pb.ErrorCode_Success { // 扣1点 + return + } code = pb.ErrorCode_BattleNoWin return } - // 胜利返回 - if code = this.module.DispenseRes(session, node.PsConsume, true); code != pb.ErrorCode_Success { // 扣1点 - return - } - for _, v := range mainline.BranchID { - if v == int32(req.MainlineId) { // 重复挑战 - code = pb.ErrorCode_MainlineNotFindChapter - return - } - if v == int32(req.MainlineId) { - break - } - } res = append(res, node.Award...) - for _, v := range res { + for _, v := range node.Award { if v.A == comm.HeroType { hero = append(hero, v.T) } @@ -119,12 +117,6 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh if mainline.Intensity < comm.MaxMainlineIntensity { _data.Intensity = mainline.Intensity + 1 // 难度+1 _data.ChapterId = 1 // 默认第一章节 - } else { // 全部通关 领奖拜拜 - if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { - this.module.Debugf("DispenseRes err:+%v", res) - } - session.SendMsg(string(this.module.GetType()), MainlineChallengeOverResp, &pb.MainlineChallengeOverResp{Data: mainline, Newheros: newhero, Olv: user.Lv}) - return } } @@ -134,6 +126,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh this.module.modelMainline.addNewChapter(session.GetUserId(), _mData) session.SendMsg(string(this.module.GetType()), MainlineNewChapterPush, &pb.MainlineNewChapterPush{Data: _data}) // 推送新的章节 + } // 发奖 if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success {