This commit is contained in:
恍兮惚兮 2024-11-23 22:44:47 +08:00
parent 92f4caa7ae
commit c0f318aa16
5 changed files with 15 additions and 7 deletions

View File

@ -678,6 +678,10 @@ namespace
strReplace(s, "#n", "\n"); strReplace(s, "#n", "\n");
buffer->from(s); buffer->from(s);
} }
void F010035001D1B2000(TextBuffer *buffer, HookParam *hp)
{
StringFilter(buffer, "#n", 2);
}
void F0100E1E00E2AE000(TextBuffer *buffer, HookParam *hp) void F0100E1E00E2AE000(TextBuffer *buffer, HookParam *hp)
{ {
auto s = buffer->strA(); auto s = buffer->strA();
@ -3355,6 +3359,9 @@ namespace
// 大正メビウスライン大全 三合一 // 大正メビウスライン大全 三合一
{0x800C43D4, {0, 0, 0, 0, F0100509013040000, "0100509013040000", "1.0.0"}}, // text {0x800C43D4, {0, 0, 0, 0, F0100509013040000, "0100509013040000", "1.0.0"}}, // text
{0x800C4468, {0, 0, 0, 0, F0100509013040000, "0100509013040000", "1.0.1"}}, // text {0x800C4468, {0, 0, 0, 0, F0100509013040000, "0100509013040000", "1.0.1"}}, // text
// 猛獣たちとお姫様 for Nintendo Switch 二合一
{0x80115C70, {CODEC_UTF8, 0, 0, 0, F010035001D1B2000, "010035001D1B2000", "1.0.0"}}, // text
{0x80115F20, {CODEC_UTF8, 0, 0, 0, F010035001D1B2000, "010035001D1B2000", "1.0.1"}}, // text
}; };
return 1; return 1;
}(); }();

View File

@ -262,10 +262,11 @@ void delayinsertadd(HookParam hp, std::string name)
} }
void delayinsertNewHook(uint64_t em_address) void delayinsertNewHook(uint64_t em_address)
{ {
if (delayinserthook->find(em_address) == delayinserthook->end()) auto &&_delayinserthook = delayinserthook.Acquire();
if (_delayinserthook->find(em_address) == _delayinserthook->end())
return; return;
auto h = delayinserthook->at(em_address); auto h = _delayinserthook->at(em_address);
delayinserthook->erase(em_address); _delayinserthook->erase(em_address);
NewHook(h.second, h.first.c_str()); NewHook(h.second, h.first.c_str());
} }
bool NewHook(HookParam hp, LPCSTR name) bool NewHook(HookParam hp, LPCSTR name)

View File

@ -1,7 +1,7 @@
set(VERSION_MAJOR 6) set(VERSION_MAJOR 6)
set(VERSION_MINOR 5) set(VERSION_MINOR 6)
set(VERSION_PATCH 8) set(VERSION_PATCH 0)
set(VERSION_REVISION 0) set(VERSION_REVISION 0)
set(LUNA_VERSION "{${VERSION_MAJOR},${VERSION_MINOR},${VERSION_PATCH},${VERSION_REVISION}}") set(LUNA_VERSION "{${VERSION_MAJOR},${VERSION_MINOR},${VERSION_PATCH},${VERSION_REVISION}}")
add_library(VERSION_DEF INTERFACE) add_library(VERSION_DEF INTERFACE)

View File

@ -5,7 +5,6 @@ from traceback import print_exc
import qtawesome, windows, winsharedutils, gobject import qtawesome, windows, winsharedutils, gobject
from myutils.config import savehook_new_data, static_data, globalconfig, _TR, isascii from myutils.config import savehook_new_data, static_data, globalconfig, _TR, isascii
from myutils.utils import checkchaos, get_time_stamp, dynamiclink, is_ascii_control from myutils.utils import checkchaos, get_time_stamp, dynamiclink, is_ascii_control
from myutils.wrapper import Singleton_close
from gui.dialog_savedgame import dialog_setting_game from gui.dialog_savedgame import dialog_setting_game
from gui.usefulwidget import ( from gui.usefulwidget import (
closeashidewindow, closeashidewindow,

View File

@ -1057,7 +1057,8 @@ def is_ascii_symbo(c: str):
def is_ascii_control(c: str): def is_ascii_control(c: str):
return cinranges(c, (0, 0x1F), (0x7F, 0xA0)) # 不要管\r\n
return cinranges(c, (0, 0x9), (0xB, 0xC), (0xE, 0x1F), (0x7F, 0xA0))
def checkchaos(text): def checkchaos(text):