Merge pull request #2663 from rebirth-of-I-am/PR-Branch

xizifu · web-flow · commit 3fac4f272d5f · 2025-06-06T01:12:29.000+08:00
复活事件半回调，技能修复，武将覆盖
diff --git a/character/mobile/character.js b/character/mobile/character.js
@@ -586,7 +586,7 @@ const characters = {
 		sex: "male",
 		group: "qun",
 		hp: 3,
-		skills: ["huantu", "bihuo"],
+		skills: ["twhuantu", "twbihuo"],
 	},
 	mayuanyi: {
 		sex: "male",
diff --git a/character/offline/skill.js b/character/offline/skill.js
@@ -4055,7 +4055,7 @@ const skills = {
 								.forResult()
 						: { control: names[0] };
 				if (result.control) {
-					await target.revive(2);
+					game.broadcastAll(player => player.revive(2), target);
 					let doubleDraw = false;
 					let num = (get.character("zombie_zombie").maxHp || get.character("zombie_zombie").hp) - (get.character(result.control).maxHp || get.character(result.control).hp);
 					if (num !== 0) {
@@ -4333,7 +4333,7 @@ const skills = {
 								.forResult()
 						: { control: names[0] };
 				if (result.control) {
-					target.revive(2);
+					game.broadcastAll(player => player.revive(2), target);
 					let doubleDraw = false;
 					let num = (get.character("zombie_zombie").maxHp || get.character("zombie_zombie").hp) - (get.character(result.control).maxHp || get.character(result.control).hp);
 					if (num !== 0) {
diff --git a/character/rank.js b/character/rank.js
@@ -1167,7 +1167,6 @@ window.noname_character_rank = {
 		"xin_panzhangmazhong",
 		"sp_mifuren",
 		"xin_caozhen",
-		"tw_yanpu",
 		"yanpu",
 		"re_xiahoushi",
 		"tw_caocao",
@@ -2291,7 +2290,6 @@ window.noname_character_rank = {
 		"sb_liubei",
 		"sb_fazheng",
 		"sb_chengong",
-		"tw_sb_chengong",
 		"sb_yuanshao",
 		"sb_pangtong",
 		"sb_xiaoqiao",
@@ -4172,7 +4170,6 @@ window.noname_character_rank = {
 			"ruanhui",
 			"re_wuguotai",
 			"yanpu",
-			"tw_yanpu",
 			"xin_caozhen",
 			"xin_guyong",
 			"ol_yujin",
@@ -4558,7 +4555,6 @@ window.noname_character_rank = {
 			"sb_ganning",
 			"sb_jiangwei",
 			"sb_chengong",
-			"tw_sb_chengong",
 			"sb_yuanshao",
 			"sb_pangtong",
 			"sb_menghuo",
diff --git a/character/replace.js b/character/replace.js
@@ -49,7 +49,7 @@ window.noname_character_replace = {
 	chendao: ["chendao", "pot_chendao", "ns_chendao", "old_chendao"],
 	chendeng: ["chendeng", "ol_chendeng", "re_chendeng", "jsrg_chendeng"],
 	chendong: ["chendong", "sp_chendong", "tw_chendong"],
-	chengong: ["chengong", "re_chengong", "sb_chengong", "tw_sb_chengong"],
+	chengong: ["chengong", "re_chengong", "sb_chengong"],
 	chengpu: ["chengpu", "ol_chengpu", "xin_chengpu", "re_chengpu", "tw_chengpu", "std_chengpu", "ns_chengpu"],
 	chengui: ["chengui", "mb_chengui"],
 	chengyu: ["chengyu", "dc_sb_chengyu", "std_chengyu"],
@@ -416,5 +416,4 @@ window.noname_character_replace = {
 	zerong: ["zerong", "std_zerong"],
 	tw_zhugejun: ["tw_zhugejun", "dc_zhugejun"],
 	wufu: ["wufu", "hr_wufu"],
-	yanpu: ["yanpu", "tw_yanpu"],
 };
diff --git a/character/sb/character.js b/character/sb/character.js
@@ -263,7 +263,7 @@ const characters = {
 		sex: "male",
 		group: "qun",
 		hp: 3,
-		skills: ["sbmingce", "sbzhichi"],
+		skills: ["twmingce", "sbzhichi"],
 	},
 	sb_diaochan: {
 		sex: "female",
diff --git a/character/tw/character.js b/character/tw/character.js
@@ -1,18 +1,4 @@
 const characters = {
-	tw_sb_chengong: {
-		sex: "male",
-		group: "qun",
-		hp: 3,
-		skills: ["twmingce", "sbzhichi"],
-		dieAudios: ["sb_chengong"],
-	},
-	tw_yanpu: {
-		sex: "male",
-		group: "qun",
-		hp: 3,
-		skills: ["twhuantu", "twbihuo"],
-		dieAudios: ["yanpu"],
-	},
 	tw_zhuzhi: {
 		sex: "male",
 		group: "wu",
diff --git a/character/tw/skill.js b/character/tw/skill.js
@@ -25299,7 +25299,6 @@ const skills = {
 			}
 		},
 		async content(event, trigger, player) {
-			await player.draw(10);
 			if (trigger.name == "phaseZhunbei") {
 				await player.chooseUseTarget(player.storage.twsidao, "nopopup", true);
 			} else {
diff --git a/character/tw/sort.js b/character/tw/sort.js
@@ -1,11 +1,11 @@
 const characterSort = {
-	tw_sp: ["tw_yanpu", "tw_simashi", "tw_beimihu", "tw_qiaozhou", "old_jiakui", "tw_jsp_guanyu", "tw_mazhong", "licuilianzhaoquanding", "simafu", "tw_zhugejun", "tw_yanliang", "tw_wenchou", "tw_yuantan", "tw_zhangzhao", "tw_zhanghong", "tw_fuwan", "tw_yujin", "tw_zhaoxiang", "tw_hucheer", "tw_hejin", "tw_mayunlu", "tw_re_caohong", "tw_zangba", "tw_liuhong", "tw_tianyu", "jiachong", "duosidawang", "wuban", "yuejiu", "tw_caocao", "tw_zhangmancheng", "tw_caozhao", "tw_wangchang", "tw_puyangxing", "tw_jiangji", "tw_niujin", "tw_xiahouen", "tw_xiahoushang", "tw_zhangji", "tw_zhangnan", "tw_fengxí", "tw_furong", "tw_liwei", "tw_yangyi", "tw_daxiaoqiao", "tw_dengzhi", "tw_baoxin", "tw_bingyuan", "tw_fanchou", "tw_haomeng", "tw_huchuquan", "tw_jianshuo", "tw_jiling", "tw_liufuren", "tw_mateng", "tw_niufudongxie", "tw_qiaorui", "tw_weixu", "tw_yanxiang", "tw_yufuluo", "tw_zhangning", "tw_dengzhi", "tw_yangyi", "tw_yangang", "tw_gongsunfan"],
+	tw_sp: ["tw_simashi", "tw_beimihu", "tw_qiaozhou", "old_jiakui", "tw_jsp_guanyu", "tw_mazhong", "licuilianzhaoquanding", "simafu", "tw_zhugejun", "tw_yanliang", "tw_wenchou", "tw_yuantan", "tw_zhangzhao", "tw_zhanghong", "tw_fuwan", "tw_yujin", "tw_zhaoxiang", "tw_hucheer", "tw_hejin", "tw_mayunlu", "tw_re_caohong", "tw_zangba", "tw_liuhong", "tw_tianyu", "jiachong", "duosidawang", "wuban", "yuejiu", "tw_caocao", "tw_zhangmancheng", "tw_caozhao", "tw_wangchang", "tw_puyangxing", "tw_jiangji", "tw_niujin", "tw_xiahouen", "tw_xiahoushang", "tw_zhangji", "tw_zhangnan", "tw_fengxí", "tw_furong", "tw_liwei", "tw_yangyi", "tw_daxiaoqiao", "tw_dengzhi", "tw_baoxin", "tw_bingyuan", "tw_fanchou", "tw_haomeng", "tw_huchuquan", "tw_jianshuo", "tw_jiling", "tw_liufuren", "tw_mateng", "tw_niufudongxie", "tw_qiaorui", "tw_weixu", "tw_yanxiang", "tw_yufuluo", "tw_zhangning", "tw_dengzhi", "tw_yangyi", "tw_yangang", "tw_gongsunfan"],
 	tw_yunchouzhi: ["tw_wangcan", "tw_dongzhao", "tw_bianfuren", "tw_feiyi", "tw_chenzhen", "tw_xunchen"],
 	tw_yunchouxin: ["tw_wangling", "tw_huojun", "tw_wujing", "tw_zhouchu"],
 	tw_yunchouren: ["tw_liuzhang", "tw_xujing", "tw_qiaogong"],
 	tw_yunchouyong: ["tw_zongyu", "tw_chendong", "tw_sunyi"],
 	tw_yunchouyan: ["tw_jiangqing"],
-	tw_sbcharacter: ["tw_sb_chengong", "tw_sb_sp_zhugeliang", "tw_sb_caopi"],
+	tw_sbcharacter: ["tw_sb_sp_zhugeliang", "tw_sb_caopi"],
 	tw_swordsman: ["xia_yuzhenzi", "xia_shie", "xia_shitao", "xia_guanyu", "xia_liubei", "xia_xiahousone", "xia_xiahoudun", "xia_zhangwei", "xia_xushu", "xia_wangyue", "xia_liyàn", "xia_tongyuan", "xia_lusu", "xia_dianwei", "xia_zhaoe", "xia_xiahouzie"],
 	tw_beiding: ["huan_luxun", "huan_liushan", "huan_zhugeliang", "huan_jiangwei", "huan_zhanghe", "huan_zhugeguo", "huan_weiyan", "huan_simayi", "huan_zhaoyun"],
 	tw_weiang: ["huan_liufeng", "huan_caoang", "huan_huanggai", "huan_dingshangwan", "huan_dianwei", "huan_caopi", "huan_caozhi", "huan_caochong"],
diff --git a/character/tw/translate.js b/character/tw/translate.js
@@ -870,12 +870,8 @@ const translates = {
 	twmiewei_info: "出牌阶段开始时，你可令此阶段使用【杀】的次数等同于你攻击范围内的角色数。你使用【杀】对目标角色造成伤害时，此伤害+X（X为本回合被【杀】指定过的角色数-1且至多为5）。",
 	twmiyong: "弥勇",
 	twmiyong_info: "限定技，出牌阶段，你可展示并标记手牌中的两张【杀】。此【杀】每回合因首次使用、首次打出或首次弃置进入弃牌堆时，你展示并获得之。",
-	tw_sb_chengong: "TW谋陈宫",
-	tw_sb_chengong_prefix: "TW谋",
 	twmingce: "明策",
 	twmingce_info: "出牌阶段各限一次，你可以将一张牌交给一名其他角色，然后其选择一项：1. 其流失1点体力，你摸三张牌并获得一个「策」标记；2.其摸两张牌。（本阶段第二次执行选项时摸牌数-1）出牌阶段开始时，若你拥有「策」标记，你可以选择一名其他角色，对其造成X点伤害并移除所有「策」标记（X为你拥有的「策」标记数量）。",
-	tw_yanpu: "TW阎圃",
-	tw_yanpu_prefix: "TW",
 	twhuantu: "缓图",
 	twhuantu_info: "每轮限一次，一名其他角色摸牌阶段开始前，你可以交给其一张牌，令其跳过摸牌阶段，若如此做，其结束阶段你须选择一项：1. 令其回复1点体力并摸两张牌；2. 你摸三张牌并交给其两张手牌。若其本回合未造成伤害且其在你攻击范围内，你可以再对其执行另一项。",
 	twbihuo: "避祸",
diff --git a/image/character/tw_sb_chengong.jpg b/image/character/tw_sb_chengong.jpg
diff --git a/image/character/tw_yanpu.jpg b/image/character/tw_yanpu.jpg
diff --git a/noname/library/element/player.js b/noname/library/element/player.js
@@ -8054,6 +8054,74 @@ export class Player extends HTMLDivElement {
 	 * @param { boolean } [log]
 	 */
 	revive(hp, log) {
+		if (log !== false) {
+			game.log(this, "复活");
+		}
+		this.maxHp = Math.max(1, this.maxHp);
+		this.hp = hp || 1;
+		game.addVideo("revive", this);
+		this.classList.remove("dead");
+		this.removeAttribute("style");
+		this.node.avatar.style.transform = "";
+		this.node.avatar2.style.transform = "";
+		this.node.hp.show();
+		this.node.equips.show();
+		this.node.count.show();
+		this.update();
+		var player;
+		player = this.previousSeat;
+		while (player.isDead()) {
+			player = player.previousSeat;
+		}
+		player.next = this;
+		this.previous = player;
+		player = this.nextSeat;
+		while (player.isDead()) {
+			player = player.nextSeat;
+		}
+		player.previous = this;
+		this.next = player;
+		game.players.add(this);
+		game.dead.remove(this);
+		if (this == game.me) {
+			if (ui.auto) {
+				ui.auto.show();
+			}
+			if (ui.wuxie) {
+				ui.wuxie.show();
+			}
+			if (ui.revive) {
+				ui.revive.close();
+				delete ui.revive;
+			}
+			if (ui.exit) {
+				ui.exit.close();
+				delete ui.exit;
+			}
+			if (ui.swap) {
+				ui.swap.close();
+				delete ui.swap;
+			}
+			if (ui.restart) {
+				ui.restart.close();
+				delete ui.restart;
+			}
+			if (ui.continue_game) {
+				ui.continue_game.close();
+				delete ui.continue_game;
+			}
+			if (this.node.dieidentity) {
+				this.node.dieidentity.delete();
+				delete this.node.dieidentity;
+			}
+		}
+	}
+	/**
+	 * 令玩家复活--事件化
+	 * @param { number } [hp = 1]
+	 * @param { boolean } [log]
+	 */
+	reviveEvent(hp, log) {
 		const next = game.createEvent("revive");
 		next.player = this;
 		if (hp) {

Original file line number	Diff line number	Diff line change
`@@ -25299,7 +25299,6 @@ const skills = {`
`25299`	`25299`	`}`
`25300`	`25300`	`},`
`25301`	`25301`	`async content(event, trigger, player) {`
`25302`		`- await player.draw(10);`
`25303`	`25302`	`if (trigger.name == "phaseZhunbei") {`
`25304`	`25303`	`await player.chooseUseTarget(player.storage.twsidao, "nopopup", true);`
`25305`	`25304`	`} else {`