Merge branch 'master' into server

f770a4dc · nanahira · 1c060a44 · c1f70f7a · f770a4dc · f770a4dc
Commit f770a4dc authored Dec 01, 2019 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

cards.cdb cards.cdb +0 -0

gframe/game.cpp gframe/game.cpp +1 -1

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -149,7 +149,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Sakura", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Fortune", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

--- a/ocgcore @ 339f3634
+++ b/ocgcore @ 339f3634
-Subproject commit 18edd6bec8b6e876cddb296989993b9009f54bbe
+Subproject commit 339f363431cd22f60189284c37708063c554e835
--- a/script @ fbaf5bb5
+++ b/script @ fbaf5bb5
-Subproject commit 99a7162f1deffcfb02ce2a7f03ee6e76ba2cbba7
+Subproject commit fbaf5bb51f7ec87ecf8a31048f0544b3ca6dc778
--- a/strings.conf
+++ b/strings.conf
@@ -49,7 +49,7 @@
 !system 94 是否现在使用这张卡的效果？
 !system 95 是否使用[%ls]的效果？
 !system 96 是否使用[%ls]的效果代替破坏？
-!system 97 是否把[%ls]在魔法与陷阱区域盖放？
+!system 97 是否把[%ls]在魔法与陷阱区域放置？
 !system 98 是否要解放对方怪兽？
 !system 100 先攻
 !system 101 后攻