Skip to content

Y
ygopro-2pick
Commit ad340888 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents da104dfa 0cae0a3d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
cards.cdb
View file @ ad340888
No preview for this file type
gframe/game.cpp
View file @ ad340888
...@@ -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 Nemesis", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf); myswprintf(strbuf, L"KoishiPro %X.0%X.%X Sakura", 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 @ 565f2fa9
Subproject commit 4844d3009f70464ce1af25dd714daf4354139083 Subproject commit 565f2fa94dd4caead3345b3257e1bcaacd760e72
script @ 256df5d2
Subproject commit 1b6c41a45c45607d676c9c81f343711b8c5787ed Subproject commit 256df5d276033dd6a8b796ae6c53c136aac965be
strings.conf
View file @ ad340888
...@@ -992,7 +992,8 @@ ...@@ -992,7 +992,8 @@
!setname 0x120 调皮宝贝 プランキッズ !setname 0x120 调皮宝贝 プランキッズ
!setname 0x121 魔妖 !setname 0x121 魔妖
!setname 0x122 女武神 ワルキューレ !setname 0x122 女武神 ワルキューレ
!setname 0x123 蔷薇龙 ローズ・ドラゴン !setname 0x123 蔷薇 ローズ
!setname 0x1123 蔷薇龙 ローズ・ドラゴン
!setname 0x124 机械天使 機械天使 !setname 0x124 机械天使 機械天使
!setname 0x125 笑容 スマイル !setname 0x125 笑容 スマイル
!setname 0x126 时间潜行者 クロノダイバー !setname 0x126 时间潜行者 クロノダイバー
......
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