fix bug
parent
2900cade4c
commit
29caa89314
|
|
@ -143,12 +143,12 @@ public class GMRequestHandler extends BaseHandler{
|
||||||
}
|
}
|
||||||
case GlobalGm.ADOPT_FIGHT_BY_VALUE:
|
case GlobalGm.ADOPT_FIGHT_BY_VALUE:
|
||||||
int fightId = cUser.getMainLevelManager().getFightId();
|
int fightId = cUser.getMainLevelManager().getFightId();
|
||||||
while (fightId>prarm1){
|
while (fightId<prarm1){
|
||||||
SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId);
|
SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId);
|
||||||
if(sMainLevelConfig.getNextLevel() != -1){
|
if(sMainLevelConfig.getNextLevel() != -1){
|
||||||
MapLogic.getInstance().openNextMainLevel(cUser,fightId);
|
MapLogic.getInstance().openNextMainLevel(cUser,fightId);
|
||||||
}
|
}
|
||||||
fightId = sMainLevelConfig.getId();
|
fightId = sMainLevelConfig.getNextLevel();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2192,7 +2192,8 @@ public class MapLogic {
|
||||||
int state = 1;
|
int state = 1;
|
||||||
SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId);
|
SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId);
|
||||||
if(sMainLevelConfig.getNextLevel()!=-1){
|
if(sMainLevelConfig.getNextLevel()!=-1){
|
||||||
if(sMainLevelConfig.getLevelLimit()>level){
|
SMainLevelConfig sMainLevelConfigNext = SMainLevelConfig.config.get(sMainLevelConfig.getNextLevel());
|
||||||
|
if(sMainLevelConfigNext.getLevelLimit()>level){
|
||||||
state =-1;
|
state =-1;
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,6 @@ class ChapterRewardActivity extends AbstractActivity {
|
||||||
boolean takeRewardsProcess(ISession session, SActivityRewardConfig sActivityRewardConfig, ActivityProgressInfo activityProgressInfo) throws Exception {
|
boolean takeRewardsProcess(ISession session, SActivityRewardConfig sActivityRewardConfig, ActivityProgressInfo activityProgressInfo) throws Exception {
|
||||||
int[][] values = sActivityRewardConfig.getValues();
|
int[][] values = sActivityRewardConfig.getValues();
|
||||||
User user = UserManager.getUser(session.getUid());
|
User user = UserManager.getUser(session.getUid());
|
||||||
return user.getMainLevelManager().getFightId()>values[0][0];
|
return user.getMainLevelManager().getFightId()>=values[0][0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue