back_recharge
jiahuiwen 2019-03-28 15:10:59 +08:00
commit 992ed00675
3 changed files with 23 additions and 9 deletions

View File

@ -122,7 +122,7 @@ public class MapLogic {
if (energy < scMapConfig.getEnergyConfused()) {
LOGGER.info("enterMap() uid=>{} energy=>{} need=>{} energy not enough ", uid, energy, scMapConfig.getEnergyConfused());
MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "");
MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "行动力不足!");
return;
}
String error = initTeamInfo(teamId, uid, user, mapManager);
@ -281,11 +281,15 @@ public class MapLogic {
}
public boolean updateMapByOnlyConsumeActionPower(ISession session, int curXY,int triggerXY, List<Integer> cells,MessageTypeProto.MessageType messageType) throws Exception {
if(triggerXY == -1){
if(triggerXY == -1000){
int uid = session.getUid();
User user = UserManager.getUser(uid);
MapManager mapManager = user.getMapManager();
SCMapConfig scMapConfig = SCMapConfig.getsCMapSize().get(mapManager.getCurMapId());
if( null == scMapConfig ){
MessageUtil.sendMessage(session, 1, messageType.getNumber(), null, true);
return true;
}
int moveConfused = scMapConfig.getMoveConfused();
if (moveConfused > 0) {
int leftStep = mapManager.getTotalStep() - cells.size() * moveConfused;
@ -831,7 +835,7 @@ public class MapLogic {
RedisUtil.getInstence().del(key);
if (valueMap == null || valueMap.isEmpty()) {
LOGGER.info("endFight() uid=>{} not start fight", uid);
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "此战斗已结算过!");
return;
}

View File

@ -35,11 +35,20 @@ public class CBean2Proto {
return player;
}
public static CommonProto.Item getItem(Item item){
/**
*
* @param item
* @param itemNum -1
* @return
*/
public static CommonProto.Item getItem(Item item,int itemNum){
if(itemNum == -1){
itemNum = item.getItemNum();
}
CommonProto.Item itemProto = CommonProto.Item
.newBuilder()
.setItemId(item.getItemId())
.setItemNum(item.getItemNum())
.setItemNum(itemNum)
.setEndingTime(item.getEndingTime())
.build();
return itemProto;
@ -113,7 +122,7 @@ public class CBean2Proto {
public static CommonProto.Drop getDrop(TemporaryItems temporaryItems) {
CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder();
for (Item item : temporaryItems.items.values()) {
drop.addItemlist(getItem(item));
drop.addItemlist(getItem(item,-1));
}
for (Equip equip : temporaryItems.equips) {
drop.addEquipId(getEquipProto(equip));

View File

@ -97,6 +97,7 @@ public class ItemUtil {
addCard(user,cardMap,dropBuilder);
return dropBuilder;
}
private static void selectItemArr(int[][] itemArr, Map<Integer, Integer> cardMap, Map<Integer, Integer>
itemMap,Map<Integer,Integer> equipMap,Map<Integer,Integer> randomMap) {
for (int[] items : itemArr){
@ -257,7 +258,7 @@ public class ItemUtil {
} else {
item.setItemNum(item.getItemNum() + entry.getValue());
}
itemProtoList.add(CBean2Proto.getItem(item));
itemProtoList.add(CBean2Proto.getItem(item,entry.getValue()));
}
if (dropBuilder != null) {
dropBuilder.addAllItemlist(itemProtoList);
@ -294,7 +295,7 @@ public class ItemUtil {
} else {
item.setItemNum(item.getItemNum() + entry.getValue());
}
itemProtoList.add(CBean2Proto.getItem(item));
itemProtoList.add(CBean2Proto.getItem(item,entry.getValue()));
}
Set<Equip> equips = temporaryItems.equips;
for (Map.Entry<Integer, Integer> entry : equipMap.entrySet()) {
@ -399,7 +400,7 @@ public class ItemUtil {
Map<Integer, Item> itemMap = itemManager.getItemMap();
if (itemMap.size() !=0 ){
for (Map.Entry<Integer, Item> entry :itemMap.entrySet()){
itemList.add(CBean2Proto.getItem(entry.getValue()));
itemList.add(CBean2Proto.getItem(entry.getValue(),-1));
}
}
return itemList;