From cd06f140bd98e83f8c8348c6b8d5e17c2b16a66c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 11 Jul 2024 13:04:37 +0800
Subject: [PATCH] 1

---
 server/jccommon/constant.go                          | 4 ++++
 server/marketserver/api/v1/market/marketsecondary.go | 4 ++--
 server/matchserver/go.mod                            | 4 ++++
 server/matchserver/team/team.go                      | 5 +++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/server/jccommon/constant.go b/server/jccommon/constant.go
index 8e786b57..4d9f9ac8 100644
--- a/server/jccommon/constant.go
+++ b/server/jccommon/constant.go
@@ -93,6 +93,10 @@ const (
 	GAME_LOG_TYPE_BACKTASK_USER_ADD_GOLD_END = "backtask.user_add_gold.end"
 )
 
+const (
+	MAP_MODE_BOUNTY = 301
+)
+
 const (
 	BC_CURRENCY_NAME_ETHEREUM = "Ethereum"
 	BC_CURRENCY_NAME_USDC = "USDC"
diff --git a/server/marketserver/api/v1/market/marketsecondary.go b/server/marketserver/api/v1/market/marketsecondary.go
index 8b08538b..654f54c3 100644
--- a/server/marketserver/api/v1/market/marketsecondary.go
+++ b/server/marketserver/api/v1/market/marketsecondary.go
@@ -39,7 +39,7 @@ func (this *MarketApi) LockList(c *gin.Context) {
 	pageSize := q5.AdjustRangeValue(q5.SafeToInt32(reqJson.PageSize), 1, 20)
 	cursor := q5.SafeToInt64(reqJson.Cursor)
 	sql := fmt.Sprintf(`
-SELECT * FROM t_nft WHERE idx > %d AND net_id = %d AND owner_address = '%s' AND owner_address = last_lock_address
+SELECT * FROM t_nft WHERE idx > %d AND net_id = %d AND last_owner_address = '%s' AND last_owner_address = last_lock_address
 `,
 		cursor, netId, owner)
 
@@ -108,4 +108,4 @@ SELECT * FROM t_nft WHERE idx > %d AND net_id = %d AND owner_address = '%s' AND
 		}
 	}
 	c.JSON(200, rspObj)
-}
\ No newline at end of file
+}
diff --git a/server/matchserver/go.mod b/server/matchserver/go.mod
index 02116da9..1c1a17ff 100644
--- a/server/matchserver/go.mod
+++ b/server/matchserver/go.mod
@@ -6,6 +6,8 @@ require q5 v1.0.0
 
 require f5 v1.0.0
 
+require jccommon v1.0.0
+
 require mt v1.0.0
 
 require mtb v1.0.0 // indirect
@@ -57,6 +59,8 @@ replace q5 => ../../third_party/q5
 
 replace f5 => ../../third_party/f5
 
+replace jccommon => ../jccommon
+
 replace mt => ./mt
 
 replace mtb => ./mtb
diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go
index dd00de2e..d004e9e2 100644
--- a/server/matchserver/team/team.go
+++ b/server/matchserver/team/team.go
@@ -7,6 +7,7 @@ import (
 	"mt"
 	"main/common"
 	"main/constant"
+	"jccommon"
 
 	"fmt"
 	"sort"
@@ -690,6 +691,10 @@ func (this *team) EnemyTeamMustHasRealPlayer() bool {
 	return false
 }
 
+func (this *team) NeedMatchRealPlayer() bool {
+	return q5.ToInt32(this.getModeId()) == jccommon.MAP_MODE_BOUNTY
+}
+
 func newTeam() *team {
 	t := new(team)
 	t.state = constant.TEAM_STATE_INIT