继续调整

Author: xizifu

character/extra/skill.js

@@ -1119,13 +1119,13 @@ const skills = {
 				});
 			} else {
 				delete evt.result.used;
+				delete evt.result.skill;
 				evt.result.card = get.autoViewAs({
 					name: name,
 					storage: { mark_shouli: true },
 					isCard: true,
 				});
 				evt.result.cards = [];
-				evt.result._apply_args = { addSkillCount: false };
 				evt.redo();
 				return;
 			}
@@ -1278,6 +1278,7 @@ const skills = {
 			},
 			backup: {
 				async precontent(event, trigger, player) {
+					event.result._apply_args = { addSkillCount: false };
 					player.popup(event.result.card.name, "metal");
 					await game.delayx();
 					event.getParent().addCount = false;
@@ -7782,6 +7783,7 @@ const skills = {
 					});
 				} else {
 					delete evt.result.used;
+					delete evt.result.skill;
 					evt.result.card = get.autoViewAs(
 						{
 							name: name,
@@ -7791,7 +7793,6 @@ const skills = {
 						result.links
 					);
 					evt.result.cards = [result.links[0]];
-					evt.result._apply_args = { addSkillCount: false };
 					target.$give(result.links[0], player, false);
 					if (player != target) {
 						target.addTempSkill("fengyin");
@@ -7918,6 +7919,7 @@ const skills = {
 					"step 0";
 					var cards = event.result.card.cards;
 					event.result.cards = cards;
+					event.result._apply_args = { addSkillCount: false };
 					var owner = get.owner(cards[0]);
 					event.target = owner;
 					owner.$give(cards[0], player, false);

character/offline/skill.js

@@ -28882,6 +28882,7 @@ const skills = {
 					});
 				} else {
 					delete evt.result.used;
+					delete evt.result.skill;
 					evt.result.card = get.autoViewAs(
 						{
 							name: name,
@@ -28891,7 +28892,6 @@ const skills = {
 						result.links
 					);
 					evt.result.cards = [result.links[0]];
-					evt.result._apply_args = { addSkillCount: false };
 					target.$give(result.links[0], player, false);
 					if (player != target) {
 						target.addTempSkill("fengyin");
@@ -29072,7 +29072,7 @@ const skills = {
 			backup: {
 				precontent() {
 					"step 0";
-					event.result._apply_args = { throw: false };
+					event.result._apply_args = { throw: false, addSkillCount: false };
 					var cards = event.result.card.cards;
 					event.result.cards = cards;
 					var owner = get.owner(cards[0]);
@@ -29844,6 +29844,7 @@ const skills = {
 					evt.backup("psqichu_backup");
 				} else {
 					delete evt.result.used;
+					delete evt.result.skill;
 					evt.result.card = get.autoViewAs(result.links[0]);
 					if (aozhan) {
 						evt.result.card.name = name;

character/sp/skill.js

@@ -38694,8 +38694,8 @@ const skills = {
 					evt.backup("aocai_backup");
 				} else {
 					delete evt.result.used;
+					delete evt.result.skill;
 					evt.result.card = get.autoViewAs(card);
-					evt.result._apply_args = { addSkillCount: false };
 					if (aozhan) {
 						evt.result.card.name = name;
 					}
@@ -38743,6 +38743,7 @@ const skills = {
 						card = get.autoViewAs({ name, isCard: true });
 					}
 					event.result.card = card;
+					event.result._apply_args = { addSkillCount: false };
 				},
 				filterCard: () => false,
 				selectCard: -1,

noname/library/element/content.js

@@ -9662,7 +9662,7 @@ player.removeVirtualEquip(card);
 			//player.using=cards;
 			let cardaudio = true;
 
-			if (event.skill && event.addSkillCount !== false) {
+			if (event.skill) {
 				if (lib.skill[event.skill].audio) {
 					cardaudio = false;
 				}
@@ -10648,7 +10648,7 @@ player.removeVirtualEquip(card);
 		async (event, trigger, player) => {
 			let { cards, card } = event;
 			var cardaudio = true;
-			if (event.skill && event.addSkillCount !== false) {
+			if (event.skill) {
 				if (lib.skill[event.skill].audio) {
 					cardaudio = false;
 				}