Merge branch 'dev_newTimeitem' into develop

worldsrv/player.go

@@ -4653,7 +4653,11 @@ func (this *Player) AddItemRecExpireTime(itemId int32, num, add int64, gainWay i
 			if this.ItemRecExpireTime == 0 {
 				this.ItemRecExpireTime = time.Now().Unix() + int64(itemData.Time)*3600*num
 			} else {
-				this.ItemRecExpireTime += int64(itemData.Time) * 3600 * num
+				if this.ItemRecExpireTime >= time.Now().Unix() {
+					this.ItemRecExpireTime += int64(itemData.Time) * 3600 * num
+				} else {
+					this.ItemRecExpireTime = time.Now().Unix() + int64(itemData.Time)*3600*num
+				}
 			}
 		}