数据上报字段修改,森罗环境层数排行修改
parent
3328d48b41
commit
d0aebf10f3
|
@ -122,7 +122,7 @@ public class HeroNodeRequestHandler extends BaseHandler<Expedition.HeroNodeReque
|
||||||
List<Integer> rewardIds = new ArrayList<>(itemlistList.size());
|
List<Integer> rewardIds = new ArrayList<>(itemlistList.size());
|
||||||
List<Integer> rewardNums = new ArrayList<>(itemlistList.size());
|
List<Integer> rewardNums = new ArrayList<>(itemlistList.size());
|
||||||
itemlistList.forEach(item->{rewardIds.add(item.getItemId());rewardIds.add(item.getItemNum());});
|
itemlistList.forEach(item->{rewardIds.add(item.getItemId());rewardIds.add(item.getItemNum());});
|
||||||
ReportUtil.onReportEvent(user,ReportEventEnum.START_TIANGONG.getType(),nodeInfo.getType(),rewardIds,rewardNums);
|
ReportUtil.onReportEvent(user,ReportEventEnum.START_TIANGONG.getType(),expeditionManager.getLay(),nodeInfo.getType(),rewardIds,rewardNums);
|
||||||
return Expedition.HeroNodeResponse.newBuilder().setDrop(drop).build();
|
return Expedition.HeroNodeResponse.newBuilder().setDrop(drop).build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -126,7 +126,7 @@ public class StartExpeditionBattleRequest extends BaseHandler<Expedition.StartEx
|
||||||
.addMonsterList(deffightTeamInfo)
|
.addMonsterList(deffightTeamInfo)
|
||||||
.build());
|
.build());
|
||||||
MessageUtil.sendMessage(iSession, 1,MessageTypeProto.MessageType.EXPEDITION_START_BATTLE_RESONSE_VALUE, fightStartResponse.build(), true);
|
MessageUtil.sendMessage(iSession, 1,MessageTypeProto.MessageType.EXPEDITION_START_BATTLE_RESONSE_VALUE, fightStartResponse.build(), true);
|
||||||
ReportUtil.onReportEvent(user, ReportEventEnum.START_TIANGONG.getType(),nodeInfo.getType(),"","");
|
ReportUtil.onReportEvent(user, ReportEventEnum.START_TIANGONG.getType(),user.getExpeditionManager().getLay(),nodeInfo.getType());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ public class StoreNodeRequestHandler extends BaseHandler<Expedition.StoreNodeReq
|
||||||
builder.addAllNodeInfo(nodeInfos);
|
builder.addAllNodeInfo(nodeInfos);
|
||||||
ISession sessionByUid = OnlineUserManager.getSessionByUid(uid);
|
ISession sessionByUid = OnlineUserManager.getSessionByUid(uid);
|
||||||
MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.EXPEDITION_NOINFO_INDICATION_VALUE, builder.build(), true);
|
MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.EXPEDITION_NOINFO_INDICATION_VALUE, builder.build(), true);
|
||||||
ReportUtil.onReportEvent(user, ReportEventEnum.START_TIANGONG.getType(),nodeInfo.getType());
|
ReportUtil.onReportEvent(user, ReportEventEnum.START_TIANGONG.getType(),expeditionManager.getLay(),nodeInfo.getType());
|
||||||
|
|
||||||
return Expedition.StoreNodeResponse.newBuilder().build();
|
return Expedition.StoreNodeResponse.newBuilder().build();
|
||||||
}
|
}
|
||||||
|
|
|
@ -2283,6 +2283,7 @@ public class MapLogic {
|
||||||
.setEnventDrop(dropBuilder)
|
.setEnventDrop(dropBuilder)
|
||||||
.build();
|
.build();
|
||||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true);
|
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true);
|
||||||
|
ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_XINMO.getType(),checkFightId,sFloodConfig.getMonster(),MonsterUtil.getMonsterForce(new int[]{sFloodConfig.getMonster()}),new Date(),"",null,null,"失败");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2306,7 +2307,7 @@ public class MapLogic {
|
||||||
itemIdList.add(item.getItemId());
|
itemIdList.add(item.getItemId());
|
||||||
itemIdList.add(item.getItemNum());
|
itemIdList.add(item.getItemNum());
|
||||||
});
|
});
|
||||||
ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_XINMO.getType(),checkFightId,sFloodConfig.getMonster(),MonsterUtil.getMonsterForce(new int[]{sFloodConfig.getMonster()}),new Date(),"",itemIdList,itemNumList,resultCode==1?"成功":"失败");
|
ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_XINMO.getType(),checkFightId,sFloodConfig.getMonster(),MonsterUtil.getMonsterForce(new int[]{sFloodConfig.getMonster()}),new Date(),"",itemIdList,itemNumList,"成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class FourtyTwoBehavior extends BaseBehavior {
|
||||||
trialInfo.setHighestTower(floor);
|
trialInfo.setHighestTower(floor);
|
||||||
AbstractRank towerRank = RankContext.getRankEnum(RankEnum.TOWER_RANK.getType());
|
AbstractRank towerRank = RankContext.getRankEnum(RankEnum.TOWER_RANK.getType());
|
||||||
if(towerRank.getScore(floor,(int)(time/1000))>towerRank.getScoreById(user.getId(),"")){
|
if(towerRank.getScore(floor,(int)(time/1000))>towerRank.getScoreById(user.getId(),"")){
|
||||||
towerRank.addRank(user.getId(),"", floor,(int)(time/1000));
|
towerRank.addRank(user.getId(),"", floor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ReportUtil.onReportEvent(user, ReportEventEnum.COMPLETE_PANOPTIC_MIRROR.getType(),trialInfo.getFloor());
|
ReportUtil.onReportEvent(user, ReportEventEnum.COMPLETE_PANOPTIC_MIRROR.getType(),trialInfo.getFloor());
|
||||||
|
|
|
@ -39,7 +39,7 @@ public enum ReportEventEnum {
|
||||||
JOIN_GUILD(25,"join_guild", new CommonEventHandler(),new String[]{"guild_id","guild_name","guild_level","guild_people_num","guild_fighting_capacity","guild_create_time"}),
|
JOIN_GUILD(25,"join_guild", new CommonEventHandler(),new String[]{"guild_id","guild_name","guild_level","guild_people_num","guild_fighting_capacity","guild_create_time"}),
|
||||||
QUIT_GUILD(26,"quit_guild", new CommonEventHandler(),new String[]{"guild_id","guild_name","guild_level","guild_people_num","guild_fighting_capacity","guild_create_time"}),
|
QUIT_GUILD(26,"quit_guild", new CommonEventHandler(),new String[]{"guild_id","guild_name","guild_level","guild_people_num","guild_fighting_capacity","guild_create_time"}),
|
||||||
CREATE_ORDER(27,"create_order", new CommonEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","entrance","item_id","item_name","goods_id","item_list"}),
|
CREATE_ORDER(27,"create_order", new CommonEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","entrance","item_id","item_name","goods_id","item_list"}),
|
||||||
ORDER_COMPLETE(28,"order_complete", new ChargeAmountEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","channel_id","server_id","goods_id","goods_name","item_id","item_num","charge_time"}),
|
ORDER_COMPLETE(28,"order_complete", new ChargeAmountEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","channel_id","server_id","goods_id","goods_name","rewards_id_list","rewards_num_list","charge_time"}),
|
||||||
CHECK_RANKING(29,"check_ranking", new CommonEventHandler(),new String[]{"ranking_type"}),
|
CHECK_RANKING(29,"check_ranking", new CommonEventHandler(),new String[]{"ranking_type"}),
|
||||||
ASK_FOR_BEING_FRIENDS(30,"ask_for_being_friends", new CommonEventHandler(),new String[]{"target_id","target_name","target_level","entrance"}),
|
ASK_FOR_BEING_FRIENDS(30,"ask_for_being_friends", new CommonEventHandler(),new String[]{"target_id","target_name","target_level","entrance"}),
|
||||||
ALLOW_FRIENDS_ASK(31,"allow_friends_ask", new CommonEventHandler(),new String[]{"target_id","target_name","target_level","entrance"}),
|
ALLOW_FRIENDS_ASK(31,"allow_friends_ask", new CommonEventHandler(),new String[]{"target_id","target_name","target_level","entrance"}),
|
||||||
|
@ -73,7 +73,7 @@ public enum ReportEventEnum {
|
||||||
|
|
||||||
HERO_COMPOSITION(50,"hero_composition", new CommonEventHandler(),new String[]{"hero_id","hero_level","hero_quality","reward_list","reward_nums_list"}),
|
HERO_COMPOSITION(50,"hero_composition", new CommonEventHandler(),new String[]{"hero_id","hero_level","hero_quality","reward_list","reward_nums_list"}),
|
||||||
|
|
||||||
SEND_HERO(51,"send_hero", new CommonEventHandler(),new String[]{"hero_id","hero_level","hero_quality","reward_list","reward_nums_list"}),
|
SEND_HERO(51,"send_hero", new CommonEventHandler(),new String[]{"hero_id","hero_level_list","hero_quality_list","reward_list","reward_nums_list"}),
|
||||||
TREASURE_DECOMPOSITION(52,"treasure_decomposition", new CommonEventHandler(),new String[]{"item_id","item_level","item_quality","reward_list","reward_nums_list"}),
|
TREASURE_DECOMPOSITION(52,"treasure_decomposition", new CommonEventHandler(),new String[]{"item_id","item_level","item_quality","reward_list","reward_nums_list"}),
|
||||||
|
|
||||||
START_TIANGONG(53,"start_tiangong",new CommonEventHandler(),new String[]{"stage_id","stage_type","rewards_id_list","rewards_num_list"}),
|
START_TIANGONG(53,"start_tiangong",new CommonEventHandler(),new String[]{"stage_id","stage_type","rewards_id_list","rewards_num_list"}),
|
||||||
|
|
|
@ -20,18 +20,25 @@ public class TowerRank extends AbstractRank {
|
||||||
return super.getRank(uid,rkey,1, rankEndLine);
|
return super.getRank(uid,rkey,1, rankEndLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Override
|
||||||
|
// public long[] getDataByScore(Double score) {
|
||||||
|
// long[] array = new long [2];
|
||||||
|
// int scoreInt = score.intValue();
|
||||||
|
// array[0] = scoreInt/3601;
|
||||||
|
// array[1] =3600-scoreInt%3601;
|
||||||
|
// return array;
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long[] getDataByScore(Double score) {
|
public long[] getDataByScore(Double score) {
|
||||||
long[] array = new long [2];
|
return new long[]{score.longValue()};
|
||||||
int scoreInt = score.intValue();
|
|
||||||
array[0] = scoreInt/3601;
|
|
||||||
array[1] =3600-scoreInt%3601;
|
|
||||||
return array;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getScore(double... data) {
|
public double getScore(double... data) {
|
||||||
double doubleTime = TimeUtils.getDoubleTime();
|
// double doubleTime = TimeUtils.getDoubleTime();
|
||||||
return data[1]>3600?data[0]*3601+doubleTime:data[0]*3601+3600-data[1]+doubleTime;
|
// return data[1]>3600?data[0]*3601+doubleTime:data[0]*3601+3600-data[1]+doubleTime;
|
||||||
|
return data[0]+TimeUtils.getDoubleTime();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue