Merge pull request #833 from PZ157/PR-Branch

bug修复
This commit is contained in:
Spmario233 2024-01-21 23:18:01 +08:00 committed by GitHub
commit b592ec1dac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 31 additions and 31 deletions

View File

@ -6061,7 +6061,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
onremove:function(player){ onremove:function(player){
game.countPlayer2(current=>{ game.countPlayer2(current=>{
if(current.getStorage('dawu2').includes(player)){ if(current.getStorage('dawu2').includes(player)){
current.unmarkAuto('dawu2',player); current.unmarkAuto('dawu2',[player]);
current.removeAdditionalSkill(`dawu_${player.playerid}`); current.removeAdditionalSkill(`dawu_${player.playerid}`);
} }
},true); },true);

View File

@ -6188,7 +6188,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.chooseCard('he',get.prompt('twxingwu'),'将一张牌置于武将牌上作为“星舞”').set('ai',function(card){ player.chooseCard('he',get.prompt('twxingwu'),'将一张牌置于武将牌上作为“星舞”').set('ai',function(card){
if(_status.event.goon) return 20-get.value(card); if(_status.event.goon) return 20-get.value(card);
return 7-get.value(card); return 7-get.value(card);
}).set('goon',player.needsToDiscard()||player.getStorage('twxingwu').length>1); }).set('goon',player.needsToDiscard()||player.getExpansions('twxingwu').length>1);
'step 1' 'step 1'
if(result.bool){ if(result.bool){
player.logSkill('twxingwu'); player.logSkill('twxingwu');

View File

@ -1736,7 +1736,7 @@ export class Get extends Uninstantable {
* @returns {string} * @returns {string}
*/ */
static suit(card, player) { static suit(card, player) {
if (!card) return; if (typeof card !== 'object') return;
if (Array.isArray(card)) { if (Array.isArray(card)) {
if (card.length == 1) return get.suit(card[0], player); if (card.length == 1) return get.suit(card[0], player);
return 'none'; return 'none';
@ -1761,7 +1761,7 @@ export class Get extends Uninstantable {
* @returns {string} * @returns {string}
*/ */
static color(card, player) { static color(card, player) {
if (!card) return; if (typeof card !== 'object') return;
if (Array.isArray(card)) { if (Array.isArray(card)) {
if (!card.length) return 'none'; if (!card.length) return 'none';
const cards = card.slice(), color = get.color(cards.shift(), player); const cards = card.slice(), color = get.color(cards.shift(), player);
@ -1790,7 +1790,7 @@ export class Get extends Uninstantable {
* @returns {number} * @returns {number}
*/ */
static number(card, player) { static number(card, player) {
if (!card) return; if (typeof card !== 'object') return;
//狗卡你是真敢出啊 //狗卡你是真敢出啊
var number = null; var number = null;
if ('number' in card) { if ('number' in card) {