测试优化

This commit is contained in:
meixiongfeng 2023-09-06 18:28:27 +08:00
parent f2c318f5d0
commit 03b236bed2
26 changed files with 4523 additions and 3507 deletions

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@ -6750,7 +6750,9 @@
250 250
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [
915005314
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -6807,31 +6809,6 @@
"RevisiCondition": "EnemyNoBuff=1", "RevisiCondition": "EnemyNoBuff=1",
"RevisiParams": [] "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, "Id": 215005322,
"EmitPR": 1000, "EmitPR": 1000,
@ -6847,7 +6824,9 @@
280 280
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [
915005314
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -6870,7 +6849,9 @@
310 310
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [
915005314
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -6893,7 +6874,9 @@
350 350
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [
915005314
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -7980,9 +7963,7 @@
2000 2000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
224002313
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -8029,9 +8010,7 @@
2300 2300
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
224002313
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -8054,9 +8033,7 @@
2600 2600
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
224002313
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -8079,9 +8056,7 @@
2900 2900
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
224002313
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -8104,9 +8079,7 @@
3200 3200
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
224002313
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -13467,8 +13440,7 @@
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
214001314, 214001314
214001315
], ],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -28824,7 +28796,7 @@
390001448, 390001448,
1000, 1000,
1, 1,
-1 2
], ],
"FollowSK": [ "FollowSK": [
255002214, 255002214,
@ -28875,7 +28847,7 @@
390001410, 390001410,
1000, 1000,
1, 1,
-1 2
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -32146,9 +32118,7 @@
-1, -1,
1 1
], ],
"FollowSK": [ "FollowSK": [],
244003314
],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -33900,7 +33870,7 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
444001213, 444001213,
1, -1,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],
@ -33974,11 +33944,10 @@
4, 4,
6000 6000
], ],
"FollowSK": [ "FollowSK": [],
244001313
],
"SucFollowSK": [ "SucFollowSK": [
244001314 244001314,
244001313
], ],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -34001,11 +33970,10 @@
4, 4,
6100 6100
], ],
"FollowSK": [ "FollowSK": [],
244001313
],
"SucFollowSK": [ "SucFollowSK": [
244001314 244001314,
244001313
], ],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -34028,11 +33996,10 @@
4, 4,
6200 6200
], ],
"FollowSK": [ "FollowSK": [],
244001313
],
"SucFollowSK": [ "SucFollowSK": [
244001314 244001314,
244001313
], ],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -34055,11 +34022,10 @@
4, 4,
6300 6300
], ],
"FollowSK": [ "FollowSK": [],
244001313
],
"SucFollowSK": [ "SucFollowSK": [
244001314 244001314,
244001313
], ],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -34082,11 +34048,10 @@
4, 4,
6400 6400
], ],
"FollowSK": [ "FollowSK": [],
244001313
],
"SucFollowSK": [ "SucFollowSK": [
244001314 244001314,
244001313
], ],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -56241,8 +56206,7 @@
"Argu": [ "Argu": [
493500231, 493500231,
-1, -1,
-1, -1
1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -56337,8 +56301,7 @@
"Argu": [ "Argu": [
492400331, 492400331,
-1, -1,
-1, -1
1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -56644,8 +56607,7 @@
"Argu": [ "Argu": [
494400531, 494400531,
-1, -1,
-1, -1
1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -56764,8 +56726,7 @@
"Argu": [ "Argu": [
491300211, 491300211,
-1, -1,
-1, -1
1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -56997,7 +56958,7 @@
390001111, 390001111,
1000, 1000,
1, 1,
1 2
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -57012,7 +56973,9 @@
"Id": 915005314, "Id": 915005314,
"EmitPR": 1000, "EmitPR": 1000,
"From": 9, "From": 9,
"Where": [], "Where": [
"SelfHasBuff=391000072"
],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
@ -57041,10 +57004,11 @@
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 2, "Type": 3,
"Argu": [ "Argu": [
491500532, 391000072,
-1, 1000,
1,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],
@ -59611,10 +59575,7 @@
"Argu": [ "Argu": [
2, 2,
2, 2,
100, 1000
1,
4,
7000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -60126,8 +60087,8 @@
"Argu": [ "Argu": [
390001001, 390001001,
1000, 1000,
0, 1,
1 3
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],

View File

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

View File

@ -4414,8 +4414,7 @@
}, },
"BuffType": 40, "BuffType": 40,
"EffectArgu": [ "EffectArgu": [
5, 5
0
], ],
"BufParNum": 1, "BufParNum": 1,
"RelyCheckArgu": [], "RelyCheckArgu": [],
@ -5701,8 +5700,7 @@
}, },
"BuffType": 40, "BuffType": 40,
"EffectArgu": [ "EffectArgu": [
5, 5
0
], ],
"BufParNum": 1, "BufParNum": 1,
"RelyCheckArgu": [], "RelyCheckArgu": [],
@ -6406,7 +6404,7 @@
"text": "所有减益效果(眩晕、冰冻、石化效果除外)持续回合-1。" "text": "所有减益效果(眩晕、冰冻、石化效果除外)持续回合-1。"
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_391000064", "key": "skill_skill_buff_Desc_390001564",
"text": "所有减益效果(眩晕、冰冻、石化效果除外)持续回合-1。" "text": "所有减益效果(眩晕、冰冻、石化效果除外)持续回合-1。"
}, },
"BuffType": 46, "BuffType": 46,
@ -6439,7 +6437,7 @@
"text": "添加减益时有20%的概率免疫此次减益效果。" "text": "添加减益时有20%的概率免疫此次减益效果。"
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_391000071", "key": "skill_skill_buff_Desc_390001571",
"text": "添加减益时有20%的概率免疫此次减益效果。" "text": "添加减益时有20%的概率免疫此次减益效果。"
}, },
"BuffType": 92, "BuffType": 92,
@ -8623,7 +8621,7 @@
"key": "skill_skill_buff_Desc_391000007", "key": "skill_skill_buff_Desc_391000007",
"text": "目标每损失10%血量伤害会增加4%。" "text": "目标每损失10%血量伤害会增加4%。"
}, },
"BuffType": 53, "BuffType": 54,
"EffectArgu": [ "EffectArgu": [
100, 100,
40 40
@ -10779,5 +10777,35 @@
"buffeffect": "", "buffeffect": "",
"buffpos": "", "buffpos": "",
"forbidFloat": 0 "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
} }
] ]

View File

@ -3290,10 +3290,10 @@
}, },
{ {
"Id": 424008111, "Id": 424008111,
"When": 3, "When": 16,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "Target=2", "TargetCheck": "Target=2",
"MainSkillCheck": "MainSkillID=124008111", "MainSkillCheck": "SkillPos=1",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
"DpsCheck": "", "DpsCheck": "",
@ -3312,10 +3312,10 @@
}, },
{ {
"Id": 424008211, "Id": 424008211,
"When": 3, "When": 16,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "Target=2", "TargetCheck": "Target=2",
"MainSkillCheck": "MainSkillID=124008211", "MainSkillCheck": "SkillPos=2",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
"DpsCheck": "", "DpsCheck": "",
@ -3334,10 +3334,10 @@
}, },
{ {
"Id": 434008111, "Id": 434008111,
"When": 3, "When": 16,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "Target=2", "TargetCheck": "Target=2",
"MainSkillCheck": "MainSkillID=134008111", "MainSkillCheck": "SkillPos=1",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
"DpsCheck": "", "DpsCheck": "",
@ -3356,10 +3356,10 @@
}, },
{ {
"Id": 434008211, "Id": 434008211,
"When": 3, "When": 16,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "Target=2", "TargetCheck": "Target=2",
"MainSkillCheck": "MainSkillID=134008211", "MainSkillCheck": "SkillPos=2",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
"DpsCheck": "", "DpsCheck": "",
@ -7466,9 +7466,9 @@
"When": 19, "When": 19,
"FromCheck": "", "FromCheck": "",
"TargetCheck": "Target=2,HasBuff=1", "TargetCheck": "Target=2,HasBuff=1",
"MainSkillCheck": "SkillPos=3", "MainSkillCheck": "MainSkillID=115002311",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "HasBuff=1,Succ=1",
"DpsCheck": "", "DpsCheck": "",
"AddCon": [], "AddCon": [],
"PasPr": 1000, "PasPr": 1000,

View File

@ -105,8 +105,6 @@ type (
GetHeroList(uid string) []*pb.DBHero GetHeroList(uid string) []*pb.DBHero
//清理玩家英雄数据 //清理玩家英雄数据
CleanData(uid string) CleanData(uid string)
// 获取指定星级等级的英雄
GetSpecifiedHero(session IUserSession, heroConfId string, star, lv int32) (errdata *pb.ErrorData)
// 英雄加经验 // 英雄加经验
AddHerosExp(session IUserSession, heroObjs []string, exp int32) (curAddExp []int32, errdata *pb.ErrorData) AddHerosExp(session IUserSession, heroObjs []string, exp int32) (curAddExp []int32, errdata *pb.ErrorData)

View File

@ -31,7 +31,6 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
heroRecord *pb.DBHeroRecord heroRecord *pb.DBHeroRecord
strPool []string // 10连跨多个卡池情况 strPool []string // 10连跨多个卡池情况
update map[string]interface{} update map[string]interface{}
normalDraw bool // 是否是普通抽
drawConf *cfg.GameDrawPoolData drawConf *cfg.GameDrawPoolData
err error err error
atno []*pb.UserAtno atno []*pb.UserAtno
@ -372,7 +371,6 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
rsp.Data = append(rsp.Data, &pb.AtnoData{Atno: atno}) rsp.Data = append(rsp.Data, &pb.AtnoData{Atno: atno})
} }
} }
// 发放许愿石奖励 // 发放许愿石奖励
@ -382,11 +380,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
rsp.FirstGet = firstGet rsp.FirstGet = firstGet
this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update) this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), DrawCard, rsp) session.SendMsg(string(this.module.GetType()), DrawCard, rsp)
normalDraw = true
if req.DrawCount == comm.DrawCardType1 || req.DrawCount == comm.DrawCardType2 || req.DrawCount == comm.DrawCardType3 || req.DrawCount == comm.DrawCardType4 {
normalDraw = false
}
// 任务统计 // 任务统计
this.module.SendTaskMsg(session, szStar, req.DrawCount, normalDraw) this.module.SendTaskMsg(session, szStar, req.DrawCount, req.DrawType)
return return
} }

View File

@ -1,55 +0,0 @@
package hero
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
)
//参数校验
func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (errdata *pb.ErrorData) {
if req.HeroCoinfigID == "" || req.Star <= 0 || req.Lv <= 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
return
}
/// 获取指定星级或等级的英雄 GM 协议
func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (errdata *pb.ErrorData) {
if errdata = this.GetSpecifiedCheck(session, req); errdata != nil {
return
}
hero, err := this.module.modelHero.createSpecialHero(session.GetUserId(), req.HeroCoinfigID)
if err == nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_HeroNoExist,
Title: pb.ErrorCode_HeroNoExist.ToString(),
}
return
}
hero.Lv = req.Lv
hero.Star = req.Star
_heroMap := map[string]interface{}{
"lv": hero.Lv,
"star": hero.Star,
}
// 保存数据
err1 := this.module.modelHero.ChangeList(session.GetUserId(), hero.Id, _heroMap)
if err1 != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
log.Errorf("GetSpecified failed:%v", err)
return
}
session.SendMsg(string(this.module.GetType()), "getspecified", &pb.HeroGetSpecifiedResp{Hero: hero})
return
}

View File

@ -92,7 +92,7 @@ func (this *ModelHero) initHeroSkill(hero *pb.DBHero) []*pb.SkillData {
} }
// 创建一个指定的英雄 // 创建一个指定的英雄
func (this *ModelHero) createSpecialHero(uid string, heroCfgId string) (hero *pb.DBHero, err error) { func (this *ModelHero) gmCreateSpecialHero(uid string, heroCfgId string) (hero *pb.DBHero, err error) {
list := this.getHeroList(uid) list := this.getHeroList(uid)
for _, v := range list { for _, v := range list {
if v.HeroID == heroCfgId { if v.HeroID == heroCfgId {

View File

@ -70,9 +70,7 @@ func (this *ModelTalent) CreateHeroTalent(uid, heroId string) (talent *pb.DBHero
} }
// gm 专用 清除所有的天赋 // gm 专用 清除所有的天赋
func (this *ModelTalent) CleanAllHeroTalent(uid string) (talent *pb.DBHeroTalent, err error) { func (this *ModelTalent) CleanAllHeroTalent(uid string) (talent *pb.DBHeroTalent, err error) {
err = this.DelByUId(uid) err = this.DelByUId(uid)
return return
} }

View File

@ -198,71 +198,6 @@ func (this *Hero) CleanData(uid string) {
this.modelHero.cleanData(uid) this.modelHero.cleanData(uid)
} }
// 创建一些特殊的英雄
func (this *Hero) GetSpecifiedHero(session comm.IUserSession, heroConfId string, star, lv int32) (errdata *pb.ErrorData) {
if session.GetUserId() == "" || heroConfId == "" || star == 0 || lv == 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
// 等级校验
conf, _ := this.configure.GetHeroConfig(heroConfId)
if conf == nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
cid := heroConfId
maxStar := conf.Star
starConf, _ := this.configure.GetHeroStarupConfig(cid, conf.Star)
if starConf == nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
// 获取最大星级
maxStar = this.configure.GetHeroMaxStar(cid, conf.Star)
maxLv := this.configure.GetHeroMaxLv(maxStar) // 最大等级
if star > maxStar || lv > maxLv {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
hero, err := this.modelHero.createSpecialHero(session.GetUserId(), heroConfId)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_HeroCreate,
Title: pb.ErrorCode_HeroCreate.ToString(),
Message: err.Error(),
}
}
hero.Lv = lv
hero.Star = star
_heroMap := map[string]interface{}{
"lv": hero.Lv,
"star": hero.Star,
"sameCount": 1,
}
// 保存数据
err = this.modelHero.ChangeList(session.GetUserId(), hero.Id, _heroMap)
if err != nil {
log.Errorf("GetSpecified failed:%v", err)
return
}
// push change
session.SendMsg("hero", "change", &pb.HeroChangePush{List: []*pb.DBHero{hero}})
return
}
// Event-------------------------------------------------------------------------------------------------玩家离线 // Event-------------------------------------------------------------------------------------------------玩家离线
func (this *Hero) EventUserOffline(uid, sessionid string) { func (this *Hero) EventUserOffline(uid, sessionid string) {
this.modelHero.RemoveUserHeroInfo(uid) this.modelHero.RemoveUserHeroInfo(uid)
@ -292,9 +227,9 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string]
} }
} }
if db.IsCross() { if db.IsCross() {
this.moduleFetter.SendRpcAddHero(session.GetUserId(), szAddHero, session.GetServiecTag()) go this.moduleFetter.SendRpcAddHero(session.GetUserId(), szAddHero, session.GetServiecTag())
} else { } else {
this.moduleFetter.AddHerosFetterData(session.GetUserId(), szAddHero) go this.moduleFetter.AddHerosFetterData(session.GetUserId(), szAddHero)
} }
if bPush { //推送 if bPush { //推送
if len(changeList) > 0 { if len(changeList) > 0 {
@ -653,7 +588,7 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession, bTalent bool) (errdat
} }
// 开始创建英雄 // 开始创建英雄
hero, err := this.modelHero.createSpecialHero(session.GetUserId(), v.Hid) hero, err := this.modelHero.gmCreateSpecialHero(session.GetUserId(), v.Hid)
if err != nil { if err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_HeroCreate, Code: pb.ErrorCode_HeroCreate,
@ -685,9 +620,6 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession, bTalent bool) (errdat
} }
if bTalent { // 满天赋 if bTalent { // 满天赋
//var talent *pb.DBHeroTalent
//talent, _ := this.modelTalent.GetHerotalent(session.GetUserId())
talent, _ := this.modelTalent.CreateHeroTalent(session.GetUserId(), hero.HeroID) talent, _ := this.modelTalent.CreateHeroTalent(session.GetUserId(), hero.HeroID)
data, err := this.configure.GMGetTalentByHeroId(hero.HeroID) data, err := this.configure.GMGetTalentByHeroId(hero.HeroID)
if err == nil { if err == nil {
@ -724,12 +656,13 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession, bTalent bool) (errdat
return return
} }
func (this *Hero) SendTaskMsg(session comm.IUserSession, szStar []int32, drawCount int32, itype bool) { func (this *Hero) SendTaskMsg(session comm.IUserSession, szStar []int32, drawCount int32, drawtype int32) {
// 任务统计 // 任务统计
var ( var (
szTask []*pb.BuriedParam szTask []*pb.BuriedParam
) )
if itype { //普通招募
if drawtype == comm.DrawCardType0 { //普通招募
if drawCount == 10 { if drawCount == 10 {
sz := make(map[int32]int32, 0) sz := make(map[int32]int32, 0)
for _, star := range szStar { for _, star := range szStar {
@ -850,31 +783,6 @@ func (this *Hero) RegisterInstructor(session comm.IUserSession, heroOid []string
return return
} }
// DrawCard_ContinuousRestriction_Camp
// func (this *Hero) DrawCardContinuousRestrictionCamp(cardId string, race map[int32]int32, sz []int32, data []*cfg.GameDrawCardData) (card string) {
// card = cardId
// cfgDraw := this.ModuleTools.GetGlobalConf() // 读取抽卡配置文件
// if cfgDraw == nil || race == nil {
// return
// }
// iMaxCount := cfgDraw.DrawCardContinuousRestrictionCamp
// // 获取阵营
// if heroConf, _ := this.configure.GetHeroConfig(cardId); heroConf != nil {
// if v1, ok := race[heroConf.Race]; ok && v1 > iMaxCount { // 满足条件 再随机获取一个英雄
// for i := 0; i < int(iMaxCount); i++ { // 最多循环次数
// randomIndex := comm.GetRandW(sz)
// if int32(len(sz)) > randomIndex {
// if v1, ok := race[heroConf.Race]; !ok && v1 <= iMaxCount {
// card = data[randomIndex].Id
// break
// }
// }
// }
// }
// }
// return card
// }
// 只通过唯一id 查询英雄信息 // 只通过唯一id 查询英雄信息
func (this *Hero) QueryCrossMultipleHeroinfo(oid []string) (hero []*pb.DBHero, err error) { func (this *Hero) QueryCrossMultipleHeroinfo(oid []string) (hero []*pb.DBHero, err error) {
if this.IsCross() { if this.IsCross() {
@ -1116,9 +1024,9 @@ func (this *Hero) CreateOneHero(session comm.IUserSession, heroCfgId string, bPu
firstGet = append(firstGet, heroCfgId) firstGet = append(firstGet, heroCfgId)
} }
if db.IsCross() { if db.IsCross() {
this.moduleFetter.SendRpcAddHero(session.GetUserId(), szAddHero, session.GetServiecTag()) go this.moduleFetter.SendRpcAddHero(session.GetUserId(), szAddHero, session.GetServiecTag())
} else { } else {
this.moduleFetter.AddHerosFetterData(session.GetUserId(), szAddHero) go this.moduleFetter.AddHerosFetterData(session.GetUserId(), szAddHero) // 异步调用
} }
if bPush { //推送 if bPush { //推送
session.SendMsg("hero", "change", &pb.HeroChangePush{List: []*pb.DBHero{hero}}) session.SendMsg("hero", "change", &pb.HeroChangePush{List: []*pb.DBHero{hero}})

View File

@ -30,6 +30,9 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri
for _, conf := range condData.Main { for _, conf := range condData.Main {
switch conf.Key { switch conf.Key {
case 1: //等级 case 1: //等级
if conf.Param == 1 { // 等级为1 直接过
continue
}
iuser := this.moduleSys.ModuleUser iuser := this.moduleSys.ModuleUser
user := iuser.GetUser(uid) user := iuser.GetUser(uid)
if user == nil { if user == nil {

View File

@ -138,19 +138,6 @@ func (this *ModuleSys) CheckOpenCondCfgById(uid string, id string) (bOpen bool,
return return
} }
// func (this *ModuleSys) FriendCountChange(uid string, count int32) {
// if cond := this.configure.getFriendTask(count); len(cond) > 0 {
// if session, ok := this.GetUserSession(uid); ok {
// this.AutoActivate(session, cond)
// if err := session.Push(); err != nil {
// this.Errorln(err)
// }
// this.PutUserSession(session)
// } else {
// this.PutUserSession(session)
// }
// }
// }
func (this *ModuleSys) QueryOpenCondData(uid string) (data map[string]int32, errdata *pb.ErrorData) { func (this *ModuleSys) QueryOpenCondData(uid string) (data map[string]int32, errdata *pb.ErrorData) {
data = make(map[string]int32, 0) data = make(map[string]int32, 0)
list, err := this.modelSys.GetOpenCondList(uid) list, err := this.modelSys.GetOpenCondList(uid)

View File

@ -20,6 +20,7 @@ type GameBuriedCondiData struct {
Type int32 Type int32
Valid int32 Valid int32
Head *Gameatn Head *Gameatn
NpcEventType int32
NPC int32 NPC int32
Value int32 Value int32
Filter []int32 Filter []int32
@ -55,6 +56,7 @@ func (_v *GameBuriedCondiData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["valid"].(float64); !_ok_ { err = errors.New("valid error"); return }; _v.Valid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["valid"].(float64); !_ok_ { err = errors.New("valid error"); return }; _v.Valid = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["head"].(map[string]interface{}); !_ok_ { err = errors.New("head error"); return }; if _v.Head, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["head"].(map[string]interface{}); !_ok_ { err = errors.New("head error"); return }; if _v.Head, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Npc_event_type"].(float64); !_ok_ { err = errors.New("Npc_event_type error"); return }; _v.NpcEventType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["NPC"].(float64); !_ok_ { err = errors.New("NPC error"); return }; _v.NPC = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["NPC"].(float64); !_ok_ { err = errors.New("NPC error"); return }; _v.NPC = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
{ {

View File

@ -19,8 +19,8 @@ type GameQualifyingData struct {
MatefailReward []*Gameatn MatefailReward []*Gameatn
RankwinReward []*Gameatn RankwinReward []*Gameatn
RankfailReward []*Gameatn RankfailReward []*Gameatn
WinValue float32 WinValue int32
FailValue float32 FailValue int32
SettlementReward []*Gameatn SettlementReward []*Gameatn
Png string Png string
} }
@ -92,8 +92,8 @@ func (_v *GameQualifyingData)Deserialize(_buf map[string]interface{}) (err error
} }
} }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["win_value"].(float64); !_ok_ { err = errors.New("win_value error"); return }; _v.WinValue = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["win_value"].(float64); !_ok_ { err = errors.New("win_value error"); return }; _v.WinValue = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fail_value"].(float64); !_ok_ { err = errors.New("fail_value error"); return }; _v.FailValue = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fail_value"].(float64); !_ok_ { err = errors.New("fail_value error"); return }; _v.FailValue = int32(_tempNum_) }
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool