Skip to content

Commit ab3f90f

Browse files
xizifuxizifu
authored
Merge pull request #2646 from Sun-F2004/PR-Branch
修正国战武将引用的阵亡配音+补充子技能引用配音
2 parents 8d461da + 98752db commit ab3f90f

File tree

23 files changed

+97
-6
lines changed

23 files changed

+97
-6
lines changed

‎audio/die/mengda.mp3‎ renamed to ‎audio/die/pe_mengda.mp3‎

File renamed without changes.

‎audio/die/gz_sunchen.mp3‎ renamed to ‎audio/die/pe_sunchen.mp3‎

File renamed without changes.

‎audio/die/gz_wenqin.mp3‎ renamed to ‎audio/die/pe_wenqin.mp3‎

File renamed without changes.

‎character/clan/skill.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ const skills = {
502502
sub: true,
503503
},
504504
effect: {
505+
audio: "clanjiannan",
505506
trigger: {
506507
global: ["loseAfter", "equipAfter", "addJudgeAfter", "gainAfter", "loseAsyncAfter", "addToExpansionAfter"],
507508
},
@@ -4706,6 +4707,7 @@ const skills = {
47064707
},
47074708
subSkill: {
47084709
remove: {
4710+
audio: "clanfangzhen",
47094711
trigger: { global: "roundStart" },
47104712
onremove: true,
47114713
forced: true,
@@ -5228,6 +5230,7 @@ const skills = {
52285230
},
52295231
subSkill: {
52305232
viewAs: {
5233+
audio: "clanshenjun",
52315234
trigger: { global: ["phaseZhunbeiEnd", "phaseJudgeEnd", "phaseDrawEnd", "phaseUseEnd", "phaseDiscardEnd", "phaseJieshuEnd"] },
52325235
filter(event, player) {
52335236
return player.countCards("h", card => card.hasGaintag("clanshenjun")) > 0;

‎character/collab/skill.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,6 +1362,7 @@ const skills = {
13621362
},
13631363
subSkill: {
13641364
temp: {
1365+
audio: "olchenlong",
13651366
charlotte: true,
13661367
trigger: { player: "dying" },
13671368
filter(event, player) {
@@ -1554,6 +1555,7 @@ const skills = {
15541555
group: "olxugou_buff",
15551556
subSkill: {
15561557
buff: {
1558+
audio: "olxugou",
15571559
trigger: { target: "shaBefore" },
15581560
filter(event, player) {
15591561
return get.color(event.card) == "red";
@@ -1711,6 +1713,7 @@ const skills = {
17111713
ai: { combo: "olfengzhu" },
17121714
subSkill: {
17131715
effect: {
1716+
audio: "olyuyu",
17141717
charlotte: true,
17151718
onremove: true,
17161719
intro: { content: "于$回合内受到1点伤害或失去一张牌后，其获得1枚“恨“标记" },
@@ -1885,6 +1888,7 @@ const skills = {
18851888
subSkill: {
18861889
backup: {},
18871890
jiese: {
1891+
audio: "oljiejiu",
18881892
trigger: {
18891893
global: "phaseBefore",
18901894
player: "enterGame",
@@ -4250,7 +4254,7 @@ const skills = {
42504254
},
42514255
subSkill: {
42524256
add: {
4253-
audio: "rezhiheng",
4257+
audio: "dczhiheng",
42544258
trigger: {
42554259
source: "damageSource",
42564260
},
@@ -4449,6 +4453,7 @@ const skills = {
44494453
group: "dctongliao_draw",
44504454
subSkill: {
44514455
draw: {
4456+
audio: "dctongliao",
44524457
trigger: {
44534458
player: ["loseAfter"],
44544459
global: ["equipAfter", "addJudgeAfter", "gainAfter", "loseAsyncAfter", "addToExpansionAfter"],
@@ -5160,6 +5165,7 @@ const skills = {
51605165
group: "dcruyi_blocker",
51615166
subSkill: {
51625167
blocker: {
5168+
audio: "dcruyi",
51635169
trigger: {
51645170
player: ["loseBefore", "disableEquipBefore"],
51655171
},

‎character/extra/skill.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,6 +1079,7 @@ const skills = {
10791079
group: "kunyu_debuff",
10801080
subSkill: {
10811081
debuff: {
1082+
audio: "kunyu",
10821083
trigger: {
10831084
global: "phaseBefore",
10841085
player: ["gainMaxHpBegin", "loseMaxHpBegin", "enterGame"],
@@ -4695,6 +4696,7 @@ const skills = {
46954696
}
46964697
},
46974698
},
4699+
audio: "dctuoyu",
46984700
trigger: { player: "useCard" },
46994701
forced: true,
47004702
filter(event, player) {
@@ -7000,6 +7002,7 @@ const skills = {
70007002
group: "yuheng_losehp",
70017003
subSkill: {
70027004
losehp: {
7005+
audio: "yuheng",
70037006
trigger: { player: "phaseUseEnd" },
70047007
forced: true,
70057008
locked: false,
@@ -7155,6 +7158,7 @@ const skills = {
71557158
intro: { content: "mark" },
71567159
subSkill: {
71577160
maxHp: {
7161+
audio: "tianren",
71587162
trigger: { player: ["tianrenAfter", "gainMaxHpAfter", "loseMaxHpAfter"] },
71597163
forced: true,
71607164
filter(event, player) {

‎character/huicui/skill.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ const skills = {
5050
},
5151
subSkill: {
5252
red: {
53+
audio: "dcgengdu",
5354
enable: "chooseToUse",
5455
charlotte: true,
5556
filter(event, player) {
@@ -144,6 +145,7 @@ const skills = {
144145
onremove: true,
145146
},
146147
black: {
148+
audio: "dcgengdu",
147149
trigger: {
148150
player: "useCardAfter",
149151
},
@@ -281,6 +283,7 @@ const skills = {
281283
},
282284
subSkill: {
283285
effect: {
286+
audio: "dcguying",
284287
charlotte: true,
285288
forced: true,
286289
intro: {
@@ -1742,6 +1745,7 @@ const skills = {
17421745
},
17431746
subSkill: {
17441747
add: {
1748+
audio: "dctanluan",
17451749
trigger: {
17461750
player: "useCard2",
17471751
},
@@ -8143,6 +8147,7 @@ const skills = {
81438147
},
81448148
subSkill: {
81458149
damage: {
8150+
audio: "dctaji",
81468151
trigger: { source: "damageBegin1" },
81478152
forced: true,
81488153
charlotte: true,
@@ -11599,6 +11604,7 @@ const skills = {
1159911604
intro: { content: "手牌上限+#" },
1160011605
},
1160111606
eff2: {
11607+
audio: "dcyongbi",
1160211608
trigger: { player: "damageBegin4" },
1160311609
forced: true,
1160411610
filter(event, player) {
@@ -11738,6 +11744,7 @@ const skills = {
1173811744
group: "dcliehou_discard",
1173911745
subSkill: {
1174011746
discard: {
11747+
audio: "dcliehou",
1174111748
trigger: { player: "phaseDrawEnd" },
1174211749
forced: true,
1174311750
filter(event, player) {
@@ -17631,6 +17638,7 @@ const skills = {
1763117638
},
1763217639
subSkill: {
1763317640
discard: {
17641+
audio: "dcdanying",
1763417642
trigger: { target: "useCardToTargeted" },
1763517643
charlotte: true,
1763617644
forced: true,

‎character/mobile/skill.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ const skills = {
574574
charlotte: true,
575575
},
576576
effect: {
577+
audio: "mbjinzu",
577578
trigger: {
578579
player: "useCard",
579580
source: "damageBegin1",
@@ -1410,6 +1411,7 @@ const skills = {
14101411
onremove: true,
14111412
charlotte: true,
14121413
forced: true,
1414+
popup: false,
14131415
trigger: { player: "phaseEnd" },
14141416
filter(event, player) {
14151417
return lib.skill.mbganggeng_effect.logTarget(event, player).length;
@@ -7287,6 +7289,7 @@ const skills = {
72877289
},
72887290
subSkill: {
72897291
effect: {
7292+
audio: "mbchoumang",
72907293
trigger: {
72917294
global: "shaMiss",
72927295
},
@@ -15033,6 +15036,7 @@ const skills = {
1503315036
},
1503415037
subSkill: {
1503515038
effect: {
15039+
audio: "jingzhong",
1503615040
trigger: { global: "useCardAfter" },
1503715041
forced: true,
1503815042
charlotte: true,
@@ -15173,6 +15177,7 @@ const skills = {
1517315177
},
1517415178
},
1517515179
init: {
15180+
audio: "sbyaoming",
1517615181
trigger: {
1517715182
global: "phaseBefore",
1517815183
player: "enterGame",

‎character/newjiang/skill.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3001,6 +3001,7 @@ const skills = {
30013001
},
30023002
subSkill: {
30033003
fullyReady: {
3004+
audio: "cibei",
30043005
trigger: { global: "phaseEnd" },
30053006
forced: true,
30063007
locked: false,

‎character/offline/voices.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export default {
3333
"#zhongyi2": "为国尽忠，天经地义。",
3434
"#gzjinfa1": "居功者，当自矜，为将者，当善伐。",
3535
"#gzjinfa2": "此战伐敌所获，皆我之功！",
36+
"#pe_wenqin:die": "公休，汝这是何意，呃……",
3637
"#qiuan1": "明公神文圣武，吾自当举城来降。",
3738
"#qiuan2": "臣心不自安，乃君之过也。",
3839
"#liangfan1": "今举兵投魏，必可封王拜相，一展宏图。",
@@ -62,6 +63,7 @@ export default {
6263
"#zyshilu2": "将这些乱臣贼子，尽皆诛之！",
6364
"#zyxiongnve1": "当今天子乃我所立，他敢怎样？",
6465
"#zyxiongnve2": "我兄弟三人同掌禁军，有何所惧？",
66+
"#pe_sunchen:die": "愿陛下念臣昔日之功，陛下？陛下！！",
6567
"#ns_lijue:die": "若无内讧，也不至如此……",
6668
"#ns_fanchou:die": "唉，稚然疑心，甚重……",
6769
};

0 commit comments

Comments
 (0)