1.24
parent
12692cbe34
commit
bd9fec7816
|
|
@ -284,7 +284,7 @@ public class HuNanChangSha {
|
||||||
yupanhandcard.addAll(changShaCardInhand);
|
yupanhandcard.addAll(changShaCardInhand);
|
||||||
//进行操作之前能否下听
|
//进行操作之前能否下听
|
||||||
|
|
||||||
List<Integer> shifoutingpai = changShaSuanFaTest.handscardshifoutingpai(changShaCardInhand,chowGroup,pongGroup,gangdepai);
|
List<Integer> shifoutingpai = changShaSuanFaTest.handscardshifoutingpai(yupanhandcard,chowGroup,pongGroup,gangdepai); //问题111
|
||||||
boolean beforelisten = false;//记录操作之前的下听状态
|
boolean beforelisten = false;//记录操作之前的下听状态
|
||||||
System.out.println("shifoutingpai"+shifoutingpai);
|
System.out.println("shifoutingpai"+shifoutingpai);
|
||||||
if (shifoutingpai.size() > 0) {
|
if (shifoutingpai.size() > 0) {
|
||||||
|
|
@ -367,7 +367,6 @@ public class HuNanChangSha {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Util.removeCard(changShaCardInhand,card,4);
|
|
||||||
Util.removeCard(gangusecars,card,4);
|
Util.removeCard(gangusecars,card,4);
|
||||||
List<Integer> shifoutingpai4 = changShaSuanFaTest.handscardshifoutingpai(gangusecars,chowGroup,pongGroup,gangdepai);
|
List<Integer> shifoutingpai4 = changShaSuanFaTest.handscardshifoutingpai(gangusecars,chowGroup,pongGroup,gangdepai);
|
||||||
if (shifoutingpai4.size() > 0) {
|
if (shifoutingpai4.size() > 0) {
|
||||||
|
|
@ -605,7 +604,8 @@ public class HuNanChangSha {
|
||||||
|
|
||||||
|
|
||||||
if (map.size() > 0 && weight==3) {
|
if (map.size() > 0 && weight==3) {
|
||||||
|
log.info("补map2 ++++++++++++++++++++++" + map2);
|
||||||
|
log.info("补map ================ ++++++++++" + map);
|
||||||
if (map2.size() > 0) {
|
if (map2.size() > 0) {
|
||||||
//判断补牌后
|
//判断补牌后
|
||||||
if (Integer.parseInt(map2.get("remainingMelds").toString())>Integer.parseInt(map.get("remainingMelds").toString())&&Integer.parseInt(map.get("remainingMelds").toString())<=2){
|
if (Integer.parseInt(map2.get("remainingMelds").toString())>Integer.parseInt(map.get("remainingMelds").toString())&&Integer.parseInt(map.get("remainingMelds").toString())<=2){
|
||||||
|
|
@ -631,7 +631,7 @@ public class HuNanChangSha {
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println("补");
|
System.out.println("补");
|
||||||
|
System.out.println("类型----"+type);
|
||||||
params.putString("session", session + "," + token);
|
params.putString("session", session + "," + token);
|
||||||
params.putInt("qi", 0);
|
params.putInt("qi", 0);
|
||||||
params.putInt("id", id);
|
params.putInt("id", id);
|
||||||
|
|
@ -996,7 +996,7 @@ public class HuNanChangSha {
|
||||||
/**
|
/**
|
||||||
* 处理杠碰胡操作
|
* 处理杠碰胡操作
|
||||||
*
|
*
|
||||||
* @param param 消息参数
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
|
|
@ -1842,7 +1842,7 @@ public class HuNanChangSha {
|
||||||
// hands1.add(208);
|
// hands1.add(208);
|
||||||
|
|
||||||
int card= 106;
|
int card= 106;
|
||||||
huNanChangSha.changShaCardInhand.addAll(hands1);
|
// huNanChangSha.changShaCardInhand.addAll(hands1);
|
||||||
TArray tiplist= new TArray();
|
TArray tiplist= new TArray();
|
||||||
ITArray opcard = TArray.newInstance();
|
ITArray opcard = TArray.newInstance();
|
||||||
opcard.addInt(108);
|
opcard.addInt(108);
|
||||||
|
|
|
||||||
|
|
@ -295,7 +295,6 @@ public class ChangShaSuanFaTest {
|
||||||
|
|
||||||
Integer maxCard = maxCards.isEmpty() ? null : maxCards.get(0);
|
Integer maxCard = maxCards.isEmpty() ? null : maxCards.get(0);
|
||||||
System.out.println("maxCard++++++++++++++++++++++++++++++" + maxCard);
|
System.out.println("maxCard++++++++++++++++++++++++++++++" + maxCard);
|
||||||
System.out.printf("特殊牌型处理333 +++++++++++++++++++++++++++++++++++");
|
|
||||||
|
|
||||||
return String.valueOf(maxCard);
|
return String.valueOf(maxCard);
|
||||||
|
|
||||||
|
|
@ -480,11 +479,6 @@ public class ChangShaSuanFaTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// List<Integer> checktingpai = TinHuChi.checktingpai(cardInhand);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//碰碰胡
|
//碰碰胡
|
||||||
List<Integer> checktingpai1 = TinHuChi.checktingpai(cardInhand);
|
List<Integer> checktingpai1 = TinHuChi.checktingpai(cardInhand);
|
||||||
|
|
||||||
|
|
@ -515,7 +509,6 @@ public class ChangShaSuanFaTest {
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
Integer maxCard = maxCards.isEmpty() ? null : maxCards.get(0);
|
Integer maxCard = maxCards.isEmpty() ? null : maxCards.get(0);
|
||||||
System.out.printf("特殊牌型处理777 +++++++++++++++++++++++++++++++++++");
|
|
||||||
|
|
||||||
return String.valueOf(maxCard);
|
return String.valueOf(maxCard);
|
||||||
|
|
||||||
|
|
@ -4767,7 +4760,10 @@ public class ChangShaSuanFaTest {
|
||||||
|
|
||||||
public static Map<Integer,List<Integer>> quyizhangDahuTingPai(List<Integer> cardhand,List<Integer> chowGroup,List<Integer> pongGroup,List<Integer> gangdepai){
|
public static Map<Integer,List<Integer>> quyizhangDahuTingPai(List<Integer> cardhand,List<Integer> chowGroup,List<Integer> pongGroup,List<Integer> gangdepai){
|
||||||
Map<Integer,List<Integer>> map = new HashMap<>();
|
Map<Integer,List<Integer>> map = new HashMap<>();
|
||||||
List<Integer> tmphc = cardhand;
|
List<Integer> tmphc = new ArrayList<>();
|
||||||
|
tmphc.addAll(cardhand);
|
||||||
|
// List<Integer> tmphc = cardhand; //问题111
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < cardhand.size(); i++) {
|
for (int i = 0; i < cardhand.size(); i++) {
|
||||||
int tmpcard = tmphc.get(0);
|
int tmpcard = tmphc.get(0);
|
||||||
|
|
@ -4806,8 +4802,9 @@ public class ChangShaSuanFaTest {
|
||||||
|
|
||||||
public static Map<Integer, List<Integer>> quyizhangTingPai(List<Integer> cardhand) {
|
public static Map<Integer, List<Integer>> quyizhangTingPai(List<Integer> cardhand) {
|
||||||
Map<Integer, List<Integer>> quxiatingmap = new HashMap<>();
|
Map<Integer, List<Integer>> quxiatingmap = new HashMap<>();
|
||||||
|
List<Integer> tmphc = new ArrayList<>();
|
||||||
List<Integer> tmphc = cardhand;
|
tmphc.addAll(cardhand);
|
||||||
|
// List<Integer> tmphc = cardhand; //问题111
|
||||||
|
|
||||||
for (int i = 0; i < cardhand.size(); i++) {
|
for (int i = 0; i < cardhand.size(); i++) {
|
||||||
int tmpcard = tmphc.get(0);
|
int tmpcard = tmphc.get(0);
|
||||||
|
|
|
||||||
|
|
@ -268,7 +268,9 @@ public class TinHuChi {
|
||||||
|
|
||||||
public static List<Integer> checktingpai(List<Integer> cardhand) {
|
public static List<Integer> checktingpai(List<Integer> cardhand) {
|
||||||
List<Integer> tpcards = new ArrayList<>();
|
List<Integer> tpcards = new ArrayList<>();
|
||||||
List<Integer> tmphc = cardhand;
|
List<Integer> tmphc = new ArrayList<>();
|
||||||
|
tmphc.addAll(cardhand);
|
||||||
|
// List<Integer> tmphc = cardhand; //问题111
|
||||||
for (int i = 0; i < cardhand.size(); i++) {
|
for (int i = 0; i < cardhand.size(); i++) {
|
||||||
|
|
||||||
int tmpcard = tmphc.get(0);
|
int tmpcard = tmphc.get(0);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue