打点修改,车迟斗法无抢夺目标修改
parent
711fa42582
commit
76d2fea459
|
@ -50,18 +50,25 @@ public class GetCarChallengeListHandler extends BaseHandler {
|
||||||
int zsetSize = RedisUtil.getInstence().getZsetSize(key);
|
int zsetSize = RedisUtil.getInstence().getZsetSize(key);
|
||||||
List<ZsetTypedTupleWithRank> beforeList = new ArrayList<>(5);
|
List<ZsetTypedTupleWithRank> beforeList = new ArrayList<>(5);
|
||||||
List<ZsetTypedTupleWithRank> afterList = new ArrayList<>(5);
|
List<ZsetTypedTupleWithRank> afterList = new ArrayList<>(5);
|
||||||
|
int maxWhile = 30;//最大匹配循环次数
|
||||||
if(myRank == -1){
|
if(myRank == -1){
|
||||||
int start = zsetSize - matchNums;
|
int end = 0;
|
||||||
if(start<0){
|
while(end<maxWhile&&beforeList.size()<matchNums){
|
||||||
start=0;
|
|
||||||
|
Set<ZSetOperations.TypedTuple<String>> beforeScore = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CAR_DEALY_RANK, "", zsetSize-end , zsetSize-end );
|
||||||
|
if(!beforeScore.isEmpty()){
|
||||||
|
ZSetOperations.TypedTuple<String> beforeNext = beforeScore.iterator().next();
|
||||||
|
if(!members.contains(Integer.parseInt(beforeNext.getValue()))){
|
||||||
|
beforeList.add(new ZsetTypedTupleWithRank(beforeNext,zsetSize-end+1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end++;
|
||||||
}
|
}
|
||||||
int end=-1;
|
// process(start,end,members,matchNums,infos);
|
||||||
process(start,end,members,matchNums,infos);
|
|
||||||
}else{
|
}else{
|
||||||
int i = myRank-1;
|
int i = myRank-1;
|
||||||
int j = myRank+1;
|
int j = myRank+1;
|
||||||
|
|
||||||
int maxWhile = 30;//最大匹配循环次数
|
|
||||||
while(i>0||j<=zsetSize){
|
while(i>0||j<=zsetSize){
|
||||||
|
|
||||||
if(i>0){
|
if(i>0){
|
||||||
|
|
|
@ -120,6 +120,7 @@ public class ReportUtil {
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
//异常处理
|
//异常处理
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
System.out.println(reportUserEvent.getBaseInfo().toString());
|
||||||
System.out.println("except:"+e);
|
System.out.println("except:"+e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -365,6 +365,7 @@ public class HeroLogic{
|
||||||
case 3:
|
case 3:
|
||||||
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(sLotterySetting.getActivityId());
|
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(sLotterySetting.getActivityId());
|
||||||
if(activity.getType()== ActivityType.LIMIT_RANDOM_CARD){
|
if(activity.getType()== ActivityType.LIMIT_RANDOM_CARD){
|
||||||
|
// TIME_SUMMON(56,"Time_summon",new CommonEventHandler(),new String[]{"hero_id","summon_type","cost_item_id","cost_amount","hero_id_quality_list"}),
|
||||||
eventEnum = ReportEventEnum.TIME_SUMMON;
|
eventEnum = ReportEventEnum.TIME_SUMMON;
|
||||||
}else if (activity.getType()==ActivityType.BEAUTY_BAG){
|
}else if (activity.getType()==ActivityType.BEAUTY_BAG){
|
||||||
eventEnum = ReportEventEnum.FATALITY_SUMMON;
|
eventEnum = ReportEventEnum.FATALITY_SUMMON;
|
||||||
|
@ -390,11 +391,14 @@ public class HeroLogic{
|
||||||
if (random == null) {
|
if (random == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
SCHero scHero = SCHero.getsCHero().get(random[0]);
|
SItem item = SItem.getsItemMap().get(random[0]);
|
||||||
if (scHero == null) {
|
// SCHero scHero = SCHero.getsCHero().get(random[0]);
|
||||||
result.add(String.valueOf(random[0]));
|
if (item == null) {
|
||||||
} else {
|
result.add(random[0] +"-id错误"+random[1]);
|
||||||
result.add(random[0] + "-" + scHero.getStar());
|
} else if(item.getItemType()==GlobalItemType.CARD) {
|
||||||
|
result.add(random[0] + "-" + item.getQuantity());
|
||||||
|
}else{
|
||||||
|
result.add(random[0] + "#" + random[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (costItem.length == 1) {
|
if (costItem.length == 1) {
|
||||||
|
@ -951,7 +955,7 @@ public class HeroLogic{
|
||||||
if(reportConsumeHero.length()>0){
|
if(reportConsumeHero.length()>0){
|
||||||
reportConsumeHero.append("|");
|
reportConsumeHero.append("|");
|
||||||
}
|
}
|
||||||
reportConsumeHero.append(hero.getTemplateId()).append("#lv.").append(hero.getLevel()).append("#star.").append(hero.getStar());
|
reportConsumeHero.append(hero.getTemplateId()).append("-").append(hero.getStar()).append("-").append(hero.getLevel());
|
||||||
|
|
||||||
|
|
||||||
if( 1 == isSame) {
|
if( 1 == isSame) {
|
||||||
|
@ -1031,6 +1035,7 @@ public class HeroLogic{
|
||||||
ChatLogic.getInstance().sendSysChatMessage(message,Global.DILIGENT,targetHero.getTemplateId(),0,0,0,0,0);
|
ChatLogic.getInstance().sendSysChatMessage(message,Global.DILIGENT,targetHero.getTemplateId(),0,0,0,0,0);
|
||||||
}
|
}
|
||||||
String consume = StringUtil.parseArrayToString(consumeMaterial);
|
String consume = StringUtil.parseArrayToString(consumeMaterial);
|
||||||
|
// HERO_STRENGTHEN(13,"hero_strengthen", new CommonEventHandler(),new String[]{"hero_id","old_quality","new_quality","strengthen_type","cost_item_list","cost_hero_list"}),
|
||||||
ReportUtil.onReportEvent(user, ReportEventEnum.HERO_STRENGTHEN.getType(),String.valueOf(targetHero.getTemplateId()),String.valueOf(oldStar),String.valueOf(targetHero.getStar()),consume,reportConsumeHero.toString());
|
ReportUtil.onReportEvent(user, ReportEventEnum.HERO_STRENGTHEN.getType(),String.valueOf(targetHero.getTemplateId()),String.valueOf(oldStar),String.valueOf(targetHero.getStar()),consume,reportConsumeHero.toString());
|
||||||
}
|
}
|
||||||
private void rankUpHeroExecute(Hero hero)throws Exception {
|
private void rankUpHeroExecute(Hero hero)throws Exception {
|
||||||
|
|
Loading…
Reference in New Issue