From 94e4b77ec387aba2fc197fe643979d7c62ed19b2 Mon Sep 17 00:00:00 2001
From: yangduo <yangduo@kingsome.cn>
Date: Tue, 10 Dec 2024 11:20:04 +0800
Subject: [PATCH] fix

---
 server/wheelserver/api/v1/activity/activity.go |  3 ++-
 server/wheelserver/mt/MapGrid.go               | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/server/wheelserver/api/v1/activity/activity.go b/server/wheelserver/api/v1/activity/activity.go
index 2f91f933..a1117ecc 100644
--- a/server/wheelserver/api/v1/activity/activity.go
+++ b/server/wheelserver/api/v1/activity/activity.go
@@ -128,7 +128,8 @@ func (this *ActivityApi) RollDice(c *gin.Context) {
 
 			awardgridids := mt.Table.MapGrid.GetAwardGridIdList()
 			user.AddAwardGrid(user.CurrGrid)
-			if len(awardgridids) >= len(userAwardgrids) {
+			userAwardgrids = user.GetAwardGrids()
+			if len(awardgridids) <= len(userAwardgrids) {
 				fullgrid = true
 			}
 		}
diff --git a/server/wheelserver/mt/MapGrid.go b/server/wheelserver/mt/MapGrid.go
index 2e3f9beb..53db8851 100644
--- a/server/wheelserver/mt/MapGrid.go
+++ b/server/wheelserver/mt/MapGrid.go
@@ -30,10 +30,12 @@ func (this *MapGrid) Init1() {
 	tmpStrs := strings.Split(this.MapGrid.GetReward(), "|")
 	for _, tmpStr := range tmpStrs {
 		tmpStrs2 := strings.Split(tmpStr, ":")
-		p := new(MapGridRewardItem)
-		p.ItemId = q5.ToInt32(tmpStrs2[0])
-		p.ItemNum = q5.ToInt32(tmpStrs2[1])
-		q5.AppendSlice(&this.rewardItems, p)
+		if len(tmpStrs2) > 1 {
+			p := new(MapGridRewardItem)
+			p.ItemId = q5.ToInt32(tmpStrs2[0])
+			p.ItemNum = q5.ToInt32(tmpStrs2[1])
+			q5.AppendSlice(&this.rewardItems, p)
+		}
 	}
 }
 
@@ -60,7 +62,9 @@ func (this *MapGridTable) GetMaxGridId() int32 {
 func (this *MapGridTable) GetAwardGridIdList() []int32 {
 	idlist := []int32{}
 	for _, item := range this.awardGrids {
-		idlist = append(idlist, item.GetId())
+		if item.GetId() > 0 {
+			idlist = append(idlist, item.GetId())
+		}
 	}
 
 	return idlist