Merge branch 'master_test' into master_test_gn
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java # serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.javaback_recharge
commit
523501b6bf
|
@ -176,7 +176,6 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
|||
PlayerLogic.getInstance().checkOldHeadFrame(user);
|
||||
// 魂印图鉴,旧数据容错
|
||||
PlayerLogic.getInstance().soulPrintHandBookDispose(user);
|
||||
|
||||
//hotfix 月卡
|
||||
PlayerLogic.getInstance().getMonthCardInfo(user);
|
||||
int monthline = STableManager.getConfig(SMonthcardConfig.class).get(Global.MONTHCARDID).getPrice();
|
||||
|
|
|
@ -1075,5 +1075,4 @@ public class PlayerLogic {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue