合并提交
parent
919fcb252a
commit
a8d396021b
|
@ -150,9 +150,11 @@ public enum ErrorCode implements IErrorCode {
|
|||
NO_USE_SAME_HERO(116,"不可上阵重复英雄"),
|
||||
DAILY_ALREADY_PASS(117,"已通关,不可重复挑战"),
|
||||
DAILY_NO_OPEN(118,"进入副本条件不足"),
|
||||
HAD_TAKE_REWARD(124,"奖励已领取")
|
||||
HAD_TAKE_REWARD(124,"奖励已领取"),
|
||||
|
||||
|
||||
SERVER_DEFINE_SELF(20000,"操作失败")
|
||||
|
||||
;
|
||||
private static final Set<Integer> CodeSet = new HashSet<>();
|
||||
|
||||
|
@ -188,6 +190,10 @@ public enum ErrorCode implements IErrorCode {
|
|||
return codeId;
|
||||
}
|
||||
|
||||
public void setErrMsg(String errMsg) {
|
||||
this.errMsg = errMsg;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String message() {
|
||||
return errMsg;
|
||||
|
@ -196,4 +202,5 @@ public enum ErrorCode implements IErrorCode {
|
|||
public static String newDefineCode(String errMsg) {
|
||||
return errMsg;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -14,6 +14,12 @@ public class ErrorCodeException extends Exception {
|
|||
this.errorCode = errorCode;
|
||||
}
|
||||
|
||||
public ErrorCodeException(ErrorCode errorCode,String newdefine) {
|
||||
super(newdefine);
|
||||
errorCode.setErrMsg(newdefine);
|
||||
this.errorCode = errorCode;
|
||||
}
|
||||
|
||||
public ErrorCodeException(String message) {
|
||||
super(message);
|
||||
errorCode = ErrorCode.SERVER_DEFINE;
|
||||
|
|
|
@ -56,6 +56,7 @@ public class GetLuckWheelRandHandler extends BaseHandler<PlayerInfoProto.GetLuck
|
|||
if (!(abstractActivity instanceof LuckWheelActivity)) {
|
||||
throw new ErrorCodeException(ErrorCode.newDefineCode("activity err"));
|
||||
}
|
||||
|
||||
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(proto.getActivityId());
|
||||
SDialRewardSetting sDialRewardSetting = SDialRewardSetting.getsDialRewardSettingMapByType().get(sGlobalActivity.getType());
|
||||
int reson = sGlobalActivity.getType() == 30 ? BIReason.LUCK_WHEEL : BIReason.LUCK_WHEEL_ADVANCE;
|
||||
|
@ -71,6 +72,13 @@ public class GetLuckWheelRandHandler extends BaseHandler<PlayerInfoProto.GetLuck
|
|||
}
|
||||
//dodrop
|
||||
int time = proto.getRepeated() ? sDialRewardSetting.getExtractingTime():1;
|
||||
|
||||
int luckWheelLimitTime = user.getPlayerInfoManager().getLuckWheelLimitTime();
|
||||
if(luckWheelLimitTime+time>100){
|
||||
throw new ErrorCodeException( ErrorCode.SERVER_DEFINE_SELF,"不可超出每日探宝上限次数!");
|
||||
}
|
||||
user.getPlayerInfoManager().setLuckWheelLimitTime(luckWheelLimitTime+time);
|
||||
|
||||
int luckId;
|
||||
int lastpos=1;
|
||||
Set<Integer> posSet = new HashSet<>();
|
||||
|
|
|
@ -88,6 +88,7 @@ public class ActivityLogic implements IEventHandler{
|
|||
//更新累计充值天数
|
||||
ActivityLogic.getInstance().resumeActivity(user, ActivityType.RECHARGE_SUM_DAY);
|
||||
user.getPlayerInfoManager().setRechargedaily(0);
|
||||
user.getPlayerInfoManager().setLuckWheelLimitTime(0);
|
||||
updateActivityMissionProgress(user, ActivityType.SevenLogin, 1);
|
||||
Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.LOGIN_TIMES.getType(),1));
|
||||
|
||||
|
|
|
@ -105,6 +105,8 @@ public class PlayerManager extends MongoBase {
|
|||
|
||||
private Set<Integer> proudInfo = new HashSet<>();
|
||||
|
||||
private int luckWheelLimitTime;
|
||||
|
||||
public PlayerManager(){
|
||||
this.setRootCollection(User._COLLECTION_NAME);
|
||||
}
|
||||
|
@ -705,4 +707,13 @@ public class PlayerManager extends MongoBase {
|
|||
this.proudInfo = proudInfo;
|
||||
updateString("proudInfo",proudInfo);
|
||||
}
|
||||
|
||||
public int getLuckWheelLimitTime() {
|
||||
return luckWheelLimitTime;
|
||||
}
|
||||
|
||||
public void setLuckWheelLimitTime(int luckWheelLimitTime) {
|
||||
updateString("luckWheelLimitTime",luckWheelLimitTime);
|
||||
this.luckWheelLimitTime = luckWheelLimitTime;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -286,11 +286,19 @@ public class FightDataUtil {
|
|||
// cd+=Integer.parseInt(args[0]);
|
||||
// }
|
||||
skill.rawset(1, LuaValue.valueOf(skillId));
|
||||
int skillDisplay =sSkillLogicVo.getSkillDisplay();
|
||||
SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay);
|
||||
int KeyFrame = sCombatControl.getKeyFrame();
|
||||
int SkillDuration = sCombatControl.getSkillDuration();
|
||||
int SkillNumber = sCombatControl.getSkillNumber();
|
||||
skill.rawset(2, LuaValue.valueOf(KeyFrame/1000f));
|
||||
skill.rawset(3, LuaValue.valueOf(SkillDuration/1000f));
|
||||
skill.rawset(4, LuaValue.valueOf(SkillNumber));
|
||||
List<LuaValue> effectList = getEffect(sSkillLogicVo);
|
||||
int size = effectList.size();
|
||||
if (size > 0) {
|
||||
for (int i = 0; i < size; i++) {
|
||||
skill.rawset(i + 2, effectList.get(i));
|
||||
skill.rawset(i + 5, effectList.get(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -301,20 +309,12 @@ public class FightDataUtil {
|
|||
List<LuaValue> effectList = new ArrayList<>();
|
||||
for (SkillTargetVo skillTargetVos : sSkillLogicVo.getSkillTargetVoList()) {
|
||||
LuaValue effect = new LuaTable();
|
||||
int skillDisplay =sSkillLogicVo.getSkillDisplay();
|
||||
SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay);
|
||||
int KeyFrame = sCombatControl.getKeyFrame();
|
||||
int SkillDuration = sCombatControl.getSkillDuration();
|
||||
int SkillNumber = sCombatControl.getSkillNumber();
|
||||
effect.rawset(1, LuaValue.valueOf(skillTargetVos.getTargetId()));
|
||||
effect.rawset(2, LuaValue.valueOf(KeyFrame/1000f));
|
||||
effect.rawset(3, LuaValue.valueOf(SkillDuration/1000f));
|
||||
effect.rawset(4, LuaValue.valueOf(SkillNumber));
|
||||
List<LuaValue> effectValueList = getEffectArgs(skillTargetVos.getEffectVale());
|
||||
int size = effectValueList.size();
|
||||
if (size > 0) {
|
||||
for (int i = 0; i < size; i++) {
|
||||
effect.rawset(i + 5, effectValueList.get(i));
|
||||
effect.rawset(i + 2, effectValueList.get(i));
|
||||
}
|
||||
}
|
||||
effectList.add(effect);
|
||||
|
|
Loading…
Reference in New Issue