diff --git a/src/com/sheep/util/BrandUtil.java b/src/com/sheep/util/BrandUtil.java index 3dca6b7..bb712fc 100644 --- a/src/com/sheep/util/BrandUtil.java +++ b/src/com/sheep/util/BrandUtil.java @@ -12,26 +12,41 @@ import java.util.Random; public class BrandUtil { public static Random random = new Random(); - public static String[] brandName= { + public static String[] brandName1= { "刷子","剪刀","叉子","手套", "木桩","棉花","毛线","水桶", "火堆","牛奶","玉米","白菜", "稻草","萝卜","铃铛","青草", }; - public static String getBrandName(){ - int randomIndex = random.nextInt(brandName.length); - return brandName[randomIndex]; + public static String[] brandName2={ + "羊1","羊2","羊3","羊4", + "羊5","羊6","羊7","羊8", + "羊9","羊10","羊11","羊12", + "羊13","羊14","羊15","羊16", + }; + public static String getBrandName(Integer gameMode){ + int randomIndex = random.nextInt(brandName1.length); + String retname = ""; + switch (gameMode){ + case 1: + retname = brandName1[randomIndex]; + break; + case 2: + retname = brandName2[randomIndex]; + break; + } + return retname; } //创建随机牌的数组 - public static Brand[] buildBrands(Integer capacity){ + public static Brand[] buildBrands(Integer capacity,Integer gamemode){ //创建牌数组 Brand[] brands = new Brand[capacity]; //赋值 for (int i = 0; i < brands.length; i+=3) { - String randomBrandName = getBrandName(); + String randomBrandName = getBrandName(gamemode); Brand brand1 = new Brand(randomBrandName); Brand brand2 = new Brand(randomBrandName); Brand brand3 = new Brand(randomBrandName); diff --git a/src/com/sheep/util/LayerUtil.java b/src/com/sheep/util/LayerUtil.java index 2eb924b..361c668 100644 --- a/src/com/sheep/util/LayerUtil.java +++ b/src/com/sheep/util/LayerUtil.java @@ -7,13 +7,13 @@ import com.sheep.model.Map; public class LayerUtil { - public static Layer LayerBuild(Integer rowNum,Integer colNum,Map map){ + public static Layer LayerBuild(Integer rowNum,Integer colNum,Map map,Integer gameMode){ //创建一个二维图层 Layer layer = new Layer(rowNum, colNum); //创建牌数组 - Brand[] brands = BrandUtil.buildBrands(layer.getCapacity()); + Brand[] brands = BrandUtil.buildBrands(layer.getCapacity(),gameMode); //将打乱的牌放入图层 int flag = 0; diff --git a/src/com/sheep/util/MapUtil.java b/src/com/sheep/util/MapUtil.java index f967eac..c82e275 100644 --- a/src/com/sheep/util/MapUtil.java +++ b/src/com/sheep/util/MapUtil.java @@ -8,14 +8,16 @@ import com.sheep.model.Cell; import com.sheep.model.Layer; import com.sheep.model.Map; +import javax.swing.*; + public class MapUtil { - public static Map MapBuild(Integer floorHeight) { + public static Map MapBuild(Integer floorHeight,Integer gameMode) { Map map = new Map(); map.setFoolHeight(floorHeight); - Layer layer1 = LayerUtil.LayerBuild(6, 6,map); - Layer layer2 = LayerUtil.LayerBuild(6, 6,map); - Layer layer3 = LayerUtil.LayerBuild(6, 6,map); + Layer layer1 = LayerUtil.LayerBuild(6, 6,map,gameMode); + Layer layer2 = LayerUtil.LayerBuild(6, 6,map,gameMode); + Layer layer3 = LayerUtil.LayerBuild(6, 6,map,gameMode); layer1.setMap(map); layer2.setMap(map); @@ -65,6 +67,7 @@ public class MapUtil { public static void compareAll(Map m){ Map map = m; + boolean flag = true; //i=0,最顶层,不需要比较 for (int i = 1; i < map.getList().size(); i++) { Layer layer = map.getList().get(i); @@ -74,6 +77,7 @@ public class MapUtil { for(int col = 0;col