元宇宙僵尸调整

src/main/java/com/izouma/nineth/domain/MetaZombie.java

@@ -1,5 +1,6 @@
 package com.izouma.nineth.domain;
 
+import com.izouma.nineth.enums.MetaZombieType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -7,6 +8,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 
 @Data
 @AllArgsConstructor
@@ -18,6 +21,10 @@ public class MetaZombie extends BaseEntity {
     @ApiModelProperty("配置名称")
     private String name;
 
+    @ApiModelProperty("僵尸类型")
+    @Enumerated(EnumType.STRING)
+    private MetaZombieType type;
+
     @ApiModelProperty("僵尸积分")
     private int zombieIntegral;
 
@@ -27,28 +34,4 @@ public class MetaZombie extends BaseEntity {
     @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;
-
 }

src/main/java/com/izouma/nineth/enums/MetaZombieType.java

@@ -0,0 +1,19 @@
+package com.izouma.nineth.enums;
+
+
+public enum MetaZombieType {
+
+    COMMON("普通僵尸"),
+
+    SPECIAL("特殊僵尸");
+
+    private final String description;
+
+    MetaZombieType(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/vue/src/views/MetaZombieEdit.vue

@@ -20,6 +20,17 @@
 						<el-input v-model="formData.name"> </el-input>
                         <div class="tip">配置名称不可重复</div>
 					</el-form-item>
+					<el-form-item prop="type" label="游戏">
+                        <el-select v-model="formData.type" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in typeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
 					<el-form-item prop="zombieIntegral" label="僵尸积分">
 						<el-input-number type="number" v-model="formData.zombieIntegral"> </el-input-number>
 					</el-form-item>
@@ -29,27 +40,6 @@
 					<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">
@@ -80,6 +70,10 @@ export default {
 	},
 	data() {
 		return {
+			typeOptions: [
+				{ label: '普通僵尸', value: 'COMMON' },
+                { label: '特殊僵尸', value: 'SPECIAL' }
+			],
 			saving: false,
 			formData: {},
 			rules: {
@@ -111,52 +105,10 @@ export default {
 						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: [
+				type: [
 					{
 						required: true,
-						message: '请输入单局时长（单位：分钟）',
+						message: '请选择僵尸类型',
 						trigger: 'blur'
 					}
 				]

src/main/vue/src/views/MetaZombieList.vue

@@ -44,24 +44,13 @@
         >
             <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 prop="name" align="center" label="配置名称" > </el-table-column>
+            <el-table-column prop="type" align="center" label="僵尸类型" :formatter="typeFormatter"> </el-table-column>
+            <el-table-column prop="zombieIntegral" align="center" label="僵尸积分" > </el-table-column>
+            <el-table-column prop="zombieAttackDamage" align="center" label="僵尸攻击伤害" >
             </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">
+            <el-table-column prop="zombieBlood" align="center" label="僵尸血量" > </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right">
                 <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,6 +89,10 @@ export default {
     mixins: [pageableTable],
     data() {
         return {
+            typeOptions: [
+				{ label: '普通僵尸', value: 'COMMON' },
+                { label: '特殊僵尸', value: 'SPECIAL' }
+			],
             multipleMode: false,
             search: '',
             url: '/metaZombie/all',
@@ -112,6 +105,13 @@ export default {
         }
     },
     methods: {
+        typeFormatter(row, column, cellValue, index) {
+			let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+			if (selectedOption) {
+				return selectedOption.label;
+			}
+			return '';
+		},
         beforeGetData() {
             return { search: this.search, query: { del: false } };
         },
@@ -192,7 +192,7 @@ export default {
                     if (e !== 'cancel') {
                         this.$alert(e.error, '提示', { type: 'info', confirmButtonText: '删除应用数据' })
                             .then(() => {
-                                return this.$http.post(`/metaGameCopy/${row.id}/del`);
+                                return this.$http.post(`/metaGameCopy/${row.id}/delMetaZombieId`);
                             })
                             .then(() => {
                                 this.$message.success('删除应用数据成功，当前您可以删除该配置');