lvxinran 2019-10-22 02:53:11 +08:00
commit 89ac91c01b
5 changed files with 36 additions and 5 deletions

View File

@ -73,6 +73,11 @@ public class GetLuckWheelRandHandler extends BaseHandler<PlayerInfoProto.GetLuck
int[][] drops = new int[time][];
for (int i = 0; i < time; i++) {
luckId = ((LuckWheelActivity) abstractActivity).getNewRewardPool(user);
if(luckId==-1){
//策划说会留个无数次的 否者道具会多扣
MessageUtil.sendErrorResponse(iSession, 0, MessageTypeProto.MessageType.GET_LUCKWHEEL_RANDREWARD_RESPONSE_VALUE, "奖池不足");
return;
}
SDialRewardConfig sDialRewardConfig = SDialRewardConfig.getsDialRewardConfigMap().get(luckId);
drops[i] = sDialRewardConfig.getReward();
//upprocess

View File

@ -149,8 +149,8 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
if(null!=sGlobalActivity&&ActivityLogic.getInstance().checkActivityMissionFinishAndTaked(id,activityMission)&&sGlobalActivity.getResetGrade()==1){
reSetValue(user);
activityMission.setValue(activityMission.getValue()-sActivityRewardConfig.getValues()[0][0]);
sendActivityProgress(session, activityMission,null);
ActivityMission newmiss = user.getActivityManager().getActivityMissionMap().get(id);
sendActivityProgress(session, newmiss,null);
}else {
sendActivityProgress(session, activityMission, Collections.singleton(missionId));
}

View File

@ -133,6 +133,9 @@ public abstract class LuckWheelActivity extends AbstractActivity {
}
//random
int result = 0;
if(amount==0){
return -1;
}
int rate = MathUtils.randomInt(amount);
amount = 0;
for (Map.Entry<Integer, Integer> entry : weightMap.entrySet()) {
@ -151,5 +154,26 @@ public abstract class LuckWheelActivity extends AbstractActivity {
user.getActivityManager().initLuckWheel(sGlobalActivity.getType());
}
@Override
public void reSetValue(User user) throws Exception {
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id);
int oldvalue = activityMission.getValue();
super.reSetValue(user);
ActivityMission newmiss = user.getActivityManager().getActivityMissionMap().get(id);
newmiss.setValue(oldvalue-getMaxProcess());
}
int getMaxProcess() {
int max=0;
List<SActivityRewardConfig> cfgs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id);
if (null == cfgs) {
return 0;
}
for (SActivityRewardConfig sActivityRewardConfig : cfgs) {
max = Math.max(max,sActivityRewardConfig.getValues()[0][0]);
}
return max;
}
}

View File

@ -681,8 +681,8 @@ public class ArenaLogic {
CommonProto.FightData build = CommonProto.FightData.newBuilder()
.setFightMaxTime(SArenaSetting.getSArenaSetting().getMostTime())
.setFightSeed(seed)
.setHeroFightInfos(deffightTeamInfo)
.addMonsterList(fightTeamInfo)
.setHeroFightInfos(fightTeamInfo)
.addMonsterList(deffightTeamInfo)
.build();
ArenaInfoProto.PlayWithSbResponse response = ArenaInfoProto.PlayWithSbResponse.newBuilder().setFightData(build).build();
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.PLAY_WITH_SB_RESPONSE_VALUE,response,true);

View File

@ -475,8 +475,10 @@ public class FriendLogic {
sendFriendStatedication(uid,friendId,1);
}
friendManager.addBlackFriendId(friendId);
}else{
}else if(optType == 2){
friendManager.delBlackFriends(friendId);
}else if(optType == 3){
friendManager.setBlackFriends(new ArrayList<>(1));
}
MessageUtil.sendMessage(session, 1, msgId, null, true);