11

RO_Server_Trunk-branch_0.1.39/rocommon/util/timer.go

@@ -186,9 +186,9 @@ func GetLatestWeek10HourTime(ms uint64) time.Time {
 	if curWeekDay == 0 {
 		curWeekDay = 7
 	}
-	delDay := 7 - curWeekDay
+	//delDay := 7 - curWeekDay
 
-	nowTime = nowTime.AddDate(0, 0, int(delDay))
+	//nowTime = nowTime.AddDate(0, 0, int(delDay))
 	dayTimeStr := nowTime.Format(DATE_FORMAT1)
 	tempDayTime, _ := time.ParseInLocation(DATE_FORMAT1, dayTimeStr, loc)
 	tempDayTime = tempDayTime.Add(time.Hour * 22)

RO_Server_Trunk-branch_0.1.39/roserver/game/model/cross_manager.go

@@ -302,9 +302,7 @@ func (this *CrossManager) getSeasonTime(seasonId int32) (time.Time, time.Time) {
 }
 
 func (this *CrossManager) Update(ms uint64) {
-	if !this.initStartUp {
-		this.init(ms)
-	}
+	this.init(ms)
 
 	if this.initStartUp && this.updateTimer.IsStart() && this.updateTimer.IsExpired(ms) {
 		if len(ServerStateCacheList) <= 0 {
@@ -335,6 +333,7 @@ func (this *CrossManager) GetSeasonReward(role uint64, selfRank, rewardSeasonId
 			//发送邮件
 			AddMailOnlineAndOffline([]uint64{role}, model.GlobalMailIdArenaTopReward, int32(serverproto.MailType_MailType_System),
 				itemList, []int32{int32(util.GetTimeSeconds())}, "飞艇排行榜奖励", "第"+strconv.FormatInt(int64(selfRank), 10)+"名")
+			util.InfoF("send rank award uid:%v award:%v", role, itemList)
 			break
 		}
 	}

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_mail.go

@@ -10,7 +10,7 @@ import (
 
 const DayMS = DaySec * 1000
 const DaySec = 24 * 60 * 60
-const MaxMailNum = 50
+const MaxMailNum = 150
 
 type RoleMail struct {
 	SaveObject
@@ -206,9 +206,9 @@ func (this *RoleMail) isExpired(mail *serverproto.MailContent, ms uint64) bool {
 	return false
 }
 
-//0未读取 1已读取  | 00未获取  10已获取
-//邮件状态 第1位标识读取状态，第2位标识附件获取状态
-//邮件是否读取
+// 0未读取 1已读取  | 00未获取  10已获取
+// 邮件状态 第1位标识读取状态，第2位标识附件获取状态
+// 邮件是否读取
 func (this *RoleMail) isMailCanRead(mail *serverproto.MailContent) bool {
 	if mail.State&1 > 0 {
 		return false
@@ -222,7 +222,7 @@ func (this *RoleMail) setMailRead(mail *serverproto.MailContent) {
 	this.SetDirty(true)
 }
 
-//附件是否领取
+// 附件是否领取
 func (this *RoleMail) isMailCanReward(mail *serverproto.MailContent) bool {
 	if len(mail.RewardList) <= 0 {
 		return false