Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
102d9a1eae
|
@ -1,6 +1,6 @@
|
|||
Id OrderBoxOpenTime OrderBoxContinue OrderBoxInterval OrderBoxPool DiamondBoxInterval Cost GetHerosInterval DiamondBoxContain TenTimesMustGetItem PerCount
|
||||
Id OrderBoxOpenTime OrderBoxContinue OrderBoxInterval OrderBoxPool DiamondBoxInterval CostItem GetHerosInterval DiamondBoxContain TenTimesMustGetItem PerCount
|
||||
int int int int mut,int#int,1 int mut,int#int,1 int mut,int#int,2 mut,int#int,2 int
|
||||
1 56 48 120 11#12#13#14 0 3#10 0 null null 10
|
||||
2 56 48 120 11#12#13#14 0 3#1 0 null null 1
|
||||
11 0 0 0 null 0 220 150 1#100 3#1 10
|
||||
12 0 0 0 null 2160 2200 0 1#100 null 1
|
||||
1 56 48 120 11#12#13#14 0 20#10 0 null null 10
|
||||
2 56 48 120 11#12#13#14 0 20#1 0 null null 1
|
||||
11 0 0 0 null 0 19#10 150 1#100 3#1 10
|
||||
12 0 0 0 null 2160 19#1 0 1#100 null 1
|
||||
|
|
|
@ -28,6 +28,8 @@ public class SLotterySetting implements BaseConfig {
|
|||
|
||||
private int[][] tenTimesMustGetItem;
|
||||
|
||||
private int[] costItem;
|
||||
|
||||
private int perCount;
|
||||
|
||||
private static Map<Integer,SLotterySetting> sLotterySettingByType;
|
||||
|
@ -89,5 +91,7 @@ public class SLotterySetting implements BaseConfig {
|
|||
return perCount;
|
||||
}
|
||||
|
||||
|
||||
public int[] getCostItem() {
|
||||
return costItem;
|
||||
}
|
||||
}
|
|
@ -28,10 +28,11 @@ public class HeroLogic {
|
|||
}
|
||||
|
||||
|
||||
|
||||
public void random(ISession session,int type) throws Exception {
|
||||
int uid = session.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
SLotterySetting sLotterySetting = SLotterySetting.getsLotterySettingMap().get(type);
|
||||
//检验消耗
|
||||
|
||||
//筛选卡池
|
||||
StringBuilder reward = new StringBuilder();
|
||||
|
@ -40,8 +41,21 @@ public class HeroLogic {
|
|||
boolean isSpecial = false;
|
||||
if(sLotterySetting.getOrderBoxPool()!=null && sLotterySetting.getOrderBoxPool().length>0){
|
||||
pooId = getOrderBoxPoolId(sLotterySetting);
|
||||
if(pooId == 0){
|
||||
MessageUtil.sendErrorResponse(session, 0, MessageTypeProto.MessageType.HERO_RAND_RESPONSE_VALUE,"");
|
||||
return;
|
||||
}
|
||||
isSpecial = true;
|
||||
}
|
||||
|
||||
//检验消耗
|
||||
int [][] costItems = new int[][]{sLotterySetting.getCostItem()};
|
||||
boolean enoughCost = ItemUtil.itemCost(user, costItems);
|
||||
if(!enoughCost){
|
||||
MessageUtil.sendErrorResponse(session, 0, MessageTypeProto.MessageType.HERO_RAND_RESPONSE_VALUE,"道具不足");
|
||||
return;
|
||||
}
|
||||
|
||||
for(int i=0;i<perCount;i++){
|
||||
if(!isSpecial){
|
||||
pooId = getPooId(sLotterySetting, pooId);
|
||||
|
@ -52,7 +66,7 @@ public class HeroLogic {
|
|||
|
||||
//额外获取
|
||||
reward.append( extraReward(sLotterySetting));
|
||||
User user = UserManager.getUser(uid);
|
||||
|
||||
|
||||
HeroInfoProto.HeroRandResponse heroRandResponse = addItem(user, reward.toString());
|
||||
MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.HERO_RAND_RESPONSE_VALUE, heroRandResponse, true);
|
||||
|
@ -111,8 +125,6 @@ public class HeroLogic {
|
|||
}
|
||||
builder.addAllHeroList(heros);
|
||||
builder.addAllItemList(items);
|
||||
//todo 为了测试 日后要删掉
|
||||
UserManager.ljsdMongoTemplate.lastUpdate();
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
|
@ -122,8 +134,8 @@ public class HeroLogic {
|
|||
int orderBoxContinue = sLotterySetting.getOrderBoxContinue();
|
||||
long now = System.currentTimeMillis();
|
||||
ServerConfig serverConfig = GameApplication.serverConfig;
|
||||
int diffHours = (int)((now - serverConfig.getCacheOpenTime())%( (orderBoxContinue + orderBoxContinue) * 1000*60*60));
|
||||
int diffSeaseon = (int)((now - serverConfig.getCacheOpenTime())/( (orderBoxContinue + orderBoxContinue) * 1000*60*60));
|
||||
int diffHours = (int)((now - serverConfig.getCacheOpenTime())/1000/60/60%( (orderBoxContinue + orderBoxContinue)));
|
||||
int diffSeaseon = (int)((now - serverConfig.getCacheOpenTime())/1000/60/60/( (orderBoxContinue + orderBoxContinue)));
|
||||
if(diffHours<=orderBoxOpenTime){
|
||||
return orderBoxPool[diffSeaseon%orderBoxPool.length];
|
||||
}
|
||||
|
|
|
@ -85,10 +85,11 @@ public class MessageUtil {
|
|||
|
||||
public static void sendErrorResponse(ISession session,int errorCode,int msgId,String errMsg) throws Exception {
|
||||
GeneratedMessage generatedMessage = null;
|
||||
if(errorCode!=1 && !StringUtil.isEmpty(errMsg)){
|
||||
generatedMessage = CommonProto.ErrorResponse.newBuilder().setErrCode(errorCode).setErrMsg(errMsg).build();
|
||||
if( null == errMsg){
|
||||
errMsg="";
|
||||
}
|
||||
LOGGER.error("send error msg,the uid={},the msgId={},the errMsg={}",session.getId(),msgId,errMsg);
|
||||
generatedMessage = CommonProto.ErrorResponse.newBuilder().setErrCode(errorCode).setErrMsg(errMsg).build();
|
||||
LOGGER.error("send error msg,the uid={},the msgId={},the errMsg={}",session.getUid(),msgId,errMsg);
|
||||
byte[] byteBuf = wrappedBuffer(session.getUid(), session.getToken(), session.getIndex(),
|
||||
errorCode,msgId, generatedMessage);
|
||||
session.writeAndFlush(byteBuf);
|
||||
|
|
Loading…
Reference in New Issue