Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
8285f4363e
|
@ -162,7 +162,6 @@ public abstract class Creature extends SceneActor{
|
|||
int curPos = getPos();
|
||||
|
||||
LOGGER.info("the id={},preMoveTimestamp={},the time ={},move={},the oldXy={},the curXy={}",getId(),new Date(preMoveTimestamp),new Date(timestamp),moveDistance,CellUtil.pos2XY(oldXY),CellUtil.pos2XY(curPos));
|
||||
setStateType(StateType.MOVEABLE);
|
||||
preMoveTimestamp = timestamp;
|
||||
return curPos;
|
||||
}
|
||||
|
|
|
@ -132,6 +132,7 @@ public abstract class SceneActor{
|
|||
}
|
||||
}
|
||||
//清楚挖抗连续事件
|
||||
setStateType(StateType.MOVEABLE);
|
||||
MessageBoxUtils.onGameEvent(AnalysisEventType.DIGGER,scene,new AnalysisSourceData(value.getTarget(),value.getCaster(),-1));
|
||||
scene.processEventUpdate(EventType.BUFFER_REMOVE,value.getId());
|
||||
}
|
||||
|
@ -160,7 +161,7 @@ public abstract class SceneActor{
|
|||
scene.processEventUpdate(EventType.SCENEACTORE_REMOVE,this.getId());
|
||||
return;
|
||||
}
|
||||
addOrUpdateBuffer(new EffectBuffer(scene.getBufferId(),4,now,now+5000,this.getId(),0,0));
|
||||
addOrUpdateBuffer(new EffectBuffer(scene.getBufferId(),BufferType.REBIRTH.getType(),now,now+5000,this.getId(),0,0));
|
||||
// 定位到出生点位置
|
||||
this.setPos(SceneManager.selectForPlayerRebirth(scene));
|
||||
scene.processEventUpdate(EventType.SCENEACTORE_UPDATE,id);
|
||||
|
|
|
@ -128,15 +128,20 @@ public class RoomMatchRequestHandler extends BaseHandler{
|
|||
int[][] openPeriod = setting.getOpenPeriod();
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
int minute = calendar.get(Calendar.MINUTE);
|
||||
boolean enter = true;
|
||||
int hour = calendar.get(Calendar.HOUR_OF_DAY);
|
||||
boolean enter = false;
|
||||
for(int i = 0;i<openPeriod.length;i++){
|
||||
if(TimeUtils.getHourOfDay()<openPeriod[i][0]/10000&&minute<openPeriod[i][0]%10000/1000){
|
||||
enter =false;
|
||||
continue;
|
||||
}
|
||||
if(TimeUtils.getHourOfDay()>=openPeriod[i][0]/10000&&minute>=openPeriod[i][0]%10000/1000){
|
||||
enter = false;
|
||||
continue;
|
||||
if(hour>=openPeriod[i][0]/10000){
|
||||
if(hour == openPeriod[i][0]/10000 && minute<openPeriod[i][1]%10000/100){
|
||||
continue;
|
||||
}
|
||||
if(hour<=openPeriod[i][1]/10000){
|
||||
if(hour == openPeriod[i][1]/10000 && minute>openPeriod[i][1]%10000/100){
|
||||
continue;
|
||||
}
|
||||
enter =true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return enter;
|
||||
|
|
|
@ -152,6 +152,9 @@ public class CBean2Proto {
|
|||
for (Equip equip : temporaryItems.equips) {
|
||||
drop.addEquipId(getEquipProto(equip));
|
||||
}
|
||||
for (SoulEquip equip : temporaryItems.soulEquips) {
|
||||
drop.addSoulEquip(getEquipProto(equip));
|
||||
}
|
||||
return drop.build();
|
||||
}
|
||||
|
||||
|
|
|
@ -583,7 +583,8 @@ public class ItemUtil {
|
|||
Map<Integer, Item> items = temporaryItems.items;
|
||||
Set<Equip> equips = temporaryItems.equips;
|
||||
Set<EspecialEquip> especialEquips = temporaryItems.especialEquips;
|
||||
if (items.isEmpty() && equips.isEmpty() && especialEquips.isEmpty()) {
|
||||
Set<SoulEquip> soulEquips= temporaryItems.soulEquips;
|
||||
if (items.isEmpty() && equips.isEmpty() && especialEquips.isEmpty()&&soulEquips.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
Map<Integer, Item> itemMap = user.getItemManager().getItemMap();
|
||||
|
@ -652,6 +653,25 @@ public class ItemUtil {
|
|||
user.getEquipManager().addEspecialEquip(user,especialEquip);
|
||||
|
||||
}
|
||||
for(SoulEquip soulEquip:soulEquips){
|
||||
SItem sItem = SItem.getsItemMap().get (soulEquip.getEquipId());
|
||||
if (sItem == null){
|
||||
continue;
|
||||
}
|
||||
if (sItem.getIsSave() != 1) {
|
||||
continue;
|
||||
}
|
||||
if(!isVictory){
|
||||
if(isFirst){
|
||||
rewardStr.append(soulEquip.getEquipId()).append("#").append("1");
|
||||
isFirst = false;
|
||||
}else{
|
||||
rewardStr.append("|").append(soulEquip.getEquipId()).append("#").append("1");
|
||||
}
|
||||
continue;
|
||||
}
|
||||
user.getEquipManager().addSoulEquip(soulEquip);
|
||||
}
|
||||
user.getMapManager().setTemporaryItems(null);
|
||||
if(!isVictory){
|
||||
String title = SErrorCodeEerverConfig.getI18NMessage("map_overtime_title");
|
||||
|
|
Loading…
Reference in New Issue