From 6a865e0d0989871b47e8dc941f6e85ab2983d21e Mon Sep 17 00:00:00 2001 From: Toukaiteio Date: Thu, 2 May 2024 17:28:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20issue=20#1302:=20?= =?UTF-8?q?=E9=9D=9E=E5=AE=98=E6=96=B9=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=8B?= =?UTF-8?q?=E7=95=8C=E5=B7=A6=E6=85=88=E5=8C=96=E8=BA=AB=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/refresh.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/character/refresh.js b/character/refresh.js index 9cff043b5..72c0cc0b0 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -12873,22 +12873,24 @@ game.import("character", function () { if (player.storage.rehuashen.current != event.card) { const old = player.storage.rehuashen.current; player.storage.rehuashen.current = event.card; + const sex = get.character(event.card, 0); game.broadcastAll( - function (player, character, old) { + function (player, character, old, sex) { player.tempname.remove(old); player.tempname.add(character); - player.sex = lib.character[event.card][0]; + player.sex = sex; }, player, event.card, - old + old, + sex ); game.log( player, "将性别变为了", - "#y" + get.translation(lib.character[event.card][0]) + "性" + "#y" + get.translation(sex) + "性" ); - player.changeGroup(lib.character[event.card][1]); + player.changeGroup(get.character(event.card, 1)); } var link = result.control; player.storage.rehuashen.current2 = link; From 397b8b1e0ee05a9e6aaabd654bba03a865bfd9a1 Mon Sep 17 00:00:00 2001 From: Toukaiteio Date: Fri, 3 May 2024 11:46:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#1302:=20=E4=BF=AE=E5=A4=8D=E9=9D=9E?= =?UTF-8?q?=E5=AE=98=E6=96=B9=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=81=94=E6=9C=BA?= =?UTF-8?q?=E7=95=8C=E5=B7=A6=E6=85=88=E7=9A=84=E5=8C=96=E8=BA=AB=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/refresh.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/character/refresh.js b/character/refresh.js index 72c0cc0b0..67f09a547 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -12873,7 +12873,7 @@ game.import("character", function () { if (player.storage.rehuashen.current != event.card) { const old = player.storage.rehuashen.current; player.storage.rehuashen.current = event.card; - const sex = get.character(event.card, 0); + const sex = get.character(event.card).sex; game.broadcastAll( function (player, character, old, sex) { player.tempname.remove(old); @@ -12890,7 +12890,7 @@ game.import("character", function () { "将性别变为了", "#y" + get.translation(sex) + "性" ); - player.changeGroup(get.character(event.card, 1)); + player.changeGroup(get.character(event.card).group); } var link = result.control; player.storage.rehuashen.current2 = link; @@ -12914,8 +12914,8 @@ game.import("character", function () { player.when("dieBegin").then(() => { const name = player.name ? player.name : player.name1; if (name) { - const sex = get.character(name, 0); - const group = get.character(name, 1); + const sex = get.character(name).sex; + const group = get.character(name).group; if (player.sex != sex) { game.broadcastAll( (player, sex) => { @@ -13037,12 +13037,12 @@ game.import("character", function () { characterInfo = get.character(node.link); let capt = get.translation(character); if (characterInfo) { - capt += `  ${get.translation(characterInfo[0])}`; + capt += `  ${get.translation(characterInfo.sex)}`; let charactergroup; const charactergroups = get.is.double(character, true); if (charactergroups) charactergroup = charactergroups.map((i) => get.translation(i)).join("/"); - else charactergroup = get.translation(characterInfo[1]); + else charactergroup = get.translation(characterInfo.group); capt += `  ${charactergroup}`; } uiintro.add(capt);