This commit is contained in:
539943419 committed 2023-10-13 13:36:41 +08:00
1 parent 1d068b0628
commit fbbe7f2c06
1 file changed
+30 -5
+30 -5
View File
@@ -5634,7 +5634,7 @@ if(get.type(card)=='basic' && get.type(card)=='trick') flag= true;
// player.hp -=trigger.num; // player.hp -=trigger.num;
"step 2" "step 2"
player.storage.shuohui_locked = false; player.storage.shuohui_locked = false;
game.log(player.hp); // game.log(player.hp);
}, },
sub: true, sub: true,
"_priority": 0 "_priority": 0
@@ -5689,9 +5689,12 @@ if(get.type(card)=='basic' && get.type(card)=='trick') flag= true;
player: ["loseHpBegin", "damageBegin3"] player: ["loseHpBegin", "damageBegin3"]
}, },
filter: function (event, player) { filter: function (event, player) {
//防止一个时机重复触发
if(player.storage.hxcx_x1 < player.storage.hxcx_x)player.storage.hxcx_x1++; if(player.storage.hxcx_x1 < player.storage.hxcx_x && player.storage.hxcx_x1_flag){
game.log(player.storage.hxcx_x1) player.storage.hxcx_x1++;
player.storage.hxcx_x1_flag = false;
}
game.log(player.storage.hxcx_x1, player.storage.hxcx_x,event.getParent().name)
if(event.num > player.storage.hxcx_x){ if(event.num > player.storage.hxcx_x){
return true return true
}else{ }else{
@@ -5706,6 +5709,7 @@ if(get.type(card)=='basic' && get.type(card)=='trick') flag= true;
var p = player; var p = player;
p.storage.hxcx_x = 0; p.storage.hxcx_x = 0;
p.storage.hxcx_x1 = -1;// 回合内满足1时机次数 p.storage.hxcx_x1 = -1;// 回合内满足1时机次数
p.storage.hxcx_x1_flag = true;// 修时机重复触发的bug
p.storage.hxcx_count1 = 0;// 效果1触发次数 p.storage.hxcx_count1 = 0;// 效果1触发次数
p.storage.hxcx_count2 = 0;// 复活次数 p.storage.hxcx_count2 = 0;// 复活次数
p.storage.yzyw_count1 = 0;// 月坠计数 p.storage.yzyw_count1 = 0;// 月坠计数
@@ -5762,7 +5766,7 @@ if(get.type(card)=='basic' && get.type(card)=='trick') flag= true;
player.storage.hxcx_count1 = 0; player.storage.hxcx_count1 = 0;
} }
}, },
group: ["zioy_hexuchongxiang_revive", "zioy_hexuchongxiang_damage", "zioy_hexuchongxiang_loseMaxHpEnd", "zioy_hexuchongxiang_phaseEnd"], group: ["zioy_hexuchongxiang_revive", "zioy_hexuchongxiang_damage", "zioy_hexuchongxiang_loseMaxHpEnd", "zioy_hexuchongxiang_phaseEnd", "zioy_hexuchongxiang_useCardAfter"],
subSkill: { subSkill: {
mark: { mark: {
mark: false, mark: false,
@@ -5889,10 +5893,31 @@ if(get.type(card)=='basic' && get.type(card)=='trick') flag= true;
unique: true, unique: true,
direct: true, direct: true,
content: function () { content: function () {
player.storage.hxcx_x1_flag = true;
player.storage.hxcx_x1=-1; player.storage.hxcx_x1=-1;
}, },
sub: true, sub: true,
"_priority": -301712300 "_priority": -301712300
},
useCardAfter:{
trigger: {
global: ["useCardAfter","damageEnd"],
player: ["loseHpBegin", "damageBegin3"]
},
filter: function (event, player) {
return true;
},
priority: -301754154563,
// forced: true,
charlotte: true,
unique: true,
direct: true,
content: function () {
player.storage.hxcx_x1_flag = true;
},
sub: true,
"_priority": -30171230236
} }
}, },
"_priority": 1300 "_priority": 1300