Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
f3747d0bad
|
@ -697,17 +697,17 @@ local passivityList = {
|
||||||
local ct2 = args[7]
|
local ct2 = args[7]
|
||||||
local i1 = args[8]
|
local i1 = args[8]
|
||||||
|
|
||||||
local auraBuff = Buff.Create(role, BuffName.Aura, 0, function (role)
|
local auraBuff = Buff.Create(role, BuffName.Aura, 0, function (r)
|
||||||
local changeBuff1 = Buff.Create(role, BuffName.PropertyChange, 0, propertyList[pro1], f2, ct1)
|
local changeBuff1 = Buff.Create(r, BuffName.PropertyChange, 0, propertyList[pro1], f2, ct1)
|
||||||
changeBuff1.cover = true
|
changeBuff1.cover = true
|
||||||
changeBuff1.maxLayer = i1
|
changeBuff1.maxLayer = i1
|
||||||
|
|
||||||
local changeBuff2 = Buff.Create(role, BuffName.PropertyChange, 0, propertyList[pro2], f3, ct2)
|
local changeBuff2 = Buff.Create(r, BuffName.PropertyChange, 0, propertyList[pro2], f3, ct2)
|
||||||
changeBuff2.cover = true
|
changeBuff2.cover = true
|
||||||
changeBuff2.maxLayer = i1
|
changeBuff2.maxLayer = i1
|
||||||
|
|
||||||
role:AddBuff(changeBuff1)
|
r:AddBuff(changeBuff1)
|
||||||
role:AddBuff(changeBuff2)
|
r:AddBuff(changeBuff2)
|
||||||
end)
|
end)
|
||||||
auraBuff.interval = f1
|
auraBuff.interval = f1
|
||||||
role:AddBuff(auraBuff)
|
role:AddBuff(auraBuff)
|
||||||
|
@ -719,8 +719,8 @@ local passivityList = {
|
||||||
local f1 = args[1]
|
local f1 = args[1]
|
||||||
local f2 = args[2]
|
local f2 = args[2]
|
||||||
|
|
||||||
local auraBuff = Buff.Create(role, BuffName.Aura, 0, function (role)
|
local auraBuff = Buff.Create(role, BuffName.Aura, 0, function (r)
|
||||||
BattleUtil.CalTreat(role, role, f2)
|
BattleUtil.CalTreat(r, r, f2)
|
||||||
end)
|
end)
|
||||||
auraBuff.interval = f1
|
auraBuff.interval = f1
|
||||||
role:AddBuff(auraBuff)
|
role:AddBuff(auraBuff)
|
||||||
|
|
|
@ -50,6 +50,7 @@ function RoleLogic:Init(uid, data)
|
||||||
self.roleData = data
|
self.roleData = data
|
||||||
|
|
||||||
self.data:Init(self, data.property)
|
self.data:Init(self, data.property)
|
||||||
|
self.isDead = self:GetRoleData(RoleDataName.Hp) <= 0
|
||||||
|
|
||||||
self.camp = data.camp --阵营 0:我方 1:敌方
|
self.camp = data.camp --阵营 0:我方 1:敌方
|
||||||
self.name = data.name
|
self.name = data.name
|
||||||
|
@ -92,7 +93,6 @@ function RoleLogic:Init(uid, data)
|
||||||
self.aiIndex = 1
|
self.aiIndex = 1
|
||||||
self.aiTempCount = 0
|
self.aiTempCount = 0
|
||||||
|
|
||||||
self.isDead = self:GetRoleData(RoleDataName.Hp) <= 0
|
|
||||||
self.Auto = true
|
self.Auto = true
|
||||||
self.IsDebug = false
|
self.IsDebug = false
|
||||||
|
|
||||||
|
|
|
@ -194,7 +194,7 @@ public class MapLogic {
|
||||||
List<TeamPosHeroInfo> teamPosForHero = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
List<TeamPosHeroInfo> teamPosForHero = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
||||||
for (int i = 0; i <teamPosForHero.size() ; i++) {
|
for (int i = 0; i <teamPosForHero.size() ; i++) {
|
||||||
String endlessHeroId = teamPosForHero.get(i).getHeroId();
|
String endlessHeroId = teamPosForHero.get(i).getHeroId();
|
||||||
int maxHp = HeroLogic.getInstance().calHeroNotBufferAttribute(user,user.getHeroManager().getHero(endlessHeroId),false).get(1);
|
int maxHp = HeroLogic.getInstance().calHeroNotBufferAttribute(user,user.getHeroManager().getHero(endlessHeroId),true).get(1);
|
||||||
mapManager.addEndlessHero(teamPosForHero.get(i).getHeroId(),maxHp);
|
mapManager.addEndlessHero(teamPosForHero.get(i).getHeroId(),maxHp);
|
||||||
}
|
}
|
||||||
if(mapManager.getEndlessMapInfo().getCurCell()!=0){
|
if(mapManager.getEndlessMapInfo().getCurCell()!=0){
|
||||||
|
@ -442,7 +442,7 @@ public class MapLogic {
|
||||||
int[][] cost = new int[1][];
|
int[][] cost = new int[1][];
|
||||||
int costId = SChallengeSetting.getChallengeSetting().getActionPowerId();
|
int costId = SChallengeSetting.getChallengeSetting().getActionPowerId();
|
||||||
int costNum = cells.size();
|
int costNum = cells.size();
|
||||||
mapManager.updateEndlessConsumeExecution(costNum);
|
mapManager.updateEndlessConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution()+costNum);
|
||||||
cost[0]= new int[]{costId,costNum};
|
cost[0]= new int[]{costId,costNum};
|
||||||
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
|
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
|
||||||
if(!costResult) {
|
if(!costResult) {
|
||||||
|
@ -548,7 +548,7 @@ public class MapLogic {
|
||||||
int[][] cost = new int[1][];
|
int[][] cost = new int[1][];
|
||||||
int costId = SChallengeSetting.getChallengeSetting().getActionPowerId();
|
int costId = SChallengeSetting.getChallengeSetting().getActionPowerId();
|
||||||
int costNum = cells.size();
|
int costNum = cells.size();
|
||||||
mapManager.updateEndlessConsumeExecution(costNum);
|
mapManager.updateEndlessConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution()+costNum);
|
||||||
cost[0]= new int[]{costId,costNum};
|
cost[0]= new int[]{costId,costNum};
|
||||||
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
|
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
|
||||||
if(!costResult){
|
if(!costResult){
|
||||||
|
@ -924,7 +924,6 @@ public class MapLogic {
|
||||||
MapInfoProto.MapOutResponse.Builder builder = MapInfoProto.MapOutResponse.newBuilder();
|
MapInfoProto.MapOutResponse.Builder builder = MapInfoProto.MapOutResponse.newBuilder();
|
||||||
//无尽副本
|
//无尽副本
|
||||||
if(challengeConfig.getType()==4) {
|
if(challengeConfig.getType()==4) {
|
||||||
mapManager.updateEndlessLocation(curXY);
|
|
||||||
if(outType==1){
|
if(outType==1){
|
||||||
mapManager.updateEndlessLocation(0);
|
mapManager.updateEndlessLocation(0);
|
||||||
int[][] cost = new int[1][];
|
int[][] cost = new int[1][];
|
||||||
|
@ -932,7 +931,7 @@ public class MapLogic {
|
||||||
int costNum = SEndlessMapConfig.sEndlessMapConfigMap.get(mapId).getTeleportCost();
|
int costNum = SEndlessMapConfig.sEndlessMapConfigMap.get(mapId).getTeleportCost();
|
||||||
int costNum2 = SEndlessMapConfig.sEndlessMapConfigMap.get(targetMapId).getTeleportCost();
|
int costNum2 = SEndlessMapConfig.sEndlessMapConfigMap.get(targetMapId).getTeleportCost();
|
||||||
int resultCost = Math.abs(costNum-costNum2);
|
int resultCost = Math.abs(costNum-costNum2);
|
||||||
mapManager.updateEndlessConsumeExecution(resultCost);
|
mapManager.updateEndlessConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution()+resultCost);
|
||||||
cost[0]= new int[]{costId,resultCost};//Math.abs(costNum-costNum)
|
cost[0]= new int[]{costId,resultCost};//Math.abs(costNum-costNum)
|
||||||
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
|
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
|
||||||
mapManager.setCurMapId(0);
|
mapManager.setCurMapId(0);
|
||||||
|
@ -944,6 +943,10 @@ public class MapLogic {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
LOGGER.info("传送消耗{}行动力"+Math.abs(costNum-costNum2));
|
LOGGER.info("传送消耗{}行动力"+Math.abs(costNum-costNum2));
|
||||||
|
}else{
|
||||||
|
mapManager.updateEndlessLocation(curXY);
|
||||||
|
mapManager.updateEndlessConsumeExecution(0);
|
||||||
|
mapManager.updateEndlessFightCount(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(outType == 0||mapManager.getTower()-1==STrialConfig.getHighestTower()){
|
if(outType == 0||mapManager.getTower()-1==STrialConfig.getHighestTower()){
|
||||||
|
@ -1135,7 +1138,7 @@ public class MapLogic {
|
||||||
int teamId = mapManager.getTeamId();
|
int teamId = mapManager.getTeamId();
|
||||||
mapManager.setLastFightResult(resultCode);
|
mapManager.setLastFightResult(resultCode);
|
||||||
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
|
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
|
||||||
mapManager.updateEndlessFightCount();
|
mapManager.updateEndlessFightCount(1+mapManager.getEndlessMapInfo().getFightCount());
|
||||||
}
|
}
|
||||||
if (resultCode == 0) {
|
if (resultCode == 0) {
|
||||||
// 失败需要等待n秒后复活所有英雄
|
// 失败需要等待n秒后复活所有英雄
|
||||||
|
@ -1351,12 +1354,12 @@ public class MapLogic {
|
||||||
mapManager.setLastFightResult(resultCode);
|
mapManager.setLastFightResult(resultCode);
|
||||||
if (resultCode == 0) {
|
if (resultCode == 0) {
|
||||||
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){
|
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){
|
||||||
mapManager.updateEndlessFightCount();
|
mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1);
|
||||||
//消耗行动力
|
//消耗行动力
|
||||||
int [][] cost = new int[1][];
|
int [][] cost = new int[1][];
|
||||||
int costId = SChallengeSetting.getChallengeSetting().getActionPowerId();
|
int costId = SChallengeSetting.getChallengeSetting().getActionPowerId();
|
||||||
int costNum = SEndlessMapConfig.sEndlessMapConfigMap.get(mapManager.getCurMapId()).getDeathCost();
|
int costNum = SEndlessMapConfig.sEndlessMapConfigMap.get(mapManager.getCurMapId()).getDeathCost();
|
||||||
mapManager.updateEndlessConsumeExecution(costNum);
|
mapManager.updateEndlessConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution()+costNum);
|
||||||
int [] cost1 = new int[]{costId,costNum};
|
int [] cost1 = new int[]{costId,costNum};
|
||||||
cost[0] = cost1;
|
cost[0] = cost1;
|
||||||
if(ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1)) {
|
if(ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1)) {
|
||||||
|
@ -1421,7 +1424,7 @@ public class MapLogic {
|
||||||
mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition()+1]);
|
mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition()+1]);
|
||||||
}
|
}
|
||||||
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
|
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
|
||||||
mapManager.updateEndlessFightCount();
|
mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1);
|
||||||
for (int i = 0 ; i <team.size();i++) {
|
for (int i = 0 ; i <team.size();i++) {
|
||||||
mapManager.updateEndlessHeroHp(team.get(i).getHeroId(),checkResult[i+2]);
|
mapManager.updateEndlessHeroHp(team.get(i).getHeroId(),checkResult[i+2]);
|
||||||
mapManager.updateHeroOneAttribute(team.get(i).getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[i+2]);
|
mapManager.updateHeroOneAttribute(team.get(i).getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[i+2]);
|
||||||
|
@ -2830,7 +2833,7 @@ public class MapLogic {
|
||||||
if(heroEntry.getValue().getLevel()<20){
|
if(heroEntry.getValue().getLevel()<20){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
int calHp = HeroLogic.getInstance().calHeroFinalAttributeWhenInMap(user, heroEntry.getValue(), false).get(1);
|
int calHp = HeroLogic.getInstance().calHeroFinalAttributeWhenInMap(user, heroEntry.getValue(), true).get(1);
|
||||||
if(!endlessHeroInfo.containsKey(heroEntry.getKey())){
|
if(!endlessHeroInfo.containsKey(heroEntry.getKey())){
|
||||||
mapManager.addEndlessHero(heroEntry.getKey(),calHp);
|
mapManager.addEndlessHero(heroEntry.getKey(),calHp);
|
||||||
}
|
}
|
||||||
|
@ -2967,6 +2970,8 @@ public class MapLogic {
|
||||||
MapInfoProto.EndlessOutConsumeResponse.Builder response = MapInfoProto.EndlessOutConsumeResponse.newBuilder();
|
MapInfoProto.EndlessOutConsumeResponse.Builder response = MapInfoProto.EndlessOutConsumeResponse.newBuilder();
|
||||||
response.setFightCount(mapManager.getEndlessMapInfo().getFightCount());
|
response.setFightCount(mapManager.getEndlessMapInfo().getFightCount());
|
||||||
response.setConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution());
|
response.setConsumeExecution(mapManager.getEndlessMapInfo().getConsumeExecution());
|
||||||
|
LOGGER.info("战斗次数{}",response.getFightCount());
|
||||||
|
LOGGER.info("消耗行动力{}",response.getConsumeExecution());
|
||||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true);
|
MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -727,12 +727,14 @@ public class MapManager extends MongoBase {
|
||||||
endlessMapInfo.getMapSign().get(mapId).remove(cellId);
|
endlessMapInfo.getMapSign().get(mapId).remove(cellId);
|
||||||
removeString(getMongoKey()+".endlessMapInfo.mapSign."+mapId+"."+cellId);
|
removeString(getMongoKey()+".endlessMapInfo.mapSign."+mapId+"."+cellId);
|
||||||
}
|
}
|
||||||
public void updateEndlessFightCount(){
|
public void updateEndlessFightCount(int count){
|
||||||
endlessMapInfo.setFightCount(1+endlessMapInfo.getFightCount());
|
endlessMapInfo.setFightCount(count);
|
||||||
updateString("endlessMapInfo.fightCount",endlessMapInfo.getFightCount());
|
updateString("endlessMapInfo.fightCount",endlessMapInfo.getFightCount());
|
||||||
}
|
}
|
||||||
public void updateEndlessConsumeExecution(int count){
|
public void updateEndlessConsumeExecution(int count){
|
||||||
endlessMapInfo.setFightCount(count+endlessMapInfo.getFightCount());
|
endlessMapInfo.setConsumeExecution(count);
|
||||||
|
updateString("endlessMapInfo.consumeExecution",endlessMapInfo.getConsumeExecution());
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,7 @@ package com.ljsd.jieling.logic.dao;
|
||||||
import com.ljsd.jieling.logic.mission.MissionType;
|
import com.ljsd.jieling.logic.mission.MissionType;
|
||||||
import com.ljsd.jieling.logic.mission.data.DataManagerDistributor;
|
import com.ljsd.jieling.logic.mission.data.DataManagerDistributor;
|
||||||
|
|
||||||
import java.util.BitSet;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class CumulationData {
|
public class CumulationData {
|
||||||
|
|
||||||
|
@ -94,8 +92,12 @@ public class CumulationData {
|
||||||
public int wearEquipTimes;// 妖灵师穿戴装备件数达到
|
public int wearEquipTimes;// 妖灵师穿戴装备件数达到
|
||||||
public Map<Integer,Integer> synthesisHeroStarTimesMap = new HashMap<>();// 碎片合成%s星妖灵师次数达到
|
public Map<Integer,Integer> synthesisHeroStarTimesMap = new HashMap<>();// 碎片合成%s星妖灵师次数达到
|
||||||
|
|
||||||
|
public Map<Integer,Integer> heroUpStarTimesMap = new HashMap<>();// 碎片合成%s星妖灵师次数达到
|
||||||
|
|
||||||
public int consumerStamina; //消耗体力数量达到
|
public int consumerStamina; //消耗体力数量达到
|
||||||
|
|
||||||
|
public Set<Integer> differentHeros = new HashSet<>();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//任务重置
|
//任务重置
|
||||||
|
@ -134,6 +136,8 @@ public class CumulationData {
|
||||||
clearArray(sEquipQualityCount);
|
clearArray(sEquipQualityCount);
|
||||||
clearArray(heroQualityCount);
|
clearArray(heroQualityCount);
|
||||||
consumerStamina=0;
|
consumerStamina=0;
|
||||||
|
differentHeros.clear();
|
||||||
|
heroUpStarTimesMap.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void clearArray(int[] source){
|
private void clearArray(int[] source){
|
||||||
|
@ -174,6 +178,14 @@ public class CumulationData {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateHeroUpStarTimes(int heroTid){
|
||||||
|
Integer count = heroUpStarTimesMap.get(heroTid);
|
||||||
|
if(count == null){
|
||||||
|
count = 0;
|
||||||
|
}
|
||||||
|
heroUpStarTimesMap.put(heroTid,count+1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public int getSecretRandomCount() {
|
public int getSecretRandomCount() {
|
||||||
return secretRandomCount;
|
return secretRandomCount;
|
||||||
|
|
|
@ -61,6 +61,10 @@ public class GuilidManager {
|
||||||
|
|
||||||
public static void addGuildLog(GuildLog guildLog) throws Exception {
|
public static void addGuildLog(GuildLog guildLog) throws Exception {
|
||||||
MongoUtil.getInstence().getMyMongoTemplate().save(guildLog);
|
MongoUtil.getInstence().getMyMongoTemplate().save(guildLog);
|
||||||
|
if(!guildLogInfoMap.containsKey(guildLog.getGuildId())){
|
||||||
|
guildLogInfoMap.put(guildLog.getGuildId(),new ArrayList<>());
|
||||||
|
}
|
||||||
|
guildLogInfoMap.get(guildLog.getGuildId()).add(guildLog);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void init() throws Exception {
|
public static void init() throws Exception {
|
||||||
|
|
|
@ -31,23 +31,6 @@ public class UserManager {
|
||||||
return userMap.containsKey(uid);
|
return userMap.containsKey(uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
// public static User getUserForLogin(int uid) throws Exception {
|
|
||||||
// User user = userMap.get(uid);
|
|
||||||
// if (user != null) {
|
|
||||||
// user = MongoUtil.getInstence().getMyMongoTemplate().findById(User.getCollectionName(), Integer.toString(uid), User.class);
|
|
||||||
// }
|
|
||||||
// if (user == null) {
|
|
||||||
// user = registerUser(uid);
|
|
||||||
// }else{
|
|
||||||
// refreshUserLoginInfo(user);
|
|
||||||
// }
|
|
||||||
// return user;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// private static void refreshUserLoginInfo(User user) {
|
|
||||||
// //TODO
|
|
||||||
// }
|
|
||||||
|
|
||||||
public static User userLogin(int uid,String openId) throws Exception {
|
public static User userLogin(int uid,String openId) throws Exception {
|
||||||
User user = null;
|
User user = null;
|
||||||
if (!UserManager.isUserExist(uid)){
|
if (!UserManager.isUserExist(uid)){
|
||||||
|
|
|
@ -5,5 +5,8 @@ public interface GuildDef {
|
||||||
int CREATE = 1;
|
int CREATE = 1;
|
||||||
int JOIN = 2;
|
int JOIN = 2;
|
||||||
int KICK = 3;
|
int KICK = 3;
|
||||||
|
int TRANSFER = 4; //转让
|
||||||
|
int APPOINTMENT = 5; //委任
|
||||||
|
int LEVEL = 6; //离开宗门
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -229,7 +229,7 @@ public class GuildLogic {
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
int msgId = MessageTypeProto.MessageType.FAMILY_GET_LOG_RESPOSNE_VALUE;
|
int msgId = MessageTypeProto.MessageType.FAMILY_GET_LOG_RESPOSNE_VALUE;
|
||||||
if(user.getPlayerInfoManager().getGuildId()==0){
|
if(user.getPlayerInfoManager().getGuildId()==0){
|
||||||
MessageUtil.sendErrorResponse(session,0,msgId,"已加入过公会");
|
MessageUtil.sendErrorResponse(session,0,msgId,"未加入公会");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Family.GetFamilyLogResponse.Builder builder = Family.GetFamilyLogResponse.newBuilder();
|
Family.GetFamilyLogResponse.Builder builder = Family.GetFamilyLogResponse.newBuilder();
|
||||||
|
@ -461,10 +461,14 @@ public class GuildLogic {
|
||||||
guildInfo.removeMember(targetType,targetUid);
|
guildInfo.removeMember(targetType,targetUid);
|
||||||
guildInfo.addMembers(position,targetUid);
|
guildInfo.addMembers(position,targetUid);
|
||||||
sendPositionChange(targetUid,position);
|
sendPositionChange(targetUid,position);
|
||||||
|
User targetUser = UserManager.getUser(targetUid);
|
||||||
if(position == GlobalsDef.CHAIRMAN){
|
if(position == GlobalsDef.CHAIRMAN){
|
||||||
guildInfo.removeMember(GlobalsDef.CHAIRMAN,uid);
|
guildInfo.removeMember(GlobalsDef.CHAIRMAN,uid);
|
||||||
guildInfo.addMembers(GlobalsDef.MEMBER,uid);
|
guildInfo.addMembers(GlobalsDef.MEMBER,uid);
|
||||||
sendPositionChange(uid,GlobalsDef.MEMBER);
|
sendPositionChange(uid,GlobalsDef.MEMBER);
|
||||||
|
addGuildLog(guildInfo.getId(),GuildDef.Log.TRANSFER,targetUser.getPlayerInfoManager().getNickName());
|
||||||
|
}else{
|
||||||
|
addGuildLog(guildInfo.getId(),GuildDef.Log.APPOINTMENT,targetUser.getPlayerInfoManager().getNickName());
|
||||||
}
|
}
|
||||||
|
|
||||||
MessageUtil.sendMessage(session,1,msgId,null,true);
|
MessageUtil.sendMessage(session,1,msgId,null,true);
|
||||||
|
@ -627,6 +631,7 @@ public class GuildLogic {
|
||||||
}
|
}
|
||||||
guildInfo.removeMember(uidType,uid);
|
guildInfo.removeMember(uidType,uid);
|
||||||
user.getPlayerInfoManager().setGuildId(0);
|
user.getPlayerInfoManager().setGuildId(0);
|
||||||
|
addGuildLog(guildInfo.getId(),GuildDef.Log.LEVEL,user.getPlayerInfoManager().getNickName());
|
||||||
MessageUtil.sendMessage(session,1,msgId,null,true);
|
MessageUtil.sendMessage(session,1,msgId,null,true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -674,54 +679,31 @@ public class GuildLogic {
|
||||||
}
|
}
|
||||||
case GuildDef.Log.JOIN: {
|
case GuildDef.Log.JOIN: {
|
||||||
// 加入宗门
|
// 加入宗门
|
||||||
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logCreate", new Object[]{name}));
|
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logJoin", new Object[]{name}));
|
||||||
GuilidManager.addGuildLog(cGuildLog);
|
GuilidManager.addGuildLog(cGuildLog);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 3: {
|
case GuildDef.Log.KICK: {
|
||||||
// 退出宗门
|
// 退出宗门
|
||||||
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logCreate", new Object[]{name}));
|
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logKick", new Object[]{name}));
|
||||||
GuilidManager.addGuildLog(cGuildLog);
|
GuilidManager.addGuildLog(cGuildLog);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 4: {
|
case GuildDef.Log.TRANSFER: {
|
||||||
// 宗门任免
|
|
||||||
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logCreate", new Object[]{name}));
|
|
||||||
GuilidManager.addGuildLog(cGuildLog);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 5: {
|
|
||||||
// 宗门转让
|
// 宗门转让
|
||||||
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logCreate", new Object[]{name}));
|
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logTransfer", new Object[]{name}));
|
||||||
GuilidManager.addGuildLog(cGuildLog);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 6: {
|
|
||||||
// 宗门改名和改图腾
|
|
||||||
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logCreate", new Object[]{name}));
|
|
||||||
GuilidManager.addGuildLog(cGuildLog);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 7: {
|
|
||||||
// 宗门公告
|
|
||||||
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logCreate", new Object[]{name}));
|
|
||||||
GuilidManager.addGuildLog(cGuildLog);
|
GuilidManager.addGuildLog(cGuildLog);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 8: {
|
case GuildDef.Log.APPOINTMENT: {
|
||||||
// 宗门宣言
|
// 宗门任免
|
||||||
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logCreate", new Object[]{name}));
|
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logAppointment", new Object[]{name}));
|
||||||
GuilidManager.addGuildLog(cGuildLog);
|
GuilidManager.addGuildLog(cGuildLog);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 9: {
|
case GuildDef.Log.LEVEL: {
|
||||||
// 15天转让
|
// 宗门退出
|
||||||
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logCreate", new Object[]{name}));
|
GuildLog cGuildLog = new GuildLog(guildId,name, SErrorCodeEerverConfig.getI18NMessage("guild.logLevel", new Object[]{name}));
|
||||||
GuilidManager.addGuildLog(cGuildLog);
|
GuilidManager.addGuildLog(cGuildLog);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -632,7 +632,7 @@ public class HeroLogic {
|
||||||
recyleHeroBySystem(user,removeHeroIds);
|
recyleHeroBySystem(user,removeHeroIds);
|
||||||
targetHero.upStar( 1 );
|
targetHero.upStar( 1 );
|
||||||
targetHero.setStarBreakId(scHeroRankUpConfig.getId());
|
targetHero.setStarBreakId(scHeroRankUpConfig.getId());
|
||||||
user.getUserMissionManager().onGameEvent(user,GameEvent.HERO_UP,2);
|
user.getUserMissionManager().onGameEvent(user,GameEvent.HERO_UP,2,targetHero.getTemplateId());
|
||||||
MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,null,true);
|
MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,null,true);
|
||||||
if(targetHero.getStar()>=7){
|
if(targetHero.getStar()>=7){
|
||||||
String message = SErrorCodeEerverConfig.getI18NMessage("lamp_rankup_hero_content", new Object[]{user.getPlayerInfoManager().getNickName(), scHero.getReadingName(),targetHero.getStar()});
|
String message = SErrorCodeEerverConfig.getI18NMessage("lamp_rankup_hero_content", new Object[]{user.getPlayerInfoManager().getNickName(), scHero.getReadingName(),targetHero.getStar()});
|
||||||
|
|
|
@ -496,9 +496,19 @@ public class MissionLoigc {
|
||||||
if(missionProgress!=null){
|
if(missionProgress!=null){
|
||||||
count = missionProgress;
|
count = missionProgress;
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
case USER_CONSUMER_STAMINA:
|
case USER_CONSUMER_STAMINA:
|
||||||
count= cumulationData.consumerStamina;
|
count= cumulationData.consumerStamina;
|
||||||
break;
|
break;
|
||||||
|
case COLLECT_DIFFERENT_HEROS:
|
||||||
|
count= cumulationData.differentHeros.size();
|
||||||
|
break;
|
||||||
|
case ONE_HERO_UP_STAR_TIMES:
|
||||||
|
Integer num= cumulationData.heroUpStarTimesMap.get(missionSubType[0]);
|
||||||
|
if(num!=null){
|
||||||
|
count = num;
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
count = 0;
|
count = 0;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -61,6 +61,8 @@ public enum MissionType {
|
||||||
HERO_WEAR_EQUIP_TIMES(46),//妖灵师穿戴装备件数达到
|
HERO_WEAR_EQUIP_TIMES(46),//妖灵师穿戴装备件数达到
|
||||||
SYNTHESIS_HERO_STAR_TIMES(47),//碎片合成%s星妖灵师次数达到
|
SYNTHESIS_HERO_STAR_TIMES(47),//碎片合成%s星妖灵师次数达到
|
||||||
USER_CONSUMER_STAMINA(48),//消耗体力数量达到
|
USER_CONSUMER_STAMINA(48),//消耗体力数量达到
|
||||||
|
COLLECT_DIFFERENT_HEROS(49), // 收集不同妖灵师数目达到
|
||||||
|
ONE_HERO_UP_STAR_TIMES(50), // 收集不同妖灵师数目达到
|
||||||
;
|
;
|
||||||
|
|
||||||
private int missionType;
|
private int missionType;
|
||||||
|
@ -171,6 +173,10 @@ public enum MissionType {
|
||||||
return SYNTHESIS_HERO_STAR_TIMES;
|
return SYNTHESIS_HERO_STAR_TIMES;
|
||||||
case 48:
|
case 48:
|
||||||
return USER_CONSUMER_STAMINA;
|
return USER_CONSUMER_STAMINA;
|
||||||
|
case 49:
|
||||||
|
return COLLECT_DIFFERENT_HEROS;
|
||||||
|
case 50:
|
||||||
|
return ONE_HERO_UP_STAR_TIMES;
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,7 @@ public class DataManagerDistributor {
|
||||||
judges.put(MissionType.RECRUITMENT_RANDOM_HEROES,new RandomHeroDataManager());
|
judges.put(MissionType.RECRUITMENT_RANDOM_HEROES,new RandomHeroDataManager());
|
||||||
judges.put(MissionType.ELEMENT_RANDOM_TIMES,new RandomHeroDataManager());
|
judges.put(MissionType.ELEMENT_RANDOM_TIMES,new RandomHeroDataManager());
|
||||||
judges.put(MissionType.COLLECT_QUALITY_HERO,new GetHeroManager());
|
judges.put(MissionType.COLLECT_QUALITY_HERO,new GetHeroManager());
|
||||||
|
judges.put(MissionType.COLLECT_DIFFERENT_HEROS,new GetHeroManager());
|
||||||
judges.put(MissionType.HERO_LEVLE_COUNT,new HeroLevelUpManager());
|
judges.put(MissionType.HERO_LEVLE_COUNT,new HeroLevelUpManager());
|
||||||
|
|
||||||
|
|
||||||
|
@ -71,6 +72,7 @@ public class DataManagerDistributor {
|
||||||
|
|
||||||
judges.put(MissionType.HERO_BREAK_TIMES,new HeroUpDataManager());
|
judges.put(MissionType.HERO_BREAK_TIMES,new HeroUpDataManager());
|
||||||
judges.put(MissionType.HERO_UP_STAR_TIMES,new HeroUpDataManager());
|
judges.put(MissionType.HERO_UP_STAR_TIMES,new HeroUpDataManager());
|
||||||
|
judges.put(MissionType.ONE_HERO_UP_STAR_TIMES,new HeroUpDataManager());
|
||||||
|
|
||||||
judges.put(MissionType.TAKE_CHAPTER_REWARD_TIMES,new TakeActivityRewardHandler());
|
judges.put(MissionType.TAKE_CHAPTER_REWARD_TIMES,new TakeActivityRewardHandler());
|
||||||
judges.put(MissionType.TAKE_ONLINE_REWARD_TIMES,new TakeActivityRewardHandler());
|
judges.put(MissionType.TAKE_ONLINE_REWARD_TIMES,new TakeActivityRewardHandler());
|
||||||
|
|
|
@ -15,6 +15,12 @@ public class GetHeroManager implements BaseDataManager {
|
||||||
SCHero scHero = SCHero.getsCHero().get(heroTid);
|
SCHero scHero = SCHero.getsCHero().get(heroTid);
|
||||||
data.updateHeroQualityCount(scHero.getStar());
|
data.updateHeroQualityCount(scHero.getStar());
|
||||||
result = new CumulationData.Result(missionType);
|
result = new CumulationData.Result(missionType);
|
||||||
|
}else if(missionType == MissionType.COLLECT_DIFFERENT_HEROS){
|
||||||
|
if(!data.differentHeros.contains(heroTid)){
|
||||||
|
data.differentHeros.add(heroTid);
|
||||||
|
result = new CumulationData.Result(missionType);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,9 @@ public class HeroUpDataManager implements BaseDataManager {
|
||||||
data.heroBreakTimes++;
|
data.heroBreakTimes++;
|
||||||
}else if(missionType == MissionType.HERO_UP_STAR_TIMES && type == 2){
|
}else if(missionType == MissionType.HERO_UP_STAR_TIMES && type == 2){
|
||||||
data.heroUpStarTimes++;
|
data.heroUpStarTimes++;
|
||||||
|
}else if(missionType == MissionType.ONE_HERO_UP_STAR_TIMES && type == 2){
|
||||||
|
int heroTid = (int) parm[1];
|
||||||
|
data.updateHeroUpStarTimes(heroTid);
|
||||||
}else{
|
}else{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,6 +50,7 @@ public class MissionEventDistributor {
|
||||||
|
|
||||||
typeList = new ArrayList<>();
|
typeList = new ArrayList<>();
|
||||||
typeList.add(MissionType.COLLECT_QUALITY_HERO);
|
typeList.add(MissionType.COLLECT_QUALITY_HERO);
|
||||||
|
typeList.add(MissionType.COLLECT_DIFFERENT_HEROS);
|
||||||
eventEnumListMap.put(GameEvent.GET_HERO,typeList);
|
eventEnumListMap.put(GameEvent.GET_HERO,typeList);
|
||||||
eventProcessor.put(GameEvent.GET_HERO,new CumulationDataEventProcessor());
|
eventProcessor.put(GameEvent.GET_HERO,new CumulationDataEventProcessor());
|
||||||
|
|
||||||
|
@ -186,6 +187,7 @@ public class MissionEventDistributor {
|
||||||
typeList = new ArrayList<>();
|
typeList = new ArrayList<>();
|
||||||
typeList.add(MissionType.HERO_BREAK_TIMES);
|
typeList.add(MissionType.HERO_BREAK_TIMES);
|
||||||
typeList.add(MissionType.HERO_UP_STAR_TIMES);
|
typeList.add(MissionType.HERO_UP_STAR_TIMES);
|
||||||
|
typeList.add(MissionType.ONE_HERO_UP_STAR_TIMES);
|
||||||
eventEnumListMap.put(GameEvent.HERO_UP,typeList);
|
eventEnumListMap.put(GameEvent.HERO_UP,typeList);
|
||||||
eventProcessor.put(GameEvent.HERO_UP,new CumulationDataEventProcessor());
|
eventProcessor.put(GameEvent.HERO_UP,new CumulationDataEventProcessor());
|
||||||
|
|
||||||
|
|
|
@ -369,9 +369,11 @@ public class PlayerLogic {
|
||||||
.setHead(1)
|
.setHead(1)
|
||||||
.setHeadFrame(playerManager.getHeadFrame())
|
.setHeadFrame(playerManager.getHeadFrame())
|
||||||
.setName(playerManager.getNickName()).setUid(session.getUid()).setTeam(team);
|
.setName(playerManager.getNickName()).setUid(session.getUid()).setTeam(team);
|
||||||
|
if(teamPosManager.getTeamPosForPoken().get(1)!=null&&teamPosManager.getTeamPosForPoken().get(1).size()>0){
|
||||||
for(TeamPosForPokenInfo posForPokenInfo:teamPosManager.getTeamPosForPoken().get(1)){
|
for(TeamPosForPokenInfo posForPokenInfo:teamPosManager.getTeamPosForPoken().get(1)){
|
||||||
playerTeamInfo.addPokemonInfos(posForPokenInfo.getPokenId());
|
playerTeamInfo.addPokemonInfos(posForPokenInfo.getPokenId());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),playerTeamInfo.build(),true);
|
MessageUtil.sendMessage(session,1,messageType.getNumber(),playerTeamInfo.build(),true);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -362,7 +362,7 @@ public class CBean2Proto {
|
||||||
boolean online = OnlineUserManager.checkUidOnline(user.getId());
|
boolean online = OnlineUserManager.checkUidOnline(user.getId());
|
||||||
int outTime = 0;
|
int outTime = 0;
|
||||||
if(!online){
|
if(!online){
|
||||||
outTime = (int)(System.currentTimeMillis() - user.getPlayerInfoManager().getLoginTime());
|
outTime = (int)((System.currentTimeMillis() - user.getPlayerInfoManager().getLoginTime())/1000);
|
||||||
}
|
}
|
||||||
return Family.FamilyUserInfo.newBuilder().setRoleUid(user.getId())
|
return Family.FamilyUserInfo.newBuilder().setRoleUid(user.getId())
|
||||||
.setUserName(user.getPlayerInfoManager().getNickName())
|
.setUserName(user.getPlayerInfoManager().getNickName())
|
||||||
|
@ -381,7 +381,7 @@ public class CBean2Proto {
|
||||||
boolean online = OnlineUserManager.checkUidOnline(user.getId());
|
boolean online = OnlineUserManager.checkUidOnline(user.getId());
|
||||||
int outTime = 0;
|
int outTime = 0;
|
||||||
if(!online){
|
if(!online){
|
||||||
outTime = (int)(System.currentTimeMillis() - user.getPlayerInfoManager().getLoginTime());
|
outTime = (int)((System.currentTimeMillis() - user.getPlayerInfoManager().getLoginTime())/1000);
|
||||||
}
|
}
|
||||||
return Family.FamilyApply.newBuilder()
|
return Family.FamilyApply.newBuilder()
|
||||||
.setRoleUid(user.getId())
|
.setRoleUid(user.getId())
|
||||||
|
|
Loading…
Reference in New Issue