Skip to content

Y
ygopro
Commit 203b435c authored by mercury233's avatar mercury233
Browse files
Options

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

parents c956dfcb 7a6ffff3
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
gframe/duelclient.cpp
View file @ 203b435c
...@@ -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;
......
gframe/game.cpp
View file @ 203b435c
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <dirent.h> #include <dirent.h>
#endif #endif
const unsigned short PRO_VERSION = 0x133F; const unsigned short PRO_VERSION = 0x1340;
namespace ygo { namespace ygo {
......
ocgcore @ fe0abffd
Subproject commit 47db364c74ea851bf2c896b0f098842f77cde7c2 Subproject commit fe0abffda1317f03b9f6cd7e3f9ee490e827d764
script @ e81b5d13
Subproject commit 14c74b934e2da9201a3dfe70fb96782185bcce66 Subproject commit e81b5d1314946c939dbe05894f4c060efc4e1f17
strings.conf
View file @ 203b435c
...@@ -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