数据库对象初始化bug 点金刷新修改
parent
e931d53f5c
commit
c5edd276e4
|
@ -8,7 +8,7 @@
|
|||
</Jbean>
|
||||
|
||||
<Jbean name="ActivityMission">
|
||||
<Variable name="activityMissionMap" type="map" key="int" value="ActivityProgressInfo" />
|
||||
<Variable name="activityMissionMap" type="map" key="int" value="ActivityProgressInfo" />
|
||||
<Variable name="activityState" type="int"/>
|
||||
<Variable name="openType" type="int"/>
|
||||
<Variable name="v" type="int"/>
|
||||
|
@ -25,8 +25,8 @@
|
|||
</Jbean>
|
||||
|
||||
<Jbean name="ActivityManager">
|
||||
<Variable name="activityMissionMap" type="map" key="int" value="ActivityMission" />
|
||||
<Variable name="senvenTime" type="long"/> 七日狂欢结束时间
|
||||
<Variable name="activityMissionMap" type="map" key="int" value="ActivityMission" />
|
||||
<Variable name="senvenStartTime" type="long"/> 七日狂欢开始时间
|
||||
<Variable name="luckWheel" type="LuckWheelMission"/>幸运探宝奖池
|
||||
<Variable name="luckWheelAdvance" type="LuckWheelMission"/>高级幸运探宝奖池
|
||||
</Jbean>
|
||||
|
|
|
@ -25,6 +25,7 @@ public final class ActivityManager extends MongoBase {
|
|||
public ActivityManager(ActivityManager _o_ ) {
|
||||
this.activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission>();
|
||||
_o_.activityMissionMap.forEach((_k_, _v_) -> this.activityMissionMap.put(_k_, new ActivityMission(_v_)));
|
||||
this.senvenStartTime = _o_.senvenStartTime;
|
||||
this.luckWheel = new LuckWheelMission(_o_.luckWheel);
|
||||
this.luckWheelAdvance = new LuckWheelMission(_o_.luckWheelAdvance);
|
||||
}
|
||||
|
@ -35,6 +36,9 @@ public final class ActivityManager extends MongoBase {
|
|||
return this.activityMissionMapLog;
|
||||
}
|
||||
|
||||
public long getSenvenStartTime() { // 七日狂欢开始时间
|
||||
return this.senvenStartTime;
|
||||
}
|
||||
|
||||
public com.ljsd.jieling.jbean.LuckWheelMission getLuckWheel() { // 幸运探宝奖池
|
||||
return this.luckWheel;
|
||||
|
@ -44,17 +48,11 @@ public final class ActivityManager extends MongoBase {
|
|||
return this.luckWheelAdvance;
|
||||
}
|
||||
|
||||
|
||||
public void setSenvenStartTime(long senvenStartTime) {
|
||||
updateString("senvenStartTime",senvenStartTime);
|
||||
this.senvenStartTime = senvenStartTime;
|
||||
public void setSenvenStartTime(long senvenstarttime) { // 七日狂欢开始时间
|
||||
updateString("senvenStartTime",senvenstarttime);
|
||||
this.senvenStartTime = senvenstarttime;
|
||||
}
|
||||
|
||||
public long getSenvenStartTime() {
|
||||
return senvenStartTime;
|
||||
}
|
||||
|
||||
|
||||
public void setLuckWheel(LuckWheelMission luckwheel) { // 幸运探宝奖池
|
||||
updateString("luckWheel",luckwheel);
|
||||
luckwheel.init(getRootId(),getMongoKey()+ ".luckWheel");
|
||||
|
@ -73,6 +71,7 @@ public final class ActivityManager extends MongoBase {
|
|||
StringBuilder _sb_ = new StringBuilder(super.toString());
|
||||
_sb_.append("=(");
|
||||
_sb_.append(this.activityMissionMap).append(",");
|
||||
_sb_.append(this.senvenStartTime).append(",");
|
||||
_sb_.append(this.luckWheel).append(",");
|
||||
_sb_.append(this.luckWheelAdvance).append(",");
|
||||
_sb_.append(")");
|
||||
|
|
|
@ -215,12 +215,13 @@ public class ActivityLogic implements IEventHandler{
|
|||
if (map.containsKey(activityId)) {
|
||||
return false;
|
||||
}
|
||||
ActivityMission activityMission = new ActivityMission();
|
||||
|
||||
initMissionInfo(activityMission,activityId);
|
||||
// activityMission.init(getRootId(), getMongoKey() + ".activityMissionMap." + activityId);
|
||||
ActivityMission activityMission = new ActivityMission();
|
||||
//自动初始化
|
||||
map.put(activityId, activityMission);
|
||||
initMissionInfo(activityMission,activityId);
|
||||
// activityMission.init(getRootId(), getMongoKey() + ".activityMissionMap." + activityId);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -54,53 +54,53 @@ class BuyGoldActivity extends AbstractActivity {
|
|||
@Override
|
||||
public void onEvent(IEvent event) throws Exception {
|
||||
super.onEvent(event);
|
||||
|
||||
List<Integer> list = SSpecialConfig.getListValue(SSpecialConfig.Gold_touch_refresh);
|
||||
if (event instanceof HourTaskEvent) {
|
||||
if (list.contains(((HourTaskEvent) event).getHour())) {
|
||||
InnerMessageUtil.broadcastWithRandom(user -> {
|
||||
if (user == null) {
|
||||
return;
|
||||
}
|
||||
setUpTime(user);
|
||||
}, new ArrayList<>(OnlineUserManager.sessionMap.keySet()), 1);
|
||||
|
||||
}
|
||||
}
|
||||
if (event instanceof UserOnlineEvent) {
|
||||
User user = UserManager.getUser(((UserOnlineEvent) event).getUid());
|
||||
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id);
|
||||
if (null == activityMission) {
|
||||
return;
|
||||
}
|
||||
boolean needRefresh = false;
|
||||
for (Integer aList : list) {
|
||||
if (TimeUtils.isOverAppointRefreshTime(System.currentTimeMillis(), activityMission.getV() * 1000L, aList)) {
|
||||
needRefresh = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (needRefresh) {
|
||||
setUpTime(user);
|
||||
}
|
||||
}
|
||||
//点金刷新走商店
|
||||
// List<Integer> list = SSpecialConfig.getListValue(SSpecialConfig.Gold_touch_refresh);
|
||||
// if (event instanceof HourTaskEvent) {
|
||||
// if (list.contains(((HourTaskEvent) event).getHour())) {
|
||||
// InnerMessageUtil.broadcastWithRandom(user -> {
|
||||
// if (user == null) {
|
||||
// return;
|
||||
// }
|
||||
// setUpTime(user);
|
||||
// }, new ArrayList<>(OnlineUserManager.sessionMap.keySet()), 1);
|
||||
//
|
||||
// }
|
||||
// }
|
||||
// if (event instanceof UserOnlineEvent) {
|
||||
// User user = UserManager.getUser(((UserOnlineEvent) event).getUid());
|
||||
// ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id);
|
||||
// if (null == activityMission) {
|
||||
// return;
|
||||
// }
|
||||
// boolean needRefresh = false;
|
||||
// for (Integer aList : list) {
|
||||
// if (TimeUtils.isOverAppointRefreshTime(System.currentTimeMillis(), activityMission.getV() * 1000L, aList)) {
|
||||
// needRefresh = true;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// if (needRefresh) {
|
||||
// setUpTime(user);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
private void setUpTime(User user) {
|
||||
|
||||
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id);
|
||||
if (null == activityMission) {
|
||||
return;
|
||||
}
|
||||
//sendclient
|
||||
activityMission.setV((int) (System.currentTimeMillis()/1000));
|
||||
HashSet<Integer> ids = new HashSet<>();
|
||||
List<Integer> listValue = SSpecialConfig.getListValue(SSpecialConfig.Gold_touch);
|
||||
listValue.forEach(type -> SPrivilegeTypeConfig.privilegeByType.get(type).forEach(sPrivilegeTypeConfig -> {
|
||||
ids.add(sPrivilegeTypeConfig.getId());
|
||||
user.getPlayerInfoManager().refreshVipByType(type);
|
||||
}));
|
||||
notifyClient(user, ids);
|
||||
// ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id);
|
||||
// if (null == activityMission) {
|
||||
// return;
|
||||
// }
|
||||
// //sendclient
|
||||
// activityMission.setV((int) (System.currentTimeMillis()/1000));
|
||||
// HashSet<Integer> ids = new HashSet<>();
|
||||
// List<Integer> listValue = SSpecialConfig.getListValue(SSpecialConfig.Gold_touch);
|
||||
// listValue.forEach(type -> SPrivilegeTypeConfig.privilegeByType.get(type).forEach(sPrivilegeTypeConfig -> {
|
||||
// ids.add(sPrivilegeTypeConfig.getId());
|
||||
// user.getPlayerInfoManager().refreshVipByType(type);
|
||||
// }));
|
||||
// notifyClient(user, ids);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue