云梦祈福修改
parent
7d141098f9
commit
e45c58c3d1
|
@ -25,9 +25,15 @@ public class BlessInfoConfig {
|
||||||
public static final int REWARD_VIEW_END_ID = 48;
|
public static final int REWARD_VIEW_END_ID = 48;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 过程状态(0:奖励保存前;-1:保存后;1及以上:抽取次数)
|
* 过程状态(0:奖励保存前;-1:保存后)
|
||||||
|
*/
|
||||||
|
public static final int BLESS_STATUS = 98;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 抽取次数
|
||||||
*/
|
*/
|
||||||
public static final int BLESS_PROGRESS_STATUS = 99;
|
public static final int BLESS_PROGRESS_STATUS = 99;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上次刷新时间
|
* 上次刷新时间
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -861,7 +861,7 @@ public class ActivityLogic implements IEventHandler{
|
||||||
throw new ErrorCodeException(ErrorCode.newDefineCode("已经抽过改格子"));
|
throw new ErrorCodeException(ErrorCode.newDefineCode("已经抽过改格子"));
|
||||||
}
|
}
|
||||||
int resultRewardId = 0;
|
int resultRewardId = 0;
|
||||||
if (activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss() == -1) {
|
if (activityProgressInfoMap.get(BlessInfoConfig.BLESS_STATUS).getProgrss() == -1) {
|
||||||
Map<Integer, SBlessingRewardPool> poolMap = STableManager.getConfig(SBlessingRewardPool.class);
|
Map<Integer, SBlessingRewardPool> poolMap = STableManager.getConfig(SBlessingRewardPool.class);
|
||||||
int[][] result = new int[BlessInfoConfig.START_CAPACITY][];
|
int[][] result = new int[BlessInfoConfig.START_CAPACITY][];
|
||||||
int index = 0;
|
int index = 0;
|
||||||
|
@ -889,12 +889,19 @@ public class ActivityLogic implements IEventHandler{
|
||||||
activityMission.getActivityMissionMap().put(entry.getKey(), progress);
|
activityMission.getActivityMissionMap().put(entry.getKey(), progress);
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
ActivityProgressInfo activityProgressInfo1 = new ActivityProgressInfo();
|
|
||||||
activityProgressInfo1.setProgrss(1);
|
// ActivityProgressInfo activityProgressInfo1 = activityProgressInfoMap.getOrDefault(BlessInfoConfig.BLESS_PROGRESS_STATUS,new ActivityProgressInfo());
|
||||||
activityProgressInfo1.setState(0);
|
// activityProgressInfo1.setProgrss(activityProgressInfo1.getProgrss()+1);
|
||||||
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_PROGRESS_STATUS,activityProgressInfo1);
|
// activityProgressInfo1.setState(0);
|
||||||
// activityMission.updateProgressInfo(BlessInfoConfig.BLESS_PROGRESS_STATUS, new ActivityProgressInfo(1, 0));
|
// activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_PROGRESS_STATUS,activityProgressInfo1);
|
||||||
|
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_STATUS,new ActivityProgressInfo());
|
||||||
|
|
||||||
|
// activityMission.updateProgressInfo(BlessInfoConfig.BLESS_PROGRESS_STATUS, new ActivityProgressInfo(1, 0));
|
||||||
}
|
}
|
||||||
|
ActivityProgressInfo activityProgressInfo1 = new ActivityProgressInfo();
|
||||||
|
activityProgressInfo1.setProgrss(activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss() + 1);
|
||||||
|
activityProgressInfo1.setState(0);
|
||||||
|
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_PROGRESS_STATUS,activityProgressInfo1);
|
||||||
//检验消耗道具
|
//检验消耗道具
|
||||||
int[][] costConfig = SBlessingConfig.blessingConfigMap.get(blessActivityId).getCost();
|
int[][] costConfig = SBlessingConfig.blessingConfigMap.get(blessActivityId).getCost();
|
||||||
int[][] cost = new int[1][];
|
int[][] cost = new int[1][];
|
||||||
|
@ -939,10 +946,7 @@ public class ActivityLogic implements IEventHandler{
|
||||||
dropItem[0] = reward;
|
dropItem[0] = reward;
|
||||||
CommonProto.Drop.Builder drop = ItemUtil.dropPer(user, dropItem, BIReason.BLESS_REWARD);
|
CommonProto.Drop.Builder drop = ItemUtil.dropPer(user, dropItem, BIReason.BLESS_REWARD);
|
||||||
|
|
||||||
ActivityProgressInfo activityProgressInfo1 = new ActivityProgressInfo();
|
|
||||||
activityProgressInfo1.setProgrss(activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss() + 1);
|
|
||||||
activityProgressInfo1.setState(0);
|
|
||||||
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_PROGRESS_STATUS,activityProgressInfo1);
|
|
||||||
// if (activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss() == BlessInfoConfig.START_CAPACITY + 1) {
|
// if (activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss() == BlessInfoConfig.START_CAPACITY + 1) {
|
||||||
// if (SBlessingConfig.sBlessingConfig.getIsRefresh() != 0) {
|
// if (SBlessingConfig.sBlessingConfig.getIsRefresh() != 0) {
|
||||||
// blessRefresh(user);
|
// blessRefresh(user);
|
||||||
|
@ -972,7 +976,7 @@ public class ActivityLogic implements IEventHandler{
|
||||||
PlayerInfoProto.blessResponse.Builder response = PlayerInfoProto.blessResponse.newBuilder();
|
PlayerInfoProto.blessResponse.Builder response = PlayerInfoProto.blessResponse.newBuilder();
|
||||||
Map<Integer, ActivityProgressInfo> blessInfoMap = activityMission.getActivityMissionMap();
|
Map<Integer, ActivityProgressInfo> blessInfoMap = activityMission.getActivityMissionMap();
|
||||||
//保存之前
|
//保存之前
|
||||||
if (blessInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss() == 0) {
|
if (blessInfoMap.get(BlessInfoConfig.BLESS_STATUS).getProgrss() == -1) {
|
||||||
for (Map.Entry<Integer, ActivityProgressInfo> entry : blessInfoMap.entrySet()) {
|
for (Map.Entry<Integer, ActivityProgressInfo> entry : blessInfoMap.entrySet()) {
|
||||||
if (entry.getKey() / BlessInfoConfig.COUNT_REWARD_START_ID > 0) {
|
if (entry.getKey() / BlessInfoConfig.COUNT_REWARD_START_ID > 0) {
|
||||||
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
||||||
|
@ -1061,6 +1065,7 @@ public class ActivityLogic implements IEventHandler{
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
response.setCount(blessInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss());
|
||||||
response.setLastRefreshTime(blessInfoMap.get(BlessInfoConfig.LAST_REFRESH_TIME).getProgrss());
|
response.setLastRefreshTime(blessInfoMap.get(BlessInfoConfig.LAST_REFRESH_TIME).getProgrss());
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
@ -1081,7 +1086,7 @@ public class ActivityLogic implements IEventHandler{
|
||||||
}
|
}
|
||||||
SBlessingConfig blessingConfig =SBlessingConfig.blessingConfigMap.get(blessActivityId) ;
|
SBlessingConfig blessingConfig =SBlessingConfig.blessingConfigMap.get(blessActivityId) ;
|
||||||
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(blessActivityId);
|
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(blessActivityId);
|
||||||
if (activityMission.getActivityMissionMap().get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss() != 0) {
|
if (activityMission.getActivityMissionMap().get(BlessInfoConfig.BLESS_STATUS).getProgrss() != -1) {
|
||||||
throw new ErrorCodeException(ErrorCode.newDefineCode("您当前不能进行保存"));
|
throw new ErrorCodeException(ErrorCode.newDefineCode("您当前不能进行保存"));
|
||||||
}
|
}
|
||||||
if (blessingConfig.getRandomNum() != BlessInfoConfig.START_CAPACITY - rewardIds.length) {
|
if (blessingConfig.getRandomNum() != BlessInfoConfig.START_CAPACITY - rewardIds.length) {
|
||||||
|
@ -1100,7 +1105,7 @@ public class ActivityLogic implements IEventHandler{
|
||||||
ActivityProgressInfo activityProgressInfo1 = new ActivityProgressInfo();
|
ActivityProgressInfo activityProgressInfo1 = new ActivityProgressInfo();
|
||||||
activityProgressInfo1.setProgrss(-1);
|
activityProgressInfo1.setProgrss(-1);
|
||||||
activityProgressInfo1.setState(0);
|
activityProgressInfo1.setState(0);
|
||||||
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_PROGRESS_STATUS, activityProgressInfo1);
|
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_STATUS, activityProgressInfo1);
|
||||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), null, true);
|
MessageUtil.sendMessage(session, 1, messageType.getNumber(), null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ public class BlessActivity extends AbstractActivity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initActivity(User user){
|
public void initActivity(User user){
|
||||||
blessInfoInit(user.getActivityManager(), id);
|
blessInfoInit(user.getActivityManager(), id,false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -61,7 +61,7 @@ public class BlessActivity extends AbstractActivity {
|
||||||
* @param activityId
|
* @param activityId
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private ActivityMission blessInfoInit(ActivityManager activityManager, int activityId) {
|
private ActivityMission blessInfoInit(ActivityManager activityManager, int activityId,boolean isRefresh) {
|
||||||
SBlessingConfig sBlessingConfig = SBlessingConfig.blessingConfigMap.get(activityId);
|
SBlessingConfig sBlessingConfig = SBlessingConfig.blessingConfigMap.get(activityId);
|
||||||
if(sBlessingConfig==null){
|
if(sBlessingConfig==null){
|
||||||
return null;
|
return null;
|
||||||
|
@ -141,8 +141,8 @@ public class BlessActivity extends AbstractActivity {
|
||||||
ActivityProgressInfo progressInfo = new ActivityProgressInfo();
|
ActivityProgressInfo progressInfo = new ActivityProgressInfo();
|
||||||
activityMission.getActivityMissionMap().put(i, progressInfo);
|
activityMission.getActivityMissionMap().put(i, progressInfo);
|
||||||
}
|
}
|
||||||
//初始化状态
|
|
||||||
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_PROGRESS_STATUS, new ActivityProgressInfo());
|
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_PROGRESS_STATUS, new ActivityProgressInfo());
|
||||||
|
|
||||||
//初始化上次刷新时间
|
//初始化上次刷新时间
|
||||||
if (activityMission.getActivityMissionMap().get(BlessInfoConfig.LAST_REFRESH_TIME) == null) {
|
if (activityMission.getActivityMissionMap().get(BlessInfoConfig.LAST_REFRESH_TIME) == null) {
|
||||||
activityMission.getActivityMissionMap().put(BlessInfoConfig.LAST_REFRESH_TIME, new ActivityProgressInfo());
|
activityMission.getActivityMissionMap().put(BlessInfoConfig.LAST_REFRESH_TIME, new ActivityProgressInfo());
|
||||||
|
@ -157,10 +157,30 @@ public class BlessActivity extends AbstractActivity {
|
||||||
progressInfo.setProgrss(supremeResult[i]);
|
progressInfo.setProgrss(supremeResult[i]);
|
||||||
activityMission.getActivityMissionMap().put(BlessInfoConfig.SUPREME_REWARD_START_ID + i, progressInfo);
|
activityMission.getActivityMissionMap().put(BlessInfoConfig.SUPREME_REWARD_START_ID + i, progressInfo);
|
||||||
}
|
}
|
||||||
for (int i = 0; i < countResult.length; i++) {
|
|
||||||
ActivityProgressInfo progressInfo = new ActivityProgressInfo();
|
ActivityProgressInfo statusInfo = new ActivityProgressInfo();
|
||||||
progressInfo.setProgrss(countResult[i]);
|
statusInfo.setProgrss(-1);
|
||||||
activityMission.getActivityMissionMap().put(BlessInfoConfig.COUNT_REWARD_START_ID + counts[i], progressInfo);
|
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_STATUS,statusInfo);
|
||||||
|
//初始化状态
|
||||||
|
if(!isRefresh){
|
||||||
|
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_PROGRESS_STATUS, new ActivityProgressInfo());
|
||||||
|
for (int i = 0; i < countResult.length; i++) {
|
||||||
|
ActivityProgressInfo progressInfo = new ActivityProgressInfo();
|
||||||
|
progressInfo.setProgrss(countResult[i]);
|
||||||
|
activityMission.getActivityMissionMap().put(BlessInfoConfig.COUNT_REWARD_START_ID + counts[i], progressInfo);
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
ActivityMission activityMission1 = activityManager.getActivityMissionMap().get(activityId);
|
||||||
|
ActivityProgressInfo missionInfo1 = activityMission1.getActivityMissionMap().get(BlessInfoConfig.BLESS_PROGRESS_STATUS);
|
||||||
|
activityMission.getActivityMissionMap().put(BlessInfoConfig.BLESS_PROGRESS_STATUS,missionInfo1);
|
||||||
|
for(Map.Entry<Integer,ActivityProgressInfo> entry:activityMission1.getActivityMissionMap().entrySet()){
|
||||||
|
|
||||||
|
if (entry.getKey() / BlessInfoConfig.COUNT_REWARD_START_ID >0) {
|
||||||
|
activityMission.getActivityMissionMap().put(entry.getKey(),entry.getValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// ActivityProgressInfo missionInfo2 = activityMission1.getActivityMissionMap().get(BlessInfoConfig.COUNT_REWARD_START_ID);
|
||||||
|
|
||||||
}
|
}
|
||||||
activityManager.getActivityMissionMap().put(activityId, activityMission);
|
activityManager.getActivityMissionMap().put(activityId, activityMission);
|
||||||
return activityMission;
|
return activityMission;
|
||||||
|
@ -188,9 +208,14 @@ public class BlessActivity extends AbstractActivity {
|
||||||
ActivityProgressInfo tempProgress = new ActivityProgressInfo();
|
ActivityProgressInfo tempProgress = new ActivityProgressInfo();
|
||||||
//数据清空
|
//数据清空
|
||||||
for (Map.Entry<Integer, ActivityProgressInfo> entry : activityMission.getActivityMissionMap().entrySet()) {
|
for (Map.Entry<Integer, ActivityProgressInfo> entry : activityMission.getActivityMissionMap().entrySet()) {
|
||||||
|
|
||||||
|
if(entry.getKey()/BlessInfoConfig.COUNT_REWARD_START_ID>0||entry.getKey()==BlessInfoConfig.BLESS_PROGRESS_STATUS){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
activityMission.getActivityMissionMap().put(entry.getKey(), tempProgress);
|
activityMission.getActivityMissionMap().put(entry.getKey(), tempProgress);
|
||||||
}
|
}
|
||||||
activityMission = blessInfoInit(activityManager, activityId);
|
activityMission = blessInfoInit(activityManager, activityId,true);
|
||||||
return activityMission;
|
return activityMission;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue