Skip to content

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

Merge branch 'master' into another

parents 26900ba3 1d492a1f
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
gframe/deck_con.cpp
View file @ b3e9ff9e
...@@ -226,11 +226,14 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -226,11 +226,14 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break; break;
mainGame->gMutex.Lock(); mainGame->gMutex.Lock();
mainGame->wDeckCode->setText(dataManager.GetSysString(1387)); mainGame->wDeckCode->setText(dataManager.GetSysString(1387));
wchar_t deck_code[2048]; if(deckManager.current_deck.main.size() > 0 || deckManager.current_deck.extra.size() > 0 || deckManager.current_deck.side.size() > 0) {
char deck_code_utf8[1024]; wchar_t deck_code[2048];
deckManager.SaveDeckToCode(deckManager.current_deck, deck_code_utf8); char deck_code_utf8[1024];
BufferIO::DecodeUTF8(deck_code_utf8, deck_code); deckManager.SaveDeckToCode(deckManager.current_deck, deck_code_utf8);
mainGame->ebDeckCode->setText(deck_code); BufferIO::DecodeUTF8(deck_code_utf8, deck_code);
mainGame->ebDeckCode->setText(deck_code);
} else
mainGame->ebDeckCode->setText(L"");
mainGame->PopupElement(mainGame->wDeckCode); mainGame->PopupElement(mainGame->wDeckCode);
mainGame->gMutex.Unlock(); mainGame->gMutex.Unlock();
prev_operation = id; prev_operation = id;
......
strings.conf
View file @ b3e9ff9e
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
!system 1385 列表为空，可能未安装合适的人机 !system 1385 列表为空，可能未安装合适的人机
!system 1386 使用正则表达式搜索卡片 !system 1386 使用正则表达式搜索卡片
!system 1387 卡组代码 !system 1387 卡组代码
!system 1388 卡组代码（Ctrl+A全选，Ctrl+C复制，Ctrl+V粘贴） !system 1388 Ctrl+A全选，Ctrl+C复制，Ctrl+V粘贴
!system 1389 卡组代码无效。 !system 1389 卡组代码无效。
!system 1390 等待行动中... !system 1390 等待行动中...
!system 1391 等待行动中.... !system 1391 等待行动中....
......
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