From a8500da1a7c78c6a2389a578dd3c80f4e9ecb95c Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Wed, 12 Jun 2024 16:44:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=91=A8=E5=8D=A1=E7=BB=AD=E8=B4=B9BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worldsrv/player.go | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/worldsrv/player.go b/worldsrv/player.go
index 5ad32df..e18fd87 100644
--- a/worldsrv/player.go
+++ b/worldsrv/player.go
@@ -4553,25 +4553,24 @@ func (this *Player) GetWeekCardAwary(id int32) {
 		logger.Logger.Trace("周卡已过期，不能领取！")
 		return
 	}
-	if this.WeekCardAward[id] {
-		return
-	}
 	ret := &player_proto.SCGetWeekCardAwary{}
-	//获取周卡奖励
-	items := data.GetDayRewards()
-	addItem := []*Item{}
-	for itemId, itemNum := range items {
-		item := &Item{ItemId: int32(itemId), ItemNum: itemNum, ObtainTime: time.Now().Unix()}
-		addItem = append(addItem, item)
-		itemInfo := &player_proto.PayItem{}
-		itemInfo.ItemId = int32(itemId)
-		itemInfo.ItemNum = itemNum
-		ret.Items = append(ret.Items, itemInfo)
+	if !this.WeekCardAward[id] {
+		//获取周卡奖励
+		items := data.GetDayRewards()
+		addItem := []*Item{}
+		for itemId, itemNum := range items {
+			item := &Item{ItemId: int32(itemId), ItemNum: itemNum, ObtainTime: time.Now().Unix()}
+			addItem = append(addItem, item)
+			itemInfo := &player_proto.PayItem{}
+			itemInfo.ItemId = int32(itemId)
+			itemInfo.ItemNum = itemNum
+			ret.Items = append(ret.Items, itemInfo)
+		}
+		BagMgrSingleton.AddItems(this, addItem, 0, common.GainWay_WeekCardAward, "system", "周卡每日奖励", 0, 0, false)
+		//返回消息
+		this.WeekCardAward[id] = true
+		ret.WeekCardAward = this.WeekCardAward[id]
 	}
-	BagMgrSingleton.AddItems(this, addItem, 0, common.GainWay_WeekCardAward, "system", "周卡每日奖励", 0, 0, false)
-	//返回消息
-	this.WeekCardAward[id] = true
-	ret.WeekCardAward = this.WeekCardAward[id]
 	info := &player_proto.WeekInfo{
 		Id:            id,
 		WeekCardTime:  this.WeekCardTime[id],

From feda7fd5c11bf13c5650245519e0d029fb590358 Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Mon, 24 Jun 2024 17:11:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worldsrv/player.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/worldsrv/player.go b/worldsrv/player.go
index e18fd87..392e221 100644
--- a/worldsrv/player.go
+++ b/worldsrv/player.go
@@ -4474,7 +4474,6 @@ func (this *Player) CollectTask(taskId int32, num int64) {
 
 // 购买周卡检查
 func (this *Player) CheckWeekCard(shopId int32) bool {
-	srvdata.PBDB_GiftCardMgr.Datas.GetArr()
 	id := int32(-1)
 	for _, card := range srvdata.PBDB_GiftCardMgr.Datas.GetArr() {
 		if card.ShopID == shopId {