Skip to content

Y
ygopro-2pick
Commit 706f1b33 authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server

parents 61ee15fb 9b3a65f9
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
gframe/duelclient.cpp
View file @ 706f1b33
...@@ -1470,6 +1470,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1470,6 +1470,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
int count = BufferIO::ReadInt8(pbuf); int count = BufferIO::ReadInt8(pbuf);
mainGame->dField.selectable_cards.clear(); mainGame->dField.selectable_cards.clear();
mainGame->dField.selected_cards.clear(); mainGame->dField.selected_cards.clear();
mainGame->dField.select_panalmode = false;
int c, l, s, t; int c, l, s, t;
unsigned int code; unsigned int code;
ClientCard* pcard; ClientCard* pcard;
......
strings.conf
View file @ 706f1b33
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
!system 530 请选择对方的卡 !system 530 请选择对方的卡
!system 531 请选择上级召唤用需要解放的怪兽 !system 531 请选择上级召唤用需要解放的怪兽
!system 532 请选择要取除超量素材的怪兽 !system 532 请选择要取除超量素材的怪兽
!system 533 请选择连接召唤的素材
!system 549 请选择攻击的对象 !system 549 请选择攻击的对象
!system 550 请选择要发动的效果 !system 550 请选择要发动的效果
!system 551 请选择效果的对象 !system 551 请选择效果的对象
......
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