diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java index 71976e820..551592528 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java @@ -94,6 +94,8 @@ public class CumulationData { public int wearEquipTimes;// 妖灵师穿戴装备件数达到 public Map synthesisHeroStarTimesMap = new HashMap<>();// 碎片合成%s星妖灵师次数达到 + public int consumerStamina; //消耗体力数量达到 + //任务重置 @@ -131,6 +133,7 @@ public class CumulationData { synthesisHeroStarTimesMap.clear(); clearArray(sEquipQualityCount); clearArray(heroQualityCount); + consumerStamina=0; } private void clearArray(int[] source){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index c8d653c98..e7583ffe6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -467,7 +467,7 @@ public class GuildLogic { sendPositionChange(targetUid,position); if(position == GlobalsDef.CHAIRMAN){ guildInfo.removeMember(GlobalsDef.CHAIRMAN,uid); - guildInfo.addMembers(GlobalsDef.MEMBER,targetUid); + guildInfo.addMembers(GlobalsDef.MEMBER,uid); sendPositionChange(uid,GlobalsDef.MEMBER); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 26ec4b899..5be905f70 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -496,6 +496,8 @@ public class MissionLoigc { if(missionProgress!=null){ count = missionProgress; } + case USER_CONSUMER_STAMINA: + count= cumulationData.consumerStamina; break; default: count = 0; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java index 7d86ecf44..d201a3c87 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java @@ -60,6 +60,7 @@ public enum MissionType { TAKE_DAILY_BOX_TIMES(45),//领取日常任务宝箱奖励次数达到 HERO_WEAR_EQUIP_TIMES(46),//妖灵师穿戴装备件数达到 SYNTHESIS_HERO_STAR_TIMES(47),//碎片合成%s星妖灵师次数达到 + USER_CONSUMER_STAMINA(48),//消耗体力数量达到 ; private int missionType; @@ -168,6 +169,8 @@ public enum MissionType { return HERO_WEAR_EQUIP_TIMES; case 47: return SYNTHESIS_HERO_STAR_TIMES; + case 48: + return USER_CONSUMER_STAMINA; default: return null; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ConsumerMaterialDataManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ConsumerMaterialDataManager.java index 960d79749..d33c5bf42 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ConsumerMaterialDataManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ConsumerMaterialDataManager.java @@ -12,14 +12,22 @@ public class ConsumerMaterialDataManager implements BaseDataManager{ public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) { CumulationData.Result result = null; Map consumeMaterialMapTmp = (Map) parm[0]; + Integer count =null; if(missionType == MissionType.USER_CONSUMER_GEM){ - Integer count = consumeMaterialMapTmp.get(Global.GEM); + count = consumeMaterialMapTmp.get(Global.GEM); if(count!=null){ data.setConsumeGem(data.getConsumeGem() + count); result = new CumulationData.Result(missionType); } + }else if(missionType == MissionType.USER_CONSUMER_STAMINA){ + count = consumeMaterialMapTmp.get(Global.STAMINA); + if(count!=null){ + data.consumerStamina+=count; + result = new CumulationData.Result(missionType); + } } + return result; } }