back_recharge
zhangshanxue 2019-08-09 10:21:15 +08:00
parent 8293f6228f
commit d325506268
7 changed files with 26 additions and 6 deletions

View File

@ -32,6 +32,9 @@ public class SGlobalActivity implements BaseConfig {
private String sesc;
private int isSaving;
@Override
public void init() throws Exception {
Map<Integer, SGlobalActivity> config = STableManager.getConfig(SGlobalActivity.class);
@ -104,4 +107,8 @@ public class SGlobalActivity implements BaseConfig {
}
public String getSesc() { return sesc; }
public int getIsSaving() {
return isSaving;
}
}

View File

@ -123,6 +123,11 @@ public class ActivityLogic {
Map<Integer, SGlobalActivity> sGlobalActivityMap = SGlobalActivity.getsGlobalActivityMap();
for (Integer openActivityId : openActivityIds) {
SGlobalActivity sGlobalActivity = sGlobalActivityMap.get(openActivityId);
ActivityMission activityMission = activityManager.getActivityMissionMap().get(openActivityId);
if (activityMission != null) {
continue;
}
if(!initOtherActivity(user, sGlobalActivity)){
activityManager.initAllActivityMission(openActivityId);
}
@ -231,7 +236,8 @@ public class ActivityLogic {
continue;
}
int activityStatus = activityMission.getActivityState();
if (SGlobalActivity.getsGlobalActivityMap().get(activityId).getType() != 7 && activityStatus != ActivityType.OPEN_STATE) {
if (SGlobalActivity.getsGlobalActivityMap().get(activityId).getIsSaving()==0 && activityStatus != ActivityType.OPEN_STATE) {
continue;
}
SGlobalActivity sGlobalActivity = sGlobalActivityMap.get(activityId);

View File

@ -11,7 +11,7 @@ class CopyExpectRankActivity extends ExpectRankActivity {
public CopyExpectRankActivity(int id) {
super(id);
//策划说 这个排行榜不开 以后可能会有
// Poster.getPoster().listenEvent(this, StoryEvent.class);
Poster.getPoster().listenEvent(this, StoryEvent.class);
}
@Override

View File

@ -17,6 +17,6 @@ class GoldExpectRankActivity extends ExpectRankActivity {
public void onEvent(IEvent event) throws Exception {
if (!(event instanceof GoldEvent))
return;
update(UserManager.getUser(((GoldEvent) event).getUid()), 1);
update(UserManager.getUser(((GoldEvent) event).getUid()), ((GoldEvent) event).getNum());
}
}

View File

@ -12,7 +12,7 @@ class StaminaExpectRankActivity extends ExpectRankActivity {
public StaminaExpectRankActivity(int id) {
super(id);
//策划说 这个排行榜不开 以后可能会有
//Poster.getPoster().listenEvent(this, UseItemEvent.class);
Poster.getPoster().listenEvent(this, UseItemEvent.class);
}
@Override

View File

@ -7,8 +7,15 @@ public class GoldEvent implements IEvent {
private int uid;
public GoldEvent(int uid) {
private int num;
public GoldEvent(int uid, int num) {
this.uid = uid;
this.num = num;
}
public int getNum() {
return num;
}
public int getUid() {

View File

@ -283,7 +283,7 @@ public class StoreLogic {
user.getUserMissionManager().onGameEvent(user, GameEvent.BUY_MATERIAL,sStoreConfig.getGoods()[0][0],itemNum);
}
if(itemId==10005){
Poster.getPoster().dispatchEvent(new GoldEvent(user.getId()));
Poster.getPoster().dispatchEvent(new GoldEvent(user.getId(),itemNum));
}
PlayerInfoProto.BuyStoreItemResponse builder = PlayerInfoProto.BuyStoreItemResponse.newBuilder().setDrop(drop).build();