上传机器人输出报表

bin/json/game_buriedtype.json

@@ -1178,7 +1178,7 @@
   },
   {
     "id": 207,
-    "insert": 1,
+    "insert": 2,
     "filter": [
       "eq"
     ]

bin/json/game_buzkashimount.json

@@ -11,7 +11,7 @@
       "text": "测试描述1"
     },
     "Color": 1,
-    "Img": "by_img_tx",
+    "Img": "by_img_54101",
     "access": [
       166
     ],
@@ -42,7 +42,7 @@
       "text": "测试描述2"
     },
     "Color": 1,
-    "Img": "by_img_tx",
+    "Img": "by_img_54101",
     "access": [
       166
     ],
@@ -73,7 +73,7 @@
       "text": "无牙/没牙仔（Toothless）品种为夜煞。夜煞是龙族非常稀有且最危险聪明的龙，与其它龙的造型很不一样，类似蝙蝠，身体附有黑色鳞片。体积娇小，表情动作灵巧可爱，双翼比例在龙的排行中最大。翼面多达三对，因此飞行时间更长，速度更快更灵活。"
     },
     "Color": 1,
-    "Img": "by_img_tx",
+    "Img": "by_img_54101",
     "access": [
       166
     ],
@@ -104,7 +104,7 @@
       "text": "测试描述4"
     },
     "Color": 1,
-    "Img": "by_img_tx2",
+    "Img": "by_img_54102",
     "access": [
       166
     ],
@@ -135,7 +135,7 @@
       "text": "测试描述5"
     },
     "Color": 1,
-    "Img": "by_img_tx2",
+    "Img": "by_img_54102",
     "access": [
       166
     ],
@@ -166,7 +166,7 @@
       "text": "它是龙族最漂亮、精力最充沛的一员，皮肤色彩斑斓，有鹦鹉一样的习性、鸸鹋的步态和雷克斯暴龙的姿势，是鸟类的祖先。纳得的性格暴躁，经常发脾气。"
     },
     "Color": 1,
-    "Img": "by_img_tx2",
+    "Img": "by_img_54102",
     "access": [
       166
     ],
@@ -197,7 +197,7 @@
       "text": "测试描述7"
     },
     "Color": 1,
-    "Img": "by_img_tx3",
+    "Img": "by_img_54103",
     "access": [
       166
     ],
@@ -228,7 +228,7 @@
       "text": "测试描述8"
     },
     "Color": 1,
-    "Img": "by_img_tx3",
+    "Img": "by_img_54103",
     "access": [
       166
     ],
@@ -259,7 +259,7 @@
       "text": "葛伦科是巨石类龙，长约4米，高约1.7米，全身披满装甲，尾巴像一个锤子，体态较胖。鱼脚司是他的好朋友（更像父亲），起名为肉球。"
     },
     "Color": 1,
-    "Img": "by_img_tx3",
+    "Img": "by_img_54103",
     "access": [
       166
     ],

bin/json/game_buzkashiqtelv.json

@@ -0,0 +1,17 @@
+[
+  {
+    "num": 1,
+    "time": 1,
+    "value": 10
+  },
+  {
+    "num": 2,
+    "time": 2,
+    "value": 15
+  },
+  {
+    "num": 3,
+    "time": 3,
+    "value": 20
+  }
+]

bin/json/game_dispatch_task.json

@@ -5,14 +5,14 @@
     "weight": 400,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_1",
-      "text": "阿宝的委托"
+      "text": "家务整理"
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 86400,
     "tasktime": 600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_1",
-      "text": "这是属于阿宝的专属委托"
+      "text": "家里全是火车零件和干草，简直成了马匹走私车厢。但我忙着工作，没空清理。幸运——她已经厌烦整理客厅了——说可以在这里找人帮忙，我来试试看。——吉姆·普雷斯科特"
     },
     "taskneed": 1,
     "taskreq": [
@@ -61,14 +61,14 @@
     "weight": 200,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_2",
-      "text": "波比的委托"
+      "text": "招募派对人手"
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 86400,
     "tasktime": 600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_2",
-      "text": "这是属于波比的专属委托"
+      "text": "我是说准备派对的人手。我要办一个能让整个中轴城都嗨起来的大派对！ps.欢迎所有人参加。——波比"
     },
     "taskneed": 1,
     "taskreq": [
@@ -117,14 +117,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_3",
-      "text": "悍娇虎的委托"
+      "text": "寻找老虎娃娃"
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 86400,
     "tasktime": 600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_3",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "幼年熊猫遗失一个形似悍娇虎的玩具娃娃，请拾到的好心人送到熊猫武馆，必有重酬（比如强力功夫训练课）。——悍娇虎"
     },
     "taskneed": 1,
     "taskreq": [
@@ -173,14 +173,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_4",
-      "text": "师父的委托"
+      "text": "写给过去自己的信"
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 86400,
     "tasktime": 600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_4",
-      "text": "这是属于师父的专属委托"
+      "text": "“你是一个好人。”好了，写好了。谁能把这封信寄给一年前的我？——沃尔夫"
     },
     "taskneed": 1,
     "taskreq": [
@@ -229,14 +229,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_5",
-      "text": "阿宝的委托"
+      "text": "好想吃香蕉"
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 86400,
     "tasktime": 600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_5",
-      "text": "这是属于阿宝的专属委托"
+      "text": "就是好想吃啊！香蕉！<br>求购香蕉，数量不限，越多越好。——瓜哥（看上去像是盖代写的。）"
     },
     "taskneed": 1,
     "taskreq": [
@@ -285,14 +285,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_6",
-      "text": "波比的委托"
+      "text": "寻求隐秘地点"
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 86400,
     "tasktime": 600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_6",
-      "text": "这是属于波比的专属委托"
+      "text": "有谁知道适合藏东西的隐秘地点？最好是熊猫不喜欢去的地方。——金猴"
     },
     "taskneed": 1,
     "taskreq": [
@@ -341,14 +341,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_7",
-      "text": "悍娇虎的委托"
+      "text": "谁能替我一下"
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 86400,
     "tasktime": 600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_7",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "感冒发烧了，同事好像都不能替我。但中轴城警备总不能松懈吧？希望有人明天能替我巡逻，工资算你的。ps.可以近距离观赏队长做彩蛋。——某巡逻队员"
     },
     "taskneed": 1,
     "taskreq": [
@@ -397,14 +397,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_8",
-      "text": "师父的委托"
+      "text": "茶喝完了"
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 86400,
     "tasktime": 600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_8",
-      "text": "这是属于师父的专属委托"
+      "text": "帮我带点碧螺春吧，然后一起喝喝茶，说不定我能看到你的烦恼。——隐居的羊"
     },
     "taskneed": 1,
     "taskreq": [
@@ -453,14 +453,14 @@
     "weight": 400,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_19",
-      "text": "悍娇虎的委托"
+      "text": "骂醒恋爱脑"
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 86400,
     "tasktime": 1200,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_19",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "莴苣公主居然看上了白马王子，我的天呐！快来人帮我骂醒这个恋爱脑！——菲奥娜"
     },
     "taskneed": 2,
     "taskreq": [
@@ -509,14 +509,14 @@
     "weight": 200,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_20",
-      "text": "师父的委托"
+      "text": "来点高级货"
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 86400,
     "tasktime": 1200,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_20",
-      "text": "这是属于师父的专属委托"
+      "text": "是时候换个好一点的炉子了，再这样下去我的铺子迟早被烧光……还要顺便给屋子里涂点儿防火层。总之我需要一些高级材料，希望接受委托的人别在泰坦那里丢了小命。——戈伯"
     },
     "taskneed": 2,
     "taskreq": [
@@ -565,14 +565,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_21",
-      "text": "阿宝的委托"
+      "text": "寻找对手"
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 86400,
     "tasktime": 1200,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_21",
-      "text": "这是属于阿宝的专属委托"
+      "text": "阿宝大师太忙了，不能只教我一个人，而且我也应该自己练习。所以有人可以与我功夫对练吗？——盖"
     },
     "taskneed": 2,
     "taskreq": [
@@ -621,14 +621,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_22",
-      "text": "波比的委托"
+      "text": "失物找回"
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 86400,
     "tasktime": 1200,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_22",
-      "text": "这是属于波比的专属委托"
+      "text": "遗失配方奶一瓶，请捡到的人联系宝贝公司。电话：×××-×××××。"
     },
     "taskneed": 2,
     "taskreq": [
@@ -677,14 +677,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_23",
-      "text": "悍娇虎的委托"
+      "text": "也许是找猫？"
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 86400,
     "tasktime": 1200,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_23",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "阿奇不知道哪里去了，我需要它帮我一个忙。请看到这条委托的人帮我找找，我会感谢你的。——希沙窦斯"
     },
     "taskneed": 2,
     "taskreq": [
@@ -733,14 +733,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_24",
-      "text": "师父的委托"
+      "text": "来做大臣"
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 86400,
     "tasktime": 1200,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_24",
-      "text": "这是属于师父的专属委托"
+      "text": "朱利安国王决定选一位新的大臣，负责打理他的王冠。——莫里斯"
     },
     "taskneed": 2,
     "taskreq": [
@@ -789,14 +789,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_25",
-      "text": "阿宝的委托"
+      "text": "护须精油"
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 86400,
     "tasktime": 1200,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_25",
-      "text": "这是属于阿宝的专属委托"
+      "text": "最近为漆黑的事操碎了心，熬了几个通宵……我原本飘逸的大胡子都没有光泽了。有人愿意帮我买瓶护须精油吗？跑腿费很可观的！——诺斯"
     },
     "taskneed": 2,
     "taskreq": [
@@ -845,14 +845,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_26",
-      "text": "波比的委托"
+      "text": "请求代购"
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 86400,
     "tasktime": 1200,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_26",
-      "text": "这是属于波比的专属委托"
+      "text": "之前实验室出了些状况，现在急需一批试剂瓶。请接受委托的人把物资交给邦尼兔先生，就说是实验室要的，谢谢。——布兰奇"
     },
     "taskneed": 2,
     "taskreq": [
@@ -901,14 +901,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_34",
-      "text": "波比的委托"
+      "text": "寻找跑腿"
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 86400,
     "tasktime": 1800,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_34",
-      "text": "这是属于波比的专属委托"
+      "text": "我需要一个有空的人，把这份礼物送给蛇哥。报酬找他要。——骇客蛛"
     },
     "taskneed": 3,
     "taskreq": [
@@ -957,14 +957,14 @@
     "weight": 300,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_35",
-      "text": "悍娇虎的委托"
+      "text": "寻找跑腿"
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 86400,
     "tasktime": 1800,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_35",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "随便来个人，把骇客蛛埋进蛋糕里。蛋糕到我这儿来拿。——蛇"
     },
     "taskneed": 3,
     "taskreq": [
@@ -1013,14 +1013,14 @@
     "weight": 75,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_36",
-      "text": "师父的委托"
+      "text": "寻找跑腿"
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 86400,
     "tasktime": 1800,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_36",
-      "text": "这是属于师父的专属委托"
+      "text": "请接受委托的人把从蛇那里拿到的蛋糕送到美肚鲨那里，不要把骇客蛛埋进去。——沃尔夫"
     },
     "taskneed": 3,
     "taskreq": [
@@ -1069,14 +1069,14 @@
     "weight": 75,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_37",
-      "text": "阿宝的委托"
+      "text": "寻找跑腿"
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 86400,
     "tasktime": 1800,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_37",
-      "text": "这是属于阿宝的专属委托"
+      "text": "从蛇那里拿到蛋糕的人，只用分一半给美肚鲨，剩下的给本大爷送来。——食人鱼"
     },
     "taskneed": 3,
     "taskreq": [
@@ -1125,14 +1125,14 @@
     "weight": 75,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_38",
-      "text": "波比的委托"
+      "text": "需要保姆家政"
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 86400,
     "tasktime": 1800,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_38",
-      "text": "这是属于波比的专属委托"
+      "text": "史莱克不在家，但我们有三个小宝宝……希望能有温柔细心的好心人来给我帮把手。我想许多人已经知道了，但还是提醒一句：我们一家都是怪物（指物种）。——菲奥娜"
     },
     "taskneed": 3,
     "taskreq": [
@@ -1181,14 +1181,14 @@
     "weight": 75,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_39",
-      "text": "悍娇虎的委托"
+      "text": "想成为小男孩"
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 86400,
     "tasktime": 1800,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_39",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "请大家帮我寻找成为小男孩的办法！无论是传说、魔法、还是女装魔药，我都愿意尝试！——诚实的匹诺曹"
     },
     "taskneed": 3,
     "taskreq": [
@@ -1237,14 +1237,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_40",
-      "text": "师父的委托"
+      "text": "例行检查"
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 86400,
     "tasktime": 1800,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_40",
-      "text": "这是属于师父的专属委托"
+      "text": "寻求对黑暗势力有了解的专业人士，协助检查城内捕梦网是否需要替换。——中轴城指挥部"
     },
     "taskneed": 3,
     "taskreq": [
@@ -1293,14 +1293,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_41",
-      "text": "阿宝的委托"
+      "text": "声乐家教"
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 86400,
     "tasktime": 1800,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_41",
-      "text": "这是属于阿宝的专属委托"
+      "text": "希望有人能教我声乐，我不相信波波星人学不会唱歌！——小欧<br>这项委托难度很高，请慎重考虑。——小钱"
     },
     "taskneed": 3,
     "taskreq": [
@@ -1349,14 +1349,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_42",
-      "text": "波比的委托"
+      "text": "求购乐器"
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 86400,
     "tasktime": 1800,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_42",
-      "text": "这是属于波比的专属委托"
+      "text": "我的吉他被回旋镖不小心踩坏了，想趁这个机会学学新的乐器。我想中轴城的流行乐器可能和西部不太一样，也许会有什么月光风琴之类的有趣玩意……谁可以卖给我吗？——阿比盖尔·斯通"
     },
     "taskneed": 3,
     "taskreq": [
@@ -1405,14 +1405,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_43",
-      "text": "悍娇虎的委托"
+      "text": "拯救螳螂"
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 86400,
     "tasktime": 1800,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_43",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "我之前很担心食人鱼大师的伙食，但现在更担心自己！救命！有没有免疫臭气的大师与我换岗！——快螳螂<br>我可以借你防毒面具。——骇客蛛"
     },
     "taskneed": 3,
     "taskreq": [
@@ -1461,14 +1461,14 @@
     "weight": 300,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_60",
-      "text": "师父的委托"
+      "text": "来找我吧！"
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_60",
-      "text": "这是属于师父的专属委托"
+      "text": "找到我就算你赢！"
     },
     "taskneed": 4,
     "taskreq": [
@@ -1517,14 +1517,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_61",
-      "text": "阿宝的委托"
+      "text": "寻云启事"
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_61",
-      "text": "这是属于阿宝的专属委托"
+      "text": "所有看到这个委托的人都可以找！我就不信找不到那朵云！——小伊（看起来像是盖代写的。）"
     },
     "taskneed": 4,
     "taskreq": [
@@ -1573,14 +1573,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_62",
-      "text": "波比的委托"
+      "text": "武馆请求"
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_62",
-      "text": "这是属于波比的专属委托"
+      "text": "寻求热心人士清理非求助类委托，也请各位居民不要在公告栏上发布游乐内容。——熊猫武馆"
     },
     "taskneed": 4,
     "taskreq": [
@@ -1629,14 +1629,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_63",
-      "text": "悍娇虎的委托"
+      "text": "一个小问题"
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_63",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "有没有人知道，现在生产芝士条的工厂搬到哪里去了？——普莱维特"
     },
     "taskneed": 4,
     "taskreq": [
@@ -1685,14 +1685,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_64",
-      "text": "师父的委托"
+      "text": "关于礼物"
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_64",
-      "text": "这是属于师父的专属委托"
+      "text": "我想给亚丝翠和妈妈带点礼物，不知道中轴城的朋友们一般会选什么……请了解这方面的朋友给我几个建议吧！——希卡普"
     },
     "taskneed": 4,
     "taskreq": [
@@ -1741,14 +1741,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_65",
-      "text": "阿宝的委托"
+      "text": "英雄需要的"
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_65",
-      "text": "这是属于阿宝的专属委托"
+      "text": "不是比试也不是牛奶！靴猫遭遇了一生之敌——原始地区的黑色池塘！没有靴子的靴猫怎么能叫靴猫？有谁知道那片池塘的情报？——P（落款是用剑划出来的）"
     },
     "taskneed": 4,
     "taskreq": [
@@ -1797,14 +1797,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_66",
-      "text": "波比的委托"
+      "text": "招募堵嘴勇士"
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_66",
-      "text": "这是属于波比的专属委托"
+      "text": "谁能堵上暴芙那特那张嘴！我把帅气的胡子借给你摸！——悍夫那特"
     },
     "taskneed": 4,
     "taskreq": [
@@ -1853,14 +1853,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_67",
-      "text": "悍娇虎的委托"
+      "text": "招募剃须勇士"
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_67",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "不会只有我一个人觉得悍夫那特的胡子纯属诈骗吧？不会吧不会吧？男人光有胡子没有肌肉顶什么用！谁能用实际行动教育教育他？我可以和你约会！——暴芙那特"
     },
     "taskneed": 4,
     "taskreq": [
@@ -1909,14 +1909,14 @@
     "weight": 100,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_68",
-      "text": "师父的委托"
+      "text": "救命！"
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_68",
-      "text": "这是属于师父的专属委托"
+      "text": "拜托了！快把我藏起来！不要告诉那个戴糖霜项链的长发姜饼人我在哪！——姜饼人（这张委托被巧克力酱污染了一些。）"
     },
     "taskneed": 4,
     "taskreq": [
@@ -1965,14 +1965,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_69",
-      "text": "阿宝的委托"
+      "text": "定制防具"
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_69",
-      "text": "这是属于阿宝的专属委托"
+      "text": "听说一种叫遮阳伞的防具能够保护巨怪不受阳光的伤害，我想定制两件大一点的，请愿意接活儿的能工巧匠与我联系。——闪闪"
     },
     "taskneed": 4,
     "taskreq": [
@@ -2021,14 +2021,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_70",
-      "text": "波比的委托"
+      "text": "提醒功夫大师"
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_70",
-      "text": "这是属于波比的专属委托"
+      "text": "听闻近来多有功夫大师缺课，特寻热心侠士提醒大师按时到课，感激不尽！另备微薄酬劳，略表心意，可来熊猫武馆领取。（看起来像师父的字迹。）"
     },
     "taskneed": 4,
     "taskreq": [
@@ -2077,14 +2077,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_71",
-      "text": "悍娇虎的委托"
+      "text": "老爹大危机！"
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_71",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "不是不想帮老爹做面啦！可师父又给我排了好多课，还请人叫我去上课……总之快来个会做饭的好心人帮帮老爹！面馆的客人超多！老爹忙不过来啦！江湖救急欸！——阿宝"
     },
     "taskneed": 4,
     "taskreq": [
@@ -2133,14 +2133,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_72",
-      "text": "师父的委托"
+      "text": "谁会打麻将"
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_72",
-      "text": "这是属于师父的专属委托"
+      "text": "我们刚学会这种游戏，但睡美人总在摸牌的时候睡着……谁愿意接替她的位置吗？用她的金币，赢了算你的。——白雪"
     },
     "taskneed": 4,
     "taskreq": [
@@ -2189,14 +2189,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_73",
-      "text": "阿宝的委托"
+      "text": "招一个特殊外卖员"
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_73",
-      "text": "这是属于阿宝的专属委托"
+      "text": "要求力气大，速度快，而且稳！把这份饭菜送给阿宝，不能弄丢了。如果他没吃饱需要再跑一趟。报酬别担心，老爹会给足的！——老平"
     },
     "taskneed": 4,
     "taskreq": [
@@ -2245,14 +2245,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_74",
-      "text": "波比的委托"
+      "text": "筷子怎么用啊"
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_74",
-      "text": "这是属于波比的专属委托"
+      "text": "暴芙那特终于答应和我共进晚餐了，不过她说吃火锅。呃，有人能教我怎么用筷子吗？我不想在女神面前出丑。——鼻涕粗"
     },
     "taskneed": 4,
     "taskreq": [
@@ -2301,14 +2301,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_71",
-      "text": "悍娇虎的委托"
+      "text": "寻找宣传大师"
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_71",
-      "text": "这是属于悍娇虎的专属委托"
+      "text": "这个月收到了好多坏牙！孩子们都怎么了？我可不想让他们的记忆保存在龋齿里！快告诉孩子们，少吃甜食多漱口！——牙仙"
     },
     "taskneed": 4,
     "taskreq": [
@@ -2357,14 +2357,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_72",
-      "text": "师父的委托"
+      "text": "护卫国王"
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_72",
-      "text": "这是属于师父的专属委托"
+      "text": "听说这里有许多勇士，总该有一个够资格担任我的出行护卫。——法夸德国王"
     },
     "taskneed": 4,
     "taskreq": [
@@ -2413,14 +2413,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_73",
-      "text": "阿宝的委托"
+      "text": "来聊天吧"
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_73",
-      "text": "这是属于阿宝的专属委托"
+      "text": "史莱克不在，我亲爱的火龙也不在，菲奥娜忙着制作魔药……怎么就剩下我一头驴了？幸好没有农妇要拿我换十金币！这张纸快填满了，我就问一句：有人来陪我聊天吗？——贫嘴驴"
     },
     "taskneed": 4,
     "taskreq": [
@@ -2469,14 +2469,14 @@
     "weight": 50,
     "taskname": {
       "key": "pandamas_pandamas_dispatch_taskname_74",
-      "text": "波比的委托"
+      "text": "！！！"
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 86400,
     "tasktime": 3600,
     "tasktxt": {
       "key": "pandamas_pandamas_dispatch_tasktxt_74",
-      "text": "这是属于波比的专属委托"
+      "text": "㇈ 丿……㇇！㇃ㄣ！<br>大概意思是……来人帮忙！<br>看来他被诺斯的小家伙们耍了，可怜的沙沙。——邦尼兔"
     },
     "taskneed": 4,
     "taskreq": [

bin/json/game_dragonplay.json

@@ -4,8 +4,8 @@
     "id": "20030001",
     "grow": 1,
     "type": 1,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 0,
     "deplete": [
       {
@@ -21,8 +21,8 @@
     "id": "20030001",
     "grow": 1,
     "type": 3,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 0,
     "deplete": [
       {
@@ -38,8 +38,8 @@
     "id": "20030001",
     "grow": 1,
     "type": 4,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 0,
     "deplete": [
       {
@@ -55,8 +55,8 @@
     "id": "20030001",
     "grow": 2,
     "type": 1,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 0,
     "deplete": [
       {
@@ -72,8 +72,8 @@
     "id": "20030001",
     "grow": 2,
     "type": 2,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 0,
     "deplete": [
       {
@@ -89,8 +89,8 @@
     "id": "20030001",
     "grow": 2,
     "type": 3,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 0,
     "deplete": [
       {
@@ -106,8 +106,8 @@
     "id": "20030001",
     "grow": 2,
     "type": 4,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 0,
     "deplete": [
       {
@@ -123,8 +123,8 @@
     "id": "20030001",
     "grow": 3,
     "type": 1,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 0,
     "deplete": [
       {
@@ -140,8 +140,8 @@
     "id": "20030001",
     "grow": 3,
     "type": 2,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 0,
     "deplete": [
       {
@@ -157,8 +157,8 @@
     "id": "20030001",
     "grow": 3,
     "type": 4,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 0,
     "deplete": [
       {
@@ -174,8 +174,8 @@
     "id": "20030001",
     "grow": 3,
     "type": 5,
-    "exp": 10,
+    "exp": 100,
-    "time": 2,
+    "time": 3,
     "cd": 7200,
     "deplete": [
       {

bin/json/game_mainchapter.json

@@ -22,10 +22,10 @@
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_1",
-      "text": "原始人聚集地"
+      "text": "极北龙岛群"
     },
     "chapter_type": 1,
-    "map": "scenes_chapter_01",
+    "map": "scenes_chapter_05",
     "camera": "",
     "title": {
       "key": "mainchapter_main_chapter_title_1",
@@ -62,14 +62,14 @@
     "shopunlock": 11001001,
     "name": {
       "key": "mainchapter_main_chapter_name_2",
-      "text": "大龙复仇记"
+      "text": "原石危机"
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_2",
-      "text": "和平谷"
+      "text": "原始人聚集地"
     },
     "chapter_type": 1,
-    "map": "scenes_chapter_02",
+    "map": "scenes_chapter_01",
     "camera": "",
     "title": {
       "key": "mainchapter_main_chapter_title_2",
@@ -110,7 +110,7 @@
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_3",
-      "text": "盗窃之城"
+      "text": "罪恶都市"
     },
     "chapter_type": 1,
     "map": "scenes_chapter_03",
@@ -154,7 +154,7 @@
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_4",
-      "text": "杜洛克王国"
+      "text": "精灵王国"
     },
     "chapter_type": 1,
     "map": "scenes_chapter_04",
@@ -194,11 +194,11 @@
     "shopunlock": 11001001,
     "name": {
       "key": "mainchapter_main_chapter_name_5",
-      "text": "黑市风波"
+      "text": "交易所风波（上）"
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_5",
-      "text": "黑市之地"
+      "text": "精灵王国"
     },
     "chapter_type": 1,
     "map": "scenes_chapter_01",
@@ -238,11 +238,11 @@
     "shopunlock": 11001001,
     "name": {
       "key": "mainchapter_main_chapter_name_6",
-      "text": "小马王 · 一路向北"
+      "text": "交易所风波（下）"
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_6",
-      "text": "维京海域"
+      "text": "东方古国"
     },
     "chapter_type": 1,
     "map": "scenes_chapter_01",
@@ -282,7 +282,7 @@
     "shopunlock": 11001001,
     "name": {
       "key": "mainchapter_main_chapter_name_7",
-      "text": "海洋之歌"
+      "text": "大龙复仇记"
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_7",

bin/json/game_qualifying.json

@@ -36,7 +36,7 @@
       }
     ],
     "win_value": 30,
-    "fail_value": 30,
+    "fail_value": 0,
     "settlement_reward": [
       {
         "a": "attr",
@@ -83,7 +83,7 @@
       }
     ],
     "win_value": 30,
-    "fail_value": 30,
+    "fail_value": 0,
     "settlement_reward": [
       {
         "a": "attr",
@@ -271,7 +271,7 @@
       }
     ],
     "win_value": 30,
-    "fail_value": 30,
+    "fail_value": -10,
     "settlement_reward": [
       {
         "a": "attr",
@@ -318,7 +318,7 @@
       }
     ],
     "win_value": 30,
-    "fail_value": 30,
+    "fail_value": -10,
     "settlement_reward": [
       {
         "a": "attr",
@@ -365,7 +365,7 @@
       }
     ],
     "win_value": 30,
-    "fail_value": 30,
+    "fail_value": -10,
     "settlement_reward": [
       {
         "a": "attr",

bin/json/game_shopcentercontrol.json

@@ -3,11 +3,11 @@
     "id": 10001,
     "pagetext": {
       "key": "supermarket_overall_pagetext_1",
-      "text": "冒险基金"
+      "text": "冒险回馈"
     },
     "text": {
       "key": "supermarket_overall_text_1",
-      "text": "冒险基金-普通"
+      "text": "冒险回馈-普通"
     },
     "type": 1,
     "index": 1,
@@ -31,11 +31,11 @@
     "id": 10002,
     "pagetext": {
       "key": "supermarket_overall_pagetext_2",
-      "text": "冒险基金"
+      "text": "冒险回馈"
     },
     "text": {
       "key": "supermarket_overall_text_2",
-      "text": "冒险基金-困难"
+      "text": "冒险回馈-困难"
     },
     "type": 1,
     "index": 2,
@@ -59,11 +59,11 @@
     "id": 10003,
     "pagetext": {
       "key": "supermarket_overall_pagetext_3",
-      "text": "冒险基金"
+      "text": "冒险回馈"
     },
     "text": {
       "key": "supermarket_overall_text_3",
-      "text": "冒险基金-地狱"
+      "text": "冒险回馈-地狱"
     },
     "type": 1,
     "index": 3,
@@ -87,11 +87,11 @@
     "id": 10004,
     "pagetext": {
       "key": "supermarket_overall_pagetext_4",
-      "text": "等级基金"
+      "text": "成长回馈"
     },
     "text": {
       "key": "supermarket_overall_text_4",
-      "text": "等级基金"
+      "text": "成长回馈"
     },
     "type": 2,
     "index": 0,
@@ -115,11 +115,11 @@
     "id": 10005,
     "pagetext": {
       "key": "supermarket_overall_pagetext_5",
-      "text": "限时基金-体力"
+      "text": "限时回馈-体力"
     },
     "text": {
       "key": "supermarket_overall_text_5",
-      "text": "限时基金-体力"
+      "text": "限时回馈-体力"
     },
     "type": 3,
     "index": 0,
@@ -143,11 +143,11 @@
     "id": 10006,
     "pagetext": {
       "key": "supermarket_overall_pagetext_6",
-      "text": "限时基金-招募"
+      "text": "限时回馈-招募"
     },
     "text": {
       "key": "supermarket_overall_text_6",
-      "text": "限时基金-招募"
+      "text": "限时回馈-招募"
     },
     "type": 4,
     "index": 0,
@@ -171,11 +171,11 @@
     "id": 10007,
     "pagetext": {
       "key": "supermarket_overall_pagetext_7",
-      "text": "限时基金-经验"
+      "text": "限时回馈-经验"
     },
     "text": {
       "key": "supermarket_overall_text_7",
-      "text": "限时基金-经验"
+      "text": "限时回馈-经验"
     },
     "type": 5,
     "index": 0,
@@ -199,11 +199,11 @@
     "id": 10008,
     "pagetext": {
       "key": "supermarket_overall_pagetext_8",
-      "text": "首充礼包"
+      "text": "新客狂欢礼盒"
     },
     "text": {
       "key": "supermarket_overall_text_8",
-      "text": "首充礼包1"
+      "text": "新客狂欢礼盒1"
     },
     "type": 6,
     "index": 1,
@@ -211,7 +211,7 @@
     "bg": "hd_gwzx_bg",
     "slogan": {
       "key": "supermarket_overall_slogan_8",
-      "text": "购买首充礼包<br>累计返利4888%"
+      "text": "购买新客狂欢礼盒<br>累计返利4888%"
     },
     "point": "fund_8",
     "props": [
@@ -233,11 +233,11 @@
     "id": 10009,
     "pagetext": {
       "key": "supermarket_overall_pagetext_9",
-      "text": "首充礼包"
+      "text": "新客狂欢礼盒"
     },
     "text": {
       "key": "supermarket_overall_text_9",
-      "text": "首充礼包2"
+      "text": "新客狂欢礼盒2"
     },
     "type": 6,
     "index": 2,
@@ -245,7 +245,7 @@
     "bg": "hd_gwzx_bg",
     "slogan": {
       "key": "supermarket_overall_slogan_9",
-      "text": "购买首充礼包<br>累计返利1688%"
+      "text": "购买新客狂欢礼盒<br>累计返利1688%"
     },
     "point": "fund_9",
     "props": [
@@ -267,11 +267,11 @@
     "id": 10010,
     "pagetext": {
       "key": "supermarket_overall_pagetext_10",
-      "text": "首充礼包"
+      "text": "新客狂欢礼盒"
     },
     "text": {
       "key": "supermarket_overall_text_10",
-      "text": "首充礼包3"
+      "text": "新客狂欢礼盒3"
     },
     "type": 6,
     "index": 3,
@@ -279,7 +279,7 @@
     "bg": "hd_gwzx_bg",
     "slogan": {
       "key": "supermarket_overall_slogan_10",
-      "text": "购买首充礼包<br>累计返利1088%"
+      "text": "购买新客狂欢礼盒<br>累计返利1088%"
     },
     "point": "fund_10",
     "props": [

bin/json/game_skillafteratk.json

@@ -6750,7 +6750,9 @@
       250
     ],
     "FollowSK": [],
-    "SucFollowSK": [],
+    "SucFollowSK": [
+      915005314
+    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -6807,31 +6809,6 @@
     "RevisiCondition": "EnemyNoBuff=1",
     "RevisiParams": []
   },
-  {
-    "Id": 215005316,
-    "EmitPR": 1000,
-    "From": 9,
-    "Where": [],
-    "Order": "",
-    "Limit": 1,
-    "ExecuteCnt": 1,
-    "Type": 30,
-    "Argu": [
-      390001112,
-      1000,
-      1,
-      2,
-      1200
-    ],
-    "FollowSK": [],
-    "SucFollowSK": [],
-    "FailFollowSK": [],
-    "MustHit": false,
-    "DpsRevisiType": 0,
-    "DpsCondition": "",
-    "RevisiCondition": "",
-    "RevisiParams": []
-  },
   {
     "Id": 215005322,
     "EmitPR": 1000,
@@ -6847,7 +6824,9 @@
       280
     ],
     "FollowSK": [],
-    "SucFollowSK": [],
+    "SucFollowSK": [
+      915005314
+    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -6870,7 +6849,9 @@
       310
     ],
     "FollowSK": [],
-    "SucFollowSK": [],
+    "SucFollowSK": [
+      915005314
+    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -6893,7 +6874,9 @@
       350
     ],
     "FollowSK": [],
-    "SucFollowSK": [],
+    "SucFollowSK": [
+      915005314
+    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -13467,8 +13450,7 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [
-      214001314,
+      214001314
-      214001315
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -28824,7 +28806,7 @@
       390001448,
       1000,
       1,
-      -1
+      2
     ],
     "FollowSK": [
       255002214,
@@ -28875,7 +28857,7 @@
       390001410,
       1000,
       1,
-      -1
+      2
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -32146,9 +32128,7 @@
       -1,
       1
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      244003314
-    ],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
@@ -33900,7 +33880,7 @@
     "Type": 2,
     "Argu": [
       444001213,
-      1,
+      -1,
       -1
     ],
     "FollowSK": [],
@@ -33974,11 +33954,10 @@
       4,
       6000
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      244001313
-    ],
     "SucFollowSK": [
-      244001314
+      244001314,
+      244001313
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -34001,11 +33980,10 @@
       4,
       6100
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      244001313
-    ],
     "SucFollowSK": [
-      244001314
+      244001314,
+      244001313
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -34028,11 +34006,10 @@
       4,
       6200
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      244001313
-    ],
     "SucFollowSK": [
-      244001314
+      244001314,
+      244001313
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -34055,11 +34032,10 @@
       4,
       6300
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      244001313
-    ],
     "SucFollowSK": [
-      244001314
+      244001314,
+      244001313
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -34082,11 +34058,10 @@
       4,
       6400
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      244001313
-    ],
     "SucFollowSK": [
-      244001314
+      244001314,
+      244001313
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -56241,8 +56216,7 @@
     "Argu": [
       493500231,
       -1,
-      -1,
+      -1
-      1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -56337,8 +56311,7 @@
     "Argu": [
       492400331,
       -1,
-      -1,
+      -1
-      1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -56644,8 +56617,7 @@
     "Argu": [
       494400531,
       -1,
-      -1,
+      -1
-      1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -56764,8 +56736,7 @@
     "Argu": [
       491300211,
       -1,
-      -1,
+      -1
-      1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -56997,7 +56968,7 @@
       390001111,
       1000,
       1,
-      1
+      2
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -57012,7 +56983,9 @@
     "Id": 915005314,
     "EmitPR": 1000,
     "From": 9,
-    "Where": [],
+    "Where": [
+      "SelfHasBuff=391000072"
+    ],
     "Order": "",
     "Limit": 1,
     "ExecuteCnt": 1,
@@ -57041,10 +57014,11 @@
     "Order": "",
     "Limit": 10,
     "ExecuteCnt": 1,
-    "Type": 2,
+    "Type": 3,
     "Argu": [
-      491500532,
+      391000072,
-      -1,
+      1000,
+      1,
       -1
     ],
     "FollowSK": [],
@@ -59611,10 +59585,7 @@
     "Argu": [
       2,
       2,
-      100,
+      1000
-      1,
-      4,
-      7000
     ],
     "FollowSK": [],
     "SucFollowSK": [],

bin/json/game_skillatk.json

@@ -4633,8 +4633,7 @@
       "Id": [
         215005311,
         215005312,
-        215005313,
+        215005313
-        215005314
       ]
     },
     "passSkill": [],
@@ -4668,8 +4667,7 @@
       "Id": [
         215005311,
         215005322,
-        215005313,
+        215005313
-        215005314
       ]
     },
     "passSkill": [],
@@ -4701,8 +4699,7 @@
       "Id": [
         215005311,
         215005332,
-        215005313,
+        215005313
-        215005314
       ]
     },
     "passSkill": [],
@@ -4734,8 +4731,7 @@
       "Id": [
         215005311,
         215005342,
-        215005313,
+        215005313
-        215005314
       ]
     },
     "passSkill": [],
@@ -4767,8 +4763,7 @@
       "Id": [
         215005311,
         215005342,
-        215005313,
+        215005313
-        215005314
       ]
     },
     "passSkill": [],
@@ -10143,8 +10138,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        234008111,
+        234008111
-        234008113
       ]
     },
     "passSkill": [
@@ -10176,8 +10170,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        234008121,
+        234008121
-        234008113
       ]
     },
     "passSkill": [
@@ -10209,8 +10202,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        234008131,
+        234008131
-        234008113
       ]
     },
     "passSkill": [
@@ -10242,8 +10234,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        234008141,
+        234008141
-        234008113
       ]
     },
     "passSkill": [
@@ -10275,8 +10266,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        234008151,
+        234008151
-        234008113
       ]
     },
     "passSkill": [
@@ -10308,8 +10298,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        234008211,
+        234008211
-        234008213
       ]
     },
     "passSkill": [
@@ -10343,8 +10332,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        234008221,
+        234008221
-        234008213
       ]
     },
     "passSkill": [
@@ -10378,8 +10366,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        234008231,
+        234008231
-        234008213
       ]
     },
     "passSkill": [
@@ -10413,8 +10400,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        234008241,
+        234008241
-        234008213
       ]
     },
     "passSkill": [
@@ -10448,8 +10434,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        234008251,
+        234008251
-        234008213
       ]
     },
     "passSkill": [
@@ -20987,7 +20972,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_155003311_1",
-      "text": "对敌方所有目标造成伤害并附带1回合[color=#e5621b]眩晕[/color状态。"
+      "text": "对敌方所有目标造成伤害并附带1回合[color=#e5621b]眩晕[/color]状态。"
     },
     "buffid": [
       390001105
@@ -21146,9 +21131,11 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_155002211_1",
-      "text": "（被动）自身造成伤害时，回复造成伤害一定比例的生命值，自身行动次数越多，造成伤害越高。"
+      "text": "（被动）当有队友死亡或自身血量首次低于30%时为自身附加2回合[color=#37d8a9]香蕉在哪[/color]。"
     },
-    "buffid": [],
+    "buffid": [
+      390001448
+    ],
     "map": ""
   },
   {
@@ -31875,7 +31862,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_770009111_1",
-      "text": "每回合战斗开始时增加30%的行动条。"
+      "text": "每回合战斗开始时增加30%的行动值。"
     },
     "buffid": [],
     "map": ""
@@ -31905,7 +31892,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_770009111_2",
-      "text": "每回合战斗开始时增加45%的行动条。"
+      "text": "每回合战斗开始时增加45%的行动值。"
     },
     "buffid": [],
     "map": ""
@@ -35068,7 +35055,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_770072111_1",
-      "text": "友方被控制时立即增加自身30%行动条。"
+      "text": "友方被控制时立即增加自身30%行动值。"
     },
     "buffid": [],
     "map": ""
@@ -35098,7 +35085,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_770072111_2",
-      "text": "友方被控制时立即增加自身50%行动条。"
+      "text": "友方被控制时立即增加自身50%行动值。"
     },
     "buffid": [],
     "map": ""
@@ -35248,7 +35235,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_770075111_1",
-      "text": "每次攻击有20%概率降低目标30%行动条。"
+      "text": "每次攻击有20%概率降低目标30%行动值。"
     },
     "buffid": [],
     "map": ""
@@ -35278,7 +35265,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_770075111_2",
-      "text": "每次攻击有30%概率降低目标30%行动条。"
+      "text": "每次攻击有30%概率降低目标30%行动值。"
     },
     "buffid": [],
     "map": ""
@@ -35969,7 +35956,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_791006111_1",
-      "text": "每次攻击时有30%概率降低目标20%行动条。"
+      "text": "每次攻击时有30%概率降低目标20%行动值。"
     },
     "buffid": [],
     "map": ""
@@ -36089,7 +36076,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_791006211_1",
-      "text": "每次攻击时有30%概率降低目标20%行动条。"
+      "text": "每次攻击时有30%概率降低目标20%行动值。"
     },
     "buffid": [],
     "map": ""
@@ -38261,7 +38248,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_913005432_1",
-      "text": "每次释放3技能时自身行动条增加10%"
+      "text": "每次释放3技能时自身行动值增加10%"
     },
     "buffid": [],
     "map": ""
@@ -43183,7 +43170,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_834008421_1",
-      "text": "血量首次低于50%是立即获得30%行动条"
+      "text": "血量首次低于50%是立即获得30%行动值"
     },
     "buffid": [],
     "map": ""
@@ -43213,7 +43200,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_834008422_1",
-      "text": "2技能有20%概率击退目标10%行动条"
+      "text": "2技能有20%概率击退目标10%行动值"
     },
     "buffid": [],
     "map": ""
@@ -43333,7 +43320,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_934008433_1",
-      "text": "3技能额外造成2段伤害并同样附加10%行动条吸收"
+      "text": "3技能额外造成2段伤害并同样附加10%行动值吸收"
     },
     "buffid": [],
     "map": ""

bin/json/game_skillbuff.json

@@ -4414,8 +4414,7 @@
     },
     "BuffType": 40,
     "EffectArgu": [
-      5,
+      5
-      0
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -5701,8 +5700,7 @@
     },
     "BuffType": 40,
     "EffectArgu": [
-      5,
+      5
-      0
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -6406,7 +6404,7 @@
       "text": "所有减益效果（眩晕、冰冻、石化效果除外）持续回合-1。"
     },
     "Desc": {
-      "key": "skill_skill_buff_Desc_391000064",
+      "key": "skill_skill_buff_Desc_390001564",
       "text": "所有减益效果（眩晕、冰冻、石化效果除外）持续回合-1。"
     },
     "BuffType": 46,
@@ -6439,7 +6437,7 @@
       "text": "添加减益时有20%的概率免疫此次减益效果。"
     },
     "Desc": {
-      "key": "skill_skill_buff_Desc_391000071",
+      "key": "skill_skill_buff_Desc_390001571",
       "text": "添加减益时有20%的概率免疫此次减益效果。"
     },
     "BuffType": 92,
@@ -8623,7 +8621,7 @@
       "key": "skill_skill_buff_Desc_391000007",
       "text": "目标每损失10%血量，伤害会增加4%。"
     },
-    "BuffType": 53,
+    "BuffType": 54,
     "EffectArgu": [
       100,
       40
@@ -10779,5 +10777,35 @@
     "buffeffect": "",
     "buffpos": "",
     "forbidFloat": 0
+  },
+  {
+    "Id": 391000072,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000071",
+      "text": "狮子3技能回血标记"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000070",
+      "text": ""
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      0
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "",
+    "forbidFloat": 0
   }
 ]

bin/json/game_skillpassive.json

@@ -3290,10 +3290,10 @@
   },
   {
     "Id": 424008111,
-    "When": 3,
+    "When": 16,
     "FromCheck": "Target=3",
     "TargetCheck": "Target=2",
-    "MainSkillCheck": "MainSkillID=124008111",
+    "MainSkillCheck": "SkillPos=1",
     "AfterSkillCheck": "",
     "BuffCheck": "",
     "DpsCheck": "",
@@ -3312,10 +3312,10 @@
   },
   {
     "Id": 424008211,
-    "When": 3,
+    "When": 16,
     "FromCheck": "Target=3",
     "TargetCheck": "Target=2",
-    "MainSkillCheck": "MainSkillID=124008211",
+    "MainSkillCheck": "SkillPos=2",
     "AfterSkillCheck": "",
     "BuffCheck": "",
     "DpsCheck": "",
@@ -3334,10 +3334,10 @@
   },
   {
     "Id": 434008111,
-    "When": 3,
+    "When": 16,
     "FromCheck": "Target=3",
     "TargetCheck": "Target=2",
-    "MainSkillCheck": "MainSkillID=134008111",
+    "MainSkillCheck": "SkillPos=1",
     "AfterSkillCheck": "",
     "BuffCheck": "",
     "DpsCheck": "",
@@ -3356,10 +3356,10 @@
   },
   {
     "Id": 434008211,
-    "When": 3,
+    "When": 16,
     "FromCheck": "Target=3",
     "TargetCheck": "Target=2",
-    "MainSkillCheck": "MainSkillID=134008211",
+    "MainSkillCheck": "SkillPos=2",
     "AfterSkillCheck": "",
     "BuffCheck": "",
     "DpsCheck": "",

bin/robot.txt

@@ -0,0 +1,14 @@
+RobotTotal:1
+SuccRobot:1
+FailRobot:0
+MessageTotal:9
+---消息压测详情----------------------------------------------------------------------------------------------------
+消息名:user.login           请求次数:1     耗时最小:348  ms 耗时最大:348  ms 平均耗时:348.00ms 中位耗时:348.00ms 
+消息名:sys.funcgetlist      请求次数:1     耗时最小:7    ms 耗时最大:7    ms 平均耗时:7.00 ms 中位耗时:7.00 ms 
+消息名:hero.list            请求次数:1     耗时最小:4    ms 耗时最大:4    ms 平均耗时:4.00 ms 中位耗时:4.00 ms 
+消息名:equipment.getlist    请求次数:1     耗时最小:2    ms 耗时最大:2    ms 平均耗时:2.00 ms 中位耗时:2.00 ms 
+消息名:mainline.info        请求次数:1     耗时最小:4    ms 耗时最大:4    ms 平均耗时:4.00 ms 中位耗时:4.00 ms 
+消息名:user.create          请求次数:1     耗时最小:1    ms 耗时最大:1    ms 平均耗时:1.00 ms 中位耗时:1.00 ms 
+消息名:hero.talentlist      请求次数:1     耗时最小:2    ms 耗时最大:2    ms 平均耗时:2.00 ms 中位耗时:2.00 ms 
+消息名:items.getlist        请求次数:1     耗时最小:3    ms 耗时最大:3    ms 平均耗时:3.00 ms 中位耗时:3.00 ms 
+消息名:wtask.info           请求次数:1     耗时最小:5    ms 耗时最大:5    ms 平均耗时:5.00 ms 中位耗时:5.00 ms 

modules/robot/core.go

@@ -8,6 +8,18 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
+//监控
+type IRobotMonitor interface {
+	//成功
+	AddSuccClient(robot *Robot)
+	//失败
+	AddFailClient(robot *Robot, err error)
+	//结束
+	RobotFinishedTest(robot *Robot)
+	//报表
+	OutReport()
+}
+
 //客户端端
 type IClient interface {
 	Init(addr string, client IClient) (err error)

modules/robot/module.go

@@ -19,10 +19,11 @@ func NewModule() core.IModule {
 
 type RobotModule struct {
 	cbase.ModuleBase
-	options   *Options
+	options         *Options
-	service   base.IRPCXService
+	service         base.IRPCXService
-	robotmgr  *robotmgrComp
+	robotmgr        *robotmgrComp
-	configure *configureComp
+	configure       *configureComp
+	statisticalComp *statisticalComp
 }
 
 // 模块名
@@ -52,4 +53,5 @@ func (this *RobotModule) OnInstallComp() {
 	this.ModuleBase.OnInstallComp()
 	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
 	this.robotmgr = this.RegisterComp(new(robotmgrComp)).(*robotmgrComp)
+	this.statisticalComp = this.RegisterComp(new(statisticalComp)).(*statisticalComp)
 }

modules/robot/options.go

@@ -8,12 +8,14 @@ import (
 type (
 	Options struct {
 		modules.Options
+		OutFilePath    string   //输出文件报表
 		ServerAddr     string   //服务地址
 		ServerID       string   //服务ID
 		RobotTotalNum  int32    //机器人总数
 		RobotSingleNum int32    //单词机器人进入数量
 		Intervals      int32    //间隔时间 单位秒
 		RobotName      string   //机器人名称
+		RobotStart     int32    //机器人初始下标
 		Pipeline       []string //执行流水线
 	}
 )

modules/robot/robot.go

@@ -24,7 +24,7 @@ type RobotStatistics struct {
 
 type Robot struct {
 	Client
-	robotmgrComp      *robotmgrComp
+	monitor           IRobotMonitor
 	index             int32 //编号
 	account, serverId string
 	curreq            string //当前请求
@@ -216,7 +216,7 @@ func (this *Robot) Heartbeat() {
 
 func (this *Robot) OnClose() {
 	log.Debug("[机器人 End]", log.Field{Key: "Account", Value: this.account})
-	this.robotmgrComp.robotEnd(this)
+	this.monitor.RobotFinishedTest(this)
 }
 
 func (this *Robot) DoTask(taskconf *cfg.GameWorldTaskData, condconf *cfg.GameBuriedCondiData, moduleStr core.M_Modules) (err error) {

modules/robot/robotmgrcomp.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/core/cbase"
-	"go_dreamfactory/lego/sys/log"
 	"sync"
 	"time"
 )
@@ -61,21 +60,16 @@ func (this *robotmgrComp) createRobot(index int32) {
 		err   error
 	)
 	robot = &Robot{
-		robotmgrComp: this,
+		monitor:  this.module.statisticalComp,
-		index:        index,
+		index:    index,
-		account:      fmt.Sprintf("%s_%d", this.module.options.RobotName, index),
+		account:  fmt.Sprintf("%s_%d", this.module.options.RobotName, this.module.options.RobotStart+index),
-		serverId:     this.module.options.ServerID,
+		serverId: this.module.options.ServerID,
-		pipeline:     this.module.options.Pipeline,
+		pipeline: this.module.options.Pipeline,
 	}
 	if err = robot.Init(this.module.options.ServerAddr, robot); err != nil {
-		log.Errorln(err)
+		this.module.statisticalComp.AddFailClient(robot, err)
 		return
 	}
+	this.module.statisticalComp.AddSuccClient(robot)
 	return
 }
-
-func (this *robotmgrComp) robotEnd(robot *Robot) {
-	this.lock.Lock()
-	this.statistical[robot.account] = robot.statistics
-	this.lock.Unlock()
-}

modules/robot/statisticalcomp.go

@@ -1,8 +1,12 @@
 package robot
 
 import (
+	"fmt"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/core/cbase"
+	"os"
+	"sort"
+	"sync"
 )
 
 /*
@@ -10,15 +14,19 @@ import (
 */
 type statisticalComp struct {
 	cbase.ModuleCompBase
+	module        *RobotModule
 	succclientNum int32                         //链接成功客户端数
 	failclientNum int32                         //链接失败客户端数
+	endClientnum  int32                         //结束
 	totalmessage  int32                         //总消息两
 	robotdata     map[string][]*RobotStatistics //机器人统计数据
+	lock          sync.RWMutex
 }
 
 //组件初始化接口
 func (this *statisticalComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
 	this.ModuleCompBase.Init(service, module, comp, options)
+	this.module = module.(*RobotModule)
 	this.robotdata = make(map[string][]*RobotStatistics)
 	return
 }
@@ -31,9 +39,65 @@ func (this *statisticalComp) AddSuccClient(robot *Robot) {
 //添加失败客户端数
 func (this *statisticalComp) AddFailClient(robot *Robot, err error) {
 	this.succclientNum++
+	this.endClientnum++
 }
 
 //机器人测试结束
 func (this *statisticalComp) RobotFinishedTest(robot *Robot) {
-
+	this.lock.Lock()
+	this.robotdata[robot.Account()] = robot.statistics
+	this.lock.Unlock()
+	this.endClientnum++
+	if this.endClientnum >= this.module.options.RobotTotalNum { //压测结束
+		this.OutReport()
+	}
+}
+
+//输出报表
+func (this *statisticalComp) OutReport() {
+	var (
+		messages map[string][]int64 = make(map[string][]int64)
+		ok       bool
+	)
+
+	for _, datas := range this.robotdata {
+		for _, v := range datas {
+			this.totalmessage++
+			if _, ok = messages[v.message]; !ok {
+				messages[v.message] = make([]int64, 0)
+			}
+			messages[v.message] = append(messages[v.message], v.time)
+		}
+	}
+
+	file, err := os.Create(this.module.options.OutFilePath)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer file.Close()
+	file.WriteString(fmt.Sprintf("机器人总数:	 %d\n", this.module.options.RobotTotalNum))
+	file.WriteString(fmt.Sprintf("成功数量:		 %d\n", this.succclientNum))
+	file.WriteString(fmt.Sprintf("失败数量:		 %d\n", this.failclientNum))
+	file.WriteString(fmt.Sprintf("消息总吞吐量:	 %d\n", this.totalmessage))
+	file.WriteString("---消息压测详情----------------------------------------------------------------------------------------------------\n")
+	for message, data := range messages {
+		sort.Slice(data, func(i, j int) bool {
+			return data[i] < data[j]
+		})
+		max := data[len(data)-1]
+		min := data[0]
+		sum := int64(0)
+		for _, num := range data {
+			sum += num
+		}
+		avg := float64(sum) / float64(len(data))
+		var median float64
+		if len(data)%2 == 0 {
+			median = float64(data[len(data)/2-1]+data[len(data)/2]) / 2.0
+		} else {
+			median = float64(data[len(data)/2])
+		}
+		file.WriteString(fmt.Sprintf("消息名:%-20s 请求次数:%-5d 耗时最小:%-5dms 耗时最大:%-5dms 平均耗时:%-5.2fms 中位耗时:%-5.2fms \n", message, len(data), min, max, avg, median))
+	}
 }