diff --git a/gframe/client_field.cpp b/gframe/client_field.cpp index dbd40728a..5c2036c82 100644 --- a/gframe/client_field.cpp +++ b/gframe/client_field.cpp @@ -383,6 +383,18 @@ void ClientField::ClearSelect() { (*cit)->is_selectable = false; (*cit)->is_selected = false; } + for(auto cit = selected_cards.begin(); cit != selected_cards.end(); ++cit) { + (*cit)->is_selectable = false; + (*cit)->is_selected = false; + } + for(auto cit = selectsum_all.begin(); cit != selectsum_all.end(); ++cit) { + (*cit)->is_selectable = false; + (*cit)->is_selected = false; + } + for(auto cit = selectsum_cards.begin(); cit != selectsum_cards.end(); ++cit) { + (*cit)->is_selectable = false; + (*cit)->is_selected = false; + } } void ClientField::ClearChainSelect() { for(auto cit = activatable_cards.begin(); cit != activatable_cards.end(); ++cit) { diff --git a/gframe/duelclient.cpp b/gframe/duelclient.cpp index 045031f60..5e2e7a94b 100644 --- a/gframe/duelclient.cpp +++ b/gframe/duelclient.cpp @@ -4166,7 +4166,10 @@ void DuelClient::SendResponse() { break; } case MSG_SELECT_CARD: - case MSG_SELECT_UNSELECT_CARD: { + case MSG_SELECT_UNSELECT_CARD: + case MSG_SELECT_TRIBUTE: + case MSG_SELECT_SUM: + case MSG_SELECT_COUNTER: { mainGame->dField.ClearSelect(); for (auto cit = mainGame->dField.limbo_temp.begin(); cit != mainGame->dField.limbo_temp.end(); ++cit) delete *cit; @@ -4177,24 +4180,6 @@ void DuelClient::SendResponse() { mainGame->dField.ClearChainSelect(); break; } - case MSG_SELECT_TRIBUTE: { - mainGame->dField.ClearSelect(); - break; - } - case MSG_SELECT_COUNTER: { - mainGame->dField.ClearSelect(); - break; - } - case MSG_SELECT_SUM: { - for(int i = 0; i < mainGame->dField.must_select_count; ++i) { - mainGame->dField.selected_cards[i]->is_selected = false; - } - for(size_t i = 0; i < mainGame->dField.selectsum_all.size(); ++i) { - mainGame->dField.selectsum_all[i]->is_selectable = false; - mainGame->dField.selectsum_all[i]->is_selected = false; - } - break; - } case MSG_CONFIRM_CARDS: { for (auto cit = mainGame->dField.limbo_temp.begin(); cit != mainGame->dField.limbo_temp.end(); ++cit) delete *cit; diff --git a/gframe/game.cpp b/gframe/game.cpp index e52c51439..96cdbf38b 100644 --- a/gframe/game.cpp +++ b/gframe/game.cpp @@ -100,6 +100,7 @@ bool Game::Initialize() { L"/usr/share/fonts/truetype/DroidSansFallbackFull.ttf", L"/usr/share/fonts/opentype/noto/NotoSansCJK-Bold.ttc", L"/usr/share/fonts/google-noto-cjk/NotoSansCJK-Bold.ttc", + L"/usr/share/fonts/noto-cjk/NotoSansCJK-Bold.ttc", L"/System/Library/Fonts/SFNSTextCondensed-Bold.otf", L"/System/Library/Fonts/SFNS.ttf", L"./fonts/numFont.ttf", @@ -122,6 +123,7 @@ bool Game::Initialize() { L"/usr/share/fonts/truetype/DroidSansFallbackFull.ttf", L"/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc", L"/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc", + L"/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc", L"/System/Library/Fonts/PingFang.ttc", L"./fonts/textFont.ttf", L"./fonts/textFont.ttc",