diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java index e85ab42a8..5c49bcfa8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java @@ -3,6 +3,7 @@ package com.ljsd.jieling.globals; public interface Global { int EXECUTION = 1;//行动力id int STAMINA = 2; // 体力id + int TALISMAN = 3;//成长护符 int HEROSTORY_TICKET = 28; //精英入场券 int GENERALSTORY_TICKET = 27; //普通入场券 int INVASIONBOSS_TICKET = 44; //外敌挑战券 @@ -17,7 +18,7 @@ public interface Global { int TREASURE_SCORE = 68;//孙龙宝藏积分 int DAILY_TASK_REMOVE_ITEM = 30;//日常任务道具 - int MISSING_ROOM_ITEM = 79; + int MISSING_ROOM_ITEM = 79;//寻龙钰 int SEND_CARD_COUNT = 20; // 每页发送卡牌个数 int SEND_ITEM_COUNT = 200; // 每页发送道具个数 int SEND_EQUIP_COUNT = 20; // 每页发送装备个数 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index f12a8f844..3ff72e1f3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1912,18 +1912,18 @@ public class ItemUtil { * 特权加成收益计算 * @param user * @param reason - * @param itemType + * @param itemId * @param sourceNum * @return */ - public static long privilegeAdd(User user,int reason,int itemType,long sourceNum){ + public static long privilegeAdd(User user,int reason,int itemId,long sourceNum){ // 基础奖励,挂机 if(reason == BIReason.ADVENTURE_BASE_REWARD){ - sourceNum = baseReward(user, itemType, sourceNum); + sourceNum = baseReward(user, itemId, sourceNum); } // 随机奖励,挂机 if(reason == BIReason.ADVENTURE_RANDOM_REWARDD){ - sourceNum = randomReward(user, itemType, sourceNum); + sourceNum = randomReward(user, itemId, sourceNum); } return sourceNum; } @@ -1940,6 +1940,8 @@ public class ItemUtil { case Global.EXP: sourceNum = parseTheValueByPrivilegeMap(user,sourceNum,VipPrivilegeType.ADVENTURE_EXP_REWARD); break; + case Global.GOLD: + case Global.TALISMAN: case Global.MISSING_ROOM_ITEM: sourceNum = parseTheValueByPrivilegeMap(user,sourceNum, VipPrivilegeType.ADVENTURE_BASE_REWARD); break;