Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw

back_recharge
duhui 2020-12-25 10:07:42 +08:00
commit 3a9ab2167d
19 changed files with 14 additions and 506301 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -8,6 +8,8 @@ import com.ljsd.jieling.exception.ErrorCodeException;
import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.ktbeans.KTGameType;
import com.ljsd.jieling.ktbeans.KtEventUtils;
import com.ljsd.jieling.ktbeans.ReportEventEnum;
import com.ljsd.jieling.ktbeans.ReportUtil;
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
import com.ljsd.jieling.logic.activity.event.ArenaChallengeEvent;
import com.ljsd.jieling.logic.activity.event.Poster;
@ -15,6 +17,7 @@ import com.ljsd.jieling.logic.arena.ArenaLogic;
import com.ljsd.jieling.logic.dao.ArenaEnemy;
import com.ljsd.jieling.logic.dao.ArenaManager;
import com.ljsd.fight.ArenaRecord;
import com.ljsd.jieling.logic.dao.Item;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.mission.GameEvent;
@ -24,6 +27,7 @@ import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank;
import com.ljsd.jieling.network.server.ProtocolsManager;
import com.ljsd.jieling.network.session.ISession;
import rpc.protocols.ArenaInfoProto;
import rpc.protocols.CommonProto;
import rpc.protocols.MessageTypeProto;
import com.ljsd.jieling.util.*;
import config.SArenaSetting;
@ -128,11 +132,12 @@ public class ArenaChallengeHandler extends BaseHandler<ArenaInfoProto.ArenaChall
ArenaLogic.getInstance().setMyArenaEnemys(uid,user);
arenaManager.updateChallenge(fightResult);
//组战斗数据
CommonProto.Drop.Builder arenaReward = ArenaLogic.getInstance().getArenaReward(user, fightResult);
ArenaInfoProto.ArenaChallengeResponse build = builder
.setMyScoreChange(myscoreChange).setDefScoreChange(defScoreChange)
.addAllArenaEnemys(ArenaLogic.getInstance().getArenaEnemyList(arenaManager.getArenaEnemies()))
.setFightResult(fightResult)
.setDrop(ArenaLogic.getInstance().getArenaReward(user,fightResult))
.setDrop(arenaReward)
.build();
user.getUserMissionManager().onGameEvent(user, GameEvent.ARENA_CHALLENGE,fightResult, myscore + myscoreChange);
if(defUser!=null && defUser.getArenaManager().getCount()>0) {
@ -140,7 +145,12 @@ public class ArenaChallengeHandler extends BaseHandler<ArenaInfoProto.ArenaChall
ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker);
}
Poster.getPoster().dispatchEvent(new ArenaChallengeEvent(user.getId()));
StringBuilder dropBuilder = new StringBuilder();
for(CommonProto.Item item:arenaReward.getItemlistList()){
dropBuilder.append(item.getItemId()).append("#").append(item.getItemNum());
}
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,build,true);
KtEventUtils.onKtEvent(user, ParamEventBean.UserGameType, KTGameType.ARENA.getIndex(),challengeUid);
// KtEventUtils.onKtEvent(user, ParamEventBean.UserGameType, KTGameType.ARENA.getIndex(),challengeUid);
ReportUtil.onReportEvent(user,ReportEventEnum.ARENA_CHALLENGE.getType(),fightResult==0?"失败":"成功",myscoreChange,dropBuilder.toString());
}
}

View File

@ -83,7 +83,7 @@ public class ChampionGuessHandler extends BaseHandler<ArenaInfoProto.ChampionBet
RedisUtil.getInstence().putMapEntry(RedisKey.CHAMPION_BET_DETAIL,selectUid +":" + winUid,Integer.toString(uid),chip);
TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.TopBattle);
ReportUtil.onReportEvent(user,ReportEventEnum.GUESSING.getType(),openTimeOfFuntionCacheByType.getTimes(),ChampionshipLogic.getSchedule()==1?ChampionshipLogic.getRealTimes():ChampionshipLogic.getRealTimes()+7,winUid==arenaRecord.getAttackId()?1:2,chip);
ReportUtil.onReportEvent(user,ReportEventEnum.GUESSING.getType(),openTimeOfFuntionCacheByType.getTimes(),ChampionshipLogic.getSchedule()==1?ChampionshipLogic.getRoundTimes():ChampionshipLogic.getRealTimes()+7,winUid==arenaRecord.getAttackId()?1:2,chip);
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.CHAMPION_BET_GUESS_RESPONSE_VALUE,null,true);
}
}

View File

@ -92,7 +92,7 @@ public enum ReportEventEnum {
GUESS_OVER(64,"guess_over",new CommonEventHandler(),new String[]{"season_id","guessing_type","stake_type","rewards_num"}),
GET_TREASURE(65,"get_treasure",new CommonEventHandler(),new String[]{"treasure_id","get_entrance"}),
ARENA_CHALLENGE(66,"arena_challenge",new CommonEventHandler(),new String[]{"battle_result","own_integral_num","rewards_num","own_new_integral_num","own_ranking","role_id","enemy_integral_num","new_enemy_integral_num","enemy_ranking","hero1","hero2","hero3","hero4","hero5","hero6","attack_pokemon,","defend_hero1","defend_hero2","defend_hero3","defend_hero4","defend_hero5","defend_hero6","defend_pokemon"}),
VIP_LEVEL_UP(100,"", new VipLevelUpEventHandler(),new String[]{""});