From c2777b48dadccf21d8aba5c6be6e5d179684dd4a Mon Sep 17 00:00:00 2001
From: kuangshen04 <2832899707@qq.com>
Date: Thu, 16 Nov 2023 09:53:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0cardintro=E7=9A=84?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=88=E5=A4=9C=E7=99=BD?=
=?UTF-8?q?=E5=8E=9F=E7=89=88=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
game/game.js | 62 +++++++++++++++++++++++++++-------------------------
1 file changed, 32 insertions(+), 30 deletions(-)
diff --git a/game/game.js b/game/game.js
index 2e298f74a..71770b301 100644
--- a/game/game.js
+++ b/game/game.js
@@ -61903,6 +61903,38 @@
else{
if(lib.translate[name+'_info']){
if(!uiintro.nosub){
+ if(lib.card[name]&&lib.card[name].derivation){
+ if(typeof lib.card[name].derivation=='string'){
+ uiintro.add('来源：'+get.translation(lib.card[name].derivation)+'
');
+ }
+ else if(lib.card[name].derivationpack){
+ uiintro.add('来源：'+get.translation(lib.card[name].derivationpack+'_card_config')+'包
');
+ }
+ }
+ var ybtype='';
+ if(lib.card[name].unique){
+ ybtype+=('特殊'+get.translation(lib.card[name].type)+'牌');
+ }
+ else{
+ if(lib.card[name].type&&lib.translate[lib.card[name].type]) ybtype+=(get.translation(lib.card[name].type)+'牌');
+ }
+ if(get.subtype(name,false)){
+ ybtype+=('-'+get.translation(get.subtype(name,false)));
+ }
+ if(ybtype){
+ uiintro.add(''+ybtype+'
');
+ }
+ if(lib.card[name].unique&&lib.card[name].type=='equip'){
+ if(lib.cardPile.guozhan&&lib.cardPack.guozhan.contains(name)){
+ uiintro.add('专属装备
').style.marginTop='-5px';
+ }
+ else{
+ uiintro.add('特殊装备
').style.marginTop='-5px';
+ }
+ }
+ if(lib.card[name]&&lib.card[name].addinfomenu){
+ uiintro.add(''+lib.card[name].addinfomenu+'
');
+ }
if(get.subtype(name,false)=='equip1'){
var added=false;
if(lib.card[node.name]&&lib.card[node.name].distance){
@@ -61916,36 +61948,6 @@
uiintro.add('攻击范围：1
');
}
}
- else if(get.subtype(name,false)){
- uiintro.add(''+get.translation(get.subtype(name,false))+'
');
- }
- else if(lib.card[name]&&lib.card[name].addinfomenu){
- uiintro.add(''+lib.card[name].addinfomenu+'
');
- }
- else if(lib.card[name]&&lib.card[name].derivation){
- if(typeof lib.card[name].derivation=='string'){
- uiintro.add('来源：'+get.translation(lib.card[name].derivation)+'
');
- }
- else if(lib.card[name].derivationpack){
- uiintro.add('来源：'+get.translation(lib.card[name].derivationpack+'_card_config')+'包
');
- }
- }
- else{
- if(lib.card[name].unique){
- uiintro.add('特殊'+get.translation(lib.card[name].type)+'牌
');
- }
- else{
- if(lib.card[name].type&&lib.translate[lib.card[name].type]) uiintro.add(''+get.translation(lib.card[name].type)+'牌
');
- }
- }
- if(lib.card[name].unique&&lib.card[name].type=='equip'){
- if(lib.cardPile.guozhan&&lib.cardPack.guozhan.contains(name)){
- uiintro.add('专属装备
').style.marginTop='-5px';
- }
- else{
- uiintro.add('特殊装备
').style.marginTop='-5px';
- }
- }
}
if(lib.card[name].cardPrompt){
var str=lib.card[name].cardPrompt(node.link||node),placetext=uiintro.add(''+str+'
');
From 9f2edb1acc0726224fab8382b6e95327fb7862c0 Mon Sep 17 00:00:00 2001
From: kuangshen04 <2832899707@qq.com>
Date: Thu, 16 Nov 2023 09:59:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=90=8Dybtype=3D>typein?=
=?UTF-8?q?fo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
game/game.js | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/game/game.js b/game/game.js
index 71770b301..a23e5c8bd 100644
--- a/game/game.js
+++ b/game/game.js
@@ -61911,18 +61911,18 @@
uiintro.add('来源：'+get.translation(lib.card[name].derivationpack+'_card_config')+'包
');
}
}
- var ybtype='';
+ let typeinfo='';
if(lib.card[name].unique){
- ybtype+=('特殊'+get.translation(lib.card[name].type)+'牌');
+ typeinfo+=('特殊'+get.translation(lib.card[name].type)+'牌');
}
- else{
- if(lib.card[name].type&&lib.translate[lib.card[name].type]) ybtype+=(get.translation(lib.card[name].type)+'牌');
+ else if(lib.card[name].type&&lib.translate[lib.card[name].type]){
+ typeinfo+=(get.translation(lib.card[name].type)+'牌');
}
if(get.subtype(name,false)){
- ybtype+=('-'+get.translation(get.subtype(name,false)));
+ typeinfo+=('-'+get.translation(get.subtype(name,false)));
}
- if(ybtype){
- uiintro.add(''+ybtype+'
');
+ if(typeinfo){
+ uiintro.add(''+typeinfo+'
');
}
if(lib.card[name].unique&&lib.card[name].type=='equip'){
if(lib.cardPile.guozhan&&lib.cardPack.guozhan.contains(name)){