装备模块雏形

logic/equip-logic/src/main/java/com/iohao/mmo/equip/action/EquipAction.java

@@ -4,13 +4,17 @@ import com.iohao.game.action.skeleton.annotation.ActionController;
 import com.iohao.game.action.skeleton.annotation.ActionMethod;
 import com.iohao.game.action.skeleton.core.flow.FlowContext;
 import com.iohao.game.action.skeleton.protocol.wrapper.StringValue;
+import com.iohao.mmo.common.config.GameCode;
 import com.iohao.mmo.equip.cmd.EquipCmd;
 import com.iohao.mmo.equip.entity.Equip;
 import com.iohao.mmo.equip.mapper.EquipMapper;
 import com.iohao.mmo.equip.proto.EquipMessage;
+import com.iohao.mmo.equip.proto.EquipResetMessage;
 import com.iohao.mmo.equip.service.EquipService;
+import io.netty.util.internal.StringUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -30,7 +34,7 @@ public class EquipAction {
 
 
     /**
-     * 获取装备列表信息
+     * 获取某人装备列表信息
      *
      * @param flowContext flowContext
      */
@@ -51,7 +55,7 @@ public class EquipAction {
     @ActionMethod(EquipCmd.getEquip)
     public EquipMessage getEquip(FlowContext flowContext, StringValue stringValue) { //参数值
         // 初始化装备数据，暂时放这
-        Equip equip = equipService.ofEquip(stringValue.value);
+        Equip equip = equipService.findById(stringValue.value);
         return EquipMapper.ME.convert(equip);
     }
 
@@ -64,4 +68,17 @@ public class EquipAction {
     public void allotEquip(FlowContext flowContext, EquipMessage equipMessage) { //参数值
         equipService.allotEquip(EquipMapper.ME.convert(equipMessage));
     }
+
+
+    /**
+     * 重新随机总属性点
+     *
+     * @param flowContext flowContext
+     * @param equipResetMessage 重新随机装备总属性点参数对象
+     */
+    @ActionMethod(EquipCmd.resetEquip)
+    public void resetEquip(FlowContext flowContext, EquipResetMessage equipResetMessage) { //参数值
+        GameCode.objNotFound.assertTrue(StringUtils.isNotBlank(equipResetMessage.equipId)&&StringUtils.isNotBlank(equipResetMessage.propId));
+        equipService.resetEquip((equipResetMessage.equipId),equipResetMessage.propId);
+    }
 }

logic/equip-logic/src/main/java/com/iohao/mmo/equip/action/EquipTemplateAction.java

@@ -34,7 +34,7 @@ public class EquipTemplateAction {
     EquipTemplateService equipTemplateService;
 
     /**
-     * 初始化装备模板
+     * TODO 初始化装备模板（暂时的方法，后期应从数据文件中读取）
      *
      * @param flowContext flowContext
      */
@@ -54,12 +54,13 @@ public class EquipTemplateAction {
     @ActionMethod(EquipCmd.getEquipTemplate)
     public EquipTemplateMessage getEquipTemplate(FlowContext flowContext, StringValue stringValue) { //参数值
         // 初始化装备数据，暂时放这
-        EquipTemplate equipTemplate = equipTemplateService.ofEquip(stringValue.value);
+        EquipTemplate equipTemplate = equipTemplateService.findById(stringValue.value);
         return EquipTemplateMapper.ME.convert(equipTemplate);
     }
 
     /**
-     * 根据装备模板列表各随机出一件新的装备
+     * TODO 根据装备模板列表随机出新的装备，
+     * 实际这里应该传入怪物id，根据怪物-物品-掉率的绑定关系去随机出掉落物品，暂时还没有怪物，先这样处理
      *
      * @param flowContext flowContext
      * @param stringValve 装备模板ids（xxx,xxx）

logic/equip-logic/src/main/java/com/iohao/mmo/equip/entity/BasicEquipProperty.java

@@ -52,14 +52,13 @@ public class BasicEquipProperty {
     /** 敏捷 */
     int agile;
 
-    public BasicEquipProperty() {
-    }
-
-    public BasicEquipProperty(int constitution, int magicPower, int power, int endurance, int agile) {
-        this.constitution = constitution;
-        this.magicPower = magicPower;
-        this.power = power;
-        this.endurance = endurance;
-        this.agile = agile;
+    public static BasicEquipProperty resetBasicEquipProperty() {
+        BasicEquipProperty basicEquipProperty = new BasicEquipProperty();
+        basicEquipProperty.constitution = 0;
+        basicEquipProperty.magicPower = 0;
+        basicEquipProperty.power = 0;
+        basicEquipProperty.endurance = 0;
+        basicEquipProperty.agile = 0;
+        return basicEquipProperty;
     }
 }

logic/equip-logic/src/main/java/com/iohao/mmo/equip/entity/Equip.java

@@ -34,6 +34,8 @@ import org.springframework.data.mongodb.core.mapping.Document;
 public class Equip {
     @Id
     String id;
+    /** 物品表id */
+    String itemId;
     /** 玩家 */
     long userId;
     /** 装备名 */
@@ -42,8 +44,6 @@ public class Equip {
     int attrTotal;
     /** 未分配属性点 */
     int undistributedAttr;
-    /** 品质 */
-//    int quality;
     /** 装备模板 */
     EquipTemplate equipTemplate;
     /** 基础属性 */

logic/equip-logic/src/main/java/com/iohao/mmo/equip/entity/Goods.java

@@ -48,7 +48,7 @@ public class Goods {
     int price;
     /** 是否可交易 */
     boolean dealFlag;
-    /** 物品类型：0装备，1药品，2材料 */
+    /** 物品类型：0装备，1药品，2材料，3装备库 */
     int type;
     /** 子表主键 */
     String detailId;

logic/equip-logic/src/main/java/com/iohao/mmo/equip/EquipQualityEnum.java → logic/equip-logic/src/main/java/com/iohao/mmo/equip/enums/EquipQualityEnum.java

@@ -1,4 +1,4 @@
-package com.iohao.mmo.equip;
+package com.iohao.mmo.equip.enums;
 
 /**
  * @author 唐斌

logic/equip-logic/src/main/java/com/iohao/mmo/equip/repository/EquipRepository.java

@@ -1,32 +0,0 @@
-/*
- * ioGame
- * Copyright (C) 2021 - 2023  渔民小镇 （262610965@qq.com、luoyizhu@gmail.com） . All Rights Reserved.
- * # iohao.com . 渔民小镇
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.iohao.mmo.equip.repository;
-
-import com.iohao.mmo.equip.entity.Equip;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * @author 唐斌
- * @date 2023-07-30
- */
-@Repository
-public interface EquipRepository extends CrudRepository<Equip, Long> {
-
-}

logic/equip-logic/src/main/java/com/iohao/mmo/equip/repository/EquipTemplateRepository.java

@@ -1,32 +0,0 @@
-/*
- * ioGame
- * Copyright (C) 2021 - 2023  渔民小镇 （262610965@qq.com、luoyizhu@gmail.com） . All Rights Reserved.
- * # iohao.com . 渔民小镇
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.iohao.mmo.equip.repository;
-
-import com.iohao.mmo.equip.entity.EquipTemplate;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * @author 唐斌
- * @date 2023-07-30
- */
-@Repository
-public interface EquipTemplateRepository extends CrudRepository<EquipTemplate, Long> {
-
-}

logic/equip-logic/src/main/java/com/iohao/mmo/equip/service/EquipService.java

@@ -21,17 +21,14 @@ package com.iohao.mmo.equip.service;
 import com.iohao.mmo.common.config.GameCode;
 import com.iohao.mmo.equip.entity.BasicEquipProperty;
 import com.iohao.mmo.equip.entity.Equip;
-import com.iohao.mmo.equip.repository.EquipRepository;
+import com.iohao.mmo.equip.utils.RandomUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 
 /**
  * @author 唐斌
@@ -42,9 +39,8 @@ import java.util.Optional;
 @AllArgsConstructor
 public class EquipService {
     final MongoTemplate mongoTemplate;
-    final EquipRepository equipRepository;
 
-    public Equip ofEquip(String id) {
+    public Equip findById(String id) {
 
         return  mongoTemplate.findById(id, Equip.class);
     }
@@ -86,6 +82,38 @@ public class EquipService {
         update.set("undistributedAttr", oldEquip.getAttrTotal()-saveAttrTotal);
         update.set("basicEquipProperty", basicEquipProperty);
         mongoTemplate.upsert(query,update,Equip.class);
+    }
 
+    /**
+     * 重新随机总属性点
+     * @param equipId 装备id
+     * @param propId 道具id
+     */
+    public Equip resetEquip(String equipId,String propId){
+        Equip equip = findById(equipId);
+        GameCode.objNotFound.assertTrue(equip!=null);
+        // TODO 这里判断道具效果，然后提高装备随机的最小值进行随机，一般是增加最小值的百分比
+        int randomMin = equip.getEquipTemplate().getTotalAttrMin();
+        int randomMax = equip.getEquipTemplate().getTotalAttrMax();
+        //TODO 这里假设道具增加30%增益效果
+        double gain = 0.3;
+        int newAttrTotal = RandomUtils.randomFromInt(randomMin+(int)((randomMax-randomMin)*gain),randomMax);
+        // 直接替换掉原装备的属性值
+        return replaceEquipAttr(equip,newAttrTotal);
     }
+
+    /**
+     * 替换掉原来装备的属性值，并且重置已分配的属性点
+     * @param oldEquip
+     * @param newAttrTotal
+     * @return
+     */
+    private Equip replaceEquipAttr(Equip oldEquip,int newAttrTotal){
+        oldEquip.setBasicEquipProperty(BasicEquipProperty.resetBasicEquipProperty());
+        oldEquip.setAttrTotal(newAttrTotal);
+        oldEquip.setUndistributedAttr(newAttrTotal);
+        save(oldEquip);
+        return oldEquip;
+    }
+
 }

logic/equip-logic/src/main/java/com/iohao/mmo/equip/service/EquipTemplateService.java

@@ -18,21 +18,17 @@
  */
 package com.iohao.mmo.equip.service;
 
+import com.iohao.mmo.common.config.GameCode;
 import com.iohao.mmo.equip.entity.BasicEquipProperty;
 import com.iohao.mmo.equip.entity.Equip;
 import com.iohao.mmo.equip.entity.EquipTemplate;
 import com.iohao.mmo.equip.entity.Goods;
-import com.iohao.mmo.equip.repository.EquipTemplateRepository;
-import com.iohao.mmo.equip.utils.EquipUtils;
 import com.iohao.mmo.equip.utils.RandomUtils;
 import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-
 /**
  * @author 唐斌
  * @date 2023-07-30
@@ -46,9 +42,8 @@ public class EquipTemplateService {
     private GoodsService goodsService;
 
     final MongoTemplate mongoTemplate;
-    final EquipTemplateRepository equipTemplateRepository;
 
-    public EquipTemplate ofEquip(String id) {
+    public EquipTemplate findById(String id) {
 
         return  mongoTemplate.findById(id, EquipTemplate.class);
     }
@@ -74,6 +69,7 @@ public class EquipTemplateService {
         goods.setBindPrice(120);
         goods.setPrice(100);
         goods.setDealFlag(true);
+        goods.setType(3);
         goodsService.save(goods);
         equipTemplate.setGoods(goods);
 
@@ -94,6 +90,7 @@ public class EquipTemplateService {
         goods2.setBindPrice(80);
         goods2.setPrice(60);
         goods2.setDealFlag(true);
+        goods2.setType(3);
         goodsService.save(goods2);
         equipTemplate2.setGoods(goods2);
 
@@ -106,24 +103,26 @@ public class EquipTemplateService {
      * @return
      */
     public Equip randomEquip(String equipTemplateId,long userId){
+        //取到装备模板
         EquipTemplate equipTemplate = mongoTemplate.findById(equipTemplateId, EquipTemplate.class);
+
+        GameCode.objNotFound.assertTrue(equipTemplate!=null);
+
         Equip equip = new Equip();
         //随机属性值
-        if(equipTemplate!=null){
-            //随机出的总属性值
-            equip.setAttrTotal(RandomUtils.randomFromInt(equipTemplate.getTotalAttrMin(),equipTemplate.getTotalAttrMax()));
-//            equip.setQuality(EquipUtils.getEquipQuality(equipTemplate.getTotalAttrMin(),equipTemplate.getTotalAttrMax(),equip.getAttrTotal()));
-            equip.setName(equipTemplate.getGoods().getName());
-        }else {
-            equip.setAttrTotal(0);
-//            equip.setQuality(1);
-            equip.setName("未知名称");
-        }
+        equip.setAttrTotal(RandomUtils.randomFromInt(equipTemplate.getTotalAttrMin(),equipTemplate.getTotalAttrMax()));
+        equip.setName(equipTemplate.getGoods().getName());
+        //新建装备对应的物品类
+        Goods goods = equipTemplate.getGoods();
+        goods.setId(null);
+        goods.setType(0);
+        goodsService.save(goods);
+        //物品id
+        equip.setItemId(goods.getId());
         equip.setUndistributedAttr(equip.getAttrTotal());
         equip.setEquipTemplate(equipTemplate);
-
-        BasicEquipProperty basicEquipProperty = new BasicEquipProperty(0,0,0,0,0);
-        equip.setBasicEquipProperty(basicEquipProperty);
+        //初始化分配的具体属性点
+        equip.setBasicEquipProperty(BasicEquipProperty.resetBasicEquipProperty());
         equip.setUserId(userId);
         mongoTemplate.save(equip);
         return equip;

logic/equip-logic/src/main/java/com/iohao/mmo/equip/service/GoodsService.java

@@ -19,7 +19,6 @@
 package com.iohao.mmo.equip.service;
 
 import com.iohao.mmo.equip.entity.BasicEquipProperty;
-import com.iohao.mmo.equip.entity.EquipTemplate;
 import com.iohao.mmo.equip.entity.Goods;
 import lombok.AllArgsConstructor;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -28,29 +27,18 @@ import org.springframework.stereotype.Service;
 /**
  * @author 唐斌
  * @date 2023-07-30
- * @description: 装备属性实现类
+ * @description: 物品类
  */
 @Service
 @AllArgsConstructor
 public class GoodsService {
     final MongoTemplate mongoTemplate;
 
-    public Goods ofEquip(long id) {
-
+    public Goods findById(long id) {
         return  mongoTemplate.findById(id, Goods.class);
     }
 
     public void save(Goods goods) {
         mongoTemplate.save(goods);
     }
-
-    private BasicEquipProperty getInitBasicEquipProperty() {
-        BasicEquipProperty basicEquipProperty = new BasicEquipProperty();
-        basicEquipProperty.setConstitution(1000);
-        basicEquipProperty.setMagicPower(120);
-        basicEquipProperty.setPower(110);
-        basicEquipProperty.setEndurance(200);
-        basicEquipProperty.setAgile(20);
-        return basicEquipProperty;
-    }
 }

logic/equip-logic/src/main/java/com/iohao/mmo/equip/utils/EquipUtils.java

@@ -1,12 +1,8 @@
 package com.iohao.mmo.equip.utils;
 
-import com.iohao.mmo.equip.EquipQualityEnum;
+import com.iohao.mmo.equip.enums.EquipQualityEnum;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-
 /**
  * @author kioor
  * @ClassName RandomUtils
@@ -18,7 +14,7 @@ import java.util.concurrent.ThreadLocalRandom;
 public class EquipUtils {
 
     /**
-     * 计算装备品质
+     * TODO 计算装备品质（暂时还未使用）
      *
      * @param randomMin 随机范围下限
      * @param randomMax 随机范围上限
@@ -33,8 +29,4 @@ public class EquipUtils {
         return EquipQualityEnum.getQuality(prop);
     }
 
-    public static void main(String[] args) {
-        System.out.println(getEquipQuality(10,40,38));
-    }
-
 }

logic/equip-logic/src/main/java/com/iohao/mmo/equip/utils/RandomUtils.java

@@ -66,23 +66,4 @@ public class RandomUtils {
         return RandomUtils.randomFromArr(rangeMin,rangeMax).intValue();
 
     }
-
-
-
-//    ///////////////////////// ↓↓↓业务相关↓↓↓ ////////////////////
-//    /**
-//     * 怪物掉落物品计算（对象列表）-无排斥随机，每一次对每一个对象随机概率都是公平的
-//     * @param monster2GoodsDTOList 对象列表
-//     * @return 筛选后的对象列表
-//     */
-//    public List<Monster2GoodsDTO> obtainGoods(List<Monster2GoodsDTO> monster2GoodsDTOList){
-//        List<Monster2GoodsDTO> backMonster2GoodsDTOList = new ArrayList<>();
-//        for(Monster2GoodsDTO monster2GoodsDTO:monster2GoodsDTOList){
-//            if(isLuck(monster2GoodsDTO.getGoodsProb())){
-//                backMonster2GoodsDTOList.add(monster2GoodsDTO);
-//            }
-//        }
-//        return backMonster2GoodsDTOList;
-//    }
-
 }

provide/equip-provide/src/main/java/com/iohao/mmo/equip/client/EquipInputCommandRegion.java

@@ -107,6 +107,25 @@ public class EquipInputCommandRegion extends AbstractInputCommandRegion {
         }).setDescription("分配装备属性信息").setInputRequestData(inputRequestData);
 
 
+        // 动态请求参数（参数值）
+        inputRequestData = () -> {
+            ScannerKit.log(() -> log.info("请输入装备id"));
+            String equipId = ScannerKit.nextLine();
+            ScannerKit.log(() -> log.info("请输入道具id"));
+            String propId = ScannerKit.nextLine();
+
+            EquipResetMessage equipResetMessage = new EquipResetMessage();
+            equipResetMessage.equipId = equipId;
+            equipResetMessage.propId = propId;
+            return equipResetMessage;
+        };
+
+        // 8-4
+        ofCommand(EquipCmd.resetEquip).callback(EquipMessage.class, result -> {
+            EquipMessage value = result.getValue();
+            log.info("装备属性信息 : {}", value);
+        }).setDescription("重新随机总属性点").setInputRequestData(inputRequestData);
+
         // 8-10
         ofCommand(EquipCmd.initEquipTemplate).callback(EquipTemplateMessage.class, result -> {
             EquipTemplateMessage value = result.getValue();
@@ -115,7 +134,7 @@ public class EquipInputCommandRegion extends AbstractInputCommandRegion {
 
         // 动态请求参数（参数值）
         inputRequestData = () -> {
-            String ids = "64ce17d12d16f264f0e88b19,64ce17d12d16f264f0e88b1b";
+            String ids = "64d0838a6f0c894087cab868,64d0838a6f0c894087cab86a";
 
             // 请求参数
             StringValue stringValue = StringValue.of(ids);

provide/equip-provide/src/main/java/com/iohao/mmo/equip/cmd/EquipCmd.java

@@ -34,6 +34,8 @@ public interface EquipCmd {
     int getEquip = 2;
     /** 分配属性点 */
     int allotEquip = 3;
+    /** 重新随机总属性点 */
+    int resetEquip = 4;
     /** 初始化装备模板 */
     int initEquipTemplate = 10;
     /** 新增装备模板 */

provide/equip-provide/src/main/java/com/iohao/mmo/equip/proto/EquipMessage.java

@@ -42,8 +42,6 @@ public class EquipMessage{
     int attrTotal;
     /** 未分配属性点 */
     int undistributedAttr;
-    /** 品质 */
-//    int quality;
     /** 装备模板 */
     EquipTemplateMessage equipTemplate;
     /** 装备基础属性 */

provide/equip-provide/src/main/java/com/iohao/mmo/equip/proto/OfEquipReq.java → provide/equip-provide/src/main/java/com/iohao/mmo/equip/proto/EquipResetMessage.java

@@ -24,15 +24,17 @@ import lombok.ToString;
 import lombok.experimental.FieldDefaults;
 
 /**
- * 获取装备
- *
+ * 重新随机装备总属性点
  * @author 唐斌
- * @date 2023-07-31
+ * @date 2023-07-30
+ * @description:
  */
 @ToString
 @ProtobufClass
 @FieldDefaults(level = AccessLevel.PUBLIC)
-public class OfEquipReq {
-    /** 装备 id */
-    String id;
+public class EquipResetMessage {
+    /** 装备id */
+    String equipId;
+    /** 随机道具id */
+    String propId;
 }