data
parent
62bb1ebb3c
commit
acdf29d390
|
|
@ -18,3 +18,30 @@ int int int int
|
|||
16 10 1 6
|
||||
17 20 5 6
|
||||
18 50 2 6
|
||||
19 10 1 7
|
||||
20 20 5 7
|
||||
21 50 3 7
|
||||
22 10 1 8
|
||||
23 20 5 8
|
||||
24 50 4 8
|
||||
25 10 1 9
|
||||
26 20 5 9
|
||||
27 50 2 9
|
||||
28 10 1 10
|
||||
29 20 5 10
|
||||
30 50 3 10
|
||||
31 10 1 11
|
||||
32 20 5 11
|
||||
33 50 4 11
|
||||
34 10 1 12
|
||||
35 20 5 12
|
||||
36 50 2 12
|
||||
37 10 1 13
|
||||
38 20 5 13
|
||||
39 50 3 13
|
||||
40 10 1 14
|
||||
41 20 5 14
|
||||
42 50 4 14
|
||||
43 10 1 15
|
||||
44 20 5 15
|
||||
45 50 2 15
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
id Event Groups isMustAppear
|
||||
int int mut,int#int,2 int
|
||||
1 102004 11#9|11#10|12#10|10#11 0
|
||||
2 102004 16#20|17#20|16#21|17#21 0
|
||||
3 102004 6#14|6#15|7#15|6#16 0
|
||||
4 102001 16#10 0
|
||||
5 102004 11#20|12#20|11#21|12#21 0
|
||||
6 102009 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|16#1|17#1|18#1|19#1|20#1|21#1|1#2|2#2|3#2|4#2|5#2|6#2|7#2|8#2|9#2|10#2|11#2|12#2|13#2|14#2|15#2|16#2|17#2|18#2|19#2|20#2|21#2|1#3|2#3|3#3|4#3|5#3|6#3|7#3|8#3|9#3|10#3|11#3|12#3|13#3|14#3|15#3|16#3|17#3|18#3|19#3|20#3|21#3|1#4|2#4|3#4|4#4|5#4|6#4|7#4|8#4|9#4|10#4|11#4|12#4|13#4|14#4|15#4|16#4|17#4|18#4|19#4|20#4|21#4|1#5|2#5|3#5|5#5|6#5|7#5|8#5|9#5|10#5|11#5|12#5|13#5|14#5|15#5|16#5|17#5|18#5|19#5|20#5|21#5|1#6|2#6|3#6|7#6|8#6|9#6|10#6|11#6|12#6|13#6|14#6|15#6|16#6|17#6|19#6|20#6|21#6|1#7|2#7|3#7|12#7|13#7|14#7|15#7|16#7|17#7|19#7|20#7|21#7|1#8|2#8|3#8|4#8|13#8|14#8|15#8|16#8|19#8|20#8|21#8|1#9|2#9|3#9|4#9|13#9|14#9|19#9|20#9|21#9|1#10|2#10|3#10|14#10|19#10|20#10|21#10|1#11|2#11|3#11|16#11|17#11|18#11|19#11|20#11|21#11|1#12|2#12|3#12|4#12|16#12|17#12|18#12|19#12|20#12|21#12|1#13|2#13|3#13|14#13|15#13|19#13|20#13|21#13|1#14|2#14|3#14|4#14|10#14|11#14|12#14|13#14|14#14|19#14|20#14|21#14|1#15|2#15|3#15|4#15|19#15|20#15|21#15|1#16|2#16|3#16|4#16|8#16|9#16|10#16|19#16|20#16|21#16|1#17|2#17|3#17|4#17|8#17|9#17|10#17|11#17|13#17|14#17|15#17|16#17|17#17|18#17|19#17|20#17|21#17|1#18|2#18|3#18|4#18|8#18|9#18|19#18|20#18|21#18|1#19|2#19|3#19|4#19|7#19|8#19|9#19|19#19|20#19|21#19|1#20|2#20|3#20|4#20|5#20|6#20|7#20|8#20|9#20|10#20|19#20|20#20|21#20|1#21|2#21|3#21|4#21|5#21|6#21|7#21|8#21|9#21|19#21|20#21|21#21|1#22|2#22|3#22|4#22|5#22|6#22|7#22|8#22|9#22|10#22|11#22|18#22|19#22|20#22|21#22|1#23|2#23|3#23|4#23|5#23|6#23|7#23|8#23|9#23|10#23|11#23|12#23|13#23|14#23|15#23|16#23|17#23|18#23|19#23|20#23|21#23|1#24|2#24|3#24|4#24|5#24|6#24|7#24|8#24|9#24|10#24|11#24|12#24|13#24|14#24|15#24|16#24|17#24|18#24|19#24|20#24|21#24|1#25|2#25|3#25|4#25|5#25|6#25|7#25|8#25|9#25|10#25|11#25|12#25|13#25|14#25|15#25|16#25|17#25|18#25|19#25|20#25|21#25|1#26|2#26|3#26|4#26|5#26|6#26|7#26|8#26|9#26|10#26|11#26|12#26|13#26|14#26|15#26|16#26|17#26|18#26|19#26|20#26|21#26 1
|
||||
7 102004 15#14|13#15|14#15|15#15 0
|
||||
1 102011 6#15 0
|
||||
2 102012 4#5 0
|
||||
3 102013 4#13 0
|
||||
4 102014 10#21 0
|
||||
5 102001 16#10 0
|
||||
6 102006 5#7|16#15 1
|
||||
7 102007 6#17 0
|
||||
8 102004 18#6|9#9|5#10|8#12|14#12|5#13|12#16|16#19|11#21|15#21 1
|
||||
9 102015 18#14 0
|
||||
10 102009 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|16#1|17#1|18#1|19#1|20#1|21#1|1#2|2#2|3#2|4#2|5#2|6#2|7#2|8#2|9#2|10#2|11#2|12#2|13#2|14#2|15#2|16#2|17#2|18#2|19#2|20#2|21#2|1#3|2#3|3#3|4#3|5#3|6#3|7#3|8#3|9#3|10#3|11#3|12#3|13#3|14#3|15#3|16#3|17#3|18#3|19#3|20#3|21#3|1#4|2#4|3#4|4#4|5#4|6#4|7#4|8#4|9#4|10#4|11#4|12#4|13#4|14#4|15#4|16#4|17#4|18#4|19#4|20#4|21#4|1#5|2#5|3#5|5#5|6#5|7#5|8#5|9#5|10#5|11#5|12#5|13#5|14#5|15#5|16#5|17#5|18#5|19#5|20#5|21#5|1#6|2#6|3#6|7#6|8#6|9#6|10#6|11#6|12#6|13#6|14#6|15#6|16#6|17#6|19#6|20#6|21#6|1#7|2#7|3#7|12#7|13#7|14#7|15#7|16#7|17#7|19#7|20#7|21#7|1#8|2#8|3#8|4#8|13#8|14#8|15#8|16#8|19#8|20#8|21#8|1#9|2#9|3#9|4#9|13#9|14#9|19#9|20#9|21#9|1#10|2#10|3#10|14#10|19#10|20#10|21#10|1#11|2#11|3#11|16#11|17#11|18#11|19#11|20#11|21#11|1#12|2#12|3#12|4#12|16#12|17#12|18#12|19#12|20#12|21#12|1#13|2#13|3#13|14#13|15#13|19#13|20#13|21#13|1#14|2#14|3#14|4#14|10#14|11#14|12#14|13#14|14#14|19#14|20#14|21#14|1#15|2#15|3#15|4#15|19#15|20#15|21#15|1#16|2#16|3#16|4#16|8#16|9#16|10#16|19#16|20#16|21#16|1#17|2#17|3#17|4#17|8#17|9#17|10#17|11#17|13#17|14#17|15#17|16#17|17#17|18#17|19#17|20#17|21#17|1#18|2#18|3#18|4#18|8#18|9#18|19#18|20#18|21#18|1#19|2#19|3#19|4#19|7#19|8#19|9#19|19#19|20#19|21#19|1#20|2#20|3#20|4#20|5#20|6#20|7#20|8#20|9#20|10#20|19#20|20#20|21#20|1#21|2#21|3#21|4#21|5#21|6#21|7#21|8#21|9#21|19#21|20#21|21#21|1#22|2#22|3#22|4#22|5#22|6#22|7#22|8#22|9#22|10#22|11#22|18#22|19#22|20#22|21#22|1#23|2#23|3#23|4#23|5#23|6#23|7#23|8#23|9#23|10#23|11#23|12#23|13#23|14#23|15#23|16#23|17#23|18#23|19#23|20#23|21#23|1#24|2#24|3#24|4#24|5#24|6#24|7#24|8#24|9#24|10#24|11#24|12#24|13#24|14#24|15#24|16#24|17#24|18#24|19#24|20#24|21#24|1#25|2#25|3#25|4#25|5#25|6#25|7#25|8#25|9#25|10#25|11#25|12#25|13#25|14#25|15#25|16#25|17#25|18#25|19#25|20#25|21#25|1#26|2#26|3#26|4#26|5#26|6#26|7#26|8#26|9#26|10#26|11#26|12#26|13#26|14#26|15#26|16#26|17#26|18#26|19#26|20#26|21#26 1
|
||||
11 102016 5#19 0
|
||||
12 102017 6#19 0
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
|||
//商店刷新次数重置
|
||||
StoreLogic.resetStoreRefreshNum(userId);
|
||||
PlayerLogic.getInstance().vipflushEveryDay(user);
|
||||
ArenaLogic.getInstance().flushFreeUseTimes(user);
|
||||
user.getUserMissionManager().onGameEvent(user, GameEvent.DAILY_REFRESH,0);
|
||||
}
|
||||
playerInfoManager.setLoginTime(TimeUtils.now());
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ public class ActivityLogic {
|
|||
int activityId = sActivityRewardConfig.getActivityId();
|
||||
ActivityManager activityManager = user.getActivityManager();
|
||||
ActivityMission activityMission = activityManager.getActivityMissionMap().get(activityId);
|
||||
if(activityMission == null || activityMission.getActivityState()!=ActivityType.OPEN_STATE){
|
||||
if(activityMission == null || activityMission.getActivityState()!=ActivityType.OPEN_STATE || activityMission.getOpenType() == 0){
|
||||
MessageUtil.sendErrorResponse(session,0,rewardResponseValue,"activity_close");
|
||||
return;
|
||||
}
|
||||
|
|
@ -169,6 +169,25 @@ public class ActivityLogic {
|
|||
}
|
||||
}
|
||||
break;
|
||||
case ActivityType.GrowthFund:{
|
||||
int type = values[0][0];
|
||||
int value = values[0][1];
|
||||
if(type == 9){
|
||||
int level = user.getPlayerInfoManager().getLevel();
|
||||
if(level<value){
|
||||
MessageUtil.sendErrorResponse(session,0,rewardResponseValue,"not finish");
|
||||
return;
|
||||
}
|
||||
}else if(type == 15){
|
||||
LevelDifficulty levelDifficulty = user.getLevelDifficultyManager().getLevelDifficultyInfosMap().get(value);
|
||||
if(levelDifficulty == null || levelDifficulty.getState()!= Global.FIGHT_CLEARANCE){
|
||||
MessageUtil.sendErrorResponse(session,0,rewardResponseValue,"not finish");
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if(missionProgress<values[0][0]){
|
||||
LOGGER.error("the uid={} the misionId={},the missionProgress={},the require is={} ",uid,missionId,missionProgress,values[0][0]);
|
||||
|
|
@ -212,13 +231,28 @@ public class ActivityLogic {
|
|||
ActivityProgressInfo activityProgressInfo = missionProgress.getValue();
|
||||
missionInfos.add(CommonProto.ActivityInfo.MissionInfo.newBuilder().setMissionId(missionId).setProgress(activityProgressInfo.getProgrss()).setState(activityProgressInfo.getState()).build());
|
||||
}
|
||||
activityInfoList.add(CommonProto.ActivityInfo.newBuilder().setActivityId(activityId).addAllMission(missionInfos).setStartTime(startTime).setEndTime(endTime).build());
|
||||
activityInfoList.add(CommonProto.ActivityInfo.newBuilder().setActivityId(activityId).addAllMission(missionInfos).setStartTime(startTime).setEndTime(endTime).setReallyOpen(activityMission.getOpenType()).build());
|
||||
}
|
||||
PlayerInfoProto.GetAllActivityResponse build = PlayerInfoProto.GetAllActivityResponse.newBuilder().addAllActivityInfo(activityInfoList).build();
|
||||
MessageUtil.sendMessage(session,1,rewardResponseValue,build,true);
|
||||
|
||||
}
|
||||
|
||||
public void openActivityReallyOpen(User user,int activityType){
|
||||
ActivityManager activityManager = user.getActivityManager();
|
||||
Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap();
|
||||
for(Map.Entry<Integer,ActivityMission> item : activityMissionMap.entrySet()){
|
||||
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(item.getKey());
|
||||
int targetActivityType = sGlobalActivity.getType();
|
||||
if(targetActivityType == activityType ){
|
||||
ActivityMission value = item.getValue();
|
||||
if(value.getOpenType()==0){
|
||||
value.setOpenType(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void updateActivityMissionProgress(User user,int activityType,int count){
|
||||
ActivityManager activityManager = user.getActivityManager();
|
||||
Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap();
|
||||
|
|
|
|||
|
|
@ -20,5 +20,5 @@ public interface ActivityType {
|
|||
int ChapterReward = 3; //章节奖励
|
||||
int FirstRecharge =4; //首充
|
||||
int RechargeTotal =5; //累计充值
|
||||
int GrowthFund =5; //成长基金
|
||||
int GrowthFund =6; //成长基金
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import com.ljsd.jieling.util.*;
|
|||
import org.luaj.vm2.LuaValue;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.boot.autoconfigure.session.SessionProperties;
|
||||
import org.springframework.data.redis.core.ZSetOperations;
|
||||
|
||||
import java.util.*;
|
||||
|
|
@ -582,11 +583,12 @@ public class ArenaLogic {
|
|||
int uid = Integer.parseInt(value);
|
||||
User user = UserManager.getUser(uid);
|
||||
String rewardByRank = getRewardByRank(rank++, type);
|
||||
if("".equals(rewardByRank)){
|
||||
break;
|
||||
if(!"".equals(rewardByRank)){
|
||||
MailLogic.getInstance().sendMail(Integer.parseInt(user.getId()),title,content,rewardByRank,nowTime, Global.MAIL_EFFECTIVE_TIME);
|
||||
MongoUtil.getInstence().lastUpdate();
|
||||
}
|
||||
MailLogic.getInstance().sendMail(Integer.parseInt(user.getId()),title,content,rewardByRank,nowTime, Global.MAIL_EFFECTIVE_TIME);
|
||||
MongoUtil.getInstence().lastUpdate();
|
||||
String key = RedisUtil.getInstence().getKey(RedisKey.ARENA_RRECORD, Integer.toString(uid));
|
||||
RedisUtil.getInstence().del(key);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import java.util.concurrent.ConcurrentHashMap;
|
|||
public class ActivityMission extends MongoBase {
|
||||
|
||||
private int activityState;
|
||||
private int openType;
|
||||
private Map<Integer,ActivityProgressInfo> activityProgressInfoMap;
|
||||
|
||||
public ActivityMission(){}
|
||||
|
|
@ -23,6 +24,10 @@ public class ActivityMission extends MongoBase {
|
|||
for(SActivityRewardConfig sActivityRewardConfig : sActivityRewardConfigs){
|
||||
activityProgressInfoMap.put(sActivityRewardConfig.getId(), new ActivityProgressInfo(ActivityLogic.getInstance().getInitActivityMissionProgress(activityId),0));
|
||||
}
|
||||
openType=1;
|
||||
if(activityId == 6){
|
||||
openType=0;
|
||||
}
|
||||
activityState = ActivityType.OPEN_STATE;
|
||||
}
|
||||
|
||||
|
|
@ -48,4 +53,13 @@ public class ActivityMission extends MongoBase {
|
|||
activityProgressInfoMap.put(missionId,activityProgressInfo);
|
||||
updateString("activityProgressInfoMap." + missionId,activityProgressInfo);
|
||||
}
|
||||
|
||||
public void setOpenType(int openType) {
|
||||
updateString("openType." ,openType);
|
||||
this.openType = openType;
|
||||
}
|
||||
|
||||
public int getOpenType() {
|
||||
return openType;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ public class RechargeInfo extends MongoBase{
|
|||
private int saveAmt;//累计充值
|
||||
private int isFirst;
|
||||
private long createTime;
|
||||
private int hadBuyFound;
|
||||
|
||||
private Map<Integer,Long> levelBagMap = new HashMap<>();
|
||||
|
||||
|
|
@ -69,4 +70,11 @@ public class RechargeInfo extends MongoBase{
|
|||
return isFirst;
|
||||
}
|
||||
|
||||
public int getHadBuyFound() {
|
||||
return hadBuyFound;
|
||||
}
|
||||
|
||||
public void setHadBuyFound(int hadBuyFound) {
|
||||
this.hadBuyFound = hadBuyFound;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ public class BuyGoodsLogic {
|
|||
if(buyCount == 1){
|
||||
int type = sRechargeCommodityConfig.getType();
|
||||
if(type == 4){
|
||||
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.GrowthFund,1);
|
||||
ActivityLogic.getInstance().openActivityReallyOpen(user, ActivityType.GrowthFund);
|
||||
}
|
||||
int[][] firstMultiple = sRechargeCommodityConfig.getFirstMultiple();
|
||||
if(firstMultiple!=null){
|
||||
|
|
|
|||
Loading…
Reference in New Issue