时间修改
parent
77d4d2c791
commit
7ff90d3a74
|
@ -17,6 +17,6 @@ public class BlessInitHandler extends BaseHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void process(ISession iSession, PacketNetData netData) throws Exception {
|
public void process(ISession iSession, PacketNetData netData) throws Exception {
|
||||||
ActivityLogic.getInstance().blessActivityInit(iSession, MessageTypeProto.MessageType.BLESS_INIT_RESPONSE);
|
// ActivityLogic.getInstance().blessActivityInit(iSession, MessageTypeProto.MessageType.BLESS_INIT_RESPONSE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ import com.ljsd.jieling.config.*;
|
||||||
import com.ljsd.jieling.core.VipPrivilegeType;
|
import com.ljsd.jieling.core.VipPrivilegeType;
|
||||||
import com.ljsd.jieling.globals.BIReason;
|
import com.ljsd.jieling.globals.BIReason;
|
||||||
import com.ljsd.jieling.globals.Global;
|
import com.ljsd.jieling.globals.Global;
|
||||||
|
import com.ljsd.jieling.handler.activity.BlessInfoConfig;
|
||||||
import com.ljsd.jieling.ktbeans.KtEventUtils;
|
import com.ljsd.jieling.ktbeans.KtEventUtils;
|
||||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
|
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
|
||||||
import com.ljsd.jieling.logic.dao.*;
|
import com.ljsd.jieling.logic.dao.*;
|
||||||
|
@ -590,24 +591,24 @@ public class ActivityLogic {
|
||||||
secretBoxSeasonTimes=0;
|
secretBoxSeasonTimes=0;
|
||||||
}
|
}
|
||||||
//云梦祈福初始化
|
//云梦祈福初始化
|
||||||
public void blessActivityInit(ISession session,MessageTypeProto.MessageType messageType) throws Exception {
|
// public void blessActivityInit(ISession session,MessageTypeProto.MessageType messageType) throws Exception {
|
||||||
User user = UserManager.getUser(session.getUid());
|
// User user = UserManager.getUser(session.getUid());
|
||||||
ActivityManager activityManager = user.getActivityManager();
|
// ActivityManager activityManager = user.getActivityManager();
|
||||||
if(activityManager.getActivityMissionMap().get(SBlessingConfig.sBlessingConfig.getActivityId()).getActivityProgressInfoMap().size()>0){
|
// if(activityManager.getActivityMissionMap().get(SBlessingConfig.sBlessingConfig.getActivityId()).getActivityProgressInfoMap().size()>0){
|
||||||
// MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"已经初始化过,不需要初始化");
|
//// MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"已经初始化过,不需要初始化");
|
||||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true);
|
// MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true);
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
//祈福信息初始化
|
// //祈福信息初始化
|
||||||
blessInfoInit(activityManager,7);
|
// blessInfoInit(activityManager,7);
|
||||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true);
|
// MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true);
|
||||||
}
|
// }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 祈福信息初始化
|
* 祈福信息初始化
|
||||||
* @param activityManager
|
* @param activityManager
|
||||||
*/
|
*/
|
||||||
private void blessInfoInit(ActivityManager activityManager,int activityId){
|
private ActivityMission blessInfoInit(ActivityManager activityManager,int activityId){
|
||||||
//第一次9种
|
//第一次9种
|
||||||
int fixRewardPool = SBlessingConfig.sBlessingConfig.getRandomPoolId();
|
int fixRewardPool = SBlessingConfig.sBlessingConfig.getRandomPoolId();
|
||||||
int fixRewardNum = SBlessingConfig.sBlessingConfig.getRandomNum();
|
int fixRewardNum = SBlessingConfig.sBlessingConfig.getRandomNum();
|
||||||
|
@ -671,39 +672,42 @@ public class ActivityLogic {
|
||||||
|
|
||||||
|
|
||||||
ActivityMission activityMission =new ActivityMission();
|
ActivityMission activityMission =new ActivityMission();
|
||||||
for(int i=16;i>0;i--){
|
for(int i = BlessInfoConfig.START_CAPACITY; i>0; i--){
|
||||||
ActivityProgressInfo progressInfo =new ActivityProgressInfo();
|
ActivityProgressInfo progressInfo =new ActivityProgressInfo();
|
||||||
if(16-i<fixResult.length){
|
if(BlessInfoConfig.START_CAPACITY-i<fixResult.length){
|
||||||
progressInfo.setState(0);
|
progressInfo.setState(0);
|
||||||
LOGGER.info("第一次第{}个数据",16-i,fixResult[16-i]);
|
LOGGER.info("第一次第{}个数据",BlessInfoConfig.START_CAPACITY-i,fixResult[BlessInfoConfig.START_CAPACITY-i]);
|
||||||
progressInfo.setProgrss(fixResult[16-i]);
|
progressInfo.setProgrss(fixResult[BlessInfoConfig.START_CAPACITY-i]);
|
||||||
}
|
}
|
||||||
activityMission.updateProgressInfo(i,progressInfo);
|
activityMission.updateProgressInfo(i,progressInfo);
|
||||||
}
|
}
|
||||||
for(int i=17;i<=32;i++){
|
for(int i=BlessInfoConfig.CHOOSE_START_ID;i<=BlessInfoConfig.CHOOSE_END_ID;i++){
|
||||||
ActivityProgressInfo progressInfo =new ActivityProgressInfo();
|
ActivityProgressInfo progressInfo =new ActivityProgressInfo();
|
||||||
activityMission.updateProgressInfo(i,progressInfo);
|
activityMission.updateProgressInfo(i,progressInfo);
|
||||||
}
|
}
|
||||||
//初始化状态
|
//初始化状态
|
||||||
activityMission.updateProgressInfo(99,new ActivityProgressInfo());
|
activityMission.updateProgressInfo(BlessInfoConfig.BLESS_PROGRESS_STATUS,new ActivityProgressInfo());
|
||||||
//初始化上次刷新时间
|
//初始化上次刷新时间
|
||||||
activityMission.updateProgressInfo(100,new ActivityProgressInfo());
|
if(activityMission.getActivityProgressInfoMap().get(BlessInfoConfig.LAST_REFRESH_TIME)==null){
|
||||||
|
activityMission.updateProgressInfo(BlessInfoConfig.LAST_REFRESH_TIME,new ActivityProgressInfo());
|
||||||
|
}
|
||||||
for(int i = 0 ; i <legendResult.length;i++){
|
for(int i = 0 ; i <legendResult.length;i++){
|
||||||
ActivityProgressInfo progressInfo =new ActivityProgressInfo();
|
ActivityProgressInfo progressInfo =new ActivityProgressInfo();
|
||||||
progressInfo.setProgrss(legendResult[i]);
|
progressInfo.setProgrss(legendResult[i]);
|
||||||
activityMission.updateProgressInfo(200+i,progressInfo);
|
activityMission.updateProgressInfo(BlessInfoConfig.LEGEND_REWARD_START_ID+i,progressInfo);
|
||||||
}
|
}
|
||||||
for(int i = 0 ; i <supremeResult.length;i++){
|
for(int i = 0 ; i <supremeResult.length;i++){
|
||||||
ActivityProgressInfo progressInfo =new ActivityProgressInfo();
|
ActivityProgressInfo progressInfo =new ActivityProgressInfo();
|
||||||
progressInfo.setProgrss(supremeResult[i]);
|
progressInfo.setProgrss(supremeResult[i]);
|
||||||
activityMission.updateProgressInfo(500+i,progressInfo);
|
activityMission.updateProgressInfo(BlessInfoConfig.SUPREME_REWARD_START_ID+i,progressInfo);
|
||||||
}
|
}
|
||||||
for(int i = 0 ; i < countResult.length ;i++){
|
for(int i = 0 ; i < countResult.length ;i++){
|
||||||
ActivityProgressInfo progressInfo =new ActivityProgressInfo();
|
ActivityProgressInfo progressInfo =new ActivityProgressInfo();
|
||||||
progressInfo.setProgrss(countResult[i]);
|
progressInfo.setProgrss(countResult[i]);
|
||||||
activityMission.updateProgressInfo(1000+counts[i],progressInfo);
|
activityMission.updateProgressInfo(BlessInfoConfig.COUNT_REWARD_START_ID+counts[i],progressInfo);
|
||||||
}
|
}
|
||||||
activityManager.addActivity(activityId,activityMission);
|
activityManager.addActivity(activityId,activityMission);
|
||||||
|
return activityMission;
|
||||||
}
|
}
|
||||||
//云梦请求数据
|
//云梦请求数据
|
||||||
public void blessInfo(ISession session, MessageTypeProto.MessageType messageType) throws Exception {
|
public void blessInfo(ISession session, MessageTypeProto.MessageType messageType) throws Exception {
|
||||||
|
@ -714,40 +718,40 @@ public class ActivityLogic {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
PlayerInfoProto.blessResponse.Builder response = getBlessInfoResponse(activityMission);
|
PlayerInfoProto.blessResponse.Builder response = getBlessInfoResponse(activityMission);
|
||||||
LOGGER.info("{},{},{}",response.getFixRewardList().toString(),response.getLegendRewardList().toString(),response.getSupremeRewardList().toString());
|
// LOGGER.info("{},{},{}",response.getFixRewardList().toString(),response.getLegendRewardList().toString(),response.getSupremeRewardList().toString());
|
||||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true);
|
MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true);
|
||||||
}
|
}
|
||||||
private PlayerInfoProto.blessResponse.Builder getBlessInfoResponse(ActivityMission activityMission){
|
private PlayerInfoProto.blessResponse.Builder getBlessInfoResponse(ActivityMission activityMission){
|
||||||
PlayerInfoProto.blessResponse.Builder response = PlayerInfoProto.blessResponse.newBuilder();
|
PlayerInfoProto.blessResponse.Builder response = PlayerInfoProto.blessResponse.newBuilder();
|
||||||
Map<Integer, ActivityProgressInfo> blessInfoMap = activityMission.getActivityProgressInfoMap();
|
Map<Integer, ActivityProgressInfo> blessInfoMap = activityMission.getActivityProgressInfoMap();
|
||||||
//保存之前
|
//保存之前
|
||||||
if(blessInfoMap.get(99).getProgrss()==0){
|
if(blessInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss()==0){
|
||||||
for(Map.Entry<Integer,ActivityProgressInfo> entry:blessInfoMap.entrySet()){
|
for(Map.Entry<Integer,ActivityProgressInfo> entry:blessInfoMap.entrySet()){
|
||||||
if(entry.getKey()/1000>0){
|
if(entry.getKey()/BlessInfoConfig.COUNT_REWARD_START_ID>0){
|
||||||
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
||||||
.setLocationId(entry.getKey()%1000)
|
.setLocationId(entry.getKey()%BlessInfoConfig.COUNT_REWARD_START_ID)
|
||||||
.setState(0)
|
.setState(0)
|
||||||
.setRewardId(entry.getValue().getProgrss())
|
.setRewardId(entry.getValue().getProgrss())
|
||||||
.build();
|
.build();
|
||||||
response.addCountReward(blessReward);
|
response.addCountReward(blessReward);
|
||||||
continue;
|
continue;
|
||||||
}else if(entry.getKey()/500>0){
|
}else if(entry.getKey()/BlessInfoConfig.SUPREME_REWARD_START_ID>0){
|
||||||
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
||||||
.setLocationId(entry.getKey()%500+1)
|
.setLocationId(entry.getKey()%BlessInfoConfig.SUPREME_REWARD_START_ID+1)
|
||||||
.setState(0)
|
.setState(0)
|
||||||
.setRewardId(entry.getValue().getProgrss())
|
.setRewardId(entry.getValue().getProgrss())
|
||||||
.build();
|
.build();
|
||||||
response.addSupremeReward(blessReward);
|
response.addSupremeReward(blessReward);
|
||||||
continue;
|
continue;
|
||||||
}else if(entry.getKey()/200>0){
|
}else if(entry.getKey()/BlessInfoConfig.LEGEND_REWARD_START_ID>0){
|
||||||
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
||||||
.setLocationId(entry.getKey()%200+1)
|
.setLocationId(entry.getKey()%BlessInfoConfig.LEGEND_REWARD_START_ID+1)
|
||||||
.setState(0)
|
.setState(0)
|
||||||
.setRewardId(entry.getValue().getProgrss())
|
.setRewardId(entry.getValue().getProgrss())
|
||||||
.build();
|
.build();
|
||||||
response.addLegendReward(blessReward);
|
response.addLegendReward(blessReward);
|
||||||
continue;
|
continue;
|
||||||
}else if(entry.getKey()<=16){
|
}else if(entry.getKey()<=BlessInfoConfig.START_CAPACITY){
|
||||||
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
||||||
.setLocationId(entry.getKey())
|
.setLocationId(entry.getKey())
|
||||||
.setState(0)
|
.setState(0)
|
||||||
|
@ -758,26 +762,26 @@ public class ActivityLogic {
|
||||||
}
|
}
|
||||||
}else{//保存之后
|
}else{//保存之后
|
||||||
for(Map.Entry<Integer,ActivityProgressInfo> entry:blessInfoMap.entrySet()){
|
for(Map.Entry<Integer,ActivityProgressInfo> entry:blessInfoMap.entrySet()){
|
||||||
if(entry.getKey()/1000>0){
|
if(entry.getKey()/BlessInfoConfig.COUNT_REWARD_START_ID>0){
|
||||||
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
||||||
.setLocationId(entry.getKey()%1000)
|
.setLocationId(entry.getKey()%BlessInfoConfig.COUNT_REWARD_START_ID)
|
||||||
.setState(1)
|
.setState(1)
|
||||||
.setRewardId(entry.getValue().getProgrss())
|
.setRewardId(entry.getValue().getProgrss())
|
||||||
.build();
|
.build();
|
||||||
response.addCountReward(blessReward);
|
response.addCountReward(blessReward);
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
}else if(entry.getKey()/500>0){
|
}else if(entry.getKey()/BlessInfoConfig.SUPREME_REWARD_START_ID>0){
|
||||||
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
||||||
.setLocationId(entry.getKey()%500+1)
|
.setLocationId(entry.getKey()%BlessInfoConfig.SUPREME_REWARD_START_ID+1)
|
||||||
.setState(1)
|
.setState(1)
|
||||||
.setRewardId(entry.getValue().getProgrss())
|
.setRewardId(entry.getValue().getProgrss())
|
||||||
.build();
|
.build();
|
||||||
response.addSupremeReward(blessReward);
|
response.addSupremeReward(blessReward);
|
||||||
continue;
|
continue;
|
||||||
}else if(entry.getKey()/200>0){
|
}else if(entry.getKey()/BlessInfoConfig.LEGEND_REWARD_START_ID>0){
|
||||||
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
||||||
.setLocationId(entry.getKey()%200+1)
|
.setLocationId(entry.getKey()%BlessInfoConfig.LEGEND_REWARD_START_ID+1)
|
||||||
.setState(1)
|
.setState(1)
|
||||||
.setRewardId(entry.getValue().getProgrss())
|
.setRewardId(entry.getValue().getProgrss())
|
||||||
.build();
|
.build();
|
||||||
|
@ -785,21 +789,21 @@ public class ActivityLogic {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for(int i = 17;i<=48;i++){
|
for(int i = BlessInfoConfig.CHOOSE_START_ID;i<=BlessInfoConfig.REWARD_VIEW_END_ID;i++){
|
||||||
for(Map.Entry<Integer,ActivityProgressInfo> entry:blessInfoMap.entrySet()) {
|
for(Map.Entry<Integer,ActivityProgressInfo> entry:blessInfoMap.entrySet()) {
|
||||||
if(entry.getKey()!=i){
|
if(entry.getKey()!=i){
|
||||||
continue;
|
continue;
|
||||||
}if (i<33){
|
}if (i<BlessInfoConfig.REWARD_VIEW_START_ID){
|
||||||
LOGGER.info("显示顺序是{}",entry.getKey());
|
LOGGER.info("显示顺序是{}",entry.getKey());
|
||||||
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
||||||
.setLocationId(i-16)
|
.setLocationId(i-BlessInfoConfig.START_CAPACITY)
|
||||||
.setState(1)
|
.setState(1)
|
||||||
.setRewardId(entry.getValue().getProgrss())
|
.setRewardId(entry.getValue().getProgrss())
|
||||||
.build();
|
.build();
|
||||||
response.addFixReward(blessReward);
|
response.addFixReward(blessReward);
|
||||||
}else{
|
}else{
|
||||||
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
CommonProto.blessReward blessReward = CommonProto.blessReward.newBuilder()
|
||||||
.setLocationId(i-32)
|
.setLocationId(i-BlessInfoConfig.CHOOSE_END_ID)
|
||||||
.setState(1)
|
.setState(1)
|
||||||
.setRewardId(entry.getValue().getProgrss())
|
.setRewardId(entry.getValue().getProgrss())
|
||||||
.build();
|
.build();
|
||||||
|
@ -809,16 +813,16 @@ public class ActivityLogic {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
response.setLastRefreshTime(blessInfoMap.get(100).getProgrss());
|
response.setLastRefreshTime(blessInfoMap.get(BlessInfoConfig.LAST_REFRESH_TIME).getProgrss());
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
public void blessSaveOptionalReward(ISession session, int[] rewardIds, MessageTypeProto.MessageType messageType) throws Exception {
|
public void blessSaveOptionalReward(ISession session, int[] rewardIds, MessageTypeProto.MessageType messageType) throws Exception {
|
||||||
User user = UserManager.getUser(session.getUid());
|
User user = UserManager.getUser(session.getUid());
|
||||||
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(SBlessingConfig.sBlessingConfig.getActivityId());
|
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(SBlessingConfig.sBlessingConfig.getActivityId());
|
||||||
if(activityMission.getActivityProgressInfoMap().get(99).getProgrss()!=0){
|
if(activityMission.getActivityProgressInfoMap().get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss()!=0){
|
||||||
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"您当前不能进行保存!");
|
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"您当前不能进行保存!");
|
||||||
}
|
}
|
||||||
if(SBlessingConfig.sBlessingConfig.getRandomNum()!=16-rewardIds.length){
|
if(SBlessingConfig.sBlessingConfig.getRandomNum()!=BlessInfoConfig.START_CAPACITY-rewardIds.length){
|
||||||
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"选择数量不对");
|
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"选择数量不对");
|
||||||
}
|
}
|
||||||
for (int i = 0 ; i <rewardIds.length;i++){
|
for (int i = 0 ; i <rewardIds.length;i++){
|
||||||
|
@ -827,11 +831,10 @@ public class ActivityLogic {
|
||||||
activityMission.updateProgressInfo(i+1,info);
|
activityMission.updateProgressInfo(i+1,info);
|
||||||
}
|
}
|
||||||
//奖励预览赋值
|
//奖励预览赋值
|
||||||
for(int i = 0 ;i <16;i++){
|
for(int i = 0 ;i <BlessInfoConfig.START_CAPACITY;i++){
|
||||||
activityMission.updateProgressInfo(i+33,activityMission.getActivityProgressInfoMap().get(i+1));
|
activityMission.updateProgressInfo(i+BlessInfoConfig.REWARD_VIEW_START_ID,activityMission.getActivityProgressInfoMap().get(i+1));
|
||||||
}
|
}
|
||||||
// activityMission.updateActivityState(-1);
|
activityMission.updateProgressInfo(BlessInfoConfig.BLESS_PROGRESS_STATUS,new ActivityProgressInfo(-1,0));
|
||||||
activityMission.updateProgressInfo(99,new ActivityProgressInfo(-1,0));
|
|
||||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true);
|
MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -846,17 +849,17 @@ public class ActivityLogic {
|
||||||
User user = UserManager.getUser(session.getUid());
|
User user = UserManager.getUser(session.getUid());
|
||||||
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(SBlessingConfig.sBlessingConfig.getActivityId());
|
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(SBlessingConfig.sBlessingConfig.getActivityId());
|
||||||
Map<Integer, ActivityProgressInfo> activityProgressInfoMap = activityMission.getActivityProgressInfoMap();
|
Map<Integer, ActivityProgressInfo> activityProgressInfoMap = activityMission.getActivityProgressInfoMap();
|
||||||
if(activityProgressInfoMap.get(locationId+16).getProgrss()!=0){
|
if(activityProgressInfoMap.get(locationId+BlessInfoConfig.START_CAPACITY).getProgrss()!=0){
|
||||||
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"已经抽过改格子");
|
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"已经抽过改格子");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int resultRewardId = 0;
|
int resultRewardId = 0;
|
||||||
if(activityProgressInfoMap.get(99).getProgrss()==-1){
|
if(activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss()==-1){
|
||||||
Map<Integer, SBlessingRewardPool> poolMap = SBlessingRewardPool.sBlessingRewardPoolMap;
|
Map<Integer, SBlessingRewardPool> poolMap = SBlessingRewardPool.sBlessingRewardPoolMap;
|
||||||
int[][] result = new int[16][];
|
int[][] result = new int[BlessInfoConfig.START_CAPACITY][];
|
||||||
int index = 0;
|
int index = 0;
|
||||||
for (Map.Entry<Integer,ActivityProgressInfo> entry :activityProgressInfoMap.entrySet()) {
|
for (Map.Entry<Integer,ActivityProgressInfo> entry :activityProgressInfoMap.entrySet()) {
|
||||||
if(entry.getKey()>16){
|
if(entry.getKey()>BlessInfoConfig.START_CAPACITY){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
int[] temp = new int[2];
|
int[] temp = new int[2];
|
||||||
|
@ -865,13 +868,13 @@ public class ActivityLogic {
|
||||||
result[index] = temp;
|
result[index] = temp;
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
int[] order = MathUtils.randomFromWeightWithTaking(result, 16);
|
int[] order = MathUtils.randomFromWeightWithTaking(result, BlessInfoConfig.START_CAPACITY);
|
||||||
for (int i = 0; i <order.length ; i++) {
|
for (int i = 0; i <order.length ; i++) {
|
||||||
LOGGER.info("获取顺序{}",order[i]);
|
LOGGER.info("获取顺序{}",order[i]);
|
||||||
}
|
}
|
||||||
index = 0;
|
index = 0;
|
||||||
for (Map.Entry<Integer,ActivityProgressInfo> entry :activityProgressInfoMap.entrySet()) {
|
for (Map.Entry<Integer,ActivityProgressInfo> entry :activityProgressInfoMap.entrySet()) {
|
||||||
if(entry.getKey()>16){
|
if(entry.getKey()>BlessInfoConfig.START_CAPACITY){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
ActivityProgressInfo progress = new ActivityProgressInfo();
|
ActivityProgressInfo progress = new ActivityProgressInfo();
|
||||||
|
@ -879,24 +882,24 @@ public class ActivityLogic {
|
||||||
activityMission.updateProgressInfo(entry.getKey(),progress);
|
activityMission.updateProgressInfo(entry.getKey(),progress);
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
activityMission.updateProgressInfo(99,new ActivityProgressInfo(1,0));
|
activityMission.updateProgressInfo(BlessInfoConfig.BLESS_PROGRESS_STATUS,new ActivityProgressInfo(1,0));
|
||||||
}
|
}
|
||||||
//检验消耗道具
|
//检验消耗道具
|
||||||
int[][] costConfig = SBlessingConfig.sBlessingConfig.getCost();
|
int[][] costConfig = SBlessingConfig.sBlessingConfig.getCost();
|
||||||
int[][] cost = new int[1][];
|
int[][] cost = new int[1][];
|
||||||
int[] temp = new int[2];
|
int[] temp = new int[2];
|
||||||
temp[0] = costConfig[0][0];
|
temp[0] = costConfig[0][0];
|
||||||
temp[1] = (int)MathUtils.calABX(activityProgressInfoMap.get(99).getProgrss(),costConfig[1]);
|
temp[1] = (int)MathUtils.calABX(activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss(),costConfig[1]);
|
||||||
cost[0] = temp;
|
cost[0] = temp;
|
||||||
LOGGER.info("本次为第{}次抽取,消耗{}个数为{}",activityProgressInfoMap.get(99).getProgrss(),temp[0],temp[1]);
|
LOGGER.info("本次为第{}次抽取,消耗{}个数为{}",activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss(),temp[0],temp[1]);
|
||||||
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.BLESS_CHOOSE_CONSUME,1);
|
boolean costResult = ItemUtil.itemCost(user,cost,BIReason.BLESS_CHOOSE_CONSUME,1);
|
||||||
if(!costResult){
|
if(!costResult){
|
||||||
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"道具不足");
|
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"道具不足");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(activityProgressInfoMap.get(99).getProgrss()>0){
|
if(activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss()>0){
|
||||||
for (Map.Entry<Integer,ActivityProgressInfo> entry :activityProgressInfoMap.entrySet()) {
|
for (Map.Entry<Integer,ActivityProgressInfo> entry :activityProgressInfoMap.entrySet()) {
|
||||||
if(entry.getKey()>16){
|
if(entry.getKey()>BlessInfoConfig.START_CAPACITY){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(entry.getValue().getProgrss()==0){
|
if(entry.getValue().getProgrss()==0){
|
||||||
|
@ -905,7 +908,7 @@ public class ActivityLogic {
|
||||||
resultRewardId = entry.getValue().getProgrss();
|
resultRewardId = entry.getValue().getProgrss();
|
||||||
ActivityProgressInfo progress = new ActivityProgressInfo();
|
ActivityProgressInfo progress = new ActivityProgressInfo();
|
||||||
progress.setProgrss(entry.getValue().getProgrss());
|
progress.setProgrss(entry.getValue().getProgrss());
|
||||||
activityMission.updateProgressInfo(locationId+16,progress);
|
activityMission.updateProgressInfo(locationId+BlessInfoConfig.START_CAPACITY,progress);
|
||||||
activityMission.updateProgressInfo(entry.getKey(),new ActivityProgressInfo());
|
activityMission.updateProgressInfo(entry.getKey(),new ActivityProgressInfo());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -914,16 +917,17 @@ public class ActivityLogic {
|
||||||
Map<Integer, SBlessingRewardPool> poolMap = SBlessingRewardPool.sBlessingRewardPoolMap;
|
Map<Integer, SBlessingRewardPool> poolMap = SBlessingRewardPool.sBlessingRewardPoolMap;
|
||||||
int[][] dropItem = new int[1][];
|
int[][] dropItem = new int[1][];
|
||||||
for(Integer count:SBlessingConfig.sBlessingConfig.getCounts()){
|
for(Integer count:SBlessingConfig.sBlessingConfig.getCounts()){
|
||||||
if (count!=activityProgressInfoMap.get(99).getProgrss()){
|
if (count!=activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss()){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
dropItem = new int[2][];
|
dropItem = new int[2][];
|
||||||
dropItem[1] = poolMap.get(activityProgressInfoMap.get(1000+count).getProgrss()).getReward();
|
dropItem[1] = poolMap.get(activityProgressInfoMap.get(BlessInfoConfig.COUNT_REWARD_START_ID+count).getProgrss()).getReward();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
int[] reward = poolMap.get(resultRewardId).getReward();
|
int[] reward = poolMap.get(resultRewardId).getReward();
|
||||||
dropItem[0] = reward;
|
dropItem[0] = reward;
|
||||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItem, BIReason.BLESS_REWARD);
|
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItem, BIReason.BLESS_REWARD);
|
||||||
activityMission.updateProgressInfo(99,new ActivityProgressInfo(activityProgressInfoMap.get(99).getProgrss()+1,0));
|
activityMission.updateProgressInfo(BlessInfoConfig.BLESS_PROGRESS_STATUS,new ActivityProgressInfo(activityProgressInfoMap.get(99).getProgrss()+1,0));
|
||||||
PlayerInfoProto.blessChooseResponse response = PlayerInfoProto.blessChooseResponse.newBuilder().setReward(drop).setChooseRewardId(resultRewardId).build();
|
PlayerInfoProto.blessChooseResponse response = PlayerInfoProto.blessChooseResponse.newBuilder().setReward(drop).setChooseRewardId(resultRewardId).build();
|
||||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),response,true);
|
MessageUtil.sendMessage(session,1,messageType.getNumber(),response,true);
|
||||||
}
|
}
|
||||||
|
@ -940,18 +944,16 @@ public class ActivityLogic {
|
||||||
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"活动不可刷新");
|
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"活动不可刷新");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// boolean check = user.getPlayerInfoManager().check(SBlessingConfig.sBlessingConfig.getDailyRefreshTimes(), 1);
|
|
||||||
// if(!check){
|
|
||||||
// MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"无刷新次数");
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
// user.getPlayerInfoManager().updateVipPrivilage(SBlessingConfig.sBlessingConfig.getDailyRefreshTimes(),1);
|
|
||||||
ActivityManager activityManager = user.getActivityManager();
|
ActivityManager activityManager = user.getActivityManager();
|
||||||
ActivityMission activityMission = activityManager.getActivityMissionMap().get(SBlessingConfig.sBlessingConfig.getActivityId());
|
ActivityMission activityMission = activityManager.getActivityMissionMap().get(SBlessingConfig.sBlessingConfig.getActivityId());
|
||||||
activityMission.initMissionInfo(SBlessingConfig.sBlessingConfig.getActivityId());
|
ActivityProgressInfo tempProgress = new ActivityProgressInfo();
|
||||||
activityMission.updateProgressInfo(99,new ActivityProgressInfo());
|
//数据清空
|
||||||
activityMission.updateProgressInfo(100,new ActivityProgressInfo((int)(TimeUtils.now()/1000),0));
|
for(Map.Entry<Integer,ActivityProgressInfo> entry:activityMission.getActivityProgressInfoMap().entrySet()){
|
||||||
blessInfoInit(activityManager,7);
|
activityMission.updateProgressInfo(entry.getKey(),tempProgress);
|
||||||
|
}
|
||||||
|
activityMission = blessInfoInit(activityManager, 7);
|
||||||
|
activityMission.updateProgressInfo(BlessInfoConfig.LAST_REFRESH_TIME,new ActivityProgressInfo((int)(TimeUtils.now()/1000),0));
|
||||||
PlayerInfoProto.blessRefresh res = PlayerInfoProto.blessRefresh.newBuilder().setReward(getBlessInfoResponse(activityMission).build()).build();
|
PlayerInfoProto.blessRefresh res = PlayerInfoProto.blessRefresh.newBuilder().setReward(getBlessInfoResponse(activityMission).build()).build();
|
||||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),res,true);
|
MessageUtil.sendMessage(session,1,messageType.getNumber(),res,true);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue