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

三界活动 修改

back_recharge
lvxinran 2020-09-24 18:28:04 +08:00
parent 5ea0547673
commit b958742c74
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
View File

@ -30,7 +30,7 @@ public enum ActivityTypeEnum {
COPY_EXPERT(ActivityType.COPY_EXPERT, CopyExpectRankActivity::new), COPY_EXPERT(ActivityType.COPY_EXPERT, CopyExpectRankActivity::new),
LEVEL_EXPERT(ActivityType.LEVEL_EXPERT, LevelExpectActivity::new), LEVEL_EXPERT(ActivityType.LEVEL_EXPERT, LevelExpectActivity::new),
STAMINA_EXPERT(ActivityType.STAMINA_EXPERT, StaminaExpectRankActivity::new), STAMINA_EXPERT(ActivityType.STAMINA_EXPERT, StaminaExpectRankActivity::new),
THREE_WORLD_RANK(ActivityType.THREE_WORLD_RANK,DefaultEmptyActivity::new), THREE_WORLD_RANK(ActivityType.THREE_WORLD_RANK,ThreeWorldRankActivity::new),
EXPEDITION_EXPERT(ActivityType.EXPEDITION_EXPERT, ExpeditionExpert::new), EXPEDITION_EXPERT(ActivityType.EXPEDITION_EXPERT, ExpeditionExpert::new),
//SIGN_IN(ActivityType.SIGN_IN, SignInSumActivity::new),//因为签到没有走活动，所以SignInSunActivity类用作了累计签到奖励活动，此类暂时先不删 //SIGN_IN(ActivityType.SIGN_IN, SignInSumActivity::new),//因为签到没有走活动，所以SignInSunActivity类用作了累计签到奖励活动，此类暂时先不删
RECHARGE_NUM(ActivityType.RECHARGE_NUM, RechargeSumActivity::new), RECHARGE_NUM(ActivityType.RECHARGE_NUM, RechargeSumActivity::new),

2
serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ThreeWorldRankActivity.java
View File

@ -15,11 +15,13 @@ public class ThreeWorldRankActivity extends AbstractActivity {
@Override @Override
public void onActivityEnd() throws Exception { public void onActivityEnd() throws Exception {
System.out.println("end"+id);
super.onActivityEnd(); super.onActivityEnd();
} }
@Override @Override
public void onActivityEndDealReward(User user) throws Exception { public void onActivityEndDealReward(User user) throws Exception {
System.out.println("endend"+id);
} }
} }

2
serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
View File

@ -26,6 +26,7 @@ import com.ljsd.jieling.logic.activity.event.*;
import com.ljsd.jieling.logic.dao.RechargeInfo; import com.ljsd.jieling.logic.dao.RechargeInfo;
import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.VipInfo; import com.ljsd.jieling.logic.dao.VipInfo;
import com.ljsd.jieling.logic.dao.WorldTreasureReward;
import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.expedition.ExpeditionLogic; import com.ljsd.jieling.logic.expedition.ExpeditionLogic;
import com.ljsd.jieling.logic.fight.CombatLogic; import com.ljsd.jieling.logic.fight.CombatLogic;
@ -855,7 +856,6 @@ public class BuyGoodsLogic {
} }
} }
if(SGlobalActivity.sRechargeId2ActivityId.containsKey(goodsId)){ if(SGlobalActivity.sRechargeId2ActivityId.containsKey(goodsId)){
Integer integer = SGlobalActivity.sRechargeId2ActivityId.get(goodsId); Integer integer = SGlobalActivity.sRechargeId2ActivityId.get(goodsId);
Set<Integer> ids =getOpenActivity(user,6); Set<Integer> ids =getOpenActivity(user,6);