11

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

@@ -3049,7 +3049,7 @@ func (this *RoleRune) AddMonthCardItem(goodId, cnt int32) {
 		if data.GoodsId == goodId {
 			//首次充值
 			if data.EndTime == 0 {
-				data.EndTime = (int64(util.GetLatest5Hour()) + 29*24*3600*1000)
+				data.EndTime = (int64(util.GetLatest5Hour()) + int64(shopItemCfg.Duration)*24*3600*1000)
 				data.NextRewardTime = int64(util.GetLatest5Hour())
 
 				//非续时，给邮件奖励
@@ -3063,7 +3063,7 @@ func (this *RoleRune) AddMonthCardItem(goodId, cnt int32) {
 						reward, []int32{29}, "", "")
 				}
 			} else {
-				data.EndTime += 30 * 24 * 3600 * 1000 //30天d
+				data.EndTime += int64(shopItemCfg.Duration) * 24 * 3600 * 1000 //30天d
 			}
 			data.BuyNum += cnt
 			data.HistoryBuy += cnt

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

@@ -73,15 +73,15 @@ func (this *RoleTower) Load(msg interface{}) bool {
 			this.nowTowerLevel = proRole.RoleTower.NowTowerLevel
 			this.nowTowerPassTime = proRole.RoleTower.NowTowerTime
 			//无尽模式数据
-			this.nowTowerWjLevel = proRole.RoleTower.NowTowerWjLevel
-			this.nowTowerWjPassTime = proRole.RoleTower.NowTowerWjTime
-			this.boss = proRole.RoleTower.Boss
-			this.rewardLevel = proRole.RoleTower.RewardLevel
-			this.buff1 = proRole.RoleTower.Buff1
-			this.buff2 = proRole.RoleTower.Buff2
-			this.buff3 = proRole.RoleTower.Buff3
-			this.duration = proRole.RoleTower.Duration
-			this.refreshTowerWj = proRole.RoleTower.RefreshTowerWj
+			//this.nowTowerWjLevel = proRole.RoleTower.NowTowerWjLevel
+			//this.nowTowerWjPassTime = proRole.RoleTower.NowTowerWjTime
+			//this.boss = proRole.RoleTower.Boss
+			//this.rewardLevel = proRole.RoleTower.RewardLevel
+			//this.buff1 = proRole.RoleTower.Buff1
+			//this.buff2 = proRole.RoleTower.Buff2
+			//this.buff3 = proRole.RoleTower.Buff3
+			//this.duration = proRole.RoleTower.Duration
+			//this.refreshTowerWj = proRole.RoleTower.RefreshTowerWj
 
 			if proRole.RoleTower.RushTower == nil {
 				proRole.RoleTower.RushTower = &serverproto.RushTower{}
@@ -102,13 +102,13 @@ func (this *RoleTower) Load(msg interface{}) bool {
 			this.SetDirty(true)
 		}
 		//无尽模式初始化第一层boss
-		if this.nowTowerWjLevel == 0 {
-			this.nowTowerWjLevel = 1
-			this.duration = TowerMag.day
-			//this.TowerRefreshRankTime()
-			this.TowerBossRandom()
-			this.SetDirty(true)
-		}
+		//if this.nowTowerWjLevel == 0 {
+		//	this.nowTowerWjLevel = 1
+		//	this.duration = TowerMag.day
+		//	//this.TowerRefreshRankTime()
+		//	this.TowerBossRandom()
+		//	this.SetDirty(true)
+		//}
 		this.towerLevelDayRewardTime = proRole.RoleTower.TowerLevelDayRewardTime
 		this.SysRewardTime = proRole.RoleTower.SysRewardTime
 	}
@@ -168,14 +168,14 @@ func (this *RoleTower) Save() {
 	saveMsg.Tower.SysRewardTime = this.SysRewardTime
 	saveMsg.Tower.NowTowerLevel = this.nowTowerLevel
 	saveMsg.Tower.NowTowerTime = this.nowTowerPassTime
-	saveMsg.Tower.NowTowerWjLevel = this.nowTowerWjLevel
-	saveMsg.Tower.NowTowerWjTime = this.nowTowerWjPassTime
-	saveMsg.Tower.Boss = this.boss
-	saveMsg.Tower.RefreshTowerWj = this.refreshTowerWj
-	saveMsg.Tower.Duration = this.duration
-	saveMsg.Tower.Buff1 = this.buff1
-	saveMsg.Tower.Buff2 = this.buff2
-	saveMsg.Tower.Buff3 = this.buff3
+	//saveMsg.Tower.NowTowerWjLevel = this.nowTowerWjLevel
+	//saveMsg.Tower.NowTowerWjTime = this.nowTowerWjPassTime
+	//saveMsg.Tower.Boss = this.boss
+	//saveMsg.Tower.RefreshTowerWj = this.refreshTowerWj
+	//saveMsg.Tower.Duration = this.duration
+	//saveMsg.Tower.Buff1 = this.buff1
+	//saveMsg.Tower.Buff2 = this.buff2
+	//saveMsg.Tower.Buff3 = this.buff3
 	saveMsg.Tower.RushTower = &serverproto.RushTower{
 		RushRound:  this.RushRound,
 		Count:      this.RushFightCount,
@@ -202,28 +202,28 @@ func (this *RoleTower) Update(ms uint64) {
 }
 
 func (this *RoleTower) DailyReset(notify bool) {
-	if this.duration != TowerMag.day {
-		this.boss = make([]int32, 0)
-		this.nowTowerWjLevel = 1
-		this.duration = TowerMag.day
-		this.TowerBossRandom()
-		this.buff1 = 0
-		this.buff2 = 0
-		this.buff3 = 0
-		this.rewardLevel = 0
-	}
-	if notify {
-		ntf := &serverproto.SCClimbingTowerWjBossNtf{
-			Boos:        this.boss,
-			WjLevel:     this.nowTowerWjLevel,
-			Buff1:       this.buff1,
-			Buff2:       this.buff2,
-			Buff3:       this.buff3,
-			Duration:    this.duration,
-			RewardLevel: this.rewardLevel,
-		}
-		this.role.ReplayGate(ntf, true)
-	}
+	//if this.duration != TowerMag.day {
+	//	this.boss = make([]int32, 0)
+	//	this.nowTowerWjLevel = 1
+	//	this.duration = TowerMag.day
+	//	this.TowerBossRandom()
+	//	this.buff1 = 0
+	//	this.buff2 = 0
+	//	this.buff3 = 0
+	//	this.rewardLevel = 0
+	//}
+	//if notify {
+	//	ntf := &serverproto.SCClimbingTowerWjBossNtf{
+	//		Boos:        this.boss,
+	//		WjLevel:     this.nowTowerWjLevel,
+	//		Buff1:       this.buff1,
+	//		Buff2:       this.buff2,
+	//		Buff3:       this.buff3,
+	//		Duration:    this.duration,
+	//		RewardLevel: this.rewardLevel,
+	//	}
+	//	this.role.ReplayGate(ntf, true)
+	//}
 
 	//this.dailyResetExpedition(notify)