From f7fe88397b45aea630e2a95e3efd0c64fee40d47 Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Mon, 15 Apr 2024 17:49:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?combo=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/huicui.js | 3 +++ character/shenhua.js | 3 --- character/yingbian.js | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/character/huicui.js b/character/huicui.js index e65de526d..5c96cfd2c 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -678,6 +678,9 @@ game.import('character', function () { await player.recover(); await player.addSkills('dczifu'); }, + ai:{ + combo:'dcjichou' + } }, dczifu:{ audio:2, diff --git a/character/shenhua.js b/character/shenhua.js index 985ba3893..b2465a13e 100755 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -2437,9 +2437,6 @@ game.import('character', function () { }, }, }, - ai:{ - combo:'nzry_zhenliang', - }, }, "nzry_zhenliang":{ audio:"nzry_zhenliang_1", diff --git a/character/yingbian.js b/character/yingbian.js index 5d54ef623..d55537e62 100644 --- a/character/yingbian.js +++ b/character/yingbian.js @@ -3454,6 +3454,9 @@ game.import('character', function () { player.addSkills('pozhu'); }, derivation:'pozhu', + ai:{ + combo:'sanchen' + } }, pozhu:{ enable:'phaseUse', From 69f7aa1ec7c5f4a9c4b5f91f5194df4d23159f6a Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Mon, 15 Apr 2024 18:17:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=BD=E6=88=98=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E4=BB=BB=E6=84=8F=E5=8F=98=E6=9B=B4=E5=8A=BF=E5=8A=9B=E7=9A=84?= =?UTF-8?q?=E6=8A=80=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/jsrg.js | 5 +++++ character/old.js | 1 + character/sb.js | 1 + character/sp.js | 1 + character/tw.js | 1 + 5 files changed, 9 insertions(+) diff --git a/character/jsrg.js b/character/jsrg.js index 0bc332c38..d3a9e5ada 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -371,6 +371,7 @@ game.import('character', function () { }, //姜维 jsrgjinfa:{ + forbid:['guozhan'], audio:2, enable:'phaseUse', usable:1, @@ -4092,6 +4093,7 @@ game.import('character', function () { }, //许攸 jsrglipan:{ + forbid:['guozhan'], audio:2, trigger:{ player:'phaseEnd', @@ -4328,6 +4330,7 @@ game.import('character', function () { }, //吕布 jsrgwuchang:{ + forbid:['guozhan'], audio:2, trigger:{ player:'gainAfter', @@ -4454,6 +4457,7 @@ game.import('character', function () { }, //张郃 jsrgqiongtu:{ + //forbid:['guozhan'], audio:2, enable:'chooseToUse', groupSkill:true, @@ -5311,6 +5315,7 @@ game.import('character', function () { }, //张辽 jsrgzhengbing:{ + //forbid:['guozhan'], audio:2, enable:'phaseUse', usable:3, diff --git a/character/old.js b/character/old.js index 1e0886310..94052cb54 100755 --- a/character/old.js +++ b/character/old.js @@ -152,6 +152,7 @@ game.import('character', function () { }, //魏武帝 junkguixin:{ + forbid:['guozhan'], init:function(){ if(!_status.junkguixin){ _status.junkguixin=[]; diff --git a/character/sb.js b/character/sb.js index e40fc1aff..5f1d28994 100644 --- a/character/sb.js +++ b/character/sb.js @@ -5995,6 +5995,7 @@ game.import('character', function () { }, //孙尚香 sbjieyin:{ + //forbid:['guozhan'], trigger:{player:'phaseUseBegin'}, forced:true, locked:false, diff --git a/character/sp.js b/character/sp.js index 47e683453..00b2c4745 100755 --- a/character/sp.js +++ b/character/sp.js @@ -4865,6 +4865,7 @@ game.import('character', function () { }, //OL孟达 olgoude:{ + forbid:['guozhan'], audio:2, trigger:{ global:'phaseEnd', diff --git a/character/tw.js b/character/tw.js index a2ab9940d..8734f6fcd 100644 --- a/character/tw.js +++ b/character/tw.js @@ -15919,6 +15919,7 @@ game.import('character', function () { } }, renshe:{ + forbid:['guozhan'], audio:2, trigger:{player:'damageEnd'}, direct:true, From 3ca2a566b1baafde55f42075b50ec55c865a324c Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Mon, 15 Apr 2024 19:16:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=BD=E6=88=98=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E6=A8=AA=E8=B7=B3=E6=AD=A6=E5=B0=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/jsrg.js | 8 +++++--- character/sb.js | 1 - character/sp.js | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/character/jsrg.js b/character/jsrg.js index d3a9e5ada..f84d3b38c 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -85,6 +85,11 @@ game.import('character', function () { }, characterTitle:{ }, + characterFilter:{ + jsrg_jiangwei(mode){ + return mode!=='guozhan'; + }, + }, perfectPair:{}, card:{ xumou_jsrg:{ @@ -371,7 +376,6 @@ game.import('character', function () { }, //姜维 jsrgjinfa:{ - forbid:['guozhan'], audio:2, enable:'phaseUse', usable:1, @@ -4457,7 +4461,6 @@ game.import('character', function () { }, //张郃 jsrgqiongtu:{ - //forbid:['guozhan'], audio:2, enable:'chooseToUse', groupSkill:true, @@ -5315,7 +5318,6 @@ game.import('character', function () { }, //张辽 jsrgzhengbing:{ - //forbid:['guozhan'], audio:2, enable:'phaseUse', usable:3, diff --git a/character/sb.js b/character/sb.js index 5f1d28994..e40fc1aff 100644 --- a/character/sb.js +++ b/character/sb.js @@ -5995,7 +5995,6 @@ game.import('character', function () { }, //孙尚香 sbjieyin:{ - //forbid:['guozhan'], trigger:{player:'phaseUseBegin'}, forced:true, locked:false, diff --git a/character/sp.js b/character/sp.js index 00b2c4745..22a118f1c 100755 --- a/character/sp.js +++ b/character/sp.js @@ -28,6 +28,9 @@ game.import('character', function () { ol_dongzhao:function(mode){ return mode=='identity'&&['normal','zhong'].includes(_status.mode); }, + ol_mengda(mode){ + return mode!=='guozhan'; + }, }, character:{ ol_liupi:['male','qun',4,['olyicheng']], @@ -4865,7 +4868,6 @@ game.import('character', function () { }, //OL孟达 olgoude:{ - forbid:['guozhan'], audio:2, trigger:{ global:'phaseEnd',