Merge branch 'master_prb_gn' into master_test_gn

# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java
back_recharge
yuanshuai 2021-11-25 16:59:54 +08:00
commit 31859110b4
1 changed files with 1 additions and 1 deletions

View File

@ -178,7 +178,7 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
//up miss
int[][] reward = sActivityRewardConfig.getReward();
CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, BIReason.TAKE_ACTIVITY_REWARD);
checkAndSetProgress(activityMission, activityProgressInfo, missionId);