无尽修改
parent
ad24318ef5
commit
5feec114b7
|
@ -13,7 +13,6 @@ public class EndlessTreasureReward extends MongoBase {
|
||||||
|
|
||||||
|
|
||||||
private int createTime; //取当天零点 根据其可以推算出期数。
|
private int createTime; //取当天零点 根据其可以推算出期数。
|
||||||
private int score;
|
|
||||||
private int isBuy;
|
private int isBuy;
|
||||||
private Map<Integer,Integer> rewardStatusMap = new HashMap<>(); //领取状态 1:表示领取基础奖励 2:表示领取额外奖励。
|
private Map<Integer,Integer> rewardStatusMap = new HashMap<>(); //领取状态 1:表示领取基础奖励 2:表示领取额外奖励。
|
||||||
|
|
||||||
|
@ -21,39 +20,17 @@ public class EndlessTreasureReward extends MongoBase {
|
||||||
this.setRootCollection(User._COLLECTION_NAME);
|
this.setRootCollection(User._COLLECTION_NAME);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reset(){
|
|
||||||
|
|
||||||
updataCreateTime((int)(TimeUtils.getMonthStartTime(1,1)/1000) -1);
|
|
||||||
setRewardStatusMap(new HashMap<>());
|
|
||||||
setIsBuy(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getCreateTime() {
|
public int getCreateTime() {
|
||||||
return createTime;
|
return createTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public int getScore() {
|
|
||||||
return score;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setScore(int score) {
|
|
||||||
this.score = score;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Map<Integer, Integer> getRewardStatusMap() {
|
public Map<Integer, Integer> getRewardStatusMap() {
|
||||||
return rewardStatusMap;
|
return rewardStatusMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRewardStatusMap(Map<Integer, Integer> rewardStatusMap) {
|
public void setRewardStatusMap(Map<Integer, Integer> rewardStatusMap) {
|
||||||
this.rewardStatusMap = rewardStatusMap;
|
this.rewardStatusMap = rewardStatusMap;
|
||||||
updateString("rewardStatusMap",rewardStatusMap);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void updateMissionStatus(int id, int value){
|
|
||||||
rewardStatusMap.put(id,value);
|
|
||||||
updateString("rewardStatusMap."+id, value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getIsBuy() {
|
public int getIsBuy() {
|
||||||
|
@ -62,10 +39,8 @@ public class EndlessTreasureReward extends MongoBase {
|
||||||
|
|
||||||
public void setIsBuy(int isBuy) {
|
public void setIsBuy(int isBuy) {
|
||||||
this.isBuy = isBuy;
|
this.isBuy = isBuy;
|
||||||
updateString("isBuy",isBuy);
|
|
||||||
}
|
}
|
||||||
public void updataCreateTime(int createTime){
|
public void setCreateTime(int createTime){
|
||||||
this.createTime = createTime;
|
this.createTime = createTime;
|
||||||
updateString("createTime",createTime);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,6 @@ import com.ljsd.jieling.core.FunctionIdEnum;
|
||||||
import com.ljsd.jieling.core.GlobalsDef;
|
import com.ljsd.jieling.core.GlobalsDef;
|
||||||
import com.ljsd.jieling.core.VipPrivilegeType;
|
import com.ljsd.jieling.core.VipPrivilegeType;
|
||||||
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
|
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
|
||||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
|
||||||
import com.ljsd.jieling.db.redis.RedisKey;
|
import com.ljsd.jieling.db.redis.RedisKey;
|
||||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||||
import com.ljsd.jieling.exception.ErrorCode;
|
import com.ljsd.jieling.exception.ErrorCode;
|
||||||
|
@ -3400,7 +3399,6 @@ public class MapLogic {
|
||||||
states.add(builder.build());
|
states.add(builder.build());
|
||||||
});
|
});
|
||||||
response.addAllTreasureRewardState(states);
|
response.addAllTreasureRewardState(states);
|
||||||
response.setScore(worldTreasureReward.getScore());
|
|
||||||
response.setResetTime(worldTreasureReward.getCreateTime());
|
response.setResetTime(worldTreasureReward.getCreateTime());
|
||||||
response.setIsBuy(worldTreasureReward.getIsBuy());
|
response.setIsBuy(worldTreasureReward.getIsBuy());
|
||||||
// }else {
|
// }else {
|
||||||
|
@ -3411,7 +3409,7 @@ public class MapLogic {
|
||||||
}
|
}
|
||||||
public void flushEndlessTreasure(User user) throws Exception {
|
public void flushEndlessTreasure(User user) throws Exception {
|
||||||
if(user.getMapManager().getEndlessTreasureReward().getCreateTime()<TimeUtils.nowInt()){
|
if(user.getMapManager().getEndlessTreasureReward().getCreateTime()<TimeUtils.nowInt()){
|
||||||
user.getMapManager().getEndlessTreasureReward().reset();
|
user.getMapManager().resetEndlessTreasure();
|
||||||
Item item = user.getItemManager().getItem(102);//升级积分清除
|
Item item = user.getItemManager().getItem(102);//升级积分清除
|
||||||
if(item!=null&&item.getItemNum()>0){
|
if(item!=null&&item.getItemNum()>0){
|
||||||
item.setItemNum(0);
|
item.setItemNum(0);
|
||||||
|
|
|
@ -123,7 +123,7 @@ public class MapManager extends MongoBase {
|
||||||
|
|
||||||
private int currentJourneyId;
|
private int currentJourneyId;
|
||||||
|
|
||||||
private EndlessTreasureReward endlessTreasureReward;
|
private EndlessTreasureReward endlessTreasureReward = new EndlessTreasureReward();
|
||||||
|
|
||||||
public MapManager() {
|
public MapManager() {
|
||||||
this.setRootCollection(User._COLLECTION_NAME);
|
this.setRootCollection(User._COLLECTION_NAME);
|
||||||
|
@ -910,10 +910,6 @@ public class MapManager extends MongoBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public EndlessTreasureReward getEndlessTreasureReward() {
|
public EndlessTreasureReward getEndlessTreasureReward() {
|
||||||
if(endlessTreasureReward==null){
|
|
||||||
endlessTreasureReward = new EndlessTreasureReward();
|
|
||||||
endlessTreasureReward.init(getRootId(), MongoKey.mapManager+"."+"endlessTreasureReward");
|
|
||||||
}
|
|
||||||
return endlessTreasureReward;
|
return endlessTreasureReward;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -940,6 +936,31 @@ public class MapManager extends MongoBase {
|
||||||
removeString("endlessMapInfo.monsterHp."+position);
|
removeString("endlessMapInfo.monsterHp."+position);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateTreasureCreateTime(int time){
|
||||||
|
endlessTreasureReward.setCreateTime(time);
|
||||||
|
updateString("endlessTreasureReward.createTime",time);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTreasureRewardStatusMap(Map<Integer, Integer> rewardStatusMap){
|
||||||
|
endlessTreasureReward.setRewardStatusMap(rewardStatusMap);
|
||||||
|
updateString("endlessTreasureReward.rewardStatusMap",rewardStatusMap);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTreasureIsBuy(int isBuy){
|
||||||
|
endlessTreasureReward.setIsBuy(isBuy);
|
||||||
|
updateString("endlessTreasureReward.isBuy",isBuy);
|
||||||
|
}
|
||||||
|
public void updateMissionStatus(int id, int value){
|
||||||
|
endlessTreasureReward.getRewardStatusMap().put(id,value);
|
||||||
|
updateString("endlessTreasureReward.rewardStatusMap."+id,value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void resetEndlessTreasure(){
|
||||||
|
updateTreasureCreateTime((int)(TimeUtils.getMonthStartTime(1,1)/1000) -1);
|
||||||
|
setTreasureRewardStatusMap(new HashMap<>());
|
||||||
|
setTreasureIsBuy(0);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ public class TakeEndlessTreasureHandler extends BaseHandler<MapInfoProto.Endless
|
||||||
|
|
||||||
dropByState(endlessTreasure, drops, curState, changeState);
|
dropByState(endlessTreasure, drops, curState, changeState);
|
||||||
|
|
||||||
endlessTreasureReward.updateMissionStatus(id, changeState);
|
user.getMapManager().updateMissionStatus(id, changeState);
|
||||||
|
|
||||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, drops, BIReason.ENDLESS_TREASURE_REWARD);
|
CommonProto.Drop.Builder drop = ItemUtil.drop(user, drops, BIReason.ENDLESS_TREASURE_REWARD);
|
||||||
MapInfoProto.EndlessTakeTreasureResponse build = MapInfoProto.EndlessTakeTreasureResponse.newBuilder().setDrop(drop).build();
|
MapInfoProto.EndlessTakeTreasureResponse build = MapInfoProto.EndlessTakeTreasureResponse.newBuilder().setDrop(drop).build();
|
||||||
|
|
|
@ -370,7 +370,7 @@ public class BuyGoodsNewLogic {
|
||||||
MessageUtil.sendIndicationMessage(OnlineUserManager.getSessionByUid(user.getId()),1,MessageTypeProto.MessageType.TREASURE_LEVELUP_INDICATION_VALUE,indication,true);
|
MessageUtil.sendIndicationMessage(OnlineUserManager.getSessionByUid(user.getId()),1,MessageTypeProto.MessageType.TREASURE_LEVELUP_INDICATION_VALUE,indication,true);
|
||||||
}
|
}
|
||||||
if(type==GiftGoodsType.ENDLESS_TREASURE){
|
if(type==GiftGoodsType.ENDLESS_TREASURE){
|
||||||
user.getMapManager().getEndlessTreasureReward().setIsBuy(1);
|
user.getMapManager().setTreasureIsBuy(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(drop!=null&&session!=null){
|
if(drop!=null&&session!=null){
|
||||||
|
|
Loading…
Reference in New Issue