fix 法宝

back_recharge
wangyuan 2020-05-09 11:59:26 +08:00
parent 930669b6b3
commit 8829b678d5
1 changed files with 3 additions and 4 deletions

View File

@ -256,13 +256,12 @@ public class RedisKey {
public static final String DEATH_PATH_TOTAL_GUILD_RANK = "DEATH_PATH_TOTAL_GUILD_RANK";
<<<<<<< HEAD
public final static String CAR_CHALLENGE_SB = "CAR_CHALLENGE_SB"; //车迟玩法挑战记录
=======
public static final String DEATH_PAHT_TOTAL_CHALLENGE_COUNT = "DEATH_PAHT_TOTAL_CHALLENGE_COUNT";
public final static String CAR_CHALLENEG_SB = "CAR_CHALLENEG_SB"; //车迟玩法挑战记录
>>>>>>> 3526bb12fd6ba435b6d019fd9cba5577ef10cdaf
public final static String CAR_CHALLENGE_RECORD = "CAR_CHALLENGE_RECORD"; //车迟玩法挑战记录