Merge remote-tracking branch 'origin/master'

# Conflicts:
#	incubator-common/src/main/java/com/incubator/common/net/netty/server/NettyServer.java
#	incubator-common/src/main/java/com/incubator/common/net/netty/server/NettyServerConfig.java

incubator-game/src/main/java/com/incubator/game/handler/room/TributeHandler.java

@@ -125,21 +125,36 @@ public class TributeHandler extends NetHandler {
 		tributeInfo.put("tributeList", room.data.tributeList);
 		tributeInfo.put("twoKingInfo", room.data.towKingList);
 		tributeInfo.put("tributeState", room.data.tributeState);
-		// 进还贡的选牌map
-		tributeInfo.put("tributeCardMap", room.data.tributeCardMap);
-
-		// 还贡是否广播
-		boolean isBroadcast = tributes.contains(player.getId());
 
-		if (backs.contains(player.getId()) && room.checkBackTributeStart()) {
-			isBroadcast = true;
+		// 进贡广播
+		if (tributes.contains(player.getId())) {
+			// 广播其他3人
+			for (Player tmPlayer : room.actors.values()) {
+				if (tmPlayer != null && !Objects.equals(tmPlayer.getId(), player.getId())) {
+					Map<String, Object> data = room.roomToMessage(tmPlayer, null);
+					tributeInfo.put("tributeCardMap", room.data.tributeCardMap);
+					data.put("tributeInfo", tributeInfo);
+					tmPlayer.receive(CommonProto.Cmd.EnterBackCardsBroadcast_VALUE, data);
+				}
+			}
 		}
 
-		// 广播其他3人
-		if (isBroadcast) {
+		// 还贡广播
+		if (backs.contains(player.getId())) {
+			// 广播其他3人
 			for (Player tmPlayer : room.actors.values()) {
 				if (tmPlayer != null && !Objects.equals(tmPlayer.getId(), player.getId())) {
 					Map<String, Object> data = room.roomToMessage(tmPlayer, null);
+
+					Map<String, Integer> tributeCardMap = new HashMap<>();
+					for (Map.Entry<String, Integer> entry : room.data.tributeCardMap.entrySet()) {
+						int value = entry.getValue();
+						if (entry.getKey().equals(player.getId())) {
+							value = room.checkBackTributeStart()? entry.getValue() : 0;
+						}
+						tributeCardMap.put(entry.getKey(), value);
+					}
+					tributeInfo.put("tributeCardMap", tributeCardMap);
 					data.put("tributeInfo", tributeInfo);
 					tmPlayer.receive(CommonProto.Cmd.EnterBackCardsBroadcast_VALUE, data);
 				}
@@ -148,6 +163,7 @@ public class TributeHandler extends NetHandler {
 
 		// 正常返回
 		Map<String, Object> data = room.roomToMessage(player, null);
+		tributeInfo.put("tributeCardMap", room.data.tributeCardMap);
 		data.put("tributeInfo", tributeInfo);
 		response.setData(data);
 	}

incubator-game/src/main/java/com/incubator/game/room/FSGDRoom.java

@@ -604,7 +604,7 @@ public class FSGDRoom extends Room {
         data.put("opId", opPlayer != null ? opPlayer.getId() : "");
         data.put("opPos", opPlayer != null ? opPlayer.data.pos : -1);
         data.put("curDiscardList", this.data.curDisCardList);
-        data.put("curDisCardType", this.data.curDisCardType != null? this.data.curDisCardType.toString() : "");
+        data.put("curDiscardType", this.data.curDisCardType != null? this.data.curDisCardType.toString() : "");
         data.put("curDiscardPlayer", this.data.disCardPlayer != null ? this.data.disCardPlayer.getId() : "");
         data.put("curDiscardSex", this.data.disCardPlayer != null ? this.data.disCardPlayer.data.sex : 0);
         data.put("curPassList", this.data.passList);
@@ -655,7 +655,7 @@ public class FSGDRoom extends Room {
         cardInfo.put("remainCards", flag? player.data.remainCards : "");
         cardInfo.put("remainCardsNum", player.data.remainCards.length);
         cardInfo.put("discardList", player.data.discardList);
-        cardInfo.put("disCardType", player.data.disCardType);
+        cardInfo.put("discardType", player.data.disCardType);
         cardInfo.put("tributeGetCard", player.data.tributeGetCard);
         data.put("cardInfo", cardInfo);
         return data;

incubator-game/src/main/java/com/incubator/game/room/FSGDTable.java

@@ -1176,7 +1176,7 @@ public class FSGDTable {
         data.put("opId", opPlayer != null ? opPlayer.getId() : "");
         data.put("opPos", opPlayer != null ? opPlayer.data.pos : -1);
         data.put("curDiscardList", this.data.curDisCardList);
-        data.put("curDisCardType", this.data.curDisCardType != null? this.data.curDisCardType.toString() : "");
+        data.put("curDiscardType", this.data.curDisCardType != null? this.data.curDisCardType.toString() : "");
         data.put("curDiscardPlayer", this.data.disCardPlayer != null ? this.data.disCardPlayer.getId() : "");
         data.put("curDiscardSex", this.data.disCardPlayer != null ? this.data.disCardPlayer.data.sex : 0);
         data.put("curPassList", this.data.passList);
@@ -1225,7 +1225,7 @@ public class FSGDTable {
         cardInfo.put("remainCards", flag? player.data.remainCards : "");
         cardInfo.put("remainCardsNum", player.data.remainCards.length);
         cardInfo.put("discardList", player.data.discardList);
-        cardInfo.put("disCardType", player.data.disCardType);
+        cardInfo.put("discardType", player.data.disCardType);
         cardInfo.put("tributeGetCard", player.data.tributeGetCard);
         data.put("cardInfo", cardInfo);
         return data;

incubator-game/src/main/java/com/incubator/game/room/GDRoom.java

@@ -1994,7 +1994,7 @@ public class GDRoom extends Room {
         data.put("opId", opPlayer != null ? opPlayer.getId() : "");
         data.put("opPos", opPlayer != null ? opPlayer.data.pos : -1);
         data.put("curDiscardList", this.data.curDisCardList);
-        data.put("curDisCardType", this.data.curDisCardType != null? this.data.curDisCardType.toString() : "");
+        data.put("curDiscardType", this.data.curDisCardType != null? this.data.curDisCardType.toString() : "");
         data.put("curDiscardPlayer", this.data.disCardPlayer != null ? this.data.disCardPlayer.getId() : "");
         data.put("curDiscardSex", this.data.disCardPlayer != null ? this.data.disCardPlayer.data.sex : 0);
         data.put("curPassList", this.data.passList);
@@ -2053,7 +2053,7 @@ public class GDRoom extends Room {
         cardInfo.put("remainCards", flag? player.data.remainCards : "");
         cardInfo.put("remainCardsNum", player.data.remainCards.length);
         cardInfo.put("discardList", player.data.discardList);
-        cardInfo.put("disCardType", player.data.disCardType != null? player.data.disCardType.toString() : "");
+        cardInfo.put("discardType", player.data.disCardType != null? player.data.disCardType.toString() : "");
         cardInfo.put("tributeGetCard", player.data.tributeGetCard);
         data.put("cardInfo", cardInfo);
         return data;

incubator-game/src/main/java/com/incubator/game/room/ZDRoom.java

@@ -1588,7 +1588,7 @@ public class ZDRoom extends Room {
         data.put("opId", opPlayer != null ? opPlayer.getId() : "");
         data.put("opPos", opPlayer != null ? opPlayer.data.pos : -1);
         data.put("curDiscardList", this.data.curDisCardList);
-        data.put("curDisCardType", this.data.curDisCardType != null? this.data.curDisCardType.toString() : "");
+        data.put("curDiscardType", this.data.curDisCardType != null? this.data.curDisCardType.toString() : "");
         data.put("curDiscardPlayer", this.data.disCardPlayer != null ? this.data.disCardPlayer.getId() : "");
         data.put("curDiscardSex", this.data.disCardPlayer != null ? this.data.disCardPlayer.data.sex : 0);
         data.put("curPassList", this.data.passList);
@@ -1642,7 +1642,7 @@ public class ZDRoom extends Room {
         cardInfo.put("remainCards", flag? player.data.remainCards : "");
         cardInfo.put("remainCardsNum", player.data.remainCards.length);
         cardInfo.put("discardList", player.data.discardList);
-        cardInfo.put("disCardType", player.data.disCardType != null? player.data.disCardType.toString() : "");
+        cardInfo.put("discardType", player.data.disCardType != null? player.data.disCardType.toString() : "");
         cardInfo.put("tributeGetCard", player.data.tributeGetCard);
         data.put("cardInfo", cardInfo);
         return data;