渔民小镇 1 year ago
parent
commit
40e0691a3e

+ 1 - 1
logic/bag-logic/src/main/java/com/iohao/mmo/bag/region/internal/equip/BuildEquipUseProcess.java

@@ -103,7 +103,7 @@ public class BuildEquipUseProcess implements UseProcess {
         String equipId = newEquipMessage.equipId;
         BagItem bagItem = new BagItem();
         bagItem.setId(equipId);
-        bagItem.setItemId(equipItemId);// TODO 这里应该取newEquipMessage.itemId
+        bagItem.setItemId(equipItemId);
         bagItem.setQuantity(1);
 
         return bagItem;

+ 2 - 2
logic/mail-logic/src/main/java/com/iohao/mmo/mail/action/MailAction.java

@@ -81,10 +81,10 @@ public class MailAction {
         BroadcastContext broadcastContext = BrokerClientHelper.getBroadcastContext();
 
         internalMailMessages.stream()
-                .filter(internalMail -> internalMail.userId > 0 && Objects.nonNull(internalMail.mailMessage))
+                .filter(internalMail -> internalMail.userId > 0 && Objects.nonNull(internalMail.mail))
                 .forEach(internalMailMessage -> {
                     long userId = internalMailMessage.userId;
-                    MailMessage mailMessage = internalMailMessage.mailMessage;
+                    MailMessage mailMessage = internalMailMessage.mail;
 
                     mailMessage.mailStatus = MailStatusMessageEnum.SEAL;
                     mailMessage.id = new ObjectId().toString();

+ 0 - 43
provide/bag-provide/src/main/java/com/iohao/mmo/bag/proto/CreateEquip.java

@@ -1,43 +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.bag.proto;
-
-import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass;
-import lombok.AccessLevel;
-import lombok.ToString;
-import lombok.experimental.FieldDefaults;
-
-/**
- * 打造装备协议
- *
- * @author 渔民小镇
- * @date 2023-08-07
- */
-@ToString
-@ProtobufClass
-@FieldDefaults(level = AccessLevel.PUBLIC)
-public class CreateEquip {
-    /** 打造的装备部位,这个 itemId 是系统的所有物品表 */
-    String itemId;
-    /**
-     * 极品率,就是生成装备时,相对极品的概率。
-     * 因为玩家可能使用更好的材料,而在装备模块的角度,是不关心使用的是什么材料
-     */
-    int excellentRate;
-}

+ 1 - 1
provide/mail-provide/src/main/java/com/iohao/mmo/mail/kit/InternalMailBuilder.java

@@ -137,7 +137,7 @@ public class InternalMailBuilder {
         // 内部邮件
         InternalMailMessage internalMailMessage = new InternalMailMessage();
         internalMailMessage.userId = userId;
-        internalMailMessage.mailMessage = mailMessage;
+        internalMailMessage.mail = mailMessage;
         return internalMailMessage;
     }
 }

+ 1 - 1
provide/mail-provide/src/main/java/com/iohao/mmo/mail/proto/InternalMailMessage.java

@@ -36,5 +36,5 @@ public class InternalMailMessage {
     /** userId */
     long userId;
     /** 玩家邮件 */
-    MailMessage mailMessage;
+    MailMessage mail;
 }