Merge branch 'master_test_gn' into master_prb_gn

back_recharge
mengchengzhen 2021-05-06 21:21:17 +08:00
commit 34e86ceb8d
2 changed files with 18 additions and 11 deletions

View File

@ -1477,14 +1477,21 @@ public class TimeUtils {
return todayZero;
}
public static long getTodayHourNum(int hour){
Calendar calendar = Calendar.getInstance();
System.out.println(calendar.getTimeInMillis());
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.HOUR_OF_DAY, hour);
calendar.set(Calendar.MILLISECOND, 0);
long todayZero = calendar.getTimeInMillis();
return todayZero;
/**
* 56bug
* @return
*/
public static long getFirsatRechargeTime(){
DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = new Date();
try{
date = df.parse("2021-05-06 18:00:00");
}catch(Exception e){
e.printStackTrace();
}
Calendar cal = Calendar.getInstance();
cal.setTime(date);
long timestamp = cal.getTimeInMillis();
return timestamp;
}
}

View File

@ -31,10 +31,10 @@ public class CBean2Proto {
public static CommonProto.Player getPlayer(int uid, PlayerManager playerManager, int maxMapId, int mapId, MapManager mapManager) {
NewRechargeInfo rechargeInfo = playerManager.getNewRechargeInfo();
//临时判断开服第一天没记recahrgeTime的bug
//临时代码开服第一天没记recahrgeTime的bug
if(!rechargeInfo.getIsFirst() && rechargeInfo.getRr()>0){
rechargeInfo.setIsFirst(true);
rechargeInfo.setFirstTime(TimeUtils.getTodayHourNum(18));
rechargeInfo.setFirstTime(TimeUtils.getFirsatRechargeTime());
}
CommonProto.Player.Builder builder = CommonProto.Player
.newBuilder()