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

203b435c · mercury233 · c956dfcb · 7a6ffff3 · 203b435c · 203b435c
Commit 203b435c authored Oct 20, 2017 by mercury233
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

gframe/duelclient.cpp gframe/duelclient.cpp +1 -0

gframe/game.cpp gframe/game.cpp +1 -1

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +1 -0

No files found.
--- a/gframe/duelclient.cpp
+++ b/gframe/duelclient.cpp
@@ -1470,6 +1470,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		int count = BufferIO::ReadInt8(pbuf);
 		mainGame->dField.selectable_cards.clear();
 		mainGame->dField.selected_cards.clear();
+		mainGame->dField.select_panalmode = false;
 		int c, l, s, t;
 		unsigned int code;
 		ClientCard* pcard;

--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -14,7 +14,7 @@
 #include <dirent.h>
 #endif

-const unsigned short PRO_VERSION = 0x133F;
+const unsigned short PRO_VERSION = 0x1340;

 namespace ygo {


--- a/ocgcore @ fe0abffd
+++ b/ocgcore @ fe0abffd
-Subproject commit 47db364c74ea851bf2c896b0f098842f77cde7c2
+Subproject commit fe0abffda1317f03b9f6cd7e3f9ee490e827d764
--- a/script @ e81b5d13
+++ b/script @ e81b5d13
-Subproject commit 14c74b934e2da9201a3dfe70fb96782185bcce66
+Subproject commit e81b5d1314946c939dbe05894f4c060efc4e1f17
--- a/strings.conf
+++ b/strings.conf
@@ -100,6 +100,7 @@
 !system 530 请选择对方的卡
 !system 531 请选择上级召唤用需要解放的怪兽
 !system 532 请选择要取除超量素材的怪兽
+!system 533 请选择连接召唤的素材
 !system 549 请选择攻击的对象
 !system 550 请选择要发动的效果
 !system 551 请选择效果的对象