Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
1d949a0f61
|
@ -22,12 +22,12 @@ int int int mut,int#int,2 mut,int#int,2 mut,int#int,2
|
||||||
20 101007 13 3#2#0 10100713 1#14
|
20 101007 13 3#2#0 10100713 1#14
|
||||||
21 101007 14 3#2#0 10100714 1#15
|
21 101007 14 3#2#0 10100714 1#15
|
||||||
22 101007 15 1#10101 10100715 1#16
|
22 101007 15 1#10101 10100715 1#16
|
||||||
23 101007 16 null 10100716 1#17
|
23 101007 16 null 10100716 0#17
|
||||||
24 101007 17 3#2#0 10100717 1#18
|
24 101007 17 3#2#0 10100717 1#18
|
||||||
25 101007 18 3#2#0 10100718 1#19
|
25 101007 18 3#2#0 10100718 1#19
|
||||||
26 101007 19 null 10100719 1#20
|
26 101007 19 null 10100719 0#20
|
||||||
27 101007 20 3#2#0 10100720 1#21
|
27 101007 20 3#2#0 10100720 1#21
|
||||||
28 101007 21 null 10100721 1#22
|
28 101007 21 null 10100721 0#22
|
||||||
29 101007 22 3#2#0 10100722 null
|
29 101007 22 3#2#0 10100722 null
|
||||||
30 101008 0 3#2#0|6#100 10100800 1#1
|
30 101008 0 3#2#0|6#100 10100800 1#1
|
||||||
31 101008 1 3#2#0|6#100 10100801 1#2
|
31 101008 1 3#2#0|6#100 10100801 1#2
|
||||||
|
|
|
@ -194,13 +194,14 @@ public class MapLogic {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int[][] contents = scMapEventsItemConfig.getContents();
|
int[][] contents = scMapEventsItemConfig.getContents();
|
||||||
|
boolean isSuccess = false;
|
||||||
|
if (contents.length > 0) {
|
||||||
if (choice < 0 || contents.length < choice) {
|
if (choice < 0 || contents.length < choice) {
|
||||||
LOGGER.info("no this choice =>{} scMapEventsItemConfig.getContents()=>{}", choice, scMapEventsItemConfig.getContents());
|
LOGGER.info("no this choice =>{} scMapEventsItemConfig.getContents()=>{}", choice, scMapEventsItemConfig.getContents());
|
||||||
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
|
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int[] eventArr = contents[choice - 1];
|
int[] eventArr = contents[choice - 1];
|
||||||
boolean isSuccess = false;
|
|
||||||
switch (eventArr[0]) {
|
switch (eventArr[0]) {
|
||||||
case EventType.fight: {
|
case EventType.fight: {
|
||||||
fightStart(uid, bigEventId);
|
fightStart(uid, bigEventId);
|
||||||
|
@ -247,6 +248,9 @@ public class MapLogic {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
isSuccess = true;
|
||||||
|
}
|
||||||
MapInfoProto.MapUpdateEventResponse.Builder mapUpdateEventResponse = MapInfoProto.MapUpdateEventResponse.newBuilder();
|
MapInfoProto.MapUpdateEventResponse.Builder mapUpdateEventResponse = MapInfoProto.MapUpdateEventResponse.newBuilder();
|
||||||
if (!isSuccess) {
|
if (!isSuccess) {
|
||||||
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
|
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
|
||||||
|
|
Loading…
Reference in New Issue