diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 9cb66a963..bf600b04f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -30,7 +30,7 @@ public enum ActivityTypeEnum { COPY_EXPERT(ActivityType.COPY_EXPERT, CopyExpectRankActivity::new), LEVEL_EXPERT(ActivityType.LEVEL_EXPERT, LevelExpectActivity::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), //SIGN_IN(ActivityType.SIGN_IN, SignInSumActivity::new),//因为签到没有走活动,所以SignInSunActivity类用作了累计签到奖励活动,此类暂时先不删 RECHARGE_NUM(ActivityType.RECHARGE_NUM, RechargeSumActivity::new), diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ThreeWorldRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ThreeWorldRankActivity.java index 99acd8e3e..2218c823f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ThreeWorldRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ThreeWorldRankActivity.java @@ -15,11 +15,13 @@ public class ThreeWorldRankActivity extends AbstractActivity { @Override public void onActivityEnd() throws Exception { + System.out.println("end"+id); super.onActivityEnd(); } @Override public void onActivityEndDealReward(User user) throws Exception { + System.out.println("endend"+id); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index 058434e91..6b4dd3e1f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -26,6 +26,7 @@ import com.ljsd.jieling.logic.activity.event.*; import com.ljsd.jieling.logic.dao.RechargeInfo; import com.ljsd.jieling.logic.dao.UserManager; 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.expedition.ExpeditionLogic; import com.ljsd.jieling.logic.fight.CombatLogic; @@ -855,7 +856,6 @@ public class BuyGoodsLogic { } } - if(SGlobalActivity.sRechargeId2ActivityId.containsKey(goodsId)){ Integer integer = SGlobalActivity.sRechargeId2ActivityId.get(goodsId); Set ids =getOpenActivity(user,6);