Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts: # conf/server/OptionConfig.txt # conf/server/RewardGroup.txtback_recharge
commit
aa89c05d4f
|
@ -1,11 +1,13 @@
|
|||
Id OpenRule MapTime ReviveTime
|
||||
int mut,int#int,2 int mut,int#int,1
|
||||
100 0#0 2147483647 0#0#0#10
|
||||
101 0#0 600 0#0#0#10
|
||||
102 0#0 600 0#0#0#10
|
||||
103 0#0 600 0#0#0#10
|
||||
104 0#0 600 0#0#0#10
|
||||
105 0#0 900 0#0#0#10
|
||||
106 0#0 900 0#0#0#10
|
||||
107 0#0 900 0#0#0#10
|
||||
108 0#0 900 0#0#0#10
|
||||
Id OpenRule Time MapTime ReviveTime
|
||||
int mut,int#int,2 int int mut,int#int,1
|
||||
100 0#0 120 2147483647 0#0#0#10
|
||||
101 0#0 120 600 0#0#0#10
|
||||
102 0#0 180 600 0#0#0#10
|
||||
103 0#0 180 600 0#0#0#10
|
||||
104 0#0 240 600 0#0#0#10
|
||||
105 0#0 240 900 0#0#0#10
|
||||
106 0#0 240 900 0#0#0#10
|
||||
107 0#0 240 900 0#0#0#10
|
||||
108 0#0 240 1200 0#0#0#10
|
||||
109 0#0 240 1200 0#0#0#10
|
||||
110 0#0 240 1200 0#0#0#10
|
||||
|
|
|
@ -22,7 +22,7 @@ int int mut,int#int,2 int
|
|||
20 108008 7#9 0
|
||||
21 108009 12#12 0
|
||||
22 108021 11#2 0
|
||||
23 108020 9#4 0
|
||||
23 108020 9#4 1
|
||||
24 108023 1#6 0
|
||||
25 108001 17#4|18#4|16#5|17#5 0
|
||||
26 108022 13#13 0
|
||||
|
|
|
@ -1,82 +1,16 @@
|
|||
id Event Groups isMustAppear
|
||||
int int mut,int#int,2 int
|
||||
1 109027 19#10|19#11|20#12 0
|
||||
2 109029 11#1|12#1|13#1 0
|
||||
3 109031 24#11|25#11|24#12|24#13 0
|
||||
4 109002 27#3|28#4|27#5|28#5|28#6 0
|
||||
5 109007 2#3 0
|
||||
6 109030 11#38|12#38|11#39 0
|
||||
7 109028 30#27|30#28|30#29 0
|
||||
8 109009 30#20 0
|
||||
9 109028 26#38|26#39|26#40 0
|
||||
10 109028 11#22|10#23|11#23|11#24 0
|
||||
11 109003 26#35|26#36|27#36|26#37|27#38 0
|
||||
12 109001 3#21|3#22|4#22|3#23 0
|
||||
13 109005 24#15|24#16 0
|
||||
14 109026 29#20 0
|
||||
15 109001 8#32|7#33|8#33|9#33|7#34 0
|
||||
16 109024 3#37 0
|
||||
17 109022 17#7 0
|
||||
18 109001 9#16|8#17|9#17|10#17|9#18 0
|
||||
19 109020 23#38 0
|
||||
20 109003 3#32|2#33|3#33|4#33|3#34 0
|
||||
21 109002 2#7|3#7|2#8|3#8 0
|
||||
22 109003 8#20|8#21|8#22|8#23 0
|
||||
23 109001 15#38|16#39|16#40|17#40 0
|
||||
24 109028 6#23|7#23|6#24 0
|
||||
25 109001 13#26|12#27|13#27|14#27|14#28 0
|
||||
26 109027 20#32|21#32|22#32 0
|
||||
27 109004 14#1|14#2|14#3|15#3 0
|
||||
28 109030 4#3|5#3|4#4 0
|
||||
29 109029 17#22|18#22|19#22|17#23 0
|
||||
30 109007 8#30 0
|
||||
31 109005 13#35|13#36 0
|
||||
32 109019 8#8 0
|
||||
33 109030 28#8|28#9|28#10 0
|
||||
34 109001 16#30|15#31|15#32|16#32 0
|
||||
35 109017 22#7 0
|
||||
36 109003 17#24|18#25|19#25|18#26 0
|
||||
37 109015 14#31 0
|
||||
38 109028 4#34|5#34|4#35 0
|
||||
39 109013 23#19 0
|
||||
40 109011 27#28 0
|
||||
41 109030 5#7|6#7|6#8 0
|
||||
42 109030 2#9|3#9|4#10 0
|
||||
43 109028 13#6|12#7|13#7 0
|
||||
44 109001 1#13|1#14|2#14|3#14|1#15 0
|
||||
45 109008 5#16 0
|
||||
46 109029 15#33|16#33|15#34 0
|
||||
47 109029 1#20|2#20|1#21 0
|
||||
48 109029 28#27|28#28|28#29 0
|
||||
49 109027 29#2|30#2|30#3 0
|
||||
50 109027 10#10|11#10|11#11 0
|
||||
51 109004 24#29|23#30|24#30|25#30|24#31 0
|
||||
52 109006 22#3|23#3 0
|
||||
53 109025 22#30 0
|
||||
54 109002 27#15|27#16|28#16|27#17|27#18 0
|
||||
55 109023 29#3 0
|
||||
56 109002 6#10|5#11|6#11|7#11|6#12 0
|
||||
57 109030 22#25|23#25|24#25 0
|
||||
58 109021 6#31 0
|
||||
59 109004 18#6|19#6|20#6|20#7|20#8 0
|
||||
60 109027 17#38|18#38|17#39 0
|
||||
61 109002 6#38|7#38|7#39|8#39 0
|
||||
62 109027 15#17|13#18|14#18|15#19 0
|
||||
63 109002 19#20|18#21|19#21|20#22 0
|
||||
64 109001 26#20|26#21|27#21|26#22|26#23 0
|
||||
65 109029 6#14|7#14|7#15 0
|
||||
66 109028 11#28|13#28|12#29 0
|
||||
67 109030 24#17|24#18|25#18 0
|
||||
68 109003 27#10|26#11|27#11|28#12 0
|
||||
69 109004 12#15|13#15|13#16|13#17 0
|
||||
70 109018 10#20 0
|
||||
71 109016 28#39 0
|
||||
72 109002 21#33|21#34|22#34|21#35 0
|
||||
73 109014 10#7 0
|
||||
74 109004 6#3|7#3|6#4|6#5 0
|
||||
75 109012 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|1#2|2#2|3#2|5#2|7#2|9#2|10#2|11#2|12#2|13#2|15#2|16#2|17#2|18#2|19#2|20#2|21#2|22#2|23#2|24#2|25#2|26#2|27#2|28#2|1#3|1#4|2#4|3#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|25#4|26#4|27#4|29#4|1#5|2#5|3#5|4#5|5#5|7#5|19#5|20#5|21#5|22#5|23#5|24#5|25#5|26#5|29#5|1#6|2#6|4#6|7#6|10#6|11#6|12#6|14#6|16#6|17#6|22#6|23#6|24#6|29#6|1#7|9#7|14#7|16#7|18#7|21#7|23#7|24#7|27#7|29#7|4#8|5#8|9#8|10#8|11#8|12#8|14#8|16#8|18#8|19#8|21#8|23#8|24#8|25#8|27#8|29#8|5#9|7#9|8#9|9#9|12#9|14#9|16#9|18#9|21#9|23#9|24#9|25#9|29#9|1#10|2#10|7#10|8#10|12#10|14#10|16#10|18#10|20#10|21#10|23#10|24#10|25#10|26#10|29#10|2#11|3#11|10#11|12#11|14#11|16#11|18#11|21#11|23#11|29#11|3#12|4#12|5#12|9#12|10#12|12#12|16#12|18#12|19#12|21#12|23#12|26#12|29#12|3#13|4#13|5#13|6#13|7#13|10#13|12#13|13#13|14#13|16#13|18#13|21#13|23#13|25#13|26#13|27#13|29#13|8#14|10#14|14#14|15#14|16#14|18#14|20#14|21#14|23#14|29#14|2#15|5#15|6#15|8#15|10#15|11#15|14#15|15#15|16#15|18#15|21#15|25#15|28#15|2#16|4#16|6#16|8#16|11#16|12#16|16#16|18#16|19#16|21#16|25#16|26#16|30#16|2#17|3#17|4#17|6#17|12#17|16#17|18#17|21#17|22#17|23#17|28#17|29#17|30#17|2#18|3#18|4#18|6#18|7#18|8#18|10#18|12#18|15#18|16#18|20#18|21#18|22#18|30#18|2#19|3#19|4#19|6#19|7#19|10#19|12#19|16#19|17#19|18#19|20#19|21#19|22#19|25#19|26#19|27#19|28#19|29#19|30#19|6#20|7#20|9#20|12#20|17#20|18#20|20#20|21#20|22#20|23#20|24#20|25#20|5#21|6#21|7#21|9#21|10#21|12#21|14#21|15#21|16#21|17#21|21#21|22#21|23#21|24#21|28#21|29#21|30#21|2#22|5#22|10#22|12#22|14#22|15#22|16#22|23#22|24#22|25#22|27#22|28#22|2#23|4#23|5#23|12#23|14#23|16#23|18#23|19#23|22#23|23#23|25#23|27#23|2#24|7#24|8#24|9#24|10#24|12#24|14#24|19#24|22#24|23#24|25#24|27#24|29#24|2#25|8#25|9#25|10#25|12#25|14#25|25#25|27#25|29#25|2#26|3#26|4#26|5#26|12#26|17#26|20#26|21#26|22#26|23#26|25#26|27#26|29#26|3#27|4#27|5#27|6#27|7#27|8#27|9#27|10#27|11#27|15#27|16#27|17#27|21#27|22#27|23#27|24#27|25#27|27#27|29#27|20#28|21#28|22#28|23#28|25#28|29#28|1#29|3#29|4#29|5#29|6#29|7#29|8#29|9#29|10#29|11#29|14#29|15#29|16#29|17#29|18#29|19#29|20#29|21#29|23#29|25#29|26#29|27#29|29#29|1#30|2#30|10#30|11#30|14#30|27#30|29#30|1#31|2#31|4#31|5#31|7#31|10#31|16#31|17#31|18#31|19#31|20#31|21#31|23#31|25#31|27#31|29#31|1#32|2#32|7#32|10#32|11#32|12#32|13#32|14#32|23#32|25#32|27#32|29#32|5#33|6#33|11#33|12#33|13#33|14#33|17#33|18#33|19#33|20#33|22#33|23#33|24#33|25#33|27#33|29#33|8#34|9#34|14#34|17#34|18#34|19#34|24#34|25#34|27#34|29#34|3#35|9#35|10#35|11#35|16#35|17#35|18#35|19#35|20#35|23#35|24#35|25#35|27#35|3#36|4#36|5#36|6#36|9#36|10#36|11#36|12#36|24#36|25#36|28#36|29#36|2#37|4#37|6#37|7#37|8#37|9#37|10#37|14#37|15#37|16#37|17#37|18#37|19#37|20#37|21#37|22#37|23#37|24#37|29#37|2#38|9#38|10#38|24#38|25#38|29#38|5#39|6#39|9#39|10#39|12#39|13#39|14#39|15#39|18#39|19#39|20#39|21#39|22#39|23#39|24#39|25#39|4#40|5#40|12#40|13#40|14#40|15#40|28#40|29#40 1
|
||||
76 109027 9#30|8#31|9#31 0
|
||||
77 109010 4#21 0
|
||||
78 109029 2#39|3#39|3#40 0
|
||||
79 109031 1#35|1#36|2#36|1#37 0
|
||||
80 109002 30#34|29#35|30#35|30#36 0
|
||||
1 109008 6#5 0
|
||||
2 109007 8#8 0
|
||||
3 109009 3#12 0
|
||||
4 109004 6#14|7#14|7#15 0
|
||||
5 109003 5#7|4#8|5#8 0
|
||||
6 109006 9#6|10#6|10#7 0
|
||||
7 109014 1#20 0
|
||||
8 109005 1#7|1#8|1#9 0
|
||||
9 109011 1#1|2#1|3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|1#2|2#2|3#2|4#2|5#2|6#2|7#2|8#2|9#2|10#2|2#3|3#3|4#3|5#3|6#3|7#3|8#3|9#3|2#4|3#4|4#4|5#4|6#4|7#4|8#4|4#5|5#5|7#5|8#5|9#5|2#6|2#7|3#7|4#7|6#7|7#7|8#7|9#7|6#8|9#8|2#9|4#9|6#9|8#9|9#9|4#10|6#10|8#10|2#11|3#11|6#11|8#11|10#11|2#12|5#12|8#12|2#13|4#13|5#13|2#14|5#14|8#14|9#14|6#15|8#15|9#15|2#16|3#16|4#16|6#16|8#16|2#17|4#17|6#17|8#17|10#17|2#18|4#18|6#18|8#18|6#19|8#19|9#19|2#20|6#20 1
|
||||
10 109012 1#3 0
|
||||
11 109013 10#3 0
|
||||
12 109010 3#17 0
|
||||
13 109002 7#19|7#20|8#20 0
|
||||
14 109001 1#16|1#17|1#18 0
|
||||
|
|
|
@ -1,20 +1,14 @@
|
|||
id Event Groups isMustAppear
|
||||
int int mut,int#int,2 int
|
||||
1 102006 1#6|2#6|1#7 0
|
||||
2 102002 7#5|6#6|7#6|7#7 0
|
||||
3 102008 8#1|10#1|9#2|8#3 0
|
||||
4 102027 7#9|6#10|7#10|8#10|7#11 0
|
||||
5 102001 1#11|1#12|2#12|1#13 0
|
||||
6 102007 11#12|12#13|11#14|12#14 0
|
||||
7 110011 8#15 0
|
||||
8 102027 9#3|9#4|9#5 0
|
||||
9 102002 13#9|13#10|13#11|14#11 0
|
||||
10 102007 3#13|3#14|3#15|4#15 0
|
||||
11 102001 4#6|3#7|4#7|3#8 0
|
||||
12 102006 4#8|6#8|5#9|5#10 0
|
||||
13 110013 5#1|2#2|3#2|5#2|7#2|8#2|11#2|2#3|3#3|5#3|10#3|11#3|12#3|14#3|15#3|5#4|6#4|7#4|8#4|12#4|2#5|3#5|4#5|8#5|10#5|12#5|14#5|8#6|10#6|12#6|14#6|5#7|6#7|8#7|12#7|14#7|2#8|8#8|12#8|2#9|4#9|8#9|9#9|10#9|11#9|12#9|14#9|15#9|2#10|4#10|12#10|2#11|4#11|6#11|8#11|9#11|10#11|12#11|4#12|6#12|14#12|15#12|2#13|4#13|6#13|8#13|9#13|10#13|11#13|13#13|14#13|15#13|2#14|4#14|6#14|10#14|2#15|6#15|7#15|12#15|14#15 1
|
||||
14 102005 10#7|11#7|10#8|11#8 0
|
||||
15 102004 1#3|1#4|2#4 0
|
||||
16 102027 13#1|12#2|13#2|14#2|13#3 0
|
||||
17 102009 3#1|4#1|4#2 0
|
||||
18 102008 13#4|14#4|13#5|13#6 0
|
||||
1 110009 1#20 0
|
||||
2 110020 13#2 0
|
||||
3 110001 2#17|3#17|2#18|3#18 0
|
||||
4 110002 12#4|13#4|12#5|13#5 0
|
||||
5 110003 10#12|11#12|10#13|11#13 0
|
||||
6 110014 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|1#2|2#2|3#2|4#2|6#2|8#2|10#2|12#2|14#2|1#3|2#3|10#3|1#4|6#4|7#4|9#4|10#4|1#5|2#5|3#5|4#5|5#5|6#5|1#6|1#7|2#7|3#7|1#8|5#8|6#8|8#8|1#9|2#9|3#9|4#9|5#9|8#9|9#9|10#9|12#9|1#10|5#10|12#10|13#10|14#10|14#11|15#11|5#12|6#12|6#13|6#14|7#14|7#15|8#15|8#17|9#17|10#17|11#17|11#18|12#18|12#19|13#19 1
|
||||
7 110004 4#6|5#6|4#7|5#7 0
|
||||
8 110005 2#10|1#11|2#11|2#12 0
|
||||
9 110016 8#10 0
|
||||
10 110006 6#18|7#18|6#19|7#19 0
|
||||
11 110018 2#8 0
|
||||
12 110019 7#2 0
|
||||
|
|
|
@ -25,6 +25,7 @@ public class SChallengeConfig implements BaseConfig {
|
|||
|
||||
private int[] reviveTime;
|
||||
|
||||
private int time;
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
|
@ -45,4 +46,8 @@ public class SChallengeConfig implements BaseConfig {
|
|||
public int[] getReviveTime() {
|
||||
return reviveTime;
|
||||
}
|
||||
|
||||
public int getTime() {
|
||||
return time;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -193,6 +193,7 @@ public class MapLogic {
|
|||
MapInfoProto.HeroInfo heroInfo = MapInfoProto.HeroInfo.newBuilder()
|
||||
.setHeroId(teamPosHeroInfo.getHeroId())
|
||||
.setHeroHp(map.get(HeroAttributeEnum.CurHP.getPropertyId()) == null ? 0 : map.get(HeroAttributeEnum.CurHP.getPropertyId()))
|
||||
.setHeroMaxHp(map.get(HeroAttributeEnum.Hp.getPropertyId()) == null ? 0 : map.get(HeroAttributeEnum.Hp.getPropertyId()))
|
||||
.build();
|
||||
mapEnterResponse.addHeroInfos(heroInfo);
|
||||
}
|
||||
|
@ -524,7 +525,6 @@ public class MapLogic {
|
|||
}
|
||||
|
||||
updateMapMission(mapManager,EventType.updateEvent, optionId,0);
|
||||
LOGGER.info("optionId={}" ,optionId);
|
||||
int totalWeight = updateMapMission(mapManager,EventType.updateEvent, pointId,0);
|
||||
if (totalWeight >= 100) {
|
||||
CrossInfo crossInfo = mapManager.getCrossInfoMap().get(mapManager.getCurMapId());
|
||||
|
@ -560,7 +560,7 @@ public class MapLogic {
|
|||
}
|
||||
// LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{} {} sOptionConfig.getReward()=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(),
|
||||
// cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon,eventUpdateResponse.getDrop(), sOptionConfig.getReward());
|
||||
LOGGER.info("updatEvent() uid=>{},nextEventId={},eventId={},mission=>{}", uid, nextEventId, cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMission());
|
||||
// LOGGER.info("updatEvent() uid=>{},nextEventId={},eventId={},mission=>{}", uid, nextEventId, cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMission());
|
||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true);
|
||||
}
|
||||
|
||||
|
@ -1313,12 +1313,13 @@ public class MapLogic {
|
|||
if (crossInfo == null) {
|
||||
crossInfo = new CrossInfo();
|
||||
}
|
||||
int beforTime = crossInfo.getLeastTime();
|
||||
if (useTime < crossInfo.getLeastTime()) {
|
||||
crossInfo.setLeastTime(useTime);
|
||||
}
|
||||
crossInfo.getStars().add(STAR_1);
|
||||
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
|
||||
if (useTime > 0 && useTime <= sChallengeConfig.getMapTime()) {
|
||||
if (useTime > 0 && useTime <= sChallengeConfig.getTime()) {
|
||||
crossInfo.getStars().add(STAR_2);
|
||||
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(mapManager.getTeamId());
|
||||
int heroForces = 0;
|
||||
|
@ -1333,7 +1334,7 @@ public class MapLogic {
|
|||
crossInfo.setForces(heroForces);
|
||||
}
|
||||
SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapManager.getCurMapId());
|
||||
if (sChallengeMapConfig.getIfRank() == 1 && useTime > 0 && useTime < crossInfo.getLeastTime()) {
|
||||
if (sChallengeMapConfig.getIfRank() == 1 && useTime > 0 && useTime < beforTime) {
|
||||
String key = RedisKey.getKey(RedisKey.MAP_RANK, Integer.toString(mapManager.getCurMapId()), true);
|
||||
RedisUtil.getInstence().zsetAddOne(key, mapManager.getRootId(), useTime);
|
||||
int zsetSize = RedisUtil.getInstence().getZsetSize(key);
|
||||
|
|
Loading…
Reference in New Issue