解决挑战副本奖励问题

back_recharge
duhui 2022-12-02 11:07:15 +08:00
parent 7988bad68e
commit 4e6bc9f165
4 changed files with 15 additions and 22 deletions

View File

@ -81,7 +81,7 @@ public class ChallengeLogic {
// 加成百分比 // 加成百分比
for (int[] fix : stage.getPassReward()) { for (int[] fix : stage.getPassReward()) {
Integer num = comDropMap.getOrDefault(fix[0], 0); Integer num = comDropMap.getOrDefault(fix[0], 0);
num = num + (int)(fix[1] * (ratio+10000d)); num = num + (int)(fix[1] * (ratio/10000d+1d));
comDropMap.put(fix[0], num); comDropMap.put(fix[0], num);
} }
builder.setPercentReward(ratio); builder.setPercentReward(ratio);

View File

@ -270,12 +270,9 @@ public class BuyGoodsNewLogic {
if(info.getMaxSingleR() < price){ if(info.getMaxSingleR() < price){
info.setMaxSingleR(price); info.setMaxSingleR(price);
} }
info.addRmb(price);
info.setRechargeList(TimeUtils.now(),price);
//处理月卡 //处理月卡
activeMonthCard(user,config.getId()); activeMonthCard(user,config.getId());
//活动 //活动
user.getPlayerInfoManager().setRechargedaily(user.getPlayerInfoManager().getRechargedaily()+price);
changeActivity(user,price,info); changeActivity(user,price,info);
} }
if(!info.getIsFirst()){ if(!info.getIsFirst()){
@ -311,7 +308,7 @@ public class BuyGoodsNewLogic {
return resultRes; return resultRes;
} }
// 数数上报 // 数数上报
// private static void ReportUploadPayInfo(User user,String orderId,double price){ // private static void ReportUploadPayInfo(User user,String orderId,double price){
// Map<Integer, Integer> mapReward = ItemUtil.arrayToMap(dropByBag); // Map<Integer, Integer> mapReward = ItemUtil.arrayToMap(dropByBag);
// ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(), orderId, price, // ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(), orderId, price,
@ -423,16 +420,21 @@ public class BuyGoodsNewLogic {
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,(int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,(int)(price*1000));
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,(int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,(int)(price*1000));
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,(int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,(int)(price*1000));
webPayHandlerBuy(user,price);
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,(int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,(int)(price*1000));
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.JADE_DYNASTY_RECHARGE_SUM,(int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.JADE_DYNASTY_RECHARGE_SUM,(int)(price*1000));
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_SUM_DAY, (int)(user.getPlayerInfoManager().getRechargedaily()*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_SUM_DAY, (int)(user.getPlayerInfoManager().getRechargedaily()*1000));
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FIND_FAIRY_FESTIVAL, (int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FIND_FAIRY_FESTIVAL, (int)(price*1000));
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.NEW_WELFARE, (int)(info.getRr())); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.NEW_WELFARE, (int)(info.getRr()));
info.addRmb(price);
info.setRechargeList(TimeUtils.now(),price);
user.getPlayerInfoManager().setRechargedaily(user.getPlayerInfoManager().getRechargedaily()+price);
AyyncWorker ayyncWorker = new AyyncWorker(user, true, new AynMissionWorker(GameEvent.RECHARGE_TOTAL,(int)(price*1000))) ; AyyncWorker ayyncWorker = new AyyncWorker(user, true, new AynMissionWorker(GameEvent.RECHARGE_TOTAL,(int)(price*1000))) ;
ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker); ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker);
webPayHandlerBuy(user,price);
ISession session = OnlineUserManager.getSessionByUid(user.getId()); ISession session = OnlineUserManager.getSessionByUid(user.getId());
PlayerInfoProto.RefreshRechargeIndication.Builder builder = PlayerInfoProto.RefreshRechargeIndication.newBuilder(); PlayerInfoProto.RefreshRechargeIndication.Builder builder = PlayerInfoProto.RefreshRechargeIndication.newBuilder();
builder.setAmount(info.getRr()); builder.setAmount(info.getRr());
@ -1027,20 +1029,18 @@ public class BuyGoodsNewLogic {
public static void minuteCheckReharge() throws Exception { public static void minuteCheckReharge() throws Exception {
Map<Integer, ISession> sessionMap = OnlineUserManager.sessionMap; Map<Integer, ISession> sessionMap = OnlineUserManager.sessionMap;
Iterator<ISession> iterator = sessionMap.values().iterator(); for (ISession value : sessionMap.values()) {
while(iterator.hasNext()){ if (value.getFiveReady() == 1) {
ISession value = iterator.next();
if(value.getFiveReady() == 1){
User user = UserManager.getUser(value.getUid(), true); User user = UserManager.getUser(value.getUid(), true);
if(user == null){ if (user == null) {
continue; continue;
} }
AyyncWorker ayyncWorker = new AyyncWorker(user, false,new AyncWorkerRunnable(){ AyyncWorker ayyncWorker = new AyyncWorker(user, false, new AyncWorkerRunnable() {
@Override @Override
public void work(User user) throws Exception { public void work(User user) throws Exception {
sendGiftGooodsIndication(user.getId()); sendGiftGooodsIndication(user.getId());
} }
}) ; });
ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker); ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker);
} }
} }
@ -1061,12 +1061,7 @@ public class BuyGoodsNewLogic {
if(list == null){ if(list == null){
return; return;
} }
Collections.sort(list, new Comparator<SPackPushConfig>(){ list.sort(Comparator.comparingInt(SPackPushConfig::getPriority));
@Override
public int compare(SPackPushConfig o1, SPackPushConfig o2) {
return Integer.compare(o1.getPriority(), o2.getPriority());
}
});
int popup = 0; int popup = 0;
boolean push = false; boolean push = false;
for(SPackPushConfig con : list){ for(SPackPushConfig con : list){

View File

@ -108,8 +108,7 @@ public class NewRechargeInfo extends MongoBase {
} }
public void addRmb(double rmb) { public void addRmb(double rmb) {
double add = MathUtils.doubleAdd(rmb, rr); this.rr = MathUtils.doubleAdd(rmb, rr);
this.rr = add;
updateString("rr",rr); updateString("rr",rr);
} }

View File

@ -1505,7 +1505,6 @@ public class ItemUtil {
switch (sItem.getItemType()){ switch (sItem.getItemType()){
case GlobalItemType.RMB_CARD: case GlobalItemType.RMB_CARD:
case GlobalItemType.DAY_RMB_CARD: case GlobalItemType.DAY_RMB_CARD:
info.addRmb(num);
BuyGoodsNewLogic.changeActivity(user,num,info); BuyGoodsNewLogic.changeActivity(user,num,info);
break; break;
case GlobalItemType.XIAN_RECHARGE_CARD: case GlobalItemType.XIAN_RECHARGE_CARD: