WIP on feature/hqjg: 7c3b5e9 Merge pull request 'release' (#1) from release into master

This commit is contained in:
xichaoyin 2024-01-05 19:42:10 +08:00
commit d592d7891f
4 changed files with 708 additions and 1017 deletions

View File

@ -1,5 +1,6 @@
{ {
"recommendations": [ "recommendations": [
"ms-ceintl.vscode-language-pack-zh-hans" "ms-ceintl.vscode-language-pack-zh-hans",
"codeium.codeium"
] ]
} }

View File

@ -5356,7 +5356,8 @@
//展示干部皮肤ID //展示干部皮肤ID
"show": 1, "show": 1,
//任务 //任务
"task" : { "task" : [
{
"day1" : "day1" :
{ {
"1": { "1": {
@ -5620,8 +5621,9 @@
} }
], ],
"des" : "intr_cszl_des_9" "des" : "intr_cszl_des_9"
}
}, },
}, {
"day2" : "day2" :
{ {
"1": { "1": {
@ -5652,6 +5654,7 @@
} }
], ],
"des" : "intr_cszl_des_1" "des" : "intr_cszl_des_1"
}
}, },
"2": { "2": {
"pval" : 300, "pval" : 300,
@ -5884,8 +5887,9 @@
} }
], ],
"des" : "intr_cszl_des_9" "des" : "intr_cszl_des_9"
}
}, },
}, {
"day3" : "day3" :
{ {
"1": { "1": {
@ -5916,6 +5920,7 @@
} }
], ],
"des" : "intr_cszl_des_1" "des" : "intr_cszl_des_1"
}
}, },
"2": { "2": {
"pval" : 300, "pval" : 300,
@ -6148,8 +6153,9 @@
} }
], ],
"des" : "intr_cszl_des_9" "des" : "intr_cszl_des_9"
}
}, },
}, {
"day4" : "day4" :
{ {
"1": { "1": {
@ -6180,6 +6186,7 @@
} }
], ],
"des" : "intr_cszl_des_1" "des" : "intr_cszl_des_1"
}
}, },
"2": { "2": {
"pval" : 300, "pval" : 300,
@ -6412,8 +6419,9 @@
} }
], ],
"des" : "intr_cszl_des_9" "des" : "intr_cszl_des_9"
}
}, },
}, {
"day5" : "day5" :
{ {
"1": { "1": {
@ -6444,6 +6452,7 @@
} }
], ],
"des" : "intr_cszl_des_1" "des" : "intr_cszl_des_1"
}
}, },
"2": { "2": {
"pval" : 300, "pval" : 300,
@ -6676,537 +6685,9 @@
} }
], ],
"des" : "intr_cszl_des_9" "des" : "intr_cszl_des_9"
}, }
},
"day6" :
{
"1": {
"pval" : 1,
"stype" : "128",
"cond": [],
"tiaozhuan": 4,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 100
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "attr",
"t" : "rmbmoney",
"n" : 200
},
{
"a" : "item",
"t" : "1",
"n" : 100000
} }
], ],
"des" : "intr_cszl_des_1"
},
"2": {
"pval" : 300,
"stype" : "116",
"cond": [],
"tiaozhuan": 5,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 200
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 3
},
{
"a" : "item",
"t" : "600",
"n" : 5
},
{
"a" : "item",
"t" : "1",
"n" : 500000
}
],
"des" : "intr_cszl_des_2"
},
"3": {
"pval" : 1000,
"stype" : "116",
"cond": [],
"tiaozhuan": 2,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 300
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 5
},
{
"a" : "item",
"t" : "600",
"n" : 10
},
{
"a" : "item",
"t" : "1",
"n" : 1000000
}
],
"des" : "intr_cszl_des_3"
},
"4": {
"pval" : 2000,
"stype" : "116",
"cond": [],
"tiaozhuan": 1,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 150
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "item",
"t" : "6",
"n" : 10
},
{
"a" : "item",
"t" : "1",
"n" : 200000
}
],
"des" : "intr_cszl_des_4"
},
"5": {
"pval" : 3,
"stype" : "142",
"cond": [2],
"tiaozhuan": 6,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 100
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "item",
"t" : "2",
"n" : 500
},
{
"a" : "item",
"t" : "1",
"n" : 200000
}
],
"des" : "intr_cszl_des_5"
},
"6": {
"pval" : 3,
"stype" : "122",
"cond": [],
"tiaozhuan": 7,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 200
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "item",
"t" : "12",
"n" : 400
},
{
"a" : "item",
"t" : "1",
"n" : 200000
}
],
"des" : "intr_cszl_des_6"
},
"7": {
"pval" : 1,
"stype" : "155",
"cond": [],
"tiaozhuan": 8,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 100
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "attr",
"t" : "rmbmoney",
"n" : 200
},
{
"a" : "item",
"t" : "1",
"n" : 100000
}
],
"des" : "intr_cszl_des_7"
},
"8": {
"pval" : 1,
"stype" : "127",
"cond": [],
"tiaozhuan": 10,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 100
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "item",
"t" : "21",
"n" : 50
},
{
"a" : "item",
"t" : "1",
"n" : 100000
}
],
"des" : "intr_cszl_des_8"
},
"9": {
"pval" : 1,
"stype" : "154",
"cond": [],
"tiaozhuan": 11,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 100
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "attr",
"t" : "jinbi",
"n" : 100000
},
{
"a" : "item",
"t" : "1",
"n" : 100000
}
],
"des" : "intr_cszl_des_9"
},
},
"day7" :
{
"1": {
"pval" : 1,
"stype" : "128",
"cond": [],
"tiaozhuan": 4,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 100
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "attr",
"t" : "rmbmoney",
"n" : 200
},
{
"a" : "item",
"t" : "1",
"n" : 100000
}
],
"des" : "intr_cszl_des_1"
},
"2": {
"pval" : 300,
"stype" : "116",
"cond": [],
"tiaozhuan": 5,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 200
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 3
},
{
"a" : "item",
"t" : "600",
"n" : 5
},
{
"a" : "item",
"t" : "1",
"n" : 500000
}
],
"des" : "intr_cszl_des_2"
},
"3": {
"pval" : 1000,
"stype" : "116",
"cond": [],
"tiaozhuan": 2,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 300
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 5
},
{
"a" : "item",
"t" : "600",
"n" : 10
},
{
"a" : "item",
"t" : "1",
"n" : 1000000
}
],
"des" : "intr_cszl_des_3"
},
"4": {
"pval" : 2000,
"stype" : "116",
"cond": [],
"tiaozhuan": 1,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 150
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "item",
"t" : "6",
"n" : 10
},
{
"a" : "item",
"t" : "1",
"n" : 200000
}
],
"des" : "intr_cszl_des_4"
},
"5": {
"pval" : 3,
"stype" : "142",
"cond": [2],
"tiaozhuan": 6,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 100
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "item",
"t" : "2",
"n" : 500
},
{
"a" : "item",
"t" : "1",
"n" : 200000
}
],
"des" : "intr_cszl_des_5"
},
"6": {
"pval" : 3,
"stype" : "122",
"cond": [],
"tiaozhuan": 7,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 200
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "item",
"t" : "12",
"n" : 400
},
{
"a" : "item",
"t" : "1",
"n" : 200000
}
],
"des" : "intr_cszl_des_6"
},
"7": {
"pval" : 1,
"stype" : "155",
"cond": [],
"tiaozhuan": 8,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 100
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "attr",
"t" : "rmbmoney",
"n" : 200
},
{
"a" : "item",
"t" : "1",
"n" : 100000
}
],
"des" : "intr_cszl_des_7"
},
"8": {
"pval" : 1,
"stype" : "127",
"cond": [],
"tiaozhuan": 10,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 100
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "item",
"t" : "21",
"n" : 50
},
{
"a" : "item",
"t" : "1",
"n" : 100000
}
],
"des" : "intr_cszl_des_8"
},
"9": {
"pval" : 1,
"stype" : "154",
"cond": [],
"tiaozhuan": 11,
"prize" : [
{
"a" : "attr",
"t" : "shengdanExp",
"n" : 100
},
{
"a" : "attr",
"t" : "shengdanBullet",
"n" : 2
},
{
"a" : "attr",
"t" : "jinbi",
"n" : 100000
},
{
"a" : "item",
"t" : "1",
"n" : 100000
}
],
"des" : "intr_cszl_des_9"
},
}
},
//抽卡 //抽卡
"chouka": [ "chouka": [
//P是权重 //P是权重
@ -7394,4 +6875,5 @@
//boss排行邮件内容 //boss排行邮件内容
"bossRank_des": "email_content_hqjg_rank" "bossRank_des": "email_content_hqjg_rank"
} }
}
] ]

View File

@ -24,6 +24,7 @@ import {ResOpen as ResOpenZhoumolibao} from '../shared/protocols/event/zhoumolib
import {ResOpen as ResOpenPobinglibao} from '../shared/protocols/event/pobinglibao/PtlOpen'; import {ResOpen as ResOpenPobinglibao} from '../shared/protocols/event/pobinglibao/PtlOpen';
import {ResOpen as ResOpenLeiChongLiBao} from '../shared/protocols/event/leichonglibao/PtlOpen'; import {ResOpen as ResOpenLeiChongLiBao} from '../shared/protocols/event/leichonglibao/PtlOpen';
import {event as ResOpenYuandan} from '../shared/protocols/event/yuandan/PtlOpen'; import {event as ResOpenYuandan} from '../shared/protocols/event/yuandan/PtlOpen';
import { HQJG } from '../api_s2c/event/hqjg/func';
export type eventType = { export type eventType = {
shouchong: { shouchong: {
@ -74,6 +75,7 @@ export type eventType = {
[k: `leichonglibao${number}`]: ResOpenLeiChongLiBao & { opentime: number }; [k: `leichonglibao${number}`]: ResOpenLeiChongLiBao & { opentime: number };
[k: `yuandan${number}`]: ResOpenYuandan; [k: `yuandan${number}`]: ResOpenYuandan;
[k: `pobinglibao${number}`]: ResOpenPobinglibao; [k: `pobinglibao${number}`]: ResOpenPobinglibao;
[k: `hqjg${number}`]: HQJG;
}; };
export type CollectionEvent<T extends keyof eventType> = { export type CollectionEvent<T extends keyof eventType> = {

File diff suppressed because it is too large Load Diff