back_recharge
mashiyu 2019-03-20 15:24:04 +08:00
commit 0e42332a4b
3 changed files with 143 additions and 132 deletions

View File

@ -1,128 +1,128 @@
Id Contents Rewardgroup Skill
int mut,int#int,2 mut,int#int,1 int
10001 1001 10001 500101
10101 1#2#3 10101#20101 0
10102 4#5#6 10102#20102 0
10103 7#8#9 10103#20103 0
10104 14#1#3 10104#20104 0
10105 14#4#6 10105#20105 0
10106 14#7#9 10106#20106 0
10107 11#1#3 10107#20107 0
10108 11#4#6 10108#20108 0
10109 11#7#9 10109#20109 0
10110 11 10110#20110 0
10111 136#137#138 10104#20104 0
10201 16#17#18 10201#20201 0
10202 20#16#18 10202#20202 0
10203 23#16#18 10203#20203 0
10204 23 10204#20204 0
10205 23#19#21 10205#20205 0
10301 25#26#27 10301#20301 0
10302 28#29#30 10302#20302 0
10303 32#25#27 10303#20303 0
10304 32#28#30 10304#20304 0
10305 32 10305#20305 0
10401 34#35#36 10401#20401 0
10402 37#38#39 10402#20402 0
10403 41#34#36 10403#20403 0
10404 41#37#39 10404#20404 0
10405 44#34#36 10405#20405 0
10406 44#37#39 10406#20406 0
10407 44 10407#20407 0
10408 43#45 10409#20409 0
10409 43#45#40#42 10408#20408 0
10501 46#48 10501#20501 0
10502 46#47#48 10502#20502 0
10503 50#46#48 10503#20503 0
10504 50 10504#20504 0
10505 49#51 10505#20505 0
10601 55#56#57 10601#20601 0
10602 53#55#57 10602#20602 0
10603 59#55#57 10603#20603 0
10604 59 10604#20604 0
10605 59#52#54 10605#20605 0
10701 70#71#72 10701#20701 0
10702 79#80#81 10702#20702 0
10703 65#71#80 10703#20703 0
10704 62#71#80 10704#20704 0
10705 77#71#80 10705#20705 0
10706 68 10706#20706 0
10707 77#62#65 10707#20707 0
10708 77 10708#20708 0
10709 74 10709#20709 0
10801 82#83#84 10801#20801 0
10802 88#89#90 10802#20802 0
10803 94#95#96 10803#20803 0
10804 86#89#95 10804#20804 0
10805 97#99 10805#20805 0
10806 92#85#87 10806#20806 0
10807 97#98#99 10807#20807 0
10808 92 10808#20808 0
10809 91#93#85#87 10809#20809 0
10901 106#107#108 10901#20901 0
10902 109#110#111 10902#20902 0
10903 104#109#111 10903#20903 0
10904 101#106#108 10904#20904 0
10905 113#101#104 10905#20905 0
10906 113 10906#20906 0
10907 116 10907#20907 0
11001 124#125#126 11001#21001 0
11002 127#128#129 11002#21002 0
11003 119#125#128 11003#21003 0
11004 122#125#128 11004#21004 0
11005 122 11005#21005 0
11006 131 11006#21006 0
1010001 1002#1003#1004 null 0
1010002 1005#1006#1007 null 0
1010003 1008#1009#1010 null 0
1010004 1011#1012#1013 null 0
1010005 1014#1016 null 0
1010006 1014#1015#1016 null 0
1010007 1017 null 0
1020001 1018#1019#1020 null 0
1020002 1021#1022#1023 null 0
1020003 1024#1025#1026 null 0
1020004 1027#1028#1029 null 0
1020005 1030#1031#1032 null 0
1020006 1033#1034#1035 null 0
1020007 1036#1037#1038 null 0
1020008 1039#1040#1041 null 0
1020009 1042 null 0
1030001 1043#1044#1045 null 0
1030002 1046#1047#1048 null 0
1030003 1052#1049#1051 null 0
1030004 1053 null 0
1040001 1054#1055#1056 null 0
1040002 1061#1057#1059 null 0
1040003 1057#1058#1059 null 0
1040004 1060#1061#1062 null 0
1040005 1063 null 0
1040006 1063#1064#1060#1062 null 0
1040007 1065#1066#1067 null 0
1050001 1068#1069#1070 null 0
1050002 1071#1072#1073 null 0
1050003 1075#1071#1073 null 0
1050004 1077#1078#1079 null 0
1050005 1080 null 0
1050006 1081#1082 null 0
1060001 1083#1084#1085 null 0
1060002 1086#1087#1088 null 0
1060003 1089#1090#1091 null 0
1060004 1092 null 0
1060005 1093#1094#1095 null 0
1060006 1096#1097#1098 null 0
1060007 1099#1101#1102#1104 null 0
1070001 1108#1110#1105#1107 null 0
1070002 1111 null 0
1080001 1112#1114 null 0
1080002 1115#1117 null 0
1080003 1118#1120 null 0
1080004 1121#1123 null 0
1080005 1124#1126 null 0
1080006 1127#1129 null 0
1080007 1130#1131 null 0
1080008 1132 null 0
1080009 1133 null 0
1090001 1134#1135#1136 null 0
1090002 1137#1138#1139 null 0
1090003 1140 null 0
int mut,int#int,2 mut,int#int,1 string
10001 1001 10001 500101#500102
10101 1#2#3 10101#20101
10102 4#5#6 10102#20102
10103 7#8#9 10103#20103
10104 14#1#3 10104#20104
10105 14#4#6 10105#20105
10106 14#7#9 10106#20106
10107 11#1#3 10107#20107
10108 11#4#6 10108#20108
10109 11#7#9 10109#20109
10110 11 10110#20110
10111 136#137#138 10104#20104
10201 16#17#18 10201#20201
10202 20#16#18 10202#20202
10203 23#16#18 10203#20203
10204 23 10204#20204
10205 23#19#21 10205#20205
10301 25#26#27 10301#20301
10302 28#29#30 10302#20302
10303 32#25#27 10303#20303
10304 32#28#30 10304#20304
10305 32 10305#20305
10401 34#35#36 10401#20401
10402 37#38#39 10402#20402
10403 41#34#36 10403#20403
10404 41#37#39 10404#20404
10405 44#34#36 10405#20405
10406 44#37#39 10406#20406
10407 44 10407#20407
10408 43#45 10409#20409
10409 43#45#40#42 10408#20408
10501 46#48 10501#20501
10502 46#47#48 10502#20502
10503 50#46#48 10503#20503
10504 50 10504#20504
10505 49#51 10505#20505
10601 55#56#57 10601#20601
10602 53#55#57 10602#20602
10603 59#55#57 10603#20603
10604 59 10604#20604
10605 59#52#54 10605#20605
10701 70#71#72 10701#20701
10702 79#80#81 10702#20702
10703 65#71#80 10703#20703
10704 62#71#80 10704#20704
10705 77#71#80 10705#20705
10706 68 10706#20706
10707 77#62#65 10707#20707
10708 77 10708#20708
10709 74 10709#20709
10801 82#83#84 10801#20801
10802 88#89#90 10802#20802
10803 94#95#96 10803#20803
10804 86#89#95 10804#20804
10805 97#99 10805#20805
10806 92#85#87 10806#20806
10807 97#98#99 10807#20807
10808 92 10808#20808
10809 91#93#85#87 10809#20809
10901 106#107#108 10901#20901
10902 109#110#111 10902#20902
10903 104#109#111 10903#20903
10904 101#106#108 10904#20904
10905 113#101#104 10905#20905
10906 113 10906#20906
10907 116 10907#20907
11001 124#125#126 11001#21001
11002 127#128#129 11002#21002
11003 119#125#128 11003#21003
11004 122#125#128 11004#21004
11005 122 11005#21005
11006 131 11006#21006
1010001 1002#1003#1004 null
1010002 1005#1006#1007 null
1010003 1008#1009#1010 null
1010004 1011#1012#1013 null
1010005 1014#1016 null
1010006 1014#1015#1016 null
1010007 1017 null
1020001 1018#1019#1020 null
1020002 1021#1022#1023 null
1020003 1024#1025#1026 null
1020004 1027#1028#1029 null
1020005 1030#1031#1032 null
1020006 1033#1034#1035 null
1020007 1036#1037#1038 null
1020008 1039#1040#1041 null
1020009 1042 null
1030001 1043#1044#1045 null
1030002 1046#1047#1048 null
1030003 1052#1049#1051 null
1030004 1053 null
1040001 1054#1055#1056 null
1040002 1061#1057#1059 null
1040003 1057#1058#1059 null
1040004 1060#1061#1062 null
1040005 1063 null
1040006 1063#1064#1060#1062 null
1040007 1065#1066#1067 null
1050001 1068#1069#1070 null
1050002 1071#1072#1073 null
1050003 1075#1071#1073 null
1050004 1077#1078#1079 null
1050005 1080 null
1050006 1081#1082 null
1060001 1083#1084#1085 null
1060002 1086#1087#1088 null
1060003 1089#1090#1091 null
1060004 1092 null
1060005 1093#1094#1095 null
1060006 1096#1097#1098 null
1060007 1099#1101#1102#1104 null
1070001 1108#1110#1105#1107 null
1070002 1111 null
1080001 1112#1114 null
1080002 1115#1117 null
1080003 1118#1120 null
1080004 1121#1123 null
1080005 1124#1126 null
1080006 1127#1129 null
1080007 1130#1131 null
1080008 1132 null
1080009 1133 null
1090001 1134#1135#1136 null
1090002 1137#1138#1139 null
1090003 1140 null

View File

@ -14,7 +14,7 @@ public class SMonsterGroup implements BaseConfig {
private int[] rewardgroup;
private int skill;
private String skill;
@Override
@ -38,7 +38,7 @@ public class SMonsterGroup implements BaseConfig {
return rewardgroup;
}
public int getSkill() {
public String getSkill() {
return skill;
}
}

View File

@ -62,9 +62,18 @@ public class CombatLogic {
User user = UserManager.getUser(uid);
SAdventureConfig sAdventureConfig = SAdventureConfig.getsAdventureConfigByPosition(position);
if(sAdventureConfig.getOpenLevel() > user.getPlayerInfoManager().getLevel()){
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,"等级不够");
return;
}
if(sAdventureConfig.getMinNum() > heroIds.size()){
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,"英雄数量小于规定数量");
return;
}
int pooId = sAdventureConfig.getPooId();
SAdventureSetting sAdventureSetting = SAdventureSetting.getsAdventureSetting(pooId);
if(hourDuration > sAdventureSetting.getPerMapMaxHour()){
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,"超出时长");
return;
}
@ -73,6 +82,7 @@ public class CombatLogic {
Map<Integer, AdventureStateInfo> adventureStateInfoMap = adventureManager.getAdventureStateInfoMap();
AdventureStateInfo adventureStateInfo = adventureManager.getAdventureStateInfoMap().get(position);
if(adventureStateInfo!=null){
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,"已驻扎");
return;
}
@ -81,6 +91,7 @@ public class CombatLogic {
for(String useHeroId : heroIds1){
if(heroIds.contains(useHeroId)){
//该英雄已上阵
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,"该英雄已上阵");
return;
}
}
@ -99,12 +110,14 @@ public class CombatLogic {
AdventureManager adventureManager = user.getAdventureManager();
AdventureStateInfo adventureStateInfo = adventureManager.getAdventureStateInfoMap().get(position);
if( null == adventureStateInfo ){
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_REWARD_RESPONSE_VALUE,"");
return;
}
int startTime = adventureStateInfo.getStartTime();
int hourDuration = adventureStateInfo.getHourDuration();
int now = (int)(System.currentTimeMillis()/1000);
if( (now - startTime ) /3600 < hourDuration ){
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_REWARD_RESPONSE_VALUE,"驻扎时长不到");
return;
}
//计算奖励
@ -165,11 +178,9 @@ public class CombatLogic {
public float calRatio(float value,float[][] base){
float result = 0;
int length = base.length;
for(int i=0;i< base.length;i++){
float weight = base[i][0];
value = value - weight;
if(value< weight){
if(value>= weight){
result = base[i][1];
}
}