From 8dc19f2d98d3a9c593275d95fe59fe51a450830c Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 23 Sep 2021 17:22:40 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/core/FunctionIdEnum.java | 2 + .../com/ljsd/jieling/globals/BIReason.java | 2 + .../hero/GetLikableDataRequestHandler.java | 48 ++++++ .../hero/HeroUpLikableRequestHandler.java | 155 ++++++++++++++++++ .../ljsd/jieling/logic/dao/HeroManager.java | 41 +++++ .../ljsd/jieling/logic/hero/HeroLogic.java | 11 ++ .../main/java/config/SLikeAbilityConfig.java | 81 +++++++++ 7 files changed, 340 insertions(+) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/hero/GetLikableDataRequestHandler.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java create mode 100644 tablemanager/src/main/java/config/SLikeAbilityConfig.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java index 50abba999..8fb7f127e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java @@ -70,6 +70,8 @@ public enum FunctionIdEnum { HongMeng(86,null), CrossYuxulundao(87,null),//跨服-玉虚论道 CrossSevenWorld(112,new SevenWorldFunction()),//七界试炼 + FourQua(113,null),//四象心法 + Likable(114,null),//好感度 WeekGood(9091,null), ; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index d438fc66d..4f80ad2c6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -347,6 +347,8 @@ public interface BIReason { int SIXIANG_UP_STAR_COST=1106;//四象心法进阶消耗 + int HERO_UP_LIKEBLE_COST=1107;//英雄提升好感度消耗 + int FOUR_CHALLENGE_FIRST = 1201;//四灵试炼首通 int FOUR_CHALLENGE_SWEEP = 1202;//四灵试炼扫荡 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/GetLikableDataRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/GetLikableDataRequestHandler.java new file mode 100644 index 000000000..ee37d1396 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/GetLikableDataRequestHandler.java @@ -0,0 +1,48 @@ +package com.ljsd.jieling.handler.hero; + +import com.google.protobuf.GeneratedMessage; +import com.ljsd.jieling.globals.BIReason; +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.hero.HeroLogic; +import com.ljsd.jieling.netty.cocdex.PacketNetData; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.util.ItemUtil; +import com.ljsd.jieling.util.MessageUtil; +import org.springframework.stereotype.Component; +import rpc.protocols.CommonProto; +import rpc.protocols.HeroInfoProto; +import rpc.protocols.MessageTypeProto; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +///获取好感度数据请求 +@Component +public class GetLikableDataRequestHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.GET_LIKABLE_DATA_REQUEST; + } + + @Override + public void process(ISession session, PacketNetData netData) throws Exception { + int uid = session.getUid(); + User user = UserManager.getUser(uid); + Map likaMap=user.getHeroManager().getHeroLikableMap(); + List _list=new ArrayList<>(); + for (Map.Entry integerEntry : likaMap.entrySet()) { + CommonProto.LikableInfo likaInfo=CommonProto.LikableInfo.newBuilder() + .setHeroStaticid(integerEntry.getKey()) + .setLikableNum(integerEntry.getValue()) + .build(); + _list.add(likaInfo); + } + HeroInfoProto.GetLikableDataResponse response=HeroInfoProto.GetLikableDataResponse.newBuilder() + .addAllInfoList(_list) + .build(); + MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_LIKABLE_DATA_RESPONSE_VALUE,response,true); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java new file mode 100644 index 000000000..6aa1fd4bd --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java @@ -0,0 +1,155 @@ +package com.ljsd.jieling.handler.hero; + +import com.ljsd.jieling.exception.ErrorCode; +import com.ljsd.jieling.exception.ErrorCodeException; +import com.ljsd.jieling.globals.BIReason; +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.dao.HeroManager; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.util.ItemUtil; +import com.ljsd.jieling.util.MessageUtil; +import config.SCHero; +import config.SItem; +import config.SLikeAbilityConfig; +import org.springframework.stereotype.Component; +import rpc.protocols.HeroInfoProto; +import rpc.protocols.MessageTypeProto; + +import java.util.HashMap; +import java.util.Map; + + +//英雄好感度提升消息 +@Component +public class HeroUpLikableRequestHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.HERO_UP_LIKABLE_REQUEST; + } + + + @Override + public void processWithProto(ISession session, HeroInfoProto.HeroUpLikableRequest proto) throws Exception { + int heroStaticId=proto.getHeroStaticId();//英雄静态id + int itemId=proto.getItemId();//消耗道具id + int itemNum=proto.getItemNum();//消耗道具数量 + int uid = session.getUid(); + + User user = UserManager.getUser(uid); + HeroManager heroManager=user.getHeroManager(); + int[][]costArr=new int[2][1]; + costArr[0][0]=itemId; + costArr[0][1]=itemNum; + boolean costResult = ItemUtil.itemCost(user,costArr, BIReason.HERO_UP_LIKEBLE_COST,heroStaticId); + if (costResult){ + SItem _item= SItem.getsItemMap().get(itemId); + int profession=SCHero.getsCHero().get(heroStaticId).getProfession(); + String[]addArr=_item.getResolveReward().split("|"); + String addStr=addArr[profession-1]; + int singleAddNum=Integer.parseInt(addStr.split("#")[1]); + int allAddNum=singleAddNum*itemNum; + int curHeroLikableNum = heroManager.getHeroLikableMap().containsKey(heroStaticId)?user.getHeroManager().getHeroLikableMap().get(heroStaticId):0; + int oldLv=GetHeroLikableLvByLikaNum(curHeroLikableNum); + curHeroLikableNum+=allAddNum; + int curLv=GetHeroLikableLvByLikaNum(curHeroLikableNum); + if (curLv>oldLv){ + MapcurHeroPropAdd=GetHeroLikableAddPeop(curLv); + heroManager.putHeroLikablePropAddMap(heroStaticId,curHeroPropAdd); + } + + int oldAllLikaLv=GetAllLikableLvByLikaNum(GetAllHeroLikableNum(heroManager.getHeroLikableMap())); + heroManager.putHeroLikableMap(heroStaticId,curHeroLikableNum); + int curAllLikaLv=GetAllLikableLvByLikaNum(GetAllHeroLikableNum(heroManager.getHeroLikableMap())); + if (curAllLikaLv>oldAllLikaLv){ + MapallHeroPropAdd=GetAllHeroLikableAddPeop(curAllLikaLv); + heroManager.putAllLikablePropAddMap(allHeroPropAdd); + } + MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.HERO_UP_LIKABLE_RESPONSE_VALUE, null,true); + }else{ + LOGGER.error("好感度提升材料不足"); + throw new ErrorCodeException(ErrorCode.HERO_ITEM_NOT); + } + } + ///通过神将好感度获取好感度等级 + public int GetHeroLikableLvByLikaNum(int _likaNum){ + int likaLv=0; + for (Map.Entry integerEntry : SLikeAbilityConfig.heroLikeAbilityByLevel.entrySet()) { + if (_likaNum>=integerEntry.getValue()){ + likaLv= integerEntry.getKey(); + }else{ + break; + } + } + return likaLv; + } + ///通过总好感度获取好感度等级 + public int GetAllLikableLvByLikaNum(int _likaNum){ + int likaLv=0; + for (Map.Entry integerEntry : SLikeAbilityConfig.allLikeAbilityByLevel.entrySet()) { + if (_likaNum>=integerEntry.getValue()){ + likaLv= integerEntry.getKey(); + }else{ + break; + } + } + return likaLv; + } + //通过当前等级获取神将好感度属性加成 + public MapGetHeroLikableAddPeop(int _lv){ + Map_propMap=new HashMap<>(); + for (int i = 0; i <= _lv; i++) { + SLikeAbilityConfig _config= SLikeAbilityConfig.heroLikeAbilityConfigMap.get(_lv); + if (_config.getProperty()==null)continue; + for (int[] ints : _config.getProperty()) { + if (_propMap.containsKey(ints[1])) { + int absProp=_propMap.get(ints[1])+ints[2]; + _propMap.put(ints[1],absProp); + }else{ + _propMap.put(ints[1],ints[2]); + } + } + } + return _propMap; + } + + //通过当前总好感度等级获取好感度属性加成 + public MapGetAllHeroLikableAddPeop(int _allLv){ + Map_propMap=new HashMap<>(); + for (int i = 0; i <= _allLv; i++) { + SLikeAbilityConfig _config= SLikeAbilityConfig.allLikeAbilityConfigMap.get(_allLv); + if (_config.getProperty()!=null){ + for (int[] ints : _config.getProperty()) { + if (_propMap.containsKey(ints[0])) { + int absProp=_propMap.get(ints[0])+ints[1]; + _propMap.put(ints[0],absProp); + }else{ + _propMap.put(ints[0],ints[1]); + } + } + } + if (_config.getPrivilegeProperty()!=null){ + for (int[] ints : _config.getPrivilegeProperty()) { + if (_propMap.containsKey(ints[0])) { + int absProp=_propMap.get(ints[0])+ints[1]; + _propMap.put(ints[0],absProp); + }else{ + _propMap.put(ints[0],ints[1]); + } + } + } + + } + return _propMap; + } + + //获取总的好感度 + public int GetAllHeroLikableNum(Map_heroLikableMap){ + int likableNum=0; + for (Map.Entry integerEntry : _heroLikableMap.entrySet()) { + likableNum+=integerEntry.getKey(); + } + return likableNum; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java index 18d4ca186..14bd59d42 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java @@ -5,6 +5,7 @@ import com.ljsd.jieling.logic.activity.event.Poster; import com.ljsd.jieling.logic.activity.event.RemoveHeroEvent; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hero.HongMengAttributeEnum; +import config.SLikeAbilityConfig; import config.SSpecialConfig; import java.util.*; @@ -111,6 +112,28 @@ public class HeroManager extends MongoBase { return sixiangPropUpMap; } + /** + * 好感度数据 + * key: 英雄静态id value:好感度值 + */ + private Map heroLikableMap = new HashMap<>(); + + public Map getHeroLikableMap() { + return heroLikableMap; + } + //神将好感度属性加成 + private Map>heroLikablePropAddMap=new HashMap<>(); + + public Map>getHeroLikablePropAddMap() { + return heroLikablePropAddMap; + } + //所有神将总好感度带来的属性加成(包含特权加成) + private MapallLikablePropAddMap=new HashMap<>(); + public MapgetAllLikablePropAddMap() { + return allLikablePropAddMap; + } + + /** * 心愿可以选择的英雄列表 */ @@ -158,6 +181,21 @@ public class HeroManager extends MongoBase { updateString("sixiangPropUpMap."+professionId, _propMap); } + public void putHeroLikableMap(int heroStaticId,int likableNum) { + heroLikableMap.put(heroStaticId,likableNum); + updateString("heroLikableMap."+heroStaticId, likableNum); + } + + public void putHeroLikablePropAddMap(int heroStaticId,Map _propMap) { + heroLikablePropAddMap.put(heroStaticId,_propMap); + updateString("heroLikablePropAddMap."+heroStaticId, _propMap); + } + + public void putAllLikablePropAddMap(Map _propMap) { + allLikablePropAddMap=_propMap; + updateString("allLikablePropAddMap", allLikablePropAddMap); + } + public void updateRandCount(int type, int count){ updateString("totalCount." + type, count); @@ -493,6 +531,7 @@ public class HeroManager extends MongoBase { updateString("wishOpenHeroList", wishOpenHeroList); } + ///获取四象心法共鸣等级 public int GetSiXiangGongMingLv(){ int gongmingLv=0; if (this.sixiangDataMap.size()<4){ @@ -506,5 +545,7 @@ public class HeroManager extends MongoBase { } return gongmingLv; } + + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index e46a55d24..49a894fff 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -2330,6 +2330,17 @@ public class HeroLogic{ int[][]skillProp=ItemUtil.mapToArray(skillPropertyMap); combinedAttribute(skillProp,heroAllAttribute); + //英雄好感度属性加成 + if (user.getHeroManager().getHeroLikablePropAddMap().containsKey(scHero.getId())){ + int[][]likableProp=ItemUtil.mapToArray(user.getHeroManager().getHeroLikablePropAddMap().get(scHero.getId())); + combinedAttribute(likableProp,heroAllAttribute); + } + //英雄总好感度属性加成 + if (user.getHeroManager().getAllLikablePropAddMap().size()>0){ + int[][]allLikableProp=ItemUtil.mapToArray(user.getHeroManager().getAllLikablePropAddMap()); + combinedAttribute(allLikableProp,heroAllAttribute); + } + //装备总战力评分 int equipForce=0; Iterator> iterator = hero.getEquipByHongmengPositionMap(user.getHeroManager()).entrySet().iterator(); diff --git a/tablemanager/src/main/java/config/SLikeAbilityConfig.java b/tablemanager/src/main/java/config/SLikeAbilityConfig.java new file mode 100644 index 000000000..4e091cb32 --- /dev/null +++ b/tablemanager/src/main/java/config/SLikeAbilityConfig.java @@ -0,0 +1,81 @@ +package config; + +import manager.STableManager; +import manager.Table; + +import java.util.HashMap; +import java.util.Map; +import java.util.TreeMap; + +@Table(name ="FourQuadrantConfig") +public class SLikeAbilityConfig implements BaseConfig { + + private int id; + + private int type; + + private int level; + + private int favorDegree; + + private int[][] property; + + private int[][] privilegeProperty; + + + public static Map sLikeAbilityConfigMap; + + public static Map heroLikeAbilityConfigMap; + public static Map heroLikeAbilityByLevel; + + public static Map allLikeAbilityConfigMap; + public static Map allLikeAbilityByLevel; + + + @Override + public void init() throws Exception { + heroLikeAbilityConfigMap=new HashMap<>(); + allLikeAbilityConfigMap=new HashMap<>(); + heroLikeAbilityByLevel=new TreeMap<>(); + allLikeAbilityByLevel=new TreeMap<>(); + sLikeAbilityConfigMap = STableManager.getConfig(SLikeAbilityConfig.class); + int heroLike=0; + int allLike=0; + for (SLikeAbilityConfig value : sLikeAbilityConfigMap.values()) { + if (value.type==1){ + allLikeAbilityConfigMap.put(value.level,value); + allLike+=value.getFavorDegree(); + allLikeAbilityByLevel.put(value.level,allLike); + }else { + heroLikeAbilityConfigMap.put(value.level,value); + heroLike+=value.getFavorDegree(); + heroLikeAbilityByLevel.put(value.level,heroLike); + } + } + } + + public int getId() { + return id; + } + + public int getType() { + return type; + } + + public int getLevel() { + return level; + } + + public int getFavorDegree() { + return favorDegree; + } + + public int[][] getProperty() { + return property; + } + + public int[][] getPrivilegeProperty() { + return privilegeProperty; + } +} + From c900a018ec17381e537da02d3d4e243c9e50a7e3 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Fri, 24 Sep 2021 14:10:02 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/globals/GlobalItemType.java | 1 + .../handler/hero/GetLikableDataRequestHandler.java | 3 +++ .../handler/hero/HeroUpLikableRequestHandler.java | 9 ++++++++- .../java/com/ljsd/jieling/logic/GlobalDataManaager.java | 1 + .../java/com/ljsd/jieling/logic/dao/HeroManager.java | 9 +++++++++ .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 6 ++++++ .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 1 + tablemanager/src/main/java/config/SSpecialConfig.java | 1 + 8 files changed, 30 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java index aef0070af..1a7814370 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java @@ -34,6 +34,7 @@ public interface GlobalItemType { int SpecialMonsterItem=22; // 灵兽碎片 // 万能狗粮 int AllPowerful_DogFood = 25; + int LikableCostItem=27;//好感度功能消耗道具 //物品使用类型 int NO_USE = 0 ; //不使用 int RANDOM_USE = 1; // 随机使用 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/GetLikableDataRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/GetLikableDataRequestHandler.java index ee37d1396..c0cf1f82c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/GetLikableDataRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/GetLikableDataRequestHandler.java @@ -10,6 +10,7 @@ import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; +import config.SSpecialConfig; import org.springframework.stereotype.Component; import rpc.protocols.CommonProto; import rpc.protocols.HeroInfoProto; @@ -40,8 +41,10 @@ public class GetLikableDataRequestHandler extends BaseHandler { .build(); _list.add(likaInfo); } + int remainTime= SSpecialConfig.getIntegerValue(SSpecialConfig.LIKE_ABILITY)-user.getHeroManager().getLikableSendTime(); HeroInfoProto.GetLikableDataResponse response=HeroInfoProto.GetLikableDataResponse.newBuilder() .addAllInfoList(_list) + .setLikableRemainTime(remainTime) .build(); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_LIKABLE_DATA_RESPONSE_VALUE,response,true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java index 6aa1fd4bd..9346539ef 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java @@ -13,6 +13,7 @@ import com.ljsd.jieling.util.MessageUtil; import config.SCHero; import config.SItem; import config.SLikeAbilityConfig; +import config.SSpecialConfig; import org.springframework.stereotype.Component; import rpc.protocols.HeroInfoProto; import rpc.protocols.MessageTypeProto; @@ -39,6 +40,11 @@ public class HeroUpLikableRequestHandler extends BaseHandler SSpecialConfig.getIntegerValue(SSpecialConfig.LIKE_ABILITY)){ + LOGGER.error("好感度赠送次数超出每日限制"); + throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT); + } int[][]costArr=new int[2][1]; costArr[0][0]=itemId; costArr[0][1]=itemNum; @@ -58,7 +64,6 @@ public class HeroUpLikableRequestHandler extends BaseHandlercurHeroPropAdd=GetHeroLikableAddPeop(curLv); heroManager.putHeroLikablePropAddMap(heroStaticId,curHeroPropAdd); } - int oldAllLikaLv=GetAllLikableLvByLikaNum(GetAllHeroLikableNum(heroManager.getHeroLikableMap())); heroManager.putHeroLikableMap(heroStaticId,curHeroLikableNum); int curAllLikaLv=GetAllLikableLvByLikaNum(GetAllHeroLikableNum(heroManager.getHeroLikableMap())); @@ -66,6 +71,8 @@ public class HeroUpLikableRequestHandler extends BaseHandlerallHeroPropAdd=GetAllHeroLikableAddPeop(curAllLikaLv); heroManager.putAllLikablePropAddMap(allHeroPropAdd); } + int sendTime= heroManager.getLikableSendTime()+itemNum; + heroManager.UpdateLikableSendTime(sendTime); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.HERO_UP_LIKABLE_RESPONSE_VALUE, null,true); }else{ LOGGER.error("好感度提升材料不足"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index f5b5bee32..924c0db75 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -454,6 +454,7 @@ public class GlobalDataManaager implements IManager { } } fBuilder.setExpeditionLeve(user.getExpeditionManager().getExpeditionLeve()); + HeroLogic.getInstance().ResetLikableSendTime(user,fBuilder);//重置好感度次数 if(session.getFiveReady() == 1){ //客户端准备好接受五点刷新请求 MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.FIVE_PLAYER_REFLUSH_INDICATION_VALUE,fBuilder.build(),true); }else{ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java index 14bd59d42..b5ae5addd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java @@ -7,6 +7,7 @@ import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hero.HongMengAttributeEnum; import config.SLikeAbilityConfig; import config.SSpecialConfig; +import org.omg.CORBA.PUBLIC_MEMBER; import java.util.*; @@ -133,7 +134,9 @@ public class HeroManager extends MongoBase { return allLikablePropAddMap; } + private int likableSendTime;//好感度已赠送次数 + public int getLikableSendTime() { return likableSendTime; } /** * 心愿可以选择的英雄列表 */ @@ -196,6 +199,12 @@ public class HeroManager extends MongoBase { updateString("allLikablePropAddMap", allLikablePropAddMap); } + //刷新好感度赠送次数 参数传当日已赠送次数 + public void UpdateLikableSendTime(int _sendTime) { + likableSendTime=_sendTime; + updateString("likableSendTime", _sendTime); + } + public void updateRandCount(int type, int count){ updateString("totalCount." + type, count); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 49a894fff..65011d201 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -5244,5 +5244,11 @@ public class HeroLogic{ MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.PurpleMansionSealIndication_VALUE,build2,true); } + ///0点重置好感度赠送次数 + public void ResetLikableSendTime(User user,PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder){ + user.getHeroManager().UpdateLikableSendTime(0); + int remainTime=SSpecialConfig.getIntegerValue(SSpecialConfig.LIKE_ABILITY)-user.getHeroManager().getLikableSendTime(); + fBuilder.setLikableRemainTime(remainTime); + } } 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 8e37f21f2..59a500ed9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -531,6 +531,7 @@ public class ItemUtil { case GlobalItemType.SOUL_MARK: case GlobalItemType.ITEM: case GlobalItemType.EQUIP: + case GlobalItemType.LikableCostItem: putCountLongMap(itemId,amount, itemObj.getItemMap()); break; case GlobalItemType.CARD: diff --git a/tablemanager/src/main/java/config/SSpecialConfig.java b/tablemanager/src/main/java/config/SSpecialConfig.java index d684317f2..371595079 100644 --- a/tablemanager/src/main/java/config/SSpecialConfig.java +++ b/tablemanager/src/main/java/config/SSpecialConfig.java @@ -114,6 +114,7 @@ public class SSpecialConfig implements BaseConfig { public static final String PRE_LOAD_REWARD = "PreLoadReward"; public static final String QIJIEHOLYCONFIG = "QIJIEHOLYCONFIG";//七界试炼遗物开启层数 + public static final String LIKE_ABILITY = "LikeAbility";//好感度功能,每日赠予礼物次数上限 @Override public void init() throws Exception { From 4f8249150dbc1f8ace874f8479acd4bba15a5dbe Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Fri, 24 Sep 2021 14:36:37 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/hero/HeroUpLikableRequestHandler.java | 4 ++-- serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java index 9346539ef..68ca00d6f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java @@ -45,14 +45,14 @@ public class HeroUpLikableRequestHandler extends BaseHandler Date: Sun, 26 Sep 2021 19:43:02 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/core/GlobalsDef.java | 1 + .../hero/HeroUpLikableRequestHandler.java | 48 ++++++++----------- .../ljsd/jieling/logic/dao/UserManager.java | 1 + .../jieling/logic/player/PlayerLogic.java | 3 ++ .../main/java/config/SLikeAbilityConfig.java | 2 +- 5 files changed, 26 insertions(+), 29 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java index e2582d995..1906289e7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java @@ -111,6 +111,7 @@ public interface GlobalsDef { int MAIN_LEVEL_UNLOCK_PRIVILEGE = 2; int VIP_UNLOCK_PRIVILEGE = 3; int RECHARGE_UNLOCK_PRIVILEGE = 4; + int LIKABLE_UNLOCK=6; //特殊商店id int DAILY_GOODS_FAST_ID = 1004;//每日礼包一键购买的礼包ID diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java index 68ca00d6f..3e739aa96 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java @@ -1,19 +1,19 @@ package com.ljsd.jieling.handler.hero; +import com.ljsd.common.mogodb.util.GlobalData; +import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.dao.HeroManager; +import com.ljsd.jieling.logic.dao.PlayerManager; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; -import config.SCHero; -import config.SItem; -import config.SLikeAbilityConfig; -import config.SSpecialConfig; +import config.*; import org.springframework.stereotype.Component; import rpc.protocols.HeroInfoProto; import rpc.protocols.MessageTypeProto; @@ -41,10 +41,10 @@ public class HeroUpLikableRequestHandler extends BaseHandler SSpecialConfig.getIntegerValue(SSpecialConfig.LIKE_ABILITY)){ - LOGGER.error("好感度赠送次数超出每日限制"); - throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT); - } +// if (itemNum+heroManager.getLikableSendTime()> SSpecialConfig.getIntegerValue(SSpecialConfig.LIKE_ABILITY)){ +// LOGGER.error("好感度赠送次数超出每日限制"); +// throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT); +// } int[][]costArr=new int[1][2]; costArr[0][0]=itemId; costArr[0][1]=itemNum; @@ -70,6 +70,8 @@ public class HeroUpLikableRequestHandler extends BaseHandleroldAllLikaLv){ MapallHeroPropAdd=GetAllHeroLikableAddPeop(curAllLikaLv); heroManager.putAllLikablePropAddMap(allHeroPropAdd); + int[][]condition= SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(2).getCondition(); + user.getPlayerInfoManager().updateVipPrivilage(1,condition[curAllLikaLv][1]); } int sendTime= heroManager.getLikableSendTime()+itemNum; heroManager.UpdateLikableSendTime(sendTime); @@ -84,7 +86,7 @@ public class HeroUpLikableRequestHandler extends BaseHandler integerEntry : SLikeAbilityConfig.heroLikeAbilityByLevel.entrySet()) { if (_likaNum>=integerEntry.getValue()){ - likaLv= integerEntry.getKey(); + likaLv= integerEntry.getKey()+1; }else{ break; } @@ -96,7 +98,7 @@ public class HeroUpLikableRequestHandler extends BaseHandler integerEntry : SLikeAbilityConfig.allLikeAbilityByLevel.entrySet()) { if (_likaNum>=integerEntry.getValue()){ - likaLv= integerEntry.getKey(); + likaLv= integerEntry.getKey()+1; }else{ break; } @@ -107,14 +109,14 @@ public class HeroUpLikableRequestHandler extends BaseHandlerGetHeroLikableAddPeop(int _lv){ Map_propMap=new HashMap<>(); for (int i = 0; i <= _lv; i++) { - SLikeAbilityConfig _config= SLikeAbilityConfig.heroLikeAbilityConfigMap.get(_lv); + SLikeAbilityConfig _config= SLikeAbilityConfig.heroLikeAbilityConfigMap.get(i); if (_config.getProperty()==null)continue; for (int[] ints : _config.getProperty()) { - if (_propMap.containsKey(ints[1])) { - int absProp=_propMap.get(ints[1])+ints[2]; - _propMap.put(ints[1],absProp); + if (_propMap.containsKey(ints[0])) { + int absProp=_propMap.get(ints[0])+ints[1]; + _propMap.put(ints[0],absProp); }else{ - _propMap.put(ints[1],ints[2]); + _propMap.put(ints[0],ints[1]); } } } @@ -125,9 +127,10 @@ public class HeroUpLikableRequestHandler extends BaseHandlerGetAllHeroLikableAddPeop(int _allLv){ Map_propMap=new HashMap<>(); for (int i = 0; i <= _allLv; i++) { - SLikeAbilityConfig _config= SLikeAbilityConfig.allLikeAbilityConfigMap.get(_allLv); + SLikeAbilityConfig _config= SLikeAbilityConfig.allLikeAbilityConfigMap.get(i); if (_config.getProperty()!=null){ for (int[] ints : _config.getProperty()) { + if(ints.length<=0)continue; if (_propMap.containsKey(ints[0])) { int absProp=_propMap.get(ints[0])+ints[1]; _propMap.put(ints[0],absProp); @@ -136,17 +139,6 @@ public class HeroUpLikableRequestHandler extends BaseHandler_heroLikableMap){ int likableNum=0; for (Map.Entry integerEntry : _heroLikableMap.entrySet()) { - likableNum+=integerEntry.getKey(); + likableNum+=integerEntry.getValue(); } return likableNum; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 43c1b76ad..68318685a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -121,6 +121,7 @@ public class UserManager { playerManager.setSendDays(1); playerManager.updateVipInfo(GlobalsDef.LEVEL_UNLOCK_PRIVILEGE,1); playerManager.updateVipInfo(GlobalsDef.VIP_UNLOCK_PRIVILEGE,0); + playerManager.updateVipInfo(GlobalsDef.LIKABLE_UNLOCK,0); playerManager.setNewRechargeInfo(new NewRechargeInfo()); playerManager.setPhoneBindInfo(new PhoneBindInfo("")); playerManager.setChannel(channel); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index a087901e0..fe194d0c4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1224,6 +1224,9 @@ public class PlayerLogic { case GlobalsDef.VIP_UNLOCK_PRIVILEGE: cond = user.getPlayerInfoManager().getVipLevel(); break; + case GlobalsDef.LIKABLE_UNLOCK: + cond = 2; + break; default:{ break; } diff --git a/tablemanager/src/main/java/config/SLikeAbilityConfig.java b/tablemanager/src/main/java/config/SLikeAbilityConfig.java index 4e091cb32..898cc9806 100644 --- a/tablemanager/src/main/java/config/SLikeAbilityConfig.java +++ b/tablemanager/src/main/java/config/SLikeAbilityConfig.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -@Table(name ="FourQuadrantConfig") +@Table(name ="LikeAbility") public class SLikeAbilityConfig implements BaseConfig { private int id; From 6724ea31cfa17a5672e295c61e80636cbc6a487d Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Sun, 26 Sep 2021 19:51:17 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/core/GlobalsDef.java | 2 +- .../com/ljsd/jieling/logic/dao/HeroManager.java | 17 +++++++++++++++++ .../ljsd/jieling/logic/player/PlayerLogic.java | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java index 1906289e7..76188f10c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java @@ -111,7 +111,7 @@ public interface GlobalsDef { int MAIN_LEVEL_UNLOCK_PRIVILEGE = 2; int VIP_UNLOCK_PRIVILEGE = 3; int RECHARGE_UNLOCK_PRIVILEGE = 4; - int LIKABLE_UNLOCK=6; + int LIKABLE_UNLOCK=6;//好感度解锁类型 //特殊商店id int DAILY_GOODS_FAST_ID = 1004;//每日礼包一键购买的礼包ID diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java index b5ae5addd..b1186c5be 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java @@ -555,6 +555,23 @@ public class HeroManager extends MongoBase { return gongmingLv; } + ///通过总好感度获取好感度等级 + public int GetAllLikableLv(){ + int likaLv=0; + int likableNum=0; + for (Map.Entry integerEntry : heroLikableMap.entrySet()) { + likableNum+=integerEntry.getValue(); + } + for (Map.Entry integerEntry : SLikeAbilityConfig.allLikeAbilityByLevel.entrySet()) { + if (likableNum>=integerEntry.getValue()){ + likaLv= integerEntry.getKey()+1; + }else{ + break; + } + } + return likaLv; + } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index fe194d0c4..c81987a41 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1225,7 +1225,7 @@ public class PlayerLogic { cond = user.getPlayerInfoManager().getVipLevel(); break; case GlobalsDef.LIKABLE_UNLOCK: - cond = 2; + cond = user.getHeroManager().GetAllLikableLv(); break; default:{ break; From 3eab389f36720119f03d075b216f401e5c8bdfa3 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Sun, 26 Sep 2021 20:05:12 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=80=81=E6=95=B0=E6=8D=AE=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 4 ++-- .../src/main/java/com/ljsd/jieling/logic/dao/UserManager.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index c108dad5e..7d9478ec9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -80,8 +80,8 @@ public class GetPlayerInfoHandler extends BaseHandler{ List list = new ArrayList<>(); Map privilegeTypeConfigMap = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap(); for(Map.Entry entry:privilegeTypeConfigMap.entrySet()){ - //如果是<4 系统内置特权 - if(entry.getValue().getUnlockType()<4&&!vipInfo.containsKey(entry.getKey())){ + //如果是<4 系统内置特权 (6是新增的好感度特权收益加成 2021.9.26) + if(entry.getValue().getUnlockType()<4||entry.getValue().getUnlockType()==6&&!vipInfo.containsKey(entry.getKey())){ playerInfoManager.addVipInfo(entry.getKey()); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 68318685a..43c1b76ad 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -121,7 +121,6 @@ public class UserManager { playerManager.setSendDays(1); playerManager.updateVipInfo(GlobalsDef.LEVEL_UNLOCK_PRIVILEGE,1); playerManager.updateVipInfo(GlobalsDef.VIP_UNLOCK_PRIVILEGE,0); - playerManager.updateVipInfo(GlobalsDef.LIKABLE_UNLOCK,0); playerManager.setNewRechargeInfo(new NewRechargeInfo()); playerManager.setPhoneBindInfo(new PhoneBindInfo("")); playerManager.setChannel(channel); From 4ba1470fb567b6fb1255794c958804abdb24edfb Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Mon, 27 Sep 2021 09:45:44 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E8=B5=A0=E9=80=81=E6=AC=A1=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/hero/HeroUpLikableRequestHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java index 3e739aa96..ba97af0a2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java @@ -41,10 +41,10 @@ public class HeroUpLikableRequestHandler extends BaseHandler SSpecialConfig.getIntegerValue(SSpecialConfig.LIKE_ABILITY)){ -// LOGGER.error("好感度赠送次数超出每日限制"); -// throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT); -// } + if (itemNum+heroManager.getLikableSendTime()> SSpecialConfig.getIntegerValue(SSpecialConfig.LIKE_ABILITY)){ + LOGGER.error("好感度赠送次数超出每日限制"); + throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT); + } int[][]costArr=new int[1][2]; costArr[0][0]=itemId; costArr[0][1]=itemNum; From be9fa17c7066057f5a2a7b10fd693e3c7a38ffd9 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 28 Sep 2021 12:05:32 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=90=E5=A5=BD=E6=84=9F=E5=BA=A6?= =?UTF-8?q?=E3=80=91bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java index ba97af0a2..153a19af5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java @@ -85,6 +85,7 @@ public class HeroUpLikableRequestHandler extends BaseHandler integerEntry : SLikeAbilityConfig.heroLikeAbilityByLevel.entrySet()) { + if (integerEntry.getKey()==SLikeAbilityConfig.heroLikeAbilityByLevel.size()-1)break; if (_likaNum>=integerEntry.getValue()){ likaLv= integerEntry.getKey()+1; }else{ @@ -97,6 +98,7 @@ public class HeroUpLikableRequestHandler extends BaseHandler integerEntry : SLikeAbilityConfig.allLikeAbilityByLevel.entrySet()) { + if (integerEntry.getKey()==SLikeAbilityConfig.allLikeAbilityByLevel.size()-1)break; if (_likaNum>=integerEntry.getValue()){ likaLv= integerEntry.getKey()+1; }else{ From 9c1f77abfbc3db7cc18b4a76b086cfcb4b9c6b99 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 28 Sep 2021 17:37:54 +0800 Subject: [PATCH 9/9] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java index 153a19af5..97537cd75 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroUpLikableRequestHandler.java @@ -51,7 +51,7 @@ public class HeroUpLikableRequestHandler extends BaseHandler