Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
58e910f05a
|
@ -1723,6 +1723,8 @@ public class MapLogic {
|
||||||
if (levelDifficulty.getState() != Global.FIGHT_CLEARANCE){
|
if (levelDifficulty.getState() != Global.FIGHT_CLEARANCE){
|
||||||
levelDifficulty.setState(Global.FIGHT_OPEND_NO_CLEARANCE);
|
levelDifficulty.setState(Global.FIGHT_OPEND_NO_CLEARANCE);
|
||||||
}
|
}
|
||||||
|
//玩家升级
|
||||||
|
userLevelUp(user,1);
|
||||||
CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder();
|
CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder();
|
||||||
FightInfoProto.FightEndResponse fightEndResponse = FightInfoProto.FightEndResponse
|
FightInfoProto.FightEndResponse fightEndResponse = FightInfoProto.FightEndResponse
|
||||||
.newBuilder()
|
.newBuilder()
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package com.ljsd.jieling.logic.store;
|
package com.ljsd.jieling.logic.store;
|
||||||
|
|
||||||
import ch.qos.logback.core.util.TimeUtil;
|
|
||||||
import com.ljsd.jieling.config.SStoreConfig;
|
import com.ljsd.jieling.config.SStoreConfig;
|
||||||
import com.ljsd.jieling.config.SStoreTypeConfig;
|
import com.ljsd.jieling.config.SStoreTypeConfig;
|
||||||
import com.ljsd.jieling.globals.BIReason;
|
import com.ljsd.jieling.globals.BIReason;
|
||||||
|
@ -327,6 +326,7 @@ public class StoreLogic {
|
||||||
if (((nowTime - lastRefreshTime) /1000/60/60) >= time){
|
if (((nowTime - lastRefreshTime) /1000/60/60) >= time){
|
||||||
lastRefreshTime = lastRefreshTime + ((nowTime -lastRefreshTime)/(intervalTime)) *(intervalTime);
|
lastRefreshTime = lastRefreshTime + ((nowTime -lastRefreshTime)/(intervalTime)) *(intervalTime);
|
||||||
storeInfo.setLastRefreshTime(lastRefreshTime);
|
storeInfo.setLastRefreshTime(lastRefreshTime);
|
||||||
|
itemNumMap = getStoreItem(sStoreTypeConfig.getId(),sStoreTypeConfig,user);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue