首冲修改
parent
10924a13a6
commit
54a4a54996
|
|
@ -153,7 +153,7 @@ public class Cmd_changename extends GmRoleAbstract {
|
||||||
//充值金额
|
//充值金额
|
||||||
rechargeInfo.setSaveAmt(hotRechargeMoney+saveAmt);
|
rechargeInfo.setSaveAmt(hotRechargeMoney+saveAmt);
|
||||||
//累计充值
|
//累计充值
|
||||||
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt());
|
// ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt());
|
||||||
//限时累计充值
|
//限时累计充值
|
||||||
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,hotRechargeMoney);
|
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,hotRechargeMoney);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@ public interface ActivityType {
|
||||||
int OnlineReward = 1; //在线奖励
|
int OnlineReward = 1; //在线奖励
|
||||||
int SevenLogin = 2; //七日登陆
|
int SevenLogin = 2; //七日登陆
|
||||||
int ChapterReward = 3; //章节奖励
|
int ChapterReward = 3; //章节奖励
|
||||||
int FirstRecharge = 4; //首充
|
int FirstRecharge = 5; //首充
|
||||||
int RechargeTotal = 5; //累计充值
|
// int RechargeTotal = 5; //累计充值
|
||||||
int GrowthFund = 6; //成长基金
|
int GrowthFund = 6; //成长基金
|
||||||
int BLESSACTIVITY = 7;//云梦祈福
|
int BLESSACTIVITY = 7;//云梦祈福
|
||||||
int TREASURE = 8; //戒灵秘宝(孙龙的宝藏)
|
int TREASURE = 8; //戒灵秘宝(孙龙的宝藏)
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ public enum ActivityTypeEnum {
|
||||||
SEVENLOGIN(ActivityType.SevenLogin, SevenLoginActivity::new),
|
SEVENLOGIN(ActivityType.SevenLogin, SevenLoginActivity::new),
|
||||||
CHAPTERREWARD(ActivityType.ChapterReward, ChapterRewardActivity::new),
|
CHAPTERREWARD(ActivityType.ChapterReward, ChapterRewardActivity::new),
|
||||||
FIRSTRECHARGE(ActivityType.FirstRecharge, FirstRechargeActivity::new),
|
FIRSTRECHARGE(ActivityType.FirstRecharge, FirstRechargeActivity::new),
|
||||||
RECHARGETOTAL(ActivityType.RechargeTotal, RechargeTotalActivity::new),
|
// RECHARGETOTAL(ActivityType.RechargeTotal, RechargeTotalActivity::new),
|
||||||
GROWTHFUND(ActivityType.GrowthFund, GrowthFundActivity::new),
|
GROWTHFUND(ActivityType.GrowthFund, GrowthFundActivity::new),
|
||||||
BLESSACTIVITY(ActivityType.BLESSACTIVITY, BlessActivity::new),
|
BLESSACTIVITY(ActivityType.BLESSACTIVITY, BlessActivity::new),
|
||||||
TREASUREACTIVITY(ActivityType.TREASURE, TreasureActivity::new),
|
TREASUREACTIVITY(ActivityType.TREASURE, TreasureActivity::new),
|
||||||
|
|
|
||||||
|
|
@ -212,14 +212,14 @@ public class BuyGoodsLogic {
|
||||||
}
|
}
|
||||||
int firstInvest = sRechargeCommodityConfig.getFirstInvest();
|
int firstInvest = sRechargeCommodityConfig.getFirstInvest();
|
||||||
int[][] reward=null;
|
int[][] reward=null;
|
||||||
if(rechargeInfo.getIsFirst()==0 && firstInvest == 1){
|
// if(rechargeInfo.getIsFirst()==0 && firstInvest == 1){
|
||||||
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FirstRecharge,1);
|
// ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FirstRecharge,1);
|
||||||
SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByActivityId(4).get(0);
|
// SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByActivityId(4).get(0);
|
||||||
rechargeInfo.setFirst(1);
|
// rechargeInfo.setFirst(1);
|
||||||
String title = SErrorCodeEerverConfig.getI18NMessage("recharge_first_title");
|
// String title = SErrorCodeEerverConfig.getI18NMessage("recharge_first_title");
|
||||||
String content = SErrorCodeEerverConfig.getI18NMessage("recharge_first_txt");
|
// String content = SErrorCodeEerverConfig.getI18NMessage("recharge_first_txt");
|
||||||
MailLogic.getInstance().sendMail(user.getId(),title,content,ItemUtil.getMailReward(sActivityRewardConfig.getReward()),nowTime, Global.MAIL_EFFECTIVE_TIME);
|
// MailLogic.getInstance().sendMail(user.getId(),title,content,ItemUtil.getMailReward(sActivityRewardConfig.getReward()),nowTime, Global.MAIL_EFFECTIVE_TIME);
|
||||||
}
|
// }
|
||||||
|
|
||||||
if(length>baseReward.length){
|
if(length>baseReward.length){
|
||||||
int[][] result = new int[length][];
|
int[][] result = new int[length][];
|
||||||
|
|
@ -261,7 +261,7 @@ public class BuyGoodsLogic {
|
||||||
rechargeInfo.setSmonthSaveAmt(price+rechargeInfo.getSmonthSaveAmt());
|
rechargeInfo.setSmonthSaveAmt(price+rechargeInfo.getSmonthSaveAmt());
|
||||||
|
|
||||||
//TODO 用事件分发
|
//TODO 用事件分发
|
||||||
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,price);
|
// ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,price);
|
||||||
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,price);
|
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,price);
|
||||||
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,price);
|
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,price);
|
||||||
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,price);
|
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,price);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue