Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
96312e7a21
|
@ -56,8 +56,8 @@ public class MongoUpdateCache {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean checkOverride(String key1,String key2){
|
public boolean checkOverride(String key1,String key2){
|
||||||
String[] fullKeyArray = key1.split(".");
|
String[] fullKeyArray = key1.split("\\.");
|
||||||
String[] key1Array = key2.split(".");
|
String[] key1Array = key2.split("\\.");
|
||||||
if(fullKeyArray.length == key1Array.length && !fullKeyArray[fullKeyArray.length -1].equals(key1Array[key1Array.length -1])){
|
if(fullKeyArray.length == key1Array.length && !fullKeyArray[fullKeyArray.length -1].equals(key1Array[key1Array.length -1])){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -230,7 +230,7 @@ public class MapLogic {
|
||||||
|
|
||||||
|
|
||||||
public void updateMap(ISession session, int curXY, int triggerXY, List<Integer> cells, MessageTypeProto.MessageType messageType) throws Exception {
|
public void updateMap(ISession session, int curXY, int triggerXY, List<Integer> cells, MessageTypeProto.MessageType messageType) throws Exception {
|
||||||
LOGGER.info("updateMap() curXY=>{},triggerXY=>{}", curXY, triggerXY);
|
// LOGGER.info("updateMap() curXY=>{},triggerXY=>{}", curXY, triggerXY);
|
||||||
if (triggerXY != curXY) {
|
if (triggerXY != curXY) {
|
||||||
boolean isConnect = CellUtil.checkIsNextCell(curXY, triggerXY);
|
boolean isConnect = CellUtil.checkIsNextCell(curXY, triggerXY);
|
||||||
if (!isConnect) {
|
if (!isConnect) {
|
||||||
|
@ -459,8 +459,8 @@ public class MapLogic {
|
||||||
if (dropBuilder != null) {
|
if (dropBuilder != null) {
|
||||||
eventUpdateResponse.setDrop(dropBuilder);
|
eventUpdateResponse.setDrop(dropBuilder);
|
||||||
}
|
}
|
||||||
LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(),
|
// LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(),
|
||||||
cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon);
|
// cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon);
|
||||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true);
|
MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue