Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
commit
86724a73b7
|
@ -25,7 +25,8 @@ class RechargeSumDayActivity extends AbstractActivity {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int missionId = STableManager.getFigureConfig(ActivityStaticConfig.class).getRechargeDaySum().get(activityMission.getV() + 1);
|
int missionId = STableManager.getFigureConfig(ActivityStaticConfig.class).getRechargeDaySum().get(activityMission.getV() + 1);
|
||||||
if (user.getPlayerInfoManager().getRechargedaily() >= SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId).getValues()[0][0]) {
|
if (user.getPlayerInfoManager().getRechargedaily() > 0 ) {//充值0.99不触发修改
|
||||||
|
// SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId).getValues()[0][0]
|
||||||
activityMission.setV(activityMission.getV() + 1);
|
activityMission.setV(activityMission.getV() + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -38,7 +39,8 @@ class RechargeSumDayActivity extends AbstractActivity {
|
||||||
if (activityProgressInfo == null || activityProgressInfo.getProgrss() == 1) {
|
if (activityProgressInfo == null || activityProgressInfo.getProgrss() == 1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (count/1000 >= SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId).getValues()[0][0]) {
|
if (count>0 ) {//只要是充值就算
|
||||||
|
//>= SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId).getValues()[0][0]
|
||||||
activityProgressInfo.setProgrss(1);
|
activityProgressInfo.setProgrss(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,6 +57,7 @@ public class ForceCurrRank extends AbstractRank implements IEventHandler{
|
||||||
|
|
||||||
private void run(){
|
private void run(){
|
||||||
Queue<UserMainTeamForceEvent> infoQueue = ForceCurrRank.infoQueue;
|
Queue<UserMainTeamForceEvent> infoQueue = ForceCurrRank.infoQueue;
|
||||||
|
LOGGER.info("实时战力排行,队列长度{}",infoQueue.size());
|
||||||
if(infoQueue.isEmpty()){
|
if(infoQueue.isEmpty()){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -69,6 +70,10 @@ public class ForceCurrRank extends AbstractRank implements IEventHandler{
|
||||||
|
|
||||||
for(int i = 0 ; i < transport;i++){
|
for(int i = 0 ; i < transport;i++){
|
||||||
UserMainTeamForceEvent event = infoQueue.poll();
|
UserMainTeamForceEvent event = infoQueue.poll();
|
||||||
|
if(event==null&&!infoQueue.isEmpty()){
|
||||||
|
ForceCurrRank.infoQueue = new ArrayDeque<>();
|
||||||
|
return;
|
||||||
|
}
|
||||||
if(event!=null){
|
if(event!=null){
|
||||||
eventList.add(event);
|
eventList.add(event);
|
||||||
}
|
}
|
||||||
|
@ -79,14 +84,18 @@ public class ForceCurrRank extends AbstractRank implements IEventHandler{
|
||||||
changeId.forEach(i-> {
|
changeId.forEach(i-> {
|
||||||
try {
|
try {
|
||||||
User user = UserManager.getUser(i);
|
User user = UserManager.getUser(i);
|
||||||
|
LOGGER.info("战力userId,{}",user.getId());
|
||||||
int force = HeroLogic.getInstance().calTeamTotalForce(user, 1, false);
|
int force = HeroLogic.getInstance().calTeamTotalForce(user, 1, false);
|
||||||
|
LOGGER.info("战力大小,{}",force);
|
||||||
addRank(i,"",force);
|
addRank(i,"",force);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
LOGGER.info("战力排行错误{}",e);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
|
LOGGER.info("战力排行报错{}",e);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue