back_recharge
zhangshanxue 2019-08-09 16:50:55 +08:00
parent b0e090433a
commit 00d007663e
3 changed files with 23 additions and 28 deletions

View File

@ -121,11 +121,9 @@ public class ActivityLogic {
ActivityManager activityManager = user.getActivityManager(); ActivityManager activityManager = user.getActivityManager();
Map<Integer, SGlobalActivity> sGlobalActivityMap = SGlobalActivity.getsGlobalActivityMap(); Map<Integer, SGlobalActivity> sGlobalActivityMap = SGlobalActivity.getsGlobalActivityMap();
for (Integer openActivityId : openActivityIds) { for (Integer openActivityId : openActivityIds) {
if (activityManager.initAllActivityMission(openActivityId)) { SGlobalActivity sGlobalActivity = sGlobalActivityMap.get(openActivityId);
continue; if(!initOtherActivity(user, sGlobalActivity)){
} activityManager.initAllActivityMission(openActivityId);
if(activityManager.getActivityMissionMap().containsKey(openActivityId)){
continue;
} }
AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(openActivityId); AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(openActivityId);
if (abstractActivity == null) { if (abstractActivity == null) {
@ -164,8 +162,9 @@ public class ActivityLogic {
if (activityMission != null) { if (activityMission != null) {
continue; continue;
} }
activityManager.initAllActivityMission(activityId); if(!initOtherActivity(user, sGlobalActivity)){
initOtherActivity(user, sGlobalActivity); activityManager.initAllActivityMission(activityId);
}
openNewActivityIds.add(activityId); openNewActivityIds.add(activityId);
} else { } else {
ActivityMission activityMission = activityMissionMap.get(activityId); ActivityMission activityMission = activityMissionMap.get(activityId);
@ -183,22 +182,24 @@ public class ActivityLogic {
} }
public void initOtherActivity(User user, SGlobalActivity sGlobalActivity) throws Exception { public boolean initOtherActivity(User user, SGlobalActivity sGlobalActivity) throws Exception {
int type = sGlobalActivity.getType(); int type = sGlobalActivity.getType();
switch (type) { switch (type) {
case ActivityType.BLESSACTIVITY: case ActivityType.BLESSACTIVITY:
blessInfoInit(user.getActivityManager(), sGlobalActivity.getId()); blessInfoInit(user.getActivityManager(), sGlobalActivity.getId());
break; return true;
case ActivityType.TREASURE: case ActivityType.TREASURE:
case ActivityType.LUCKYCAT: case ActivityType.LUCKYCAT:
case ActivityType.SERVERHAPPY: case ActivityType.SERVERHAPPY:
AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(sGlobalActivity.getId()); AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(sGlobalActivity.getId());
if (abstractActivity == null) { if (abstractActivity == null) {
break; return false;
} }
abstractActivity.initActivity(user); abstractActivity.initActivity(user);
return true;
default:
return false;
} }
} }

View File

@ -22,28 +22,22 @@ class HeroUpExpectRankActivity extends ExpectRankActivity {
@Override @Override
public void onEvent(IEvent event) throws Exception { public void onEvent(IEvent event) throws Exception {
if (!(event instanceof HeroUpExpectRankActivity)) if (!(event instanceof HeroUpStarEvent))
return; return;
User user = UserManager.getUser(((HeroUpStarEvent) event).getUid()); // User user = UserManager.getUser(((HeroUpStarEvent) event).getUid());
HeroManager heroManager = user.getHeroManager(); // HeroManager heroManager = user.getHeroManager();
SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id).get(0); SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id).get(0);
if(sActivityRewardConfig==null) if(sActivityRewardConfig==null)
return; return;
int count = 0; // int count = 0;
for (Hero targetHero:heroManager.getHeroMap().values()) { // for (Hero targetHero:heroManager.getHeroMap().values()) {
if(targetHero.getStar()>=sActivityRewardConfig.getValues()[0][0]){ // if(targetHero.getStar()>=sActivityRewardConfig.getValues()[0][0]){
count++; // count++;
} // }
} // }
update(UserManager.getUser(((HeroUpStarEvent) event).getUid()), count); update(UserManager.getUser(((HeroUpStarEvent) event).getUid()), 1);
} }
@Override
void updateProgress(User user, ActivityMission activityMission, int count) {
activityMission.setValue(count+activityMission.getValue());
String key = RedisKey.getKey(RedisKey.EXPERT_RANK, String.valueOf(id), false);
RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), count);
}
} }

View File

@ -282,7 +282,7 @@ public class StoreLogic {
if(SStoreTypeConfig.getsStoreTypeConfigMap().get(storeId).getStoreType() != StoreType.GIFT_STORE.getType()){ if(SStoreTypeConfig.getsStoreTypeConfigMap().get(storeId).getStoreType() != StoreType.GIFT_STORE.getType()){
user.getUserMissionManager().onGameEvent(user, GameEvent.BUY_MATERIAL,sStoreConfig.getGoods()[0][0],itemNum); user.getUserMissionManager().onGameEvent(user, GameEvent.BUY_MATERIAL,sStoreConfig.getGoods()[0][0],itemNum);
} }
if(itemId==10015){ if(itemId==10005){
Poster.getPoster().dispatchEvent(new GoldEvent(user.getId())); Poster.getPoster().dispatchEvent(new GoldEvent(user.getId()));
} }