Skip to content

Y
ygopro
Commit f770a4dc authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 1c060a44 c1f70f7a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cards.cdb
View file @ f770a4dc
No preview for this file type
gframe/game.cpp
View file @ f770a4dc
...@@ -149,7 +149,7 @@ bool Game::Initialize() { ...@@ -149,7 +149,7 @@ bool Game::Initialize() {
SetWindowsIcon(); SetWindowsIcon();
//main menu //main menu
wchar_t strbuf[256]; 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 = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
wMainMenu->getCloseButton()->setVisible(false); wMainMenu->getCloseButton()->setVisible(false);
btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200)); btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));
......
ocgcore @ 339f3634
Subproject commit 18edd6bec8b6e876cddb296989993b9009f54bbe Subproject commit 339f363431cd22f60189284c37708063c554e835
script @ fbaf5bb5
Subproject commit 99a7162f1deffcfb02ce2a7f03ee6e76ba2cbba7 Subproject commit fbaf5bb51f7ec87ecf8a31048f0544b3ca6dc778
strings.conf
View file @ f770a4dc
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
!system 94 是否现在使用这张卡的效果？ !system 94 是否现在使用这张卡的效果？
!system 95 是否使用[%ls]的效果？ !system 95 是否使用[%ls]的效果？
!system 96 是否使用[%ls]的效果代替破坏？ !system 96 是否使用[%ls]的效果代替破坏？
!system 97 是否把[%ls]在魔法与陷阱区域盖放？ !system 97 是否把[%ls]在魔法与陷阱区域放置？
!system 98 是否要解放对方怪兽？ !system 98 是否要解放对方怪兽？
!system 100 先攻 !system 100 先攻
!system 101 后攻 !system 101 后攻
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment