瀏覽代碼

元宇宙相关

sunkean 3 年之前
父節點
當前提交
15fbbe20dd
共有 23 個文件被更改,包括 1293 次插入448 次删除
  1. 32 0
      src/main/java/com/izouma/nineth/converter/MetaGameAwardListConverter.java
  2. 23 0
      src/main/java/com/izouma/nineth/domain/MetaGameAward.java
  3. 26 8
      src/main/java/com/izouma/nineth/domain/MetaGameCopy.java
  4. 54 0
      src/main/java/com/izouma/nineth/domain/MetaZombie.java
  5. 2 3
      src/main/java/com/izouma/nineth/enums/GameCopyType.java
  6. 2 2
      src/main/java/com/izouma/nineth/enums/MetaGame.java
  7. 21 0
      src/main/java/com/izouma/nineth/repo/MetaGameCopyRepo.java
  8. 0 21
      src/main/java/com/izouma/nineth/repo/MetaGameRepo.java
  9. 21 0
      src/main/java/com/izouma/nineth/repo/MetaZombieRepo.java
  10. 1 1
      src/main/java/com/izouma/nineth/service/AssetService.java
  11. 20 0
      src/main/java/com/izouma/nineth/service/MetaGameCopyService.java
  12. 0 20
      src/main/java/com/izouma/nineth/service/MetaGameService.java
  13. 20 0
      src/main/java/com/izouma/nineth/service/MetaZombieService.java
  14. 0 67
      src/main/java/com/izouma/nineth/web/MetaGameController.java
  15. 86 0
      src/main/java/com/izouma/nineth/web/MetaGameCopyController.java
  16. 70 0
      src/main/java/com/izouma/nineth/web/MetaZombieController.java
  17. 0 0
      src/main/resources/genjson/MetaZombie.json
  18. 24 8
      src/main/vue/src/router.js
  19. 461 0
      src/main/vue/src/views/MetaGameCopyEdit.vue
  20. 29 18
      src/main/vue/src/views/MetaGameCopyList.vue
  21. 0 300
      src/main/vue/src/views/MetaGameEdit.vue
  22. 214 0
      src/main/vue/src/views/MetaZombieEdit.vue
  23. 187 0
      src/main/vue/src/views/MetaZombieList.vue

+ 32 - 0
src/main/java/com/izouma/nineth/converter/MetaGameAwardListConverter.java

@@ -0,0 +1,32 @@
+package com.izouma.nineth.converter;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.izouma.nineth.domain.MetaGameAward;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.persistence.AttributeConverter;
+import java.util.List;
+
+public class MetaGameAwardListConverter implements AttributeConverter<List<MetaGameAward>, String> {
+
+    @Override
+    public String convertToDatabaseColumn(List<MetaGameAward> metaGameAwards) {
+        if (metaGameAwards == null) {
+            return null;
+        }
+        return JSON.toJSONString(metaGameAwards);
+    }
+
+    @Override
+    public List<MetaGameAward> convertToEntityAttribute(String s) {
+        if (StringUtils.isEmpty(s)) {
+            return null;
+        }
+        try {
+            return JSONArray.parseArray(s, MetaGameAward.class);
+        } catch (Exception ignored) {
+        }
+        return null;
+    }
+}

+ 23 - 0
src/main/java/com/izouma/nineth/domain/MetaGameAward.java

@@ -0,0 +1,23 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.enums.EntryModeType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MetaGameAward {
+
+    @ApiModelProperty("奖励类型")
+    private EntryModeType awardType;
+
+    @ApiModelProperty("奖励配置(金币奖励为金币数量,NFT奖励为NFT奖励图片地址)")
+    private String config;
+
+    @ApiModelProperty("概率")
+    private int probability;
+
+}

+ 26 - 8
src/main/java/com/izouma/nineth/domain/MetaGame.java → src/main/java/com/izouma/nineth/domain/MetaGameCopy.java

@@ -1,10 +1,13 @@
 package com.izouma.nineth.domain;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.converter.LongArrayConverter;
+import com.izouma.nineth.converter.MetaGameAwardListConverter;
 import com.izouma.nineth.converter.MintRuleConverter;
 import com.izouma.nineth.dto.MintActivityRule;
 import com.izouma.nineth.enums.EntryModeType;
-import com.izouma.nineth.enums.GameModeType;
-import com.izouma.nineth.enums.MetaGameType;
+import com.izouma.nineth.enums.GameCopyType;
+import com.izouma.nineth.enums.MetaGame;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,26 +15,32 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@ApiModel("元宇宙游戏")
-public class MetaGame extends BaseEntity{
+@ApiModel("元宇宙游戏副本配置")
+public class MetaGameCopy extends BaseEntity {
 
-    @ApiModelProperty("游戏")
+    @ApiModelProperty("游戏名称")
     @Enumerated(EnumType.STRING)
-    private MetaGameType name;
+    private MetaGame gameName;
 
-    @ApiModelProperty("游戏模式")
+    @ApiModelProperty("游戏副本类型")
     @Enumerated(EnumType.STRING)
-    private GameModeType gameModeType;
+    private GameCopyType gameCopyType;
 
     @ApiModelProperty("入场方式")
     @Enumerated(EnumType.STRING)
     private EntryModeType entryModeType;
 
+    @ApiModelProperty("规则说明")
+    @Column(columnDefinition = "TEXT")
+    @ExcelProperty("规则说明")
+    private String detail;
+
     @ApiModelProperty("所需金币数量")
     private int goldNum;
 
@@ -50,6 +59,15 @@ public class MetaGame extends BaseEntity{
     @ApiModelProperty("所需nft数量")
     private int num;
 
+    @Convert(converter = LongArrayConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private List<Long> metaZombieIds;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = MetaGameAwardListConverter.class)
+    @ApiModelProperty("奖励配置")
+    private List<MetaGameAward> metaGameAwards;
+
     @ApiModelProperty("是否发布")
     private boolean publish;
 }

+ 54 - 0
src/main/java/com/izouma/nineth/domain/MetaZombie.java

@@ -0,0 +1,54 @@
+package com.izouma.nineth.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙僵尸游戏配置")
+public class MetaZombie extends BaseEntity {
+
+    @ApiModelProperty("配置名称")
+    private String name;
+
+    @ApiModelProperty("僵尸积分")
+    private int zombieIntegral;
+
+    @ApiModelProperty("僵尸攻击伤害")
+    private int zombieAttackDamage;
+
+    @ApiModelProperty("僵尸血量")
+    private int zombieBlood;
+
+    @ApiModelProperty("人类攻击伤害/每发子弹")
+    private int humanAttackDamage;
+
+    @ApiModelProperty("子弹数")
+    private int bulletNum;
+
+    @ApiModelProperty("人类血量")
+    private int humanBlood;
+
+    @ApiModelProperty("特殊僵尸攻击伤害")
+    private int specialZombieAttackDamage;
+
+    @ApiModelProperty("特殊僵尸血量")
+    private int specialZombieBlood;
+
+    @ApiModelProperty("特殊僵尸积分")
+    private int specialZombieIntegral;
+
+    @ApiModelProperty("单局时长")
+    private int singleGameDuration;
+
+    @ApiModelProperty("单局奖励")
+    private String singleGameAward;
+
+}

+ 2 - 3
src/main/java/com/izouma/nineth/enums/GameModeType.java → src/main/java/com/izouma/nineth/enums/GameCopyType.java

@@ -1,7 +1,6 @@
 package com.izouma.nineth.enums;
 
-
-public enum GameModeType {
+public enum GameCopyType {
 
     BRONZE("青铜"),
 
@@ -11,7 +10,7 @@ public enum GameModeType {
 
     private final String description;
 
-    GameModeType(String description) {
+    GameCopyType(String description) {
         this.description = description;
     }
 

+ 2 - 2
src/main/java/com/izouma/nineth/enums/MetaGameType.java → src/main/java/com/izouma/nineth/enums/MetaGame.java

@@ -1,13 +1,13 @@
 package com.izouma.nineth.enums;
 
 
-public enum MetaGameType {
+public enum MetaGame {
 
     ZOMBIE("僵尸游戏");
 
     private final String description;
 
-    MetaGameType(String description) {
+    MetaGame(String description) {
         this.description = description;
     }
 

+ 21 - 0
src/main/java/com/izouma/nineth/repo/MetaGameCopyRepo.java

@@ -0,0 +1,21 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaGameCopy;
+import com.izouma.nineth.enums.GameCopyType;
+import com.izouma.nineth.enums.MetaGame;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface MetaGameCopyRepo extends JpaRepository<MetaGameCopy, Long>, JpaSpecificationExecutor<MetaGameCopy> {
+    @Query("update MetaGameCopy t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    MetaGameCopy findByGameNameAndGameCopyTypeAndPublishAndDel(MetaGame gameName, GameCopyType gameCopyType, boolean publish, boolean del);
+
+}

+ 0 - 21
src/main/java/com/izouma/nineth/repo/MetaGameRepo.java

@@ -1,21 +0,0 @@
-package com.izouma.nineth.repo;
-
-import com.izouma.nineth.domain.MetaGame;
-import com.izouma.nineth.enums.GameModeType;
-import com.izouma.nineth.enums.MetaGameType;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-
-import javax.transaction.Transactional;
-
-public interface MetaGameRepo extends JpaRepository<MetaGame, Long>, JpaSpecificationExecutor<MetaGame> {
-    @Query("update MetaGame t set t.del = true where t.id = ?1")
-    @Modifying
-    @Transactional
-    void softDelete(Long id);
-
-    MetaGame findByNameAndGameModeTypeAndPublishAndDel(MetaGameType name, GameModeType gameModeType, boolean publish, boolean del);
-
-}

+ 21 - 0
src/main/java/com/izouma/nineth/repo/MetaZombieRepo.java

@@ -0,0 +1,21 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MetaZombie;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+public interface MetaZombieRepo extends JpaRepository<MetaZombie, Long>, JpaSpecificationExecutor<MetaZombie> {
+    @Query("update MetaZombie t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    MetaZombie findByNameAndDel(String name, boolean del);
+
+    List<MetaZombie> findAllByDel(boolean del);
+}

+ 1 - 1
src/main/java/com/izouma/nineth/service/AssetService.java

@@ -1167,7 +1167,7 @@ public class AssetService {
                     new MetaPlayerRole(id + 1, "苍茫雷道"),
                     new MetaPlayerRole(id + 2, "炼炉天族"),
                     new MetaPlayerRole(id + 3, "未央宗"),
-                    new MetaPlayerRole(id + 4, "八门"),
+                    new MetaPlayerRole(id + 4, "八门"),
                     new MetaPlayerRole(id + 5, "人族"),
                     new MetaPlayerRole(id + 6, "凤鸣寺"),
                     new MetaPlayerRole(id + 7, "九州岛"));

+ 20 - 0
src/main/java/com/izouma/nineth/service/MetaGameCopyService.java

@@ -0,0 +1,20 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.MetaGameCopy;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.MetaGameCopyRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class MetaGameCopyService {
+
+    private MetaGameCopyRepo metaGameCopyRepo;
+
+    public Page<MetaGameCopy> all(PageQuery pageQuery) {
+        return metaGameCopyRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaGameCopy.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

+ 0 - 20
src/main/java/com/izouma/nineth/service/MetaGameService.java

@@ -1,20 +0,0 @@
-package com.izouma.nineth.service;
-
-import com.izouma.nineth.domain.MetaGame;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.repo.MetaGameRepo;
-import com.izouma.nineth.utils.JpaUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-public class MetaGameService {
-
-    private MetaGameRepo metaGameRepo;
-
-    public Page<MetaGame> all(PageQuery pageQuery) {
-        return metaGameRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaGame.class), JpaUtils.toPageRequest(pageQuery));
-    }
-}

+ 20 - 0
src/main/java/com/izouma/nineth/service/MetaZombieService.java

@@ -0,0 +1,20 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.MetaZombie;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.MetaZombieRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class MetaZombieService {
+
+    private MetaZombieRepo metaZombieRepo;
+
+    public Page<MetaZombie> all(PageQuery pageQuery) {
+        return metaZombieRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaZombie.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

+ 0 - 67
src/main/java/com/izouma/nineth/web/MetaGameController.java

@@ -1,67 +0,0 @@
-package com.izouma.nineth.web;
-
-import com.izouma.nineth.domain.MetaGame;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.MetaGameRepo;
-import com.izouma.nineth.service.MetaGameService;
-import com.izouma.nineth.utils.ObjUtils;
-import com.izouma.nineth.utils.excel.ExcelUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-import java.util.Objects;
-
-@RestController
-@RequestMapping("/metaGame")
-@AllArgsConstructor
-public class MetaGameController extends BaseController {
-    private MetaGameService metaGameService;
-    private MetaGameRepo metaGameRepo;
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/save")
-    public MetaGame save(@RequestBody MetaGame record) {
-        if (record.isPublish()) {
-            MetaGame metaGame = metaGameRepo.findByNameAndGameModeTypeAndPublishAndDel(record.getName(), record.getGameModeType(), true, false);
-            if (Objects.nonNull(metaGame) && !Objects.equals(metaGame.getId(), record.getId())) {
-                throw new BusinessException("已为该游戏配置过该模式参数!");
-            }
-        }
-        if (record.getId() != null) {
-            MetaGame orig = metaGameRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return metaGameRepo.save(orig);
-        }
-        return metaGameRepo.save(record);
-    }
-
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/all")
-    public Page<MetaGame> all(@RequestBody PageQuery pageQuery) {
-        return metaGameService.all(pageQuery);
-    }
-
-    @GetMapping("/get/{id}")
-    public MetaGame get(@PathVariable Long id) {
-        return metaGameRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-    }
-
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        metaGameRepo.softDelete(id);
-    }
-
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<MetaGame> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-}
-

+ 86 - 0
src/main/java/com/izouma/nineth/web/MetaGameCopyController.java

@@ -0,0 +1,86 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaGameCopy;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaGameCopyRepo;
+import com.izouma.nineth.service.MetaGameCopyService;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@RestController
+@RequestMapping("/metaGameCopy")
+@AllArgsConstructor
+public class MetaGameCopyController extends BaseController {
+
+    private MetaGameCopyService metaGameCopyService;
+
+    private MetaGameCopyRepo metaGameCopyRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MetaGameCopy save(@RequestBody MetaGameCopy record) {
+        if (CollectionUtils.isNotEmpty(record.getMetaGameAwards())) {
+            AtomicInteger i = new AtomicInteger();
+            record.getMetaGameAwards().forEach(metaGameAward -> {
+                i.set(i.get() + metaGameAward.getProbability());
+            });
+            if (i.get() != 100) {
+                throw new BusinessException("奖励概率总和必须为100!");
+            }
+        }
+        if (record.isPublish()) {
+            MetaGameCopy metaGameCopy = metaGameCopyRepo.findByGameNameAndGameCopyTypeAndPublishAndDel(record.getGameName(), record.getGameCopyType(), true, false);
+            if (Objects.nonNull(metaGameCopy) && !Objects.equals(metaGameCopy.getId(), record.getId())) {
+                throw new BusinessException("已为该游戏配置过该模式参数!");
+            }
+        }
+        if (record.getId() != null) {
+            MetaGameCopy orig = metaGameCopyRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            if (CollectionUtils.isEmpty(record.getMetaZombieIds())) {
+                orig.setMetaZombieIds(null);
+            }
+            if (CollectionUtils.isEmpty(record.getMetaGameAwards())) {
+                orig.setMetaGameAwards(null);
+            }
+            return metaGameCopyRepo.save(orig);
+        }
+        return metaGameCopyRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaGameCopy> all(@RequestBody PageQuery pageQuery) {
+        return metaGameCopyService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MetaGameCopy get(@PathVariable Long id) {
+        return metaGameCopyRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metaGameCopyRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaGameCopy> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

+ 70 - 0
src/main/java/com/izouma/nineth/web/MetaZombieController.java

@@ -0,0 +1,70 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaZombie;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaZombieRepo;
+import com.izouma.nineth.service.MetaZombieService;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+
+@RestController
+@RequestMapping("/metaZombie")
+@AllArgsConstructor
+public class MetaZombieController extends BaseController {
+    private MetaZombieService metaZombieService;
+    private MetaZombieRepo metaZombieRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MetaZombie save(@RequestBody MetaZombie record) {
+        MetaZombie metaZombie = metaZombieRepo.findByNameAndDel(record.getName(), false);
+        if (Objects.nonNull(metaZombie) && !Objects.equals(metaZombie.getId(), record.getId())) {
+            throw new BusinessException("该配置名称已经存在!");
+        }
+        if (record.getId() != null) {
+            MetaZombie orig = metaZombieRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return metaZombieRepo.save(orig);
+        }
+        return metaZombieRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MetaZombie> all(@RequestBody PageQuery pageQuery) {
+        return metaZombieService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MetaZombie get(@PathVariable Long id) {
+        return metaZombieRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        metaZombieRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaZombie> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @GetMapping("/findAll")
+    public List<MetaZombie> findAll() {
+        return metaZombieRepo.findAllByDel(false);
+    }
+}
+

文件差異過大導致無法顯示
+ 0 - 0
src/main/resources/genjson/MetaZombie.json


+ 24 - 8
src/main/vue/src/router.js

@@ -1262,19 +1262,35 @@ const router = new Router({
                     },
                },
                 {
-                    path: '/metaGameEdit',
-                    name: 'MetaGameEdit',
-                    component: () => import(/* webpackChunkName: "metaGameEdit" */ '@/views/MetaGameEdit.vue'),
+                    path: '/metaGameCopyEdit',
+                    name: 'MetaGameCopyEdit',
+                    component: () => import(/* webpackChunkName: "metaGameCopyEdit" */ '@/views/MetaGameCopyEdit.vue'),
                     meta: {
-                       title: '元宇宙游戏模式配置编辑',
+                       title: '元宇宙游戏副本配置编辑',
                     },
                 },
                 {
-                    path: '/metaGameList',
-                    name: 'MetaGameList',
-                    component: () => import(/* webpackChunkName: "metaGameList" */ '@/views/MetaGameList.vue'),
+                    path: '/metaGameCopyList',
+                    name: 'MetaGameCopyList',
+                    component: () => import(/* webpackChunkName: "metaGameCopyList" */ '@/views/MetaGameCopyList.vue'),
                     meta: {
-                       title: '元宇宙游戏模式配置',
+                       title: '元宇宙游戏副本配置',
+                    },
+               },
+                {
+                    path: '/metaZombieEdit',
+                    name: 'MetaZombieEdit',
+                    component: () => import(/* webpackChunkName: "metaZombieEdit" */ '@/views/MetaZombieEdit.vue'),
+                    meta: {
+                       title: '元宇宙僵尸游戏配置编辑',
+                    },
+                },
+                {
+                    path: '/metaZombieList',
+                    name: 'MetaZombieList',
+                    component: () => import(/* webpackChunkName: "metaZombieList" */ '@/views/MetaZombieList.vue'),
+                    meta: {
+                       title: '元宇宙僵尸游戏配置',
                     },
                }
                 /**INSERT_LOCATION**/

+ 461 - 0
src/main/vue/src/views/MetaGameCopyEdit.vue

@@ -0,0 +1,461 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="108px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px"
+                >
+                    <el-form-item prop="gameName" label="游戏">
+                        <el-select v-model="formData.gameName" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in gameNameOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="gameCopyType" label="副本">
+                        <el-select v-model="formData.gameCopyType" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in gameCopyTypeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="entryModeType" label="入场方式">
+                        <el-select v-model="formData.entryModeType" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in entryModeTypeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="goldNum" label="所需金币数量" v-if="formData.entryModeType === 'GOLD'">
+                        <el-input-number type="goldNum" v-model="formData.goldNum" :step="1" :min="1">
+                        </el-input-number>
+                        <div class="tip">输入规则:正整数,最小为1</div>
+                    </el-form-item>
+                    <el-form-item prop="audit" label="是否需要审核" v-if="formData.entryModeType === 'NFT'">
+                        <el-radio-group v-model="formData.audit">
+                            <el-radio :label="true"> 人工审核 </el-radio>
+                            <el-radio :label="false"> 自动匹配 </el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item
+                        prop="collectionName"
+                        label="藏品名称"
+                        v-if="formData.entryModeType === 'NFT' && formData.audit === true"
+                    >
+                        <el-input v-model="formData.collectionName" :disabled="!canEdit" class="width"> </el-input>
+                    </el-form-item>
+                    <el-form-item
+                        prop="rule"
+                        label="匹配规则设置"
+                        v-if="formData.entryModeType === 'NFT' && formData.audit === false"
+                    >
+                        <template v-if="formData.rule && formData.rule.and">
+                            <div v-for="(item, i) in formData.rule.and" class="rule-item">
+                                <el-select v-model="item.detail.tag" value-key="id" size="mini">
+                                    <el-option v-for="item in tags" :key="item.id" :value="item" :label="item.name">
+                                    </el-option>
+                                </el-select>
+                                <span style="padding: 0 10px; color: #606266; font-weight: bold"> ×&nbsp;1 </span>
+                                <i @click="delRule(i)" class="el-icon-delete icon-del"> </i>
+                            </div>
+                        </template>
+                        <el-button size="mini" @click="addRule"> 添加 </el-button>
+                    </el-form-item>
+                    <el-form-item prop="num" label="所需nft数量" v-if="formData.entryModeType === 'NFT'">
+                        <el-input-number
+                            type="number"
+                            v-model="formData.num"
+                            :disabled="!canEdit"
+                            :step="1"
+                            :min="0"
+                            class="width1"
+                        >
+                        </el-input-number>
+                        <div class="tip">0表示不限</div>
+                    </el-form-item>
+                    <el-form-item prop="detail" label="规则详情" style="width: calc(100vw - 450px)">
+                        <el-input
+                            v-model="formData.detail"
+                            type="textarea"
+                            :autosize="{ minRows: 3, maxRows: 20 }"
+                            placeholder="请输入规则详情"
+                        >
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="僵尸配置" prop="metaZombieIds">
+                        <el-select v-model="formData.metaZombieIds" multiple placeholder="请选择" style="width: 100%">
+                            <el-option v-for="item in metaZombie" :key="item.id" :label="item.name" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="metaGameAwards" label="奖励配置" style="width: calc(100vw - 450px)" size="mini">
+                        <el-table :data="formData.metaGameAwards">
+                            <el-table-column prop="awardType" label="奖励类型">
+                                <template v-slot="{ row }">
+                                    <el-select
+                                        v-model="row.awardType"
+                                        clearable
+                                        filterable
+                                        placeholder="请选择"
+                                        @change="changeAwardType(row)"
+                                    >
+                                        <el-option
+                                            v-for="item in entryModeTypeOptions"
+                                            :key="item.value"
+                                            :label="item.label"
+                                            :value="item.value"
+                                        >
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="config" label="配置值(金币-数量/NFT-NFT图片)">
+                                <template v-slot="{ row }">
+                                    <template v-if="row && row.awardType === 'GOLD'">
+                                        <el-input-number v-model="row.config" :step="1" :min="1"> </el-input-number>
+                                        <div class="tip">规则:正整数,最小为1且小数部分将会被截取</div>
+                                    </template>
+                                    <template v-if="row && row.awardType === 'NFT'">
+                                        <single-upload v-model="row.config"> </single-upload>
+                                    </template>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="probability" label="概率(%)">
+                                <template v-slot="{ row }">
+                                    <el-input-number v-model="row.probability" :step="1" :min="1" :max="100">
+                                    </el-input-number>
+                                    <div class="tip">输入规则:正整数,最小为1,最大为100</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="80" align="center">
+                                <template v-slot="{ row, $index }">
+                                    <el-button type="danger" plain size="mini" @click="delAward($index)">
+                                        删除
+                                    </el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button size="mini" @click="addAward"> 添加配置 </el-button>
+                    </el-form-item>
+                    <el-form-item prop="publish" label="是否发布">
+                        <el-switch v-model="formData.publish"> </el-switch>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'MetaGameCopyEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('metaGameCopy/get/' + this.$route.query.id)
+                .then(res => {
+                    res.metaGameAwards = res.metaGameAwards || [];
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http.post('/tag/all', { size: 10000 }, { body: 'json' }).then(res => {
+            this.tags = res.content;
+        });
+        this.$http.post('/metaZombie/all', { size: 10000 }, { body: 'json' }).then(res => {
+            this.metaZombie = res.content;
+        });
+    },
+    data() {
+        return {
+            reg: /^[1-9]\d*$/,
+            awardType: [],
+            metaZombie: [],
+            tags: [],
+            saving: false,
+            formData: {
+                metaGameAwards: []
+            },
+            rules: {
+                detail: [
+                    {
+                        required: true,
+                        message: '请输入规则详情',
+                        trigger: 'blur'
+                    }
+                ],
+                gameName: [
+                    {
+                        required: true,
+                        message: '请选择游戏',
+                        trigger: 'blur'
+                    }
+                ],
+                gameCopyType: [
+                    {
+                        required: true,
+                        message: '请选择副本',
+                        trigger: 'blur'
+                    }
+                ],
+                entryModeType: [
+                    {
+                        required: true,
+                        message: '请选择入场方式',
+                        trigger: 'blur'
+                    }
+                ],
+                goldNum: [
+                    {
+                        required: true,
+                        message: '请输入所需金币数量',
+                        trigger: 'blur'
+                    },
+                    {
+                        validator: (rule, value, callback) => {
+                            if (!this.reg.test(value)) {
+                                callback(new Error('所需金币数量必须为大于1的整数'));
+                                return;
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                rule: [
+                    { required: true, message: '请选择规则', trigger: 'blur' },
+                    {
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.audit) {
+                                if (!this.formData.rule) {
+                                    callback(new Error('请填写规则'));
+                                } else if (!this.formData.rule.and) {
+                                    callback(new Error('请填写规则'));
+                                } else if (!this.formData.rule.and.length) {
+                                    callback(new Error('请填写规则'));
+                                } else {
+                                    for (let i = 0; i < this.formData.rule.and.length; i++) {
+                                        if (
+                                            !(this.formData.rule.and[i].detail && this.formData.rule.and[i].detail.tag)
+                                        ) {
+                                            callback(new Error('请选择'));
+                                            callback = null;
+                                            break;
+                                        }
+                                    }
+                                    if (callback) {
+                                        callback();
+                                    }
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                metaGameAwards: [
+                    {
+                        validator: (rule, value, callback) => {
+                            if (value) {
+                                if (!(value instanceof Array)) {
+                                    callback(new Error('metaGameAwards must be array!'));
+                                    return;
+                                } else {
+                                    for (let i = 0; i < value.length; i++) {
+                                        if (
+                                            value[i].awardType === '' ||
+                                            value[i].awardType === undefined ||
+                                            value[i].awardType === null
+                                        ) {
+                                            callback(new Error('请选择奖励类型'));
+                                            return;
+                                        }
+                                        if (
+                                            value[i].config === '' ||
+                                            value[i].config === undefined ||
+                                            value[i].config === null
+                                        ) {
+                                            callback(new Error('请填写奖励配置'));
+                                            return;
+                                        }
+                                        if (value[i].awardType === 'GOLD' && !this.reg.test(value[i].config)) {
+                                            callback(new Error('奖励金币数量必须为大于1的整数'));
+                                            return;
+                                        }
+                                        if (
+                                            value[i].probability === '' ||
+                                            value[i].probability === undefined ||
+                                            value[i].probability === null
+                                        ) {
+                                            callback(new Error('请填写奖励概率'));
+                                            return;
+                                        }
+                                        if (!this.reg.test(value[i].probability)) {
+                                            callback(new Error('奖励概率必须为大于1的整数'));
+                                            return;
+                                        }
+                                    }
+                                }
+                            }
+                            callback();
+                        },
+                        trigger: 'blur'
+                    }
+                ],
+                audit: [
+                    {
+                        required: true,
+                        message: '请选择是否审核',
+                        trigger: 'blur'
+                    }
+                ],
+                collectionName: [
+                    {
+                        required: true,
+                        message: '请输入藏品名称',
+                        trigger: 'blur'
+                    }
+                ],
+                num: [
+                    {
+                        required: true,
+                        message: '请输入所需nft数量',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            gameNameOptions: [{ label: '僵尸', value: 'ZOMBIE' }],
+            gameCopyTypeOptions: [
+                { label: '青铜', value: 'BRONZE' },
+                { label: '白银', value: 'SILVER' },
+                { label: '黄金', value: 'GOLD' }
+            ],
+            entryModeTypeOptions: [
+                { label: 'NFT', value: 'NFT' },
+                { label: '金币', value: 'GOLD' }
+            ]
+        };
+    },
+    computed: {
+        canEdit() {
+            return !!!this.$route.query.id;
+        }
+    },
+    methods: {
+        changeAwardType(row) {
+            row.config = '';
+        },
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+            this.saving = true;
+            this.$http
+                .post('/metaGameCopy/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaGameCopy/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        },
+        addRule() {
+            if (!(this.formData.rule && this.formData.rule.and)) {
+                this.$set(this.formData, 'rule', { and: [] });
+            }
+            this.formData.rule.and.push({ detail: { tag: null, num: 1 } });
+        },
+        delRule(i) {
+            this.formData.rule.and.splice(i, 1);
+        },
+        addAward() {
+            this.formData.metaGameAwards.push({
+                awardType: '',
+                config: '',
+                probability: ''
+            });
+        },
+        delAward(i) {
+            this.formData.metaGameAwards.splice(i, 1);
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.width1 {
+	width: 150px;
+}
+
+.rule-item {
+	display: flex;
+	align-items: center;
+	margin-bottom: 10px;
+
+	.icon-del {
+		color: #f56c6c;
+		cursor: pointer;
+		font-size: 18px;
+	}
+}
+</style>

+ 29 - 18
src/main/vue/src/views/MetaGameList.vue → src/main/vue/src/views/MetaGameCopyList.vue

@@ -43,12 +43,12 @@
 			v-loading="fetchingData"
 		>
 			<el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-			<el-table-column prop="id" label="ID" width="100"> </el-table-column>
-			<el-table-column prop="name" label="游戏名称"> </el-table-column>
-			<el-table-column prop="gameModeType" label="游戏模式" :formatter="gameModeTypeFormatter"> </el-table-column>
-			<el-table-column prop="entryModeType" label="入场方式" :formatter="entryModeTypeFormatter">
+			<el-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
+			<el-table-column prop="gameName" align="center" label="名称" :formatter="gameNameFormatter"> </el-table-column>
+			<el-table-column prop="gameCopyType" align="center" label="副本" :formatter="gameCopyTypeFormatter"> </el-table-column>
+			<el-table-column prop="entryModeType" align="center" label="入场方式" :formatter="entryModeTypeFormatter">
 			</el-table-column>
-			<el-table-column prop="goldNum" label="所需金币数量"> </el-table-column>
+			<el-table-column prop="goldNum" align="center" label="所需金币数量"> </el-table-column>
 			<el-table-column prop="rule" label="藏品规则">
 				<template v-slot="{ row }">
 					<template v-if="row.rule">
@@ -66,14 +66,15 @@
 					</template>
 				</template>
 			</el-table-column>
-			<el-table-column prop="collectionName" label="藏品名称"> </el-table-column>
-			<el-table-column prop="num" label="所需nft数量"> </el-table-column>
-            <el-table-column prop="publish" label="是否发布">
+			<el-table-column prop="collectionName" align="center" label="藏品名称"> </el-table-column>
+			<el-table-column prop="num" align="center" label="所需nft数量"> </el-table-column>
+            <el-table-column prop="detail" align="center" label="规则详情"> </el-table-column>
+            <el-table-column prop="publish" align="center" label="是否发布">
 				<template slot-scope="{ row }">
 					<el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column label="操作" align="center" fixed="right" width="150">
+			<el-table-column label="操作" align="center" fixed="right" width="350">
 				<template slot-scope="{ row }">
 					<el-button @click="editRow(row)" type="primary" size="mini" plain> 编辑 </el-button>
 					<el-button @click="deleteRow(row)" type="danger" size="mini" plain> 删除 </el-button>
@@ -100,15 +101,18 @@ import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 
 export default {
-	name: 'MetaGameList',
+	name: 'MetaGameCopyList',
 	mixins: [pageableTable],
 	data() {
 		return {
 			multipleMode: false,
 			search: '',
-			url: '/metaGame/all',
+			url: '/metaGameCopy/all',
 			downloading: false,
-			gameModeTypeOptions: [
+			gameNameOptions: [
+				{ label: '僵尸游戏', value: 'ZOMBIE' }
+			],
+			gameCopyTypeOptions: [
 				{ label: '青铜', value: 'BRONZE' },
 				{ label: '白银', value: 'SILVER' },
 				{ label: '黄金', value: 'GOLD' }
@@ -125,8 +129,15 @@ export default {
 		}
 	},
 	methods: {
-		gameModeTypeFormatter(row, column, cellValue, index) {
-			let selectedOption = this.gameModeTypeOptions.find(i => i.value === cellValue);
+		gameNameFormatter(row, column, cellValue, index) {
+			let selectedOption = this.gameNameOptions.find(i => i.value === cellValue);
+			if (selectedOption) {
+				return selectedOption.label;
+			}
+			return '';
+		},
+		gameCopyTypeFormatter(row, column, cellValue, index) {
+			let selectedOption = this.gameCopyTypeOptions.find(i => i.value === cellValue);
 			if (selectedOption) {
 				return selectedOption.label;
 			}
@@ -150,7 +161,7 @@ export default {
 		},
 		addRow() {
 			this.$router.push({
-				path: '/metaGameEdit',
+				path: '/metaGameCopyEdit',
 				query: {
 					...this.$route.query
 				}
@@ -158,7 +169,7 @@ export default {
 		},
 		editRow(row) {
 			this.$router.push({
-				path: '/metaGameEdit',
+				path: '/metaGameCopyEdit',
 				query: {
 					id: row.id
 				}
@@ -167,7 +178,7 @@ export default {
 		download() {
 			this.downloading = true;
 			this.$axios
-				.get('/metaGame/excel', {
+				.get('/metaGameCopy/excel', {
 					responseType: 'blob',
 					params: { size: 10000 }
 				})
@@ -200,7 +211,7 @@ export default {
 		deleteRow(row) {
 			this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
 				.then(() => {
-					return this.$http.post(`/metaGame/del/${row.id}`);
+					return this.$http.post(`/metaGameCopy/del/${row.id}`);
 				})
 				.then(() => {
 					this.$message.success('删除成功');

+ 0 - 300
src/main/vue/src/views/MetaGameEdit.vue

@@ -1,300 +0,0 @@
-<template>
-	<div class="edit-view">
-		<page-title>
-			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
-			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-		</page-title>
-		<div class="edit-view__content-wrapper">
-			<div class="edit-view__content-section">
-				<el-form
-					:model="formData"
-					:rules="rules"
-					ref="form"
-					label-width="108px"
-					label-position="right"
-					size="small"
-					style="max-width: 500px"
-				>
-                <el-form-item prop="name" label="游戏">
-						<el-select v-model="formData.name" clearable filterable placeholder="请选择">
-							<el-option
-								v-for="item in gameNameOptions"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"
-							>
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item prop="gameModeType" label="游戏模式">
-						<el-select v-model="formData.gameModeType" clearable filterable placeholder="请选择">
-							<el-option
-								v-for="item in gameModeTypeOptions"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"
-							>
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item prop="entryModeType" label="入场方式">
-						<el-select v-model="formData.entryModeType" clearable filterable placeholder="请选择">
-							<el-option
-								v-for="item in entryModeTypeOptions"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"
-							>
-							</el-option>
-						</el-select>
-					</el-form-item>
-                    <el-form-item prop="goldNum" label="所需金币数量" v-if="formData.entryModeType === 'GOLD'">
-                        <el-input-number type="goldNum" v-model="formData.goldNum"> </el-input-number>
-                    </el-form-item>
-					<el-form-item prop="audit" label="是否需要审核" v-if="formData.entryModeType === 'NFT'">
-                        <el-radio-group v-model="formData.audit">
-                            <el-radio :label="true"> 人工审核 </el-radio>
-                            <el-radio :label="false"> 自动匹配 </el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item prop="collectionName" label="藏品名称" v-if="formData.entryModeType === 'NFT' && formData.audit === true">
-                        <el-input v-model="formData.collectionName" :disabled="!canEdit" class="width"> </el-input>
-                    </el-form-item>
-                    <el-form-item prop="rule" label="匹配规则设置" v-if="formData.entryModeType === 'NFT' && formData.audit === false">
-                        <template v-if="formData.rule && formData.rule.and">
-                            <div v-for="(item, i) in formData.rule.and" class="rule-item">
-                                <el-select v-model="item.detail.tag" value-key="id" size="mini">
-                                    <el-option v-for="item in tags" :key="item.id" :value="item" :label="item.name">
-                                    </el-option>
-                                </el-select>
-                                <span style="padding: 0 10px; color: #606266; font-weight: bold"> ×&nbsp;1 </span>
-                                <i @click="delRule(i)" class="el-icon-delete icon-del"> </i>
-                            </div>
-                        </template>
-                        <el-button size="mini" @click="addRule"> 添加 </el-button>
-                    </el-form-item>
-                    <el-form-item prop="num" label="所需nft数量" v-if="formData.entryModeType === 'NFT'">
-                        <el-input-number
-                            type="number"
-                            v-model="formData.num"
-                            :disabled="!canEdit"
-                            :step="1"
-                            :min="0"
-                            class="width1"
-                        >
-                        </el-input-number>
-                        <div class="tip">0表示不限</div>
-                    </el-form-item>
-                    <el-form-item prop="publish" label="是否发布">
-						<el-switch v-model="formData.publish"> </el-switch>
-					</el-form-item>
-					<el-form-item class="form-submit">
-						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
-						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-					</el-form-item>
-				</el-form>
-			</div>
-		</div>
-	</div>
-</template>
-<script>
-export default {
-	name: 'MetaGameEdit',
-	created() {
-		if (this.$route.query.id) {
-			this.$http
-				.get('metaGame/get/' + this.$route.query.id)
-				.then(res => {
-					this.formData = res;
-				})
-				.catch(e => {
-					console.log(e);
-					this.$message.error(e.error);
-				});
-		}
-        this.$http.post('/tag/all', { size: 10000 }, { body: 'json' }).then(res => {
-            this.tags = res.content;
-        });
-	},
-	data() {
-		return {
-            tags: [],
-			saving: false,
-			formData: {},
-			rules: {
-				name: [
-					{
-						required: true,
-						message: '请输入游戏名称',
-						trigger: 'blur'
-					}
-				],
-				gameModeType: [
-					{
-						required: true,
-						message: '请输入游戏模式',
-						trigger: 'blur'
-					}
-				],
-				entryModeType: [
-					{
-						required: true,
-						message: '请输入入场方式',
-						trigger: 'blur'
-					}
-				],
-				goldNum: [
-					{
-						required: true,
-						message: '请输入所需金币数量',
-						trigger: 'blur'
-					}
-				],
-				rule: [
-                    { required: true, message: '请选择规则', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!this.formData.audit) {
-                                if (!this.formData.rule) {
-                                    callback(new Error('请填写规则'));
-                                } else if (!this.formData.rule.and) {
-                                    callback(new Error('请填写规则'));
-                                } else if (!this.formData.rule.and.length) {
-                                    callback(new Error('请填写规则'));
-                                } else {
-                                    for (let i = 0; i < this.formData.rule.and.length; i++) {
-                                        if (
-                                            !(this.formData.rule.and[i].detail && this.formData.rule.and[i].detail.tag)
-                                        ) {
-                                            callback(new Error('请选择'));
-                                            callback = null;
-                                            break;
-                                        }
-                                    }
-                                    if (callback) {
-                                        callback();
-                                    }
-                                }
-                            } else {
-                                callback();
-                            }
-                        }
-                    }
-                ],
-				audit: [
-					{
-						required: true,
-						message: '请输入是否审核',
-						trigger: 'blur'
-					}
-				],
-				collectionName: [
-					{
-						required: true,
-						message: '请输入藏品名称',
-						trigger: 'blur'
-					}
-				],
-				num: [
-					{
-						required: true,
-						message: '请输入所需nft数量',
-						trigger: 'blur'
-					}
-				]
-			},
-            gameNameOptions: [
-				{ label: '僵尸', value: 'ZOMBIE' }
-			],
-			gameModeTypeOptions: [
-				{ label: '青铜', value: 'BRONZE' },
-				{ label: '白银', value: 'SILVER' },
-				{ label: '黄金', value: 'GOLD' }
-			],
-			entryModeTypeOptions: [
-				{ label: 'NFT', value: 'NFT' },
-				{ label: '金币', value: 'GOLD' }
-			]
-		};
-	},
-    computed: {
-        canEdit() {
-            return !!!this.$route.query.id;
-        }
-    },
-	methods: {
-		onSave() {
-			this.$refs.form.validate(valid => {
-				if (valid) {
-					this.submit();
-				} else {
-					return false;
-				}
-			});
-		},
-		submit() {
-			let data = { ...this.formData };
-
-			this.saving = true;
-			this.$http
-				.post('/metaGame/save', data, { body: 'json' })
-				.then(res => {
-					this.saving = false;
-					this.$message.success('成功');
-					this.$router.go(-1);
-				})
-				.catch(e => {
-					console.log(e);
-					this.saving = false;
-					this.$message.error(e.error);
-				});
-		},
-		onDelete() {
-			this.$confirm('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
-				.then(() => {
-					return this.$http.post(`/metaGame/del/${this.formData.id}`);
-				})
-				.then(() => {
-					this.$message.success('删除成功');
-					this.$router.go(-1);
-				})
-				.catch(e => {
-					if (e !== 'cancel') {
-						console.log(e);
-						this.$message.error((e || {}).error || '删除失败');
-					}
-				});
-		},
-        addRule() {
-            if (!(this.formData.rule && this.formData.rule.and)) {
-                this.$set(this.formData, 'rule', { and: [] });
-            }
-            this.formData.rule.and.push({ detail: { tag: null, num: 1 } });
-        },
-        delRule(i) {
-            this.formData.rule.and.splice(i, 1);
-        }
-	}
-};
-</script>
-<style lang="less" scoped>
-.width1 {
-	width: 150px;
-}
-
-.rule-item {
-	display: flex;
-	align-items: center;
-	margin-bottom: 10px;
-
-	.icon-del {
-		color: #f56c6c;
-		cursor: pointer;
-		font-size: 18px;
-	}
-}
-</style>

+ 214 - 0
src/main/vue/src/views/MetaZombieEdit.vue

@@ -0,0 +1,214 @@
+<template>
+	<div class="edit-view">
+		<page-title>
+			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+		</page-title>
+		<div class="edit-view__content-wrapper">
+			<div class="edit-view__content-section">
+				<el-form
+					:model="formData"
+					:rules="rules"
+					ref="form"
+					label-width="178px"
+					label-position="right"
+					size="small"
+					style="max-width: 500px"
+				>
+					<el-form-item prop="name" label="配置名称">
+						<el-input v-model="formData.name"> </el-input>
+                        <div class="tip">配置名称不可重复</div>
+					</el-form-item>
+					<el-form-item prop="zombieIntegral" label="僵尸积分">
+						<el-input-number type="number" v-model="formData.zombieIntegral"> </el-input-number>
+					</el-form-item>
+					<el-form-item prop="zombieAttackDamage" label="僵尸攻击伤害">
+						<el-input-number type="number" v-model="formData.zombieAttackDamage"> </el-input-number>
+					</el-form-item>
+					<el-form-item prop="zombieBlood" label="僵尸血量">
+						<el-input-number type="number" v-model="formData.zombieBlood"> </el-input-number>
+					</el-form-item>
+					<el-form-item prop="humanAttackDamage" label="人类攻击伤害/每发子弹">
+						<el-input-number type="number" v-model="formData.humanAttackDamage"> </el-input-number>
+					</el-form-item>
+					<el-form-item prop="bulletNum" label="子弹数">
+						<el-input-number type="number" v-model="formData.bulletNum"> </el-input-number>
+					</el-form-item>
+					<el-form-item prop="humanBlood" label="人类血量">
+						<el-input-number type="number" v-model="formData.humanBlood"> </el-input-number>
+					</el-form-item>
+					<el-form-item prop="specialZombieAttackDamage" label="特殊僵尸攻击伤害">
+						<el-input-number type="number" v-model="formData.specialZombieAttackDamage"> </el-input-number>
+					</el-form-item>
+					<el-form-item prop="specialZombieBlood" label="特殊僵尸血量">
+						<el-input-number type="number" v-model="formData.specialZombieBlood"> </el-input-number>
+					</el-form-item>
+					<el-form-item prop="specialZombieIntegral" label="特殊僵尸积分">
+						<el-input-number type="number" v-model="formData.specialZombieIntegral"> </el-input-number>
+					</el-form-item>
+					<el-form-item prop="singleGameDuration" label="单局时长(单位:分钟)">
+						<el-input-number type="number" v-model="formData.singleGameDuration"> </el-input-number>
+					</el-form-item>
+					<el-form-item class="form-submit">
+						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+							删除
+						</el-button>
+						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	name: 'MetaZombieEdit',
+	created() {
+		if (this.$route.query.id) {
+			this.$http
+				.get('metaZombie/get/' + this.$route.query.id)
+				.then(res => {
+					this.formData = res;
+				})
+				.catch(e => {
+					console.log(e);
+					this.$message.error(e.error);
+				});
+		}
+	},
+	data() {
+		return {
+			saving: false,
+			formData: {},
+			rules: {
+				name: [
+					{
+						required: true,
+						message: '请输入配置名称',
+						trigger: 'blur'
+					}
+				],
+				zombieIntegral: [
+					{
+						required: true,
+						message: '请输入僵尸积分',
+						trigger: 'blur'
+					}
+				],
+				zombieAttackDamage: [
+					{
+						required: true,
+						message: '请输入僵尸攻击伤害',
+						trigger: 'blur'
+					}
+				],
+				zombieBlood: [
+					{
+						required: true,
+						message: '请输入僵尸血量',
+						trigger: 'blur'
+					}
+				],
+				humanAttackDamage: [
+					{
+						required: true,
+						message: '请输入人类攻击伤害/每发子弹',
+						trigger: 'blur'
+					}
+				],
+				bulletNum: [
+					{
+						required: true,
+						message: '请输入子弹数',
+						trigger: 'blur'
+					}
+				],
+				humanBlood: [
+					{
+						required: true,
+						message: '请输入人类血量',
+						trigger: 'blur'
+					}
+				],
+				specialZombieAttackDamage: [
+					{
+						required: true,
+						message: '请输入特殊僵尸攻击伤害',
+						trigger: 'blur'
+					}
+				],
+				specialZombieBlood: [
+					{
+						required: true,
+						message: '请输入特殊僵尸血量',
+						trigger: 'blur'
+					}
+				],
+				specialZombieIntegral: [
+					{
+						required: true,
+						message: '请输入特殊僵尸积分',
+						trigger: 'blur'
+					}
+				],
+				singleGameDuration: [
+					{
+						required: true,
+						message: '请输入单局时长(单位:分钟)',
+						trigger: 'blur'
+					}
+				]
+			}
+		};
+	},
+	methods: {
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
+
+			this.saving = true;
+			this.$http
+				.post('/metaZombie/save', data, { body: 'json' })
+				.then(res => {
+					this.saving = false;
+					this.$message.success('成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					console.log(e);
+					this.saving = false;
+					this.$message.error(e.error);
+				});
+		},
+		onDelete() {
+			this.$confirm('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+				.then(() => {
+					return this.$http.post(`/metaZombie/del/${this.formData.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						console.log(e);
+						this.$message.error((e || {}).error || '删除失败');
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

+ 187 - 0
src/main/vue/src/views/MetaZombieList.vue

@@ -0,0 +1,187 @@
+<template>
+	<div class="list-view">
+		<page-title>
+			<el-button
+				@click="addRow"
+				type="primary"
+				icon="el-icon-plus"
+				:disabled="fetchingData || downloading"
+				class="filter-item"
+			>
+				新增
+			</el-button>
+			<el-button
+				@click="download"
+				icon="el-icon-upload2"
+				:loading="downloading"
+				:disabled="fetchingData"
+				class="filter-item"
+			>
+				导出
+			</el-button>
+		</page-title>
+		<div class="filters-container">
+			<el-input
+				placeholder="搜索..."
+				v-model="search"
+				clearable
+				class="filter-item search"
+				@keyup.enter.native="getData"
+			>
+				<el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+			</el-input>
+		</div>
+		<el-table
+			:data="tableData"
+			row-key="id"
+			ref="table"
+			header-row-class-name="table-header-row"
+			header-cell-class-name="table-header-cell"
+			row-class-name="table-row"
+			cell-class-name="table-cell"
+			:height="tableHeight"
+			v-loading="fetchingData"
+		>
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+			<el-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
+			<el-table-column prop="name" align="center" label="配置名称" width="100"> </el-table-column>
+			<el-table-column prop="zombieIntegral" align="center" label="僵尸积分" width="100"> </el-table-column>
+			<el-table-column prop="zombieAttackDamage" align="center" label="僵尸攻击伤害" width="150"> </el-table-column>
+			<el-table-column prop="zombieBlood" align="center" label="僵尸血量" width="100"> </el-table-column>
+			<el-table-column prop="humanAttackDamage" align="center" label="人类攻击伤害/每发子弹" width="200"> </el-table-column>
+			<el-table-column prop="bulletNum" align="center" label="子弹数" width="100"> </el-table-column>
+			<el-table-column prop="humanBlood" align="center" label="人类血量" width="100"> </el-table-column>
+			<el-table-column prop="specialZombieAttackDamage" align="center" label="特殊僵尸攻击伤害" width="200"> </el-table-column>
+			<el-table-column prop="specialZombieBlood" align="center" label="特殊僵尸血量" width="150"> </el-table-column>
+			<el-table-column prop="specialZombieIntegral" align="center" label="特殊僵尸积分" width="150"> </el-table-column>
+			<el-table-column prop="singleGameDuration" align="center" label="单局时长(单位:分钟)" width="200"> </el-table-column>
+			<el-table-column label="操作" align="center" fixed="right" width="150">
+				<template slot-scope="{ row }">
+					<el-button @click="editRow(row)" type="primary" size="mini" plain> 编辑 </el-button>
+					<el-button @click="deleteRow(row)" type="danger" size="mini" plain> 删除 </el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<div class="pagination-wrapper">
+			<!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)"> 批量编辑 </el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1"> 批量操作1 </el-button>
+                    <el-button @click="operation2"> 批量操作2 </el-button>
+                    <el-button @click="toggleMultipleMode(false)"> 取消 </el-button>
+                </el-button-group>
+            </div> -->
+			<el-pagination
+				background
+				@size-change="onSizeChange"
+				@current-change="onCurrentChange"
+				:current-page="page"
+				:page-sizes="[10, 20, 30, 40, 50]"
+				:page-size="pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="totalElements"
+			>
+			</el-pagination>
+		</div>
+	</div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+	name: 'MetaZombieList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaZombie/all',
+			downloading: false
+		};
+	},
+	computed: {
+		selection() {
+			return this.$refs.table.selection.map(i => i.id);
+		}
+	},
+	methods: {
+		beforeGetData() {
+			return { search: this.search, query: { del: false } };
+		},
+		toggleMultipleMode(multipleMode) {
+			this.multipleMode = multipleMode;
+			if (!multipleMode) {
+				this.$refs.table.clearSelection();
+			}
+		},
+		addRow() {
+			this.$router.push({
+				path: '/metaZombieEdit',
+				query: {
+					...this.$route.query
+				}
+			});
+		},
+		editRow(row) {
+			this.$router.push({
+				path: '/metaZombieEdit',
+				query: {
+					id: row.id
+				}
+			});
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaZombie/excel', {
+					responseType: 'blob',
+					params: { size: 10000 }
+				})
+				.then(res => {
+					console.log(res);
+					this.downloading = false;
+					const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+					const link = document.createElement('a');
+					link.href = downloadUrl;
+					link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+					document.body.appendChild(link);
+					link.click();
+					link.remove();
+				})
+				.catch(e => {
+					console.log(e);
+					this.downloading = false;
+					this.$message.error(e.error);
+				});
+		},
+		operation1() {
+			this.$notify({
+				title: '提示',
+				message: this.selection
+			});
+		},
+		operation2() {
+			this.$message('操作2');
+		},
+		deleteRow(row) {
+			this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+				.then(() => {
+					return this.$http.post(`/metaZombie/del/${row.id}`);
+				})
+				.then(() => {
+					this.$message.success('删除成功');
+					this.getData();
+				})
+				.catch(e => {
+					if (e !== 'cancel') {
+						this.$message.error(e.error);
+					}
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped>
+
+</style>

部分文件因文件數量過多而無法顯示