Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
fcbf678d97
|
@ -37,10 +37,7 @@ import util.MathUtils;
|
||||||
import util.StringUtil;
|
import util.StringUtil;
|
||||||
import util.TimeUtils;
|
import util.TimeUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.*;
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.PrintWriter;
|
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
@ -62,17 +59,32 @@ public class GMRequestHandler extends BaseHandler{
|
||||||
String command = gmCommand.getCommand();
|
String command = gmCommand.getCommand();
|
||||||
int uid = iSession.getUid();
|
int uid = iSession.getUid();
|
||||||
LOGGER.error("gm commond is {}",command);
|
LOGGER.error("gm commond is {}",command);
|
||||||
if(command.startsWith("//check_fight")){
|
// if(command.startsWith("//check_fight")){
|
||||||
FIGHT_LOGGER.error(command);
|
// FIGHT_LOGGER.error(command);
|
||||||
CommonProto.GmResponse.Builder gmBuilder = CommonProto.GmResponse.newBuilder();
|
// CommonProto.GmResponse.Builder gmBuilder = CommonProto.GmResponse.newBuilder();
|
||||||
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GM_RESPONSE_VALUE, gmBuilder.build(), true);
|
// MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GM_RESPONSE_VALUE, gmBuilder.build(), true);
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
if(command.startsWith("//check_fight")){
|
||||||
|
|
||||||
if(command.startsWith("//")){
|
|
||||||
PrintWriter printWriter = new PrintWriter(new FileOutputStream( new File(SysUtil.getPath("conf/check_fight" + uid + ".txt"))));
|
PrintWriter printWriter = new PrintWriter(new FileOutputStream( new File(SysUtil.getPath("conf/check_fight" + uid + ".txt"))));
|
||||||
|
//保存前端战斗数据
|
||||||
printWriter.print(command);
|
printWriter.print(command);
|
||||||
|
printWriter.print("\n");
|
||||||
|
//保存后端战斗数据
|
||||||
|
FileReader fileReader = new FileReader(SysUtil.getPath("luafight/BattleRecord/log-" + uid + ".txt"));
|
||||||
|
BufferedReader reader= new BufferedReader(fileReader);
|
||||||
|
String line = reader.readLine();
|
||||||
|
while(line!=null){
|
||||||
|
printWriter.print(line);
|
||||||
|
printWriter.print("\n");
|
||||||
|
|
||||||
|
line = reader.readLine();
|
||||||
|
}
|
||||||
printWriter.flush();
|
printWriter.flush();
|
||||||
|
fileReader.close();
|
||||||
|
reader.close();
|
||||||
printWriter.close();
|
printWriter.close();
|
||||||
CommonProto.GmResponse.Builder gmBuilder = CommonProto.GmResponse.newBuilder();
|
CommonProto.GmResponse.Builder gmBuilder = CommonProto.GmResponse.newBuilder();
|
||||||
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GM_RESPONSE_VALUE, gmBuilder.build(), true);
|
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GM_RESPONSE_VALUE, gmBuilder.build(), true);
|
||||||
|
|
|
@ -92,7 +92,7 @@ public enum ReportEventEnum {
|
||||||
GUESS_OVER(64,"guess_over",CommonEventHandler.getInstance(),new String[]{"season_id","guessing_type","stake_type","rewards_num"}),
|
GUESS_OVER(64,"guess_over",CommonEventHandler.getInstance(),new String[]{"season_id","guessing_type","stake_type","rewards_num"}),
|
||||||
|
|
||||||
GET_TREASURE(65,"get_treasure",CommonEventHandler.getInstance(),new String[]{"treasure_id","get_entrance"}),
|
GET_TREASURE(65,"get_treasure",CommonEventHandler.getInstance(),new String[]{"treasure_id","get_entrance"}),
|
||||||
ARENA_CHALLENGE(66,"arena_challenge",CommonEventHandler.getInstance(),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"}),
|
ARENA_CHALLENGE(66,"arena_challenge",CommonEventHandler.getInstance(),new String[]{"battle_result","own_integral_num","rewards_id_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"}),
|
||||||
CEREMONY(67,"ceremony",CommonEventHandler.getInstance(),new String[]{"cost_item_id","integral_num","new_integral_num","own_ranking","guild_ranking"}),
|
CEREMONY(67,"ceremony",CommonEventHandler.getInstance(),new String[]{"cost_item_id","integral_num","new_integral_num","own_ranking","guild_ranking"}),
|
||||||
TREASURE_SUMMON(68,"treasure_summon",CommonEventHandler.getInstance(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}),// 降妖夺宝
|
TREASURE_SUMMON(68,"treasure_summon",CommonEventHandler.getInstance(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}),// 降妖夺宝
|
||||||
VANQUISH_BOSS(69,"vanquish_boss",CommonEventHandler.getInstance(),new String[]{"boss_id","damage_num","reward_nums_list"}),// 新将来袭
|
VANQUISH_BOSS(69,"vanquish_boss",CommonEventHandler.getInstance(),new String[]{"boss_id","damage_num","reward_nums_list"}),// 新将来袭
|
||||||
|
|
|
@ -80,6 +80,10 @@ public class ReportUserEvent {
|
||||||
baseInfo.put("fighting_capacity",fighting_capacity);
|
baseInfo.put("fighting_capacity",fighting_capacity);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
public ReportUserEvent setLevel(int level){
|
||||||
|
baseInfo.put("level",level);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public Map<String, Object> getBaseInfo() {
|
public Map<String, Object> getBaseInfo() {
|
||||||
return baseInfo;
|
return baseInfo;
|
||||||
|
|
|
@ -101,7 +101,8 @@ public class ReportUtil {
|
||||||
.setVip_level(user.getPlayerInfoManager().getVipLevel())
|
.setVip_level(user.getPlayerInfoManager().getVipLevel())
|
||||||
.setCoins_amount(coin==null?0:coin.getItemNum())
|
.setCoins_amount(coin==null?0:coin.getItemNum())
|
||||||
.setDiamond_amount(diamond==null?0:diamond.getItemNum())
|
.setDiamond_amount(diamond==null?0:diamond.getItemNum())
|
||||||
.setFighting_capacity(user.getPlayerInfoManager().getMaxForce());
|
.setFighting_capacity(user.getPlayerInfoManager().getMaxForce())
|
||||||
|
.setLevel(user.getPlayerInfoManager().getLevel());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void doReport(ReportUserEvent reportUserEvent){
|
public static void doReport(ReportUserEvent reportUserEvent){
|
||||||
|
|
Loading…
Reference in New Issue