root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
jiahuiwen 2021-12-20 11:12:59 +08:00
parent 58311e37df 9d7058bec8
commit 7ea5e79269
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java
View File

@ -76,13 +76,11 @@ public class NewWelfareActivity extends AbstractActivity {
} else {
super.takeReward(session,missionId);
}
return true;
}
@Override
public void getAllMissRewards(User user, ISession session, List<int[][]> itemAttrs) {
public void getAllMissRewards(User user, ISession session, List<int[][]> itemAttrs) throws Exception {
if (this.id == 42) {
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
if (sGlobalActivity == null || !user.getActivityManager().getActivityMissionMap().containsKey(id)) {
@ -107,7 +105,7 @@ public class NewWelfareActivity extends AbstractActivity {
List<SActivityRewardConfig> sActivityRewardConfigs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id);
itemAttrs.add(sActivityRewardConfigs.get(0).getReward());
}else{
// super.getAllMissRewards(user,session,itemAttrs);
super.getAllMissRewards(user,session,itemAttrs);
}
}

4
serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumDayActivity.java
View File

@ -28,6 +28,10 @@ class RechargeSumDayActivity extends AbstractActivity {
} catch (Exception e) {
e.printStackTrace();
}
// 该活动已被替换，未参与的玩家不再累计
if (activityMission.getV() <= 0 || activityMission.getV() >= 15) {
return;
}
if (user.getPlayerInfoManager().getRechargedaily() > 0 ) {//充值0.99不触发修改
// SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId).getValues()[0][0]
activityMission.setV(activityMission.getV() + 1);