Merge branch 'master_test_gn' into master_test_gn_zf
commit
327bbe281d
|
@ -16,6 +16,7 @@ import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.mission.GameEvent;
|
import com.ljsd.jieling.logic.mission.GameEvent;
|
||||||
import com.ljsd.jieling.logic.player.PlayerLogic;
|
import com.ljsd.jieling.logic.player.PlayerLogic;
|
||||||
import com.ljsd.jieling.logic.store.GiftGoodsType;
|
import com.ljsd.jieling.logic.store.GiftGoodsType;
|
||||||
|
import com.ljsd.jieling.logic.store.newRechargeInfo.bean.ReceiveWelfareBag;
|
||||||
import com.ljsd.jieling.network.session.ISession;
|
import com.ljsd.jieling.network.session.ISession;
|
||||||
import rpc.protocols.CommonProto;
|
import rpc.protocols.CommonProto;
|
||||||
import rpc.protocols.MessageTypeProto;
|
import rpc.protocols.MessageTypeProto;
|
||||||
|
@ -49,7 +50,7 @@ public class TreasureActivity extends AbstractActivity {
|
||||||
LOGGER.info("[青龙秘宝初始化] [重置秘宝解锁状态] [uid:{}]",user.getId());
|
LOGGER.info("[青龙秘宝初始化] [重置秘宝解锁状态] [uid:{}]",user.getId());
|
||||||
user.getPlayerInfoManager().setHadBuyTreasure(0);
|
user.getPlayerInfoManager().setHadBuyTreasure(0);
|
||||||
}
|
}
|
||||||
|
reSetGood(user);
|
||||||
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_MONTH_REFRESH, sGlobalActivity.getId());
|
user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_MONTH_REFRESH, sGlobalActivity.getId());
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_WEEK_REFRESH, sGlobalActivity.getId());
|
user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_WEEK_REFRESH, sGlobalActivity.getId());
|
||||||
|
@ -267,6 +268,15 @@ public class TreasureActivity extends AbstractActivity {
|
||||||
getAllTreasureRewards(user, user.getActivityManager().getActivityMissionMap().get(id), getDestState(user), itemAttrs);
|
getAllTreasureRewards(user, user.getActivityManager().getActivityMissionMap().get(id), getDestState(user), itemAttrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void reSetGood(User user){
|
||||||
|
ReceiveWelfareBag bagInfo = (ReceiveWelfareBag) user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(5001);
|
||||||
|
if (bagInfo == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
bagInfo.refresh();
|
||||||
|
LOGGER.info("================青龙秘宝刷新===============,uid:{},id:{}",user.getId(),id);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通知客户端每周补给特权变动
|
* 通知客户端每周补给特权变动
|
||||||
* @param sesson
|
* @param sesson
|
||||||
|
|
Loading…
Reference in New Issue