代码优化
parent
c3be084f49
commit
d1eccf88b9
|
@ -21,14 +21,14 @@ public class ConcurrentDataMessage {
|
|||
myMongoTemplate.updateMongoData(take);
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws InterruptedException {
|
||||
BlockingQueue<Map<String, String>> dataQueueTest = new BlockingUniqueQueue<>();
|
||||
Map<String,String> test = new HashMap<>();
|
||||
test.put("1","2");
|
||||
dataQueueTest.add(new HashMap<>(test));
|
||||
test.clear();
|
||||
Map<String, String> take = dataQueueTest.take();
|
||||
|
||||
|
||||
}
|
||||
// public static void main(String[] args) throws InterruptedException {
|
||||
// BlockingQueue<Map<String, String>> dataQueueTest = new BlockingUniqueQueue<>();
|
||||
// Map<String,String> test = new HashMap<>();
|
||||
// test.put("1","2");
|
||||
// dataQueueTest.add(new HashMap<>(test));
|
||||
// test.clear();
|
||||
// Map<String, String> take = dataQueueTest.take();
|
||||
//
|
||||
//
|
||||
// }
|
||||
}
|
||||
|
|
|
@ -1300,7 +1300,7 @@ public class TimeUtils {
|
|||
return now();
|
||||
}
|
||||
|
||||
public static long DifferMintFromLast(Object object){
|
||||
public static long differMintFromLast(Object object){
|
||||
try {
|
||||
String time;
|
||||
if(null!=object){
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package com.ljsd;
|
||||
|
||||
import com.ljsd.jieling.config.json.CoreSettings;
|
||||
import com.ljsd.jieling.config.json.ServerConfiguration;
|
||||
import com.ljsd.jieling.config.json.ServerProperties;
|
||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||
|
@ -45,7 +44,7 @@ public class GameApplication {
|
|||
|
||||
serverProperties = serverConfiguration.getServerProperties();
|
||||
serverId = serverProperties.getId();
|
||||
CoreSettings coreSettings = ConfigurableApplicationContextManager.getBean(CoreSettings.class);
|
||||
// CoreSettings coreSettings = ConfigurableApplicationContextManager.getBean(CoreSettings.class);
|
||||
// GameApplication.areaId = coreSettings.getArea();
|
||||
LOGGER.info("ServerProperties ->{},coreIp=>{}", serverProperties.toString());
|
||||
MongoUtil.getInstence().init();
|
||||
|
@ -80,7 +79,7 @@ public class GameApplication {
|
|||
serverConfigTmp = new ServerConfig();
|
||||
if (GameApplication.serverProperties.isAutoOpen()) {
|
||||
int startbefore = 60; //开服白名单时间
|
||||
long needtime = TimeUtils.DifferMintFromLast(RedisUtil.getInstence().getObject(GameApplication.serverId + RedisKey.Delimiter_colon + RedisKey.AUTOOPENTIME ,"",String.class,-1));
|
||||
long needtime = TimeUtils.differMintFromLast(RedisUtil.getInstence().getObject(GameApplication.serverId + RedisKey.Delimiter_colon + RedisKey.AUTOOPENTIME ,"",String.class,-1));
|
||||
while (needtime - startbefore > 0) {
|
||||
long sleepTime = needtime - startbefore;
|
||||
try {
|
||||
|
@ -89,7 +88,7 @@ public class GameApplication {
|
|||
} catch (Exception e) {
|
||||
LOGGER.error("休眠异常", e.getMessage(), e);
|
||||
}
|
||||
needtime = TimeUtils.DifferMintFromLast(RedisUtil.getInstence().getObject(GameApplication.serverId + RedisKey.Delimiter_colon + RedisKey.AUTOOPENTIME ,"",String.class,-1));
|
||||
needtime = TimeUtils.differMintFromLast(RedisUtil.getInstence().getObject(GameApplication.serverId + RedisKey.Delimiter_colon + RedisKey.AUTOOPENTIME ,"",String.class,-1));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -5,10 +5,7 @@ import com.google.gson.Gson;
|
|||
import com.ljsd.GameApplication;
|
||||
import com.ljsd.jieling.chat.ChatRedisEntity;
|
||||
import com.ljsd.jieling.chat.messge.MessageCache;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
|
||||
import com.ljsd.jieling.dataReport.reportBeans_37.Report37Response;
|
||||
import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;
|
||||
import com.ljsd.jieling.db.redis.RedisKey;
|
||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
import com.ljsd.jieling.exception.ErrorCode;
|
||||
|
@ -29,6 +26,8 @@ import com.ljsd.jieling.util.CBean2Proto;
|
|||
import com.ljsd.jieling.util.MessageUtil;
|
||||
import com.ljsd.jieling.util.SensitivewordFilter;
|
||||
import com.ljsd.jieling.util.ShieldedWordUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
@ -37,6 +36,8 @@ import java.util.Map;
|
|||
|
||||
public class ChatLogic {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ChatLogic.class);
|
||||
|
||||
public static class Instance {
|
||||
public final static ChatLogic instance = new ChatLogic();
|
||||
}
|
||||
|
@ -84,6 +85,9 @@ public class ChatLogic {
|
|||
RedisUtil.getInstence().del(GameApplication.serverId + RedisKey.CUser_Chat + uid);
|
||||
}
|
||||
break;
|
||||
default:{
|
||||
LOGGER.info("getAllChatMessageInfo wrong chatType=>{} uid=>{}", chatType, uid);
|
||||
}
|
||||
}
|
||||
ChatProto.GetChatMessageInfoResponse getChatMessageInfoResponse = ChatProto.GetChatMessageInfoResponse
|
||||
.newBuilder().addAllChatInfo(chatInfoList)
|
||||
|
@ -200,6 +204,9 @@ public class ChatLogic {
|
|||
}
|
||||
|
||||
break;
|
||||
default:{
|
||||
break;
|
||||
}
|
||||
}
|
||||
onSendChatSuccess(user,chatType,message);
|
||||
ReportUtil.onReportEvent(user, ReportEventEnum.SEND_MESSAGE.getType(),String.valueOf(chatType),message);
|
||||
|
|
|
@ -1,27 +1,25 @@
|
|||
package com.ljsd.jieling.config.reportData;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.google.gson.FieldAttributes;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.ljsd.GameApplication;
|
||||
import com.ljsd.GameLogicService;
|
||||
import com.ljsd.common.mogodb.util.BlockingUniqueQueue;
|
||||
import com.ljsd.jieling.config.json.SDK37Constans;
|
||||
import com.ljsd.jieling.dataReport.reportBeans_37.*;
|
||||
import com.ljsd.jieling.dataReport.reportBeans_37.Report37Param;
|
||||
import com.ljsd.jieling.dataReport.reportBeans_37.Report37RoleLeveBean;
|
||||
import com.ljsd.jieling.dataReport.reportBeans_37.Report37TaskBean;
|
||||
import com.ljsd.jieling.ktbeans.KTParam;
|
||||
import com.ljsd.jieling.ktbeans.KTSendBody;
|
||||
import com.ljsd.jieling.util.MD5Util;
|
||||
import com.ljsd.jieling.util.http.HttpPool;
|
||||
import org.apache.http.HttpResponse;
|
||||
import org.apache.http.client.entity.UrlEncodedFormEntity;
|
||||
import org.apache.http.message.BasicNameValuePair;
|
||||
import org.luaj.vm2.ast.Str;
|
||||
import util.StringUtil;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLEncoder;
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.BlockingQueue;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
|
|
@ -1,17 +1,12 @@
|
|||
package com.ljsd.jieling.dataReport.reportBeans_37;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.google.gson.Gson;
|
||||
import com.ljsd.GameApplication;
|
||||
import com.ljsd.jieling.config.json.SDK37Constans;
|
||||
import com.ljsd.jieling.config.json.ServerProperties;
|
||||
import com.ljsd.jieling.config.reportData.DataMessageUtils;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.util.MD5Util;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.util.concurrent.*;
|
||||
|
||||
public class Repot37EventUtil {
|
||||
private static Gson gson = new Gson();
|
||||
|
||||
|
@ -53,6 +48,9 @@ public class Repot37EventUtil {
|
|||
report37RoleLeveBean.setSign(MD5Util.encrypByMd5(signSt));
|
||||
DataMessageUtils.addLogQueue(report37RoleLeveBean);
|
||||
break;
|
||||
default:{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
// public static <T> T hadResReport(Class<T> clazz,User user, Report37EventType eventType, Object... parm){
|
||||
|
|
|
@ -171,7 +171,7 @@ public class AreaManager {
|
|||
|
||||
if (System.currentTimeMillis() > execDate) {
|
||||
serverArenaInfoManagerCache = serverArenaInfoManager;
|
||||
int tmpAreaId = areaId;
|
||||
// int tmpAreaId = areaId;
|
||||
boolean isSuccess = RedisUtil.getInstence().tryGetDistributedLock(RedisKey.ServerArenaJob, "", Integer.toString(newAreaId), 15000);
|
||||
int i=0;
|
||||
while (i<1000&&!isSuccess){
|
||||
|
|
|
@ -182,7 +182,7 @@ public class LjsdMongoTemplate implements MongoUpdateImp {
|
|||
Integer guilderverId = MongoUtil.getInstence().findGuilderverId(Integer.parseInt(id));
|
||||
otherMonogTemplate = MongoUtil.getInstence().getMonogTemplate(guilderverId);
|
||||
}else {
|
||||
int serverIdByUid = AreaManager.getInstance().getServerIdByUid(Integer.valueOf(id), GameApplication.serverId);
|
||||
int serverIdByUid = AreaManager.getInstance().getServerIdByUid(Integer.parseInt(id), GameApplication.serverId);
|
||||
otherMonogTemplate = MongoUtil.getInstence().getMonogTemplate(serverIdByUid);
|
||||
}
|
||||
|
||||
|
|
|
@ -116,30 +116,30 @@ public class MongoUtil {
|
|||
return MongoUtil.getInstence().coreMongoTemplate;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
try {
|
||||
LjsdMongoTemplate ljsdMongoTemplate = getLjsdMongoTemplate();
|
||||
Criteria criatira = new Criteria();
|
||||
Random random = new Random();
|
||||
int minLevel = random.nextInt(10) - 5;
|
||||
minLevel = minLevel <= 5 ? 5 : minLevel;
|
||||
int maxLevel = random.nextInt(10) + 20;
|
||||
long befor3Day = 1558332518379l - 3;
|
||||
// criatira.andOperator(Criteria.where("id").nin(10003770),
|
||||
// Criteria.where("level").gte(minLevel), Criteria.where("level").lte(maxLevel),
|
||||
// Criteria.where("lastLoginTime").gte(befor3Day));//不包含自己
|
||||
// Criteria.where("level").is(1);
|
||||
Query query = new Query(criatira).limit(100);
|
||||
query.fields().include("playerManager");
|
||||
long startTime = System.currentTimeMillis();
|
||||
List<User> allByCondition = ljsdMongoTemplate.findAllByCondition(query, User.class);
|
||||
System.out.println((System.currentTimeMillis() - startTime));
|
||||
} catch (UnknownHostException e) {
|
||||
e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
// public static void main(String[] args) {
|
||||
// try {
|
||||
// LjsdMongoTemplate ljsdMongoTemplate = getLjsdMongoTemplate();
|
||||
// Criteria criatira = new Criteria();
|
||||
// Random random = new Random();
|
||||
// int minLevel = random.nextInt(10) - 5;
|
||||
// minLevel = minLevel <= 5 ? 5 : minLevel;
|
||||
// int maxLevel = random.nextInt(10) + 20;
|
||||
// long befor3Day = 1558332518379l - 3;
|
||||
//// criatira.andOperator(Criteria.where("id").nin(10003770),
|
||||
//// Criteria.where("level").gte(minLevel), Criteria.where("level").lte(maxLevel),
|
||||
//// Criteria.where("lastLoginTime").gte(befor3Day));//不包含自己
|
||||
//// Criteria.where("level").is(1);
|
||||
// Query query = new Query(criatira).limit(100);
|
||||
// query.fields().include("playerManager");
|
||||
// long startTime = System.currentTimeMillis();
|
||||
// List<User> allByCondition = ljsdMongoTemplate.findAllByCondition(query, User.class);
|
||||
// System.out.println((System.currentTimeMillis() - startTime));
|
||||
// } catch (UnknownHostException e) {
|
||||
// e.printStackTrace();
|
||||
// } catch (Exception e) {
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
public static void checkDb() {
|
||||
|
|
|
@ -45,7 +45,7 @@ public class GetArenaRecordHandler extends BaseHandler {
|
|||
Collections.sort(arenaRecordList, new Comparator<ArenaRecord>() {
|
||||
@Override
|
||||
public int compare(ArenaRecord o1, ArenaRecord o2) {
|
||||
return Integer.valueOf(o1.getCreateTime()).compareTo(Integer.valueOf(o2.getCreateTime()));
|
||||
return Integer.compare(o1.getCreateTime(), o2.getCreateTime());
|
||||
}
|
||||
});
|
||||
int size = arenaRecordList.size();
|
||||
|
|
|
@ -33,6 +33,10 @@ public class GetFriendInfoHandler extends BaseHandler {
|
|||
case 4: //黑名单列表
|
||||
FriendLogic.getInstance().getBlackFriendInfos(iSession);
|
||||
break;
|
||||
default: {
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -110,7 +110,7 @@ public class SaveHeroChangeRequestHandler extends BaseHandler<HeroInfoProto.Save
|
|||
LOGGER.error("随机失败"+j);
|
||||
throw new ErrorCodeException(ErrorCode.CFG_NULL);
|
||||
}
|
||||
hero.getTemplateId();
|
||||
// hero.getTemplateId();
|
||||
hero.setChangeId(result);
|
||||
return HeroInfoProto.SaveHeroChangeResponse.newBuilder().setHeroTempId(result).build();
|
||||
|
||||
|
|
|
@ -1111,7 +1111,7 @@ public class MapLogic {
|
|||
AbstractRank towerRank = RankContext.getRankEnum(RankEnum.TOWER_RANK.getType());
|
||||
// TowerRankUtil.getRankNumber(mapManager.getTrialInfo().getFloor(),(int)(mapManager.getCurrTowerTime()/1000))
|
||||
if(towerRank.getScore(mapManager.getTrialInfo().getFloor(),(int)(mapManager.getCurrTowerTime()/1000))>towerRank.getScoreById(user.getId(),"")){
|
||||
towerRank.addRank(user.getId(),"",mapManager.getTrialInfo().getFloor(),(int)mapManager.getCurrTowerTime()/1000);
|
||||
towerRank.addRank(user.getId(),"",mapManager.getTrialInfo().getFloor(),(int)(mapManager.getCurrTowerTime()/1000));
|
||||
// RedisUtil.getInstence().zsetAddOne(RedisKey.getKey(RedisKey.TOWER_RANK,"",false),String.valueOf(user.getId()),TowerRankUtil.getRankNumber(mapManager.getTrialInfo().getFloor(),(int)(mapManager.getCurrTowerTime()/1000)));
|
||||
}
|
||||
}
|
||||
|
@ -3065,6 +3065,10 @@ public class MapLogic {
|
|||
case 3:
|
||||
open = playerInfoManager.getMaxForce()>=rule[1];
|
||||
break;
|
||||
default:{
|
||||
LOGGER.info("dailyChallenge wrong type=>{} uid=>{}", rule[0], session.getUid());
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(!open){
|
||||
throw new ErrorCodeException(ErrorCode.DAILY_NO_OPEN);
|
||||
|
|
|
@ -22,7 +22,7 @@ public class Cmd_addfete extends GmRoleAbstract {
|
|||
return true;
|
||||
}
|
||||
int guildId = Integer.parseInt(args[0]);
|
||||
int addexp = Integer.valueOf(args[1]);
|
||||
int addexp = Integer.parseInt(args[1]);
|
||||
|
||||
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId);
|
||||
|
||||
|
|
|
@ -23,13 +23,13 @@ public class Cmd_restart extends GmRoleAbstract{
|
|||
LOGGER.error("Exception to change thread name"+ name);
|
||||
System.out.println("name = " + name);
|
||||
try {
|
||||
ProtocolsManager.handlerThreads[Integer.valueOf(args[0])].interrupt();
|
||||
ProtocolsManager.handlerThreads[Integer.parseInt(args[0])].interrupt();
|
||||
}catch (Exception e){LOGGER.error(e.toString());}
|
||||
|
||||
ProtocolsManager.handlerThreads[Integer.valueOf(args[0])]= new HandlerLogicThread();
|
||||
ProtocolsManager.handlerThreads[Integer.valueOf(args[0])].setPriority(9);//优先级最高
|
||||
ProtocolsManager.handlerThreads[Integer.valueOf(args[0])].setName("h-n" + Integer.valueOf(args[0]));
|
||||
ProtocolsManager.handlerThreads[Integer.valueOf(args[0])].start();
|
||||
ProtocolsManager.handlerThreads[Integer.parseInt(args[0])]= new HandlerLogicThread();
|
||||
ProtocolsManager.handlerThreads[Integer.parseInt(args[0])].setPriority(9);//优先级最高
|
||||
ProtocolsManager.handlerThreads[Integer.parseInt(args[0])].setName("h-n" + Integer.valueOf(args[0]));
|
||||
ProtocolsManager.handlerThreads[Integer.parseInt(args[0])].start();
|
||||
LOGGER.error("Exception new change thread ok");
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -428,6 +428,10 @@ public class GlobalDataManaager implements IManager {
|
|||
case 5:
|
||||
number = MessageTypeProto.MessageType.SERVER_FIVE_REQEUST_VALUE;
|
||||
break;
|
||||
default:{
|
||||
LOGGER.info("everTask wrong case=>{}", hour);
|
||||
break;
|
||||
}
|
||||
}
|
||||
for(ISession session : sessionMap.values()){
|
||||
int uid = session.getUid();
|
||||
|
|
|
@ -55,7 +55,7 @@ public class LeveGiftEventHander implements IEventHandler {
|
|||
|
||||
if(rechargeInfo.getLevelAndMoneyBagMap().containsKey(entry.getKey())){
|
||||
long lasttime = rechargeInfo.getLevelAndMoneyBagMap().get(entry.getKey());
|
||||
long i = orDefault.getDiscountType()[3] * 3600*1000;
|
||||
long i = orDefault.getDiscountType()[3] * 3600*1000L;
|
||||
if(System.currentTimeMillis()-lasttime<i){
|
||||
rechargeInfo.addDyGoodsCanBuyTimes(orDefault.getId());
|
||||
}else {
|
||||
|
|
|
@ -17,6 +17,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
|
|||
|
||||
public class PlayerManager extends MongoBase {
|
||||
|
||||
private static final long serialVersionUID = 145421254563L;
|
||||
|
||||
private transient String openId;
|
||||
|
||||
private int pid;
|
||||
|
|
|
@ -32,6 +32,6 @@ public class TeamPosForPokenInfo implements Comparable<TeamPosForPokenInfo>{
|
|||
|
||||
@Override
|
||||
public int compareTo(TeamPosForPokenInfo o) {
|
||||
return this.getPosition() - o.getPosition();
|
||||
return Integer.compare(this.getPosition(), o.getPosition());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,6 +33,6 @@ public class TeamPosHeroInfo implements Comparable<TeamPosHeroInfo> {
|
|||
|
||||
@Override
|
||||
public int compareTo(TeamPosHeroInfo o) {
|
||||
return this.getPosition()-o.getPosition();
|
||||
return Integer.compare(this.getPosition(), o.getPosition());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
package com.ljsd.jieling.logic.dao;
|
||||
|
||||
public class TempDropInfo {
|
||||
private int[] dropGroupIds;
|
||||
private float dropRatio;
|
||||
|
||||
public TempDropInfo(int[] dropGroupIds, float dropRatio) {
|
||||
this.dropGroupIds = dropGroupIds;
|
||||
this.dropRatio = dropRatio;
|
||||
}
|
||||
|
||||
public TempDropInfo() {
|
||||
}
|
||||
|
||||
public int[] getDropGroupIds() {
|
||||
return dropGroupIds;
|
||||
}
|
||||
|
||||
public float getDropRatio() {
|
||||
return dropRatio;
|
||||
}
|
||||
}
|
|
@ -80,8 +80,8 @@ public class UserMissionManager extends MongoBase {
|
|||
vipMissionIdsType.openMission(user,missionId,missionTypeEnumListMap.get(GameMisionType.VIPMISSION));
|
||||
}
|
||||
updateString("vipMissionIdsType",vipMissionIdsType);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case DAILY_REFRESH:
|
||||
Set<Integer> missionIds = SDailyTasksConfig.config.keySet();
|
||||
int type = (int)parm[0];
|
||||
|
@ -297,6 +297,9 @@ public class UserMissionManager extends MongoBase {
|
|||
}
|
||||
updateString("missingRoomMissionType",missingRoomMissionType);
|
||||
break;
|
||||
default:{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -30,6 +30,6 @@ public class GuildApply implements Comparable<GuildApply>{
|
|||
|
||||
@Override
|
||||
public int compareTo(GuildApply o) {
|
||||
return this.createTime - o.getCreateTime();
|
||||
return Integer.compare(this.createTime, o.getCreateTime());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -564,6 +564,10 @@ public class GuildLogic {
|
|||
MessageUtil.sendIndicationMessage(targetSession,1, MessageTypeProto.MessageType.FAMILY_REFUSE_JOIN_INDICATION_VALUE,refuseName,true);
|
||||
}
|
||||
break;
|
||||
default: {
|
||||
LOGGER.info("operationApplyList wrong type=>{} uid=>{}", type, uid);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}finally {
|
||||
RedisUtil.getInstence().releaseDistributedLock(RedisKey.OPERATE_FAMILY_APPLY,Integer.toString(guildId), Integer.toString(uid));
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
package com.ljsd.jieling.logic.fight.result;
|
||||
|
||||
import com.ljsd.jieling.exception.ErrorCode;
|
||||
import com.ljsd.jieling.exception.ErrorCodeException;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
|
@ -375,6 +375,10 @@ public class FriendLogic {
|
|||
case 4://全部拒绝
|
||||
friendManager.setApplyFriends(new CopyOnWriteArrayList<>());
|
||||
break;
|
||||
default: {
|
||||
LOGGER.info("sendAgree wrong type=>{} uid=>{}", type, uid);
|
||||
break;
|
||||
}
|
||||
}
|
||||
MessageUtil.sendMessage(iSession, 1, msgId, null, true);
|
||||
}
|
||||
|
|
|
@ -274,10 +274,10 @@ public class HeroLogic{
|
|||
}
|
||||
|
||||
|
||||
private void reportRandom(User user,SLotterySetting sLotterySetting,int[][] resultRandom,int[] costItem){
|
||||
private void reportRandom(User user,SLotterySetting sLotterySetting,int[][] resultRandom,int[] costItem) {
|
||||
int lotteryType = sLotterySetting.getLotteryType();
|
||||
ReportEventEnum eventEnum = null;
|
||||
switch (lotteryType){
|
||||
switch (lotteryType) {
|
||||
case 5:
|
||||
eventEnum = ReportEventEnum.NORMAL_SUMMON;
|
||||
break;
|
||||
|
@ -289,36 +289,36 @@ public class HeroLogic{
|
|||
break;
|
||||
case 2:
|
||||
eventEnum = ReportEventEnum.SUMMON_HERO;
|
||||
default:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
}
|
||||
if(eventEnum==null){
|
||||
if (eventEnum == null) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
if(eventEnum == ReportEventEnum.SUMMON_HERO){
|
||||
ReportUtil.onReportEvent(user,eventEnum.getType(),String.valueOf(resultRandom[0][0]),sLotterySetting.getPropertyType(),resultRandom[0][1]);
|
||||
if (eventEnum == ReportEventEnum.SUMMON_HERO) {
|
||||
ReportUtil.onReportEvent(user, eventEnum.getType(), String.valueOf(resultRandom[0][0]), sLotterySetting.getPropertyType(), resultRandom[0][1]);
|
||||
return;
|
||||
}
|
||||
List<String> result = new ArrayList<>(resultRandom.length);
|
||||
for(int[] random:resultRandom){
|
||||
if(random==null){
|
||||
for (int[] random : resultRandom) {
|
||||
if (random == null) {
|
||||
continue;
|
||||
}
|
||||
SCHero scHero = SCHero.getsCHero().get(random[0]);
|
||||
if(scHero==null){
|
||||
if (scHero == null) {
|
||||
result.add(String.valueOf(random[0]));
|
||||
}else{
|
||||
result.add(random[0]+"-"+scHero.getStar());
|
||||
} else {
|
||||
result.add(random[0] + "-" + scHero.getStar());
|
||||
}
|
||||
}
|
||||
if(costItem.length==1){
|
||||
ReportUtil.onReportEvent(user,eventEnum.getType(),"",String.valueOf(sLotterySetting.getPerCount()),String.valueOf(costItem[0]),0,result);
|
||||
}else if(costItem.length>=2){
|
||||
ReportUtil.onReportEvent(user,eventEnum.getType(),"",String.valueOf(sLotterySetting.getPerCount()),String.valueOf(costItem[0]),costItem[1],result);
|
||||
}else {
|
||||
ReportUtil.onReportEvent(user,eventEnum.getType(),"",String.valueOf(sLotterySetting.getPerCount()),"","",result);
|
||||
if (costItem.length == 1) {
|
||||
ReportUtil.onReportEvent(user, eventEnum.getType(), "", String.valueOf(sLotterySetting.getPerCount()), String.valueOf(costItem[0]), 0, result);
|
||||
} else if (costItem.length >= 2) {
|
||||
ReportUtil.onReportEvent(user, eventEnum.getType(), "", String.valueOf(sLotterySetting.getPerCount()), String.valueOf(costItem[0]), costItem[1], result);
|
||||
} else {
|
||||
ReportUtil.onReportEvent(user, eventEnum.getType(), "", String.valueOf(sLotterySetting.getPerCount()), "", "", result);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
|
@ -503,16 +503,19 @@ public class HeroLogic{
|
|||
for(SLotteryRewardConfig sLotteryRewardConfig : sLotteryRewardConfigListByPoolId ){
|
||||
int[] openRules = sLotteryRewardConfig.getOpenRules();
|
||||
boolean canAdd = true;
|
||||
if(openRules!=null&&openRules.length>0){
|
||||
if (openRules != null && openRules.length > 0) {
|
||||
int openType = openRules[0];
|
||||
int openValue = openRules[1];
|
||||
switch (openType){
|
||||
switch (openType) {
|
||||
case 1:
|
||||
canAdd = randomCount>openValue;
|
||||
canAdd = randomCount > openValue;
|
||||
break;
|
||||
case 2:
|
||||
canAdd = userLevel > openValue;
|
||||
break;
|
||||
default: {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(canAdd){
|
||||
|
@ -2048,6 +2051,10 @@ public class HeroLogic{
|
|||
case 6:
|
||||
quality = "UR+";
|
||||
break;
|
||||
default: {
|
||||
quality = "UR+";
|
||||
break;
|
||||
}
|
||||
}
|
||||
return quality;
|
||||
}
|
||||
|
|
|
@ -499,7 +499,10 @@ public class PlayerLogic {
|
|||
case 2:
|
||||
rewards[i][1] = rewardTemplate[2] * user.getPlayerInfoManager().getVipLevel();
|
||||
break;
|
||||
|
||||
default:{
|
||||
rewards[i][1] = rewardTemplate[2];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
mailReward = ItemUtil.getMailReward(rewards);
|
||||
|
@ -902,6 +905,9 @@ public class PlayerLogic {
|
|||
case GlobalsDef.VIP_UNLOCK_PRIVILEGE:
|
||||
cond = user.getPlayerInfoManager().getVipLevel();
|
||||
break;
|
||||
default:{
|
||||
break;
|
||||
}
|
||||
}
|
||||
TreeMap<Integer, Integer> condition = (TreeMap)conditionMap.get(privilegeId);
|
||||
if(sPrivilegeTypeConfig.getUnlockType()!=GlobalsDef.RECHARGE_UNLOCK_PRIVILEGE){
|
||||
|
|
|
@ -33,9 +33,6 @@ public class CQuestionOptionBean {
|
|||
return options;
|
||||
}
|
||||
|
||||
public void setOptions(String[] options) {
|
||||
this.options = options;
|
||||
}
|
||||
|
||||
public int getAnswerType() {
|
||||
return answerType;
|
||||
|
|
|
@ -117,7 +117,7 @@ public class QuestionLogic {
|
|||
CQuestionBean cQuestionBean = last.first();
|
||||
int qid = Integer.parseInt(cQuestionBean.getId());
|
||||
if (qid != globalSystemControl.getQuestId()) {
|
||||
globalSystemControl.setQuestId(Integer.valueOf(cQuestionBean.getId()));
|
||||
globalSystemControl.setQuestId(Integer.parseInt(cQuestionBean.getId()));
|
||||
globalSystemControl.addQuestion(new Question(cQuestionBean.getId(), cQuestionBean.getQuestDes(), cQuestionBean.getReward(), cQuestionBean.getStart(), cQuestionBean.getEnd(), cQuestionBean.getcQuestionOptionBeans()));
|
||||
globalSystemControl.resetLast();
|
||||
isNeedUp = true;
|
||||
|
|
|
@ -581,13 +581,13 @@ public class BuyGoodsLogic {
|
|||
continue;
|
||||
}
|
||||
startTime = levelAndMoneyBagMap.get(value);
|
||||
long i = discountType[3] * 3600*1000;
|
||||
long i = discountType[3] * 3600*1000L;
|
||||
if(now-startTime>=i){
|
||||
//超过2小时重置动态购买次数
|
||||
rechargeInfo.removeDyGoodsCanBuyTimes(goodsId);
|
||||
continue;
|
||||
}
|
||||
endTime = startTime + discountType[3]*3600*1000;
|
||||
endTime = startTime + discountType[3]*3600*1000L;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -285,7 +285,7 @@ public class StoreLogic implements IEventHandler {
|
|||
long endTime = sStoreTypeConfig.getEndTimeLong();
|
||||
if(sStoreTypeConfig.getStoreOpenRule() == 2 ){
|
||||
startTime = now;
|
||||
endTime =Integer.parseInt(sStoreTypeConfig.getEndTime())*60*1000 + now;
|
||||
endTime =Integer.parseInt(sStoreTypeConfig.getEndTime())*60*1000L + now;
|
||||
}
|
||||
if(sStoreTypeConfig.getStoreOpenRule() == 6 ){
|
||||
long userCreateTime = user.getPlayerInfoManager().getCreateTime();
|
||||
|
@ -314,7 +314,7 @@ public class StoreLogic implements IEventHandler {
|
|||
long startTime = now;
|
||||
long endTime = 0;
|
||||
if(sStoreTypeConfig.getStoreOpenRule() == 2 ){
|
||||
endTime =Integer.parseInt(sStoreTypeConfig.getEndTime())*60*1000 + now;
|
||||
endTime =Integer.parseInt(sStoreTypeConfig.getEndTime())*60*1000L + now;
|
||||
}
|
||||
Map<Integer, Integer> itemNumMap = new LinkedHashMap<>();
|
||||
int rewardId = getRewardId(storeType,sort,user);
|
||||
|
@ -691,13 +691,17 @@ public class StoreLogic implements IEventHandler {
|
|||
}
|
||||
case 3:
|
||||
long lastRefreshTime = storeInfo.getLastRefreshTime();
|
||||
int intervalTime = time*1000*60*60;
|
||||
if (((nowTime - lastRefreshTime) /1000/60/60) >= time){
|
||||
lastRefreshTime = lastRefreshTime + ((nowTime -lastRefreshTime)/(intervalTime)) *(intervalTime);
|
||||
int intervalTime = time * 1000 * 60 * 60;
|
||||
if (((nowTime - lastRefreshTime) / 1000 / 60 / 60) >= time) {
|
||||
lastRefreshTime = lastRefreshTime + ((nowTime - lastRefreshTime) / (intervalTime)) * (intervalTime);
|
||||
storeInfo.setLastRefreshTime(lastRefreshTime);
|
||||
itemNumMap = getStoreItem(sStoreTypeConfig.getId(),sStoreTypeConfig,user);
|
||||
itemNumMap = getStoreItem(sStoreTypeConfig.getId(), sStoreTypeConfig, user);
|
||||
}
|
||||
break;
|
||||
default: {
|
||||
LOGGER.info("automaticRefreStore wrong type=>{} uid=>{}", type, uid);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (itemNumMap == null){
|
||||
LOGGER.info("automaticRefreStore==>uid={},storeid={},type={}",uid,storeId,type);
|
||||
|
|
|
@ -35,9 +35,6 @@ public class RetrySendIndicationThread extends Thread{
|
|||
|
||||
private void doWork() throws InterruptedException {
|
||||
Map<Integer, ISession> sessionMap = new ConcurrentHashMap<>(OnlineUserManager.sessionMap);
|
||||
if(sessionMap == null){
|
||||
return;
|
||||
}
|
||||
long now = TimeUtils.now();
|
||||
Set<Integer> removeIds = new HashSet<>();
|
||||
for(ISession session : sessionMap.values()){
|
||||
|
|
|
@ -362,7 +362,7 @@ public class ItemUtil {
|
|||
for (int i = 0; i < rewards.length; i++) {
|
||||
int rewardId = Integer.parseInt(rewards[i]);
|
||||
if (dropAddition.contains(rewardId)) {
|
||||
int dropWeight = Integer.valueOf(weights[i]);
|
||||
int dropWeight = Integer.parseInt(weights[i]);
|
||||
SRewardItem sRewardItem = SRewardItem.getsDropMap().get(rewardId);
|
||||
//权重加成 1等级权重加成
|
||||
int[] chanceAddition = sRewardItem.getChanceAddition();
|
||||
|
@ -398,26 +398,26 @@ public class ItemUtil {
|
|||
|
||||
private static void getSuccessivelyRandmoMap(User user,SRewardGroup sRewardGroup, String[]
|
||||
rewardArr, String[] weightArr, Map<Integer, Integer> itemMap, Map<Integer, Integer>
|
||||
cardMap, Map<Integer,Integer> equipMap, Map<Integer,Integer> randomMap, float dropRatio) throws ErrorCodeException{
|
||||
for (int i = 0 ; i < sRewardGroup.getRewardMaxNum();i++){
|
||||
cardMap, Map<Integer,Integer> equipMap, Map<Integer,Integer> randomMap, float dropRatio) throws ErrorCodeException {
|
||||
for (int i = 0; i < sRewardGroup.getRewardMaxNum(); i++) {
|
||||
int id = 0;
|
||||
for (int j = 0 ; j < sRewardGroup.getLoop();i++){
|
||||
for (int j = 0; j < sRewardGroup.getLoop(); j++) {
|
||||
int index = MathUtils.randomForStrArray(weightArr);
|
||||
id = Integer.parseInt(rewardArr[index]);
|
||||
if (id ==Integer.parseInt(rewardArr[j])){
|
||||
if (id == Integer.parseInt(rewardArr[j])) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (0 == id){
|
||||
if (0 == id) {
|
||||
int index = MathUtils.randomForStrArray(weightArr);
|
||||
id = Integer.parseInt(rewardArr[index]);
|
||||
}
|
||||
SRewardItem sRewardItem = SRewardItem.getsDropMap().get(id);
|
||||
int itemNum = getItemNum(user,sRewardItem);
|
||||
if (itemNum <= 0){
|
||||
int itemNum = getItemNum(user, sRewardItem);
|
||||
if (itemNum <= 0) {
|
||||
continue;
|
||||
}
|
||||
getMap(sRewardItem.getItemId(),itemNum ,itemMap, cardMap,equipMap,randomMap,dropRatio);
|
||||
getMap(sRewardItem.getItemId(), itemNum, itemMap, cardMap, equipMap, randomMap, dropRatio);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -99,7 +99,7 @@ public class SBloodyBattleSetting implements BaseConfig {
|
|||
}
|
||||
|
||||
int[][][] monsterPatrol = sBloodyBattleSettingTmp.getMonsterPatrol();
|
||||
int[][] monster = sBloodyBattleSettingTmp.getMonster();
|
||||
// int[][] monster = sBloodyBattleSettingTmp.getMonster();
|
||||
Map<Integer, List<Integer>> monsterPotrolPaths = new HashMap<>(monsterPatrol.length);
|
||||
for(int i=0;i<monsterPatrol.length;i++){
|
||||
|
||||
|
|
Loading…
Reference in New Issue