Merge branch 'master_prb_gn' into master_test_gn
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.javaback_recharge
commit
fad0cadb25
|
@ -178,6 +178,7 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
|
||||||
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
//up miss
|
//up miss
|
||||||
int[][] reward = sActivityRewardConfig.getReward();
|
int[][] reward = sActivityRewardConfig.getReward();
|
||||||
|
|
||||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, BIReason.TAKE_ACTIVITY_REWARD);
|
CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, BIReason.TAKE_ACTIVITY_REWARD);
|
||||||
checkAndSetProgress(activityMission, activityProgressInfo, missionId);
|
checkAndSetProgress(activityMission, activityProgressInfo, missionId);
|
||||||
|
|
||||||
|
|
|
@ -194,14 +194,18 @@ public class CrossLingmaiLogic {
|
||||||
|
|
||||||
//TODO 之后删除
|
//TODO 之后删除
|
||||||
public void fixBug(){
|
public void fixBug(){
|
||||||
|
LOGGER.error("lingmaimijing6");
|
||||||
//初始化数据
|
//初始化数据
|
||||||
int crossGroup = GlobleSystemLogic.getInstence().getCrossGroup();
|
int crossGroup = GlobleSystemLogic.getInstence().getCrossGroup();
|
||||||
if (crossGroup == -1) {
|
if (crossGroup == -1) {
|
||||||
|
LOGGER.error("lingmaifenzu:"+crossGroup);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Map<String, LingMaiSecretArea> lingMaiMap1 = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + 1, String.class, LingMaiSecretArea.class);
|
Map<String, LingMaiSecretArea> lingMaiMap1 = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + 1, String.class, LingMaiSecretArea.class);
|
||||||
Map<String, LingMaiSecretArea> lingMaiMap2 = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + 2, String.class, LingMaiSecretArea.class);
|
Map<String, LingMaiSecretArea> lingMaiMap2 = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + 2, String.class, LingMaiSecretArea.class);
|
||||||
|
LOGGER.error("lingmaimijing4");
|
||||||
fixBugUpdateLingmaiData(lingMaiMap1,crossGroup,1);
|
fixBugUpdateLingmaiData(lingMaiMap1,crossGroup,1);
|
||||||
|
LOGGER.error("lingmaimijing5");
|
||||||
fixBugUpdateLingmaiData(lingMaiMap2,crossGroup,2);
|
fixBugUpdateLingmaiData(lingMaiMap2,crossGroup,2);
|
||||||
LOGGER.error("lingmaimijing1");
|
LOGGER.error("lingmaimijing1");
|
||||||
//排行榜删除
|
//排行榜删除
|
||||||
|
|
|
@ -337,7 +337,7 @@ public class MinuteTask extends Thread {
|
||||||
|
|
||||||
//bug 修复
|
//bug 修复
|
||||||
if(w==4){
|
if(w==4){
|
||||||
if(hour ==10 && minute ==20){
|
if(hour ==10 && minute ==50){
|
||||||
LOGGER.error("lingmaimijing0 000000");
|
LOGGER.error("lingmaimijing0 000000");
|
||||||
CrossLingmaiLogic.getInstance().fixBug();
|
CrossLingmaiLogic.getInstance().fixBug();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue