修复tag观战聊天问题

Classes/gframe/event_handler.cpp

@@ -950,16 +950,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				const wchar_t* input = mainGame->ebChatInput->getText();
 				if(input[0]) {
 					unsigned short msgbuf[256];
-					if(mainGame->dInfo.isStarted) {
-						if(mainGame->dInfo.player_type < 7) {
-							if(mainGame->dInfo.isTag && (mainGame->dInfo.player_type % 2))
-								mainGame->AddChatMsg((wchar_t*)input, 2);
-							else
-								mainGame->AddChatMsg((wchar_t*)input, 0);
-						} else
-							mainGame->AddChatMsg((wchar_t*)input, 10);
-					} else
-						mainGame->AddChatMsg((wchar_t*)input, 7);
 					int len = BufferIO::CopyWStr(input, msgbuf, 256);
 					DuelClient::SendBufferToServer(CTOS_CHAT, msgbuf, (len + 1) * sizeof(short));
 					mainGame->ebChatInput->setText(L"");

Classes/gframe/single_duel.cpp

@@ -27,17 +27,10 @@ void SingleDuel::Chat(DuelPlayer* dp, void* pdata, int len) {
 	scc.player = dp->type;
 	unsigned short* msg = (unsigned short*)pdata;
 	int msglen = BufferIO::CopyWStr(msg, scc.msg, 256);
-	if(dp->type > 1) {
-		NetServer::SendBufferToPlayer(players[0], STOC_CHAT, &scc, 4 + msglen * 2);
-		NetServer::ReSendToPlayer(players[1]);
-		for(auto pit = observers.begin(); pit != observers.end(); ++pit)
-			if((*pit) != dp)
-				NetServer::ReSendToPlayer(*pit);
-	} else {
-		NetServer::SendBufferToPlayer(players[1 - dp->type], STOC_CHAT, &scc, 4 + msglen * 2);
-		for(auto pit = observers.begin(); pit != observers.end(); ++pit)
-			NetServer::ReSendToPlayer(*pit);
-	}
+	NetServer::SendBufferToPlayer(players[0], STOC_CHAT, &scc, 4 + msglen * 2);
+	NetServer::ReSendToPlayer(players[1]);
+	for(auto pit = observers.begin(); pit != observers.end(); ++pit)
+		NetServer::ReSendToPlayer(*pit);
 }
 void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
 	if(!is_creater) {

Classes/gframe/single_mode.cpp

@@ -95,9 +95,6 @@ int SingleMode::SinglePlayThread(void* param) {
 	mainGame->dInfo.isSingleMode = true;
 	mainGame->device->setEventReceiver(&mainGame->dField);
 	mainGame->gMutex.Unlock();
-#ifdef _IRR_ANDROID_PLATFORM_
-		android::toggleOverlayView(mainGame->appMain, true);
-#endif
 	char engineBuffer[0x1000];
 	is_closing = false;
 	is_continuing = true;
@@ -137,6 +134,7 @@ int SingleMode::SinglePlayThread(void* param) {
 	wchar_t timetext[80];
 	mbstowcs(timetext, timebuf, size);
 	mainGame->ebRSName->setText(timetext);
+	mainGame->wReplaySave->setText(dataManager.GetSysString(1340));
 	mainGame->PopupElement(mainGame->wReplaySave);
 	mainGame->gMutex.Unlock();
 	mainGame->replaySignal.Reset();
@@ -144,9 +142,6 @@ int SingleMode::SinglePlayThread(void* param) {
 	if(mainGame->actionParam)
 		last_replay.SaveReplay(mainGame->ebRSName->getText());
 	end_duel(pduel);
-#ifdef _IRR_ANDROID_PLATFORM_
-		android::toggleOverlayView(mainGame->appMain, false);
-#endif
 	if(!is_closing) {
 		mainGame->gMutex.Lock();
 		mainGame->dInfo.isStarted = false;

Classes/gframe/tag_duel.cpp

@@ -24,8 +24,9 @@ void TagDuel::Chat(DuelPlayer* dp, void* pdata, int len) {
 	unsigned short* msg = (unsigned short*)pdata;
 	int msglen = BufferIO::CopyWStr(msg, scc.msg, 256);
 	for(int i = 0; i < 4; ++i)
-		if(players[i] != dp)
-			NetServer::SendBufferToPlayer(players[i], STOC_CHAT, &scc, 4 + msglen * 2);
+		NetServer::SendBufferToPlayer(players[i], STOC_CHAT, &scc, 4 + msglen * 2);
+	for(auto pit = observers.begin(); pit != observers.end(); ++pit)
+		NetServer::ReSendToPlayer(*pit);
 }
 void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
 	if(!is_creater) {

mobile/assets/changelog.html

@@ -21,8 +21,14 @@
 <pre>
     更新：
     1.更新ygo内核；
-    2.新卡ST18+18SP+VJ
-    3.升级lua为5.3
+    2.新卡ST18+18SP+VJ；
+    3.升级lua为5.3；
+    优化：
+    1.优化英、韩文界面；
+    2.新增更新比较快的正式卡服；
+    修复：
+    1.补充缺失的部分场地底盘和token图；
+    2.四人决斗中观战聊天不可见的问题；
 </pre>
 <ul>
     <li style="color:#ffffff">3.1.6</li>

mobile/assets/serverlist.xml

@@ -9,6 +9,13 @@
         <port>17225</port>
         <keep>true</keep>
     </server>
+    <server>
+        <player-name>Knight of Hanoi</player-name>
+        <name>Koishi 중국서버</name>
+        <ip>koishi.ygopro.cn</ip>
+        <port>7210</port>
+        <keep>true</keep>
+    </server>
     <server>
         <player-name>Knight of Hanoi</player-name>
         <name>YGOPRO 중국서버</name>

mobile/build.gradle

@@ -9,7 +9,7 @@ android {
         applicationId "cn.garymb.ygomobile.KO"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 310702
+        versionCode 3107331
         versionName "KO3.1.7"
         vectorDrawables.useSupportLibrary = true
         ndk {