Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
8293f6228f
|
@ -76,9 +76,7 @@ public class HandlerLogicThread extends Thread{
|
||||||
//日后删除
|
//日后删除
|
||||||
whiteMsg.add(MessageTypeProto.MessageType.GET_CHAT_MESSAGE_REQUEST_VALUE);
|
whiteMsg.add(MessageTypeProto.MessageType.GET_CHAT_MESSAGE_REQUEST_VALUE);
|
||||||
|
|
||||||
|
whiteMsg.add(MessageTypeProto.MessageType.SERVER_FIVE_REQEUST_VALUE);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -565,8 +565,11 @@ public class MapLogic {
|
||||||
cost[0]= new int[]{costId,costNum};
|
cost[0]= new int[]{costId,costNum};
|
||||||
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
|
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
|
||||||
if(!costResult){
|
if(!costResult){
|
||||||
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"行动力不足!");
|
costNum = user.getItemManager().getItem(costId).getItemNum();
|
||||||
return;
|
cost[0][1]= costNum;
|
||||||
|
ItemUtil.itemCost(user,cost,BIReason.ENDLESS_CONSUME_EXECUTION,1);
|
||||||
|
// MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"行动力不足!");
|
||||||
|
// return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue