diff --git a/bin/json/game_dispatch_lv.json b/bin/json/game_dispatch_lv.json index c9f845fba..13fb569d7 100644 --- a/bin/json/game_dispatch_lv.json +++ b/bin/json/game_dispatch_lv.json @@ -2,8 +2,8 @@ { "lv": 1, "probability": [ - 80, - 20, + 60, + 40, 0, 0 ], @@ -12,8 +12,8 @@ { "lv": 2, "probability": [ - 70, - 20, + 60, + 30, 10, 0 ], diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 3c58acf05..ea59653ac 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -6,18 +6,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 94, + "tasktime": 110, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 1, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 16 + "param": 29 } ], "reqtxt": [ @@ -54,9 +54,9 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 86, + "tasktime": 110, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -65,7 +65,7 @@ "taskreq": [ { "key": 1, - "param": 26 + "param": 25 } ], "reqtxt": [ @@ -102,18 +102,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 150, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 30 + "param": 24 } ], "reqtxt": [ @@ -150,18 +150,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 164, + "tasktime": 180, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 3, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 1 + "param": 29 } ], "reqtxt": [ @@ -198,18 +198,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 109, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 3, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 18 + "param": 10 } ], "reqtxt": [ @@ -246,14 +246,14 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 170, + "tasktime": 174, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, @@ -294,18 +294,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 132, + "tasktime": 87, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 1, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 27 + "param": 25 } ], "reqtxt": [ @@ -342,18 +342,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 179, + "tasktime": 133, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 1, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 16 + "param": 6 } ], "reqtxt": [ @@ -390,9 +390,9 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 165, + "tasktime": 130, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -401,7 +401,7 @@ "taskreq": [ { "key": 1, - "param": 5 + "param": 26 } ], "reqtxt": [ @@ -438,18 +438,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 164, + "tasktime": 169, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 2, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 20 + "param": 30 } ], "reqtxt": [ @@ -486,18 +486,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 66, + "tasktime": 71, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 1, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 7 + "param": 26 } ], "reqtxt": [ @@ -534,18 +534,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 75, + "tasktime": 105, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 3, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 7 + "param": 20 } ], "reqtxt": [ @@ -582,9 +582,9 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 98, + "tasktime": 122, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -593,7 +593,7 @@ "taskreq": [ { "key": 1, - "param": 27 + "param": 2 } ], "reqtxt": [ @@ -630,18 +630,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 141, + "tasktime": 148, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 11 + "param": 18 } ], "reqtxt": [ @@ -678,9 +678,9 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 80, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -689,7 +689,7 @@ "taskreq": [ { "key": 1, - "param": 19 + "param": 13 } ], "reqtxt": [ @@ -726,18 +726,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 74, + "tasktime": 84, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 4, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 11 + "param": 2 } ], "reqtxt": [ @@ -774,18 +774,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 163, + "tasktime": 64, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 3, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 2 + "param": 22 } ], "reqtxt": [ @@ -822,18 +822,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 124, + "tasktime": 75, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 18 + "param": 9 } ], "reqtxt": [ @@ -870,18 +870,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 165, + "tasktime": 110, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 3, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 29 + "param": 19 } ], "reqtxt": [ @@ -918,18 +918,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 122, + "tasktime": 100, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 24 + "param": 5 } ], "reqtxt": [ @@ -966,9 +966,9 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 108, + "tasktime": 93, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -977,7 +977,7 @@ "taskreq": [ { "key": 1, - "param": 1 + "param": 13 } ], "reqtxt": [ @@ -1014,18 +1014,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 82, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 2 + "param": 10 } ], "reqtxt": [ @@ -1062,18 +1062,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 61, + "tasktime": 121, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 23 + "param": 4 } ], "reqtxt": [ @@ -1110,18 +1110,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 142, + "tasktime": 116, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 30 + "param": 2 } ], "reqtxt": [ @@ -1158,18 +1158,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 171, + "tasktime": 164, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 27 + "param": 2 } ], "reqtxt": [ @@ -1206,18 +1206,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 76, + "tasktime": 147, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 30 + "param": 26 } ], "reqtxt": [ @@ -1254,18 +1254,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 177, + "tasktime": 101, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 17 + "param": 14 } ], "reqtxt": [ @@ -1302,9 +1302,9 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 60, + "tasktime": 108, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1313,7 +1313,7 @@ "taskreq": [ { "key": 1, - "param": 22 + "param": 20 } ], "reqtxt": [ @@ -1350,9 +1350,9 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 95, + "tasktime": 139, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1398,9 +1398,9 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 121, + "tasktime": 89, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1409,7 +1409,7 @@ "taskreq": [ { "key": 1, - "param": 21 + "param": 9 } ], "reqtxt": [ @@ -1446,18 +1446,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 69, + "tasktime": 66, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 15 + "param": 28 } ], "reqtxt": [ @@ -1494,18 +1494,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 85, + "tasktime": 62, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 6 + "param": 5 } ], "reqtxt": [ @@ -1542,18 +1542,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 92, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 1, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 11 + "param": 30 } ], "reqtxt": [ @@ -1590,9 +1590,9 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 156, + "tasktime": 164, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1601,7 +1601,7 @@ "taskreq": [ { "key": 1, - "param": 20 + "param": 16 } ], "reqtxt": [ @@ -1638,18 +1638,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 65, + "tasktime": 68, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 16 + "param": 9 } ], "reqtxt": [ @@ -1686,18 +1686,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 174, + "tasktime": 81, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 3 + "param": 16 } ], "reqtxt": [ @@ -1734,18 +1734,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 106, + "tasktime": 165, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 21 + "param": 30 } ], "reqtxt": [ @@ -1782,18 +1782,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 160, + "tasktime": 164, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 3, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 23 + "param": 21 } ], "reqtxt": [ @@ -1830,18 +1830,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 66, + "tasktime": 140, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 1, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 7 + "param": 21 } ], "reqtxt": [ @@ -1878,18 +1878,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 101, + "tasktime": 165, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 21 + "param": 15 } ], "reqtxt": [ @@ -1926,14 +1926,14 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 92, + "tasktime": 98, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, @@ -1974,18 +1974,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 177, + "tasktime": 160, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 3 + "param": 4 } ], "reqtxt": [ @@ -2022,18 +2022,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 72, + "tasktime": 138, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 8 + "param": 14 } ], "reqtxt": [ @@ -2070,18 +2070,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 107, + "tasktime": 132, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 2 + "param": 15 } ], "reqtxt": [ @@ -2118,18 +2118,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 151, + "tasktime": 117, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 4, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 25 + "param": 20 } ], "reqtxt": [ @@ -2166,18 +2166,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 109, + "tasktime": 159, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 3, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 25 + "param": 24 } ], "reqtxt": [ @@ -2214,18 +2214,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 143, + "tasktime": 83, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 3, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 18 + "param": 29 } ], "reqtxt": [ @@ -2262,18 +2262,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 115, + "tasktime": 119, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 8 + "param": 23 } ], "reqtxt": [ @@ -2310,18 +2310,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 131, + "tasktime": 85, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 11 + "param": 25 } ], "reqtxt": [ @@ -2358,18 +2358,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 112, + "tasktime": 156, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 6 + "param": 27 } ], "reqtxt": [ @@ -2406,18 +2406,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 180, + "tasktime": 145, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 4, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 28 + "param": 2 } ], "reqtxt": [ @@ -2454,18 +2454,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 160, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 3, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 5 + "param": 19 } ], "reqtxt": [ @@ -2502,18 +2502,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 70, + "tasktime": 143, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 1, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 14 + "param": 13 } ], "reqtxt": [ @@ -2550,18 +2550,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 159, + "tasktime": 82, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 21 + "param": 20 } ], "reqtxt": [ @@ -2598,18 +2598,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 159, + "tasktime": 168, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 22 + "param": 14 } ], "reqtxt": [ @@ -2646,18 +2646,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 114, + "tasktime": 68, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 3, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 30 + "param": 12 } ], "reqtxt": [ @@ -2694,18 +2694,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 169, + "tasktime": 113, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 21 + "param": 7 } ], "reqtxt": [ @@ -2742,18 +2742,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 105, + "tasktime": 92, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 1, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 13 + "param": 21 } ], "reqtxt": [ @@ -2790,18 +2790,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 137, + "tasktime": 173, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 24 + "param": 5 } ], "reqtxt": [ @@ -2838,18 +2838,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 141, + "tasktime": 99, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 3 + "param": 10 } ], "reqtxt": [ @@ -2886,9 +2886,9 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 62, + "tasktime": 162, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2897,7 +2897,7 @@ "taskreq": [ { "key": 1, - "param": 27 + "param": 5 } ], "reqtxt": [ @@ -2934,9 +2934,9 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 60, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2945,7 +2945,7 @@ "taskreq": [ { "key": 1, - "param": 27 + "param": 7 } ], "reqtxt": [ @@ -2982,9 +2982,9 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 126, + "tasktime": 164, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2993,7 +2993,7 @@ "taskreq": [ { "key": 1, - "param": 11 + "param": 20 } ], "reqtxt": [ @@ -3030,18 +3030,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 90, + "tasktime": 94, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 18 + "param": 1 } ], "reqtxt": [ @@ -3078,18 +3078,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 139, + "tasktime": 85, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 8 + "param": 2 } ], "reqtxt": [ @@ -3126,18 +3126,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 74, + "tasktime": 105, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 3, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 2 + "param": 16 } ], "reqtxt": [ @@ -3174,18 +3174,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 111, + "tasktime": 74, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 19 + "param": 8 } ], "reqtxt": [ @@ -3222,18 +3222,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 161, + "tasktime": 70, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 21 + "param": 9 } ], "reqtxt": [ @@ -3270,18 +3270,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 70, + "tasktime": 83, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 1, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 20 + "param": 10 } ], "reqtxt": [ @@ -3318,18 +3318,18 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 61, + "tasktime": 96, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 16 + "param": 4 } ], "reqtxt": [ @@ -3366,18 +3366,18 @@ "key": "Entrustment of Tiger", "text": "悍娇虎的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 96, + "tasktime": 167, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 9 + "param": 16 } ], "reqtxt": [ @@ -3414,18 +3414,18 @@ "key": "Entrustment of Shifu", "text": "师父的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 170, + "tasktime": 138, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 22 + "param": 19 } ], "reqtxt": [ @@ -3462,18 +3462,18 @@ "key": "Entrustment of Po", "text": "阿宝的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 98, + "tasktime": 69, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 20 + "param": 13 } ], "reqtxt": [ @@ -3510,9 +3510,9 @@ "key": "Entrustment of Bobi", "text": "波比的委托" }, - "icon": "wg_cj1_img01", + "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 75, + "tasktime": 71, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3521,7 +3521,7 @@ "taskreq": [ { "key": 1, - "param": 12 + "param": 4 } ], "reqtxt": [ diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 89e959207..52e01fff5 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -660,6 +660,7 @@ "n": 30000 } ], - "game_make_TunkNum": 5 + "game_make_TunkNum": 5, + "pandamas_tiguandiaoxiang_cd": 10 } ] \ No newline at end of file diff --git a/bin/json/game_pandamasmz.json b/bin/json/game_pandamasmz.json index 8ea852e10..d788acb5d 100644 --- a/bin/json/game_pandamasmz.json +++ b/bin/json/game_pandamasmz.json @@ -63,7 +63,7 @@ "key": "muzhuang_3", "text": "3级木人桩" }, - "pile_appearance": "Level2", + "pile_appearance": "Level3", "effect": { "key": "muzhuang_xiaoguo_3", "text": "每分钟提升经验{0}" @@ -92,7 +92,7 @@ "key": "muzhuang_4", "text": "4级木人桩" }, - "pile_appearance": "Level2", + "pile_appearance": "Level4", "effect": { "key": "muzhuang_xiaoguo_4", "text": "每分钟提升经验{0}" @@ -121,7 +121,7 @@ "key": "muzhuang_5", "text": "5级木人桩" }, - "pile_appearance": "Level2", + "pile_appearance": "Level5", "effect": { "key": "muzhuang_xiaoguo_5", "text": "每分钟提升经验{0}" diff --git a/bin/json/game_pandamastj.json b/bin/json/game_pandamastj.json index 319c26a25..e6c57ecc6 100644 --- a/bin/json/game_pandamastj.json +++ b/bin/json/game_pandamastj.json @@ -32,7 +32,7 @@ "key": "wuguan_1", "text": "图鉴信息描述" }, - "icon": "wg_icon_mz02", + "icon": "wg_icon_mz03", "atlas_score": 45 }, { @@ -50,7 +50,7 @@ "key": "wuguan_1", "text": "图鉴信息描述" }, - "icon": "wg_icon_mz03", + "icon": "wg_icon_mz02", "atlas_score": 60 }, { diff --git a/modules/practice/api_info.go b/modules/practice/api_info.go index 149252c45..d8b83b922 100644 --- a/modules/practice/api_info.go +++ b/modules/practice/api_info.go @@ -29,10 +29,13 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (c if room.Npcstate == 0 && room.Currnpc == 0 { this.module.modelPandata.refreshnpc(room) + update["currnpc"] = room.Currnpc + update["captain"] = room.Captain + update["formation"] = room.Formation } for i := 0; i < len(room.Statuers); { - if time.Unix(room.Statuers[i].End, 0).After(configure.Now()) { //过期 + if configure.Now().After(time.Unix(room.Statuers[i].End, 0)) { room.Statuers = append(room.Statuers[:i], room.Statuers[i+1:]...) update["statuers"] = room.Statuers } else { diff --git a/modules/practice/module.go b/modules/practice/module.go index b14a29c98..a591033b6 100644 --- a/modules/practice/module.go +++ b/modules/practice/module.go @@ -214,7 +214,7 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) { keep = false for _, v := range buleroom.Statuers { if v.Uid == red { - v.End = configure.Now().Add(time.Minute * 1).Unix() + v.End = configure.Now().Add(time.Minute * time.Duration(this.configure.GetGlobalConf().PandamasTiguandiaoxiangCd)).Unix() keep = true break } @@ -223,7 +223,7 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) { buleroom.Statuers = append(buleroom.Statuers, &pb.DBPracticeStatuer{ Uid: red, Figure: reduser.Figure, - End: configure.Now().Add(time.Minute * 1).Unix(), + End: configure.Now().Add(time.Minute * time.Duration(this.configure.GetGlobalConf().PandamasTiguandiaoxiangCd)).Unix(), }) } @@ -238,7 +238,7 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) { keep = false for _, v := range redroom.Statuers { if v.Uid == bule { - v.End = configure.Now().Add(time.Minute * 1).Unix() + v.End = configure.Now().Add(time.Minute * time.Duration(this.configure.GetGlobalConf().PandamasTiguandiaoxiangCd)).Unix() keep = true break } @@ -247,7 +247,7 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) { redroom.Statuers = append(redroom.Statuers, &pb.DBPracticeStatuer{ Uid: bule, Figure: buleuser.Figure, - End: configure.Now().Add(time.Minute * 1).Unix(), + End: configure.Now().Add(time.Minute * time.Duration(this.configure.GetGlobalConf().PandamasTiguandiaoxiangCd)).Unix(), }) } for i, v := range buleroom.Statuers { diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index fe75b0360..cf697bc5e 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -196,6 +196,7 @@ type GameGlobalData struct { PandamasRankedBelow50 int32 MrylFlushed []*Gameatn GameMakeTunkNum int32 + PandamasTiguandiaoxiangCd int32 } const TypeId_GameGlobalData = 477542761 @@ -819,6 +820,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["game_make_TunkNum"].(float64); !_ok_ { err = errors.New("game_make_TunkNum error"); return }; _v.GameMakeTunkNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pandamas_tiguandiaoxiang_cd"].(float64); !_ok_ { err = errors.New("pandamas_tiguandiaoxiang_cd error"); return }; _v.PandamasTiguandiaoxiangCd = int32(_tempNum_) } return }