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 7e98fda7..4360af97 100644 --- a/server/marketserver/api/v1/market/marketsecondary.go +++ b/server/marketserver/api/v1/market/marketsecondary.go @@ -111,4 +111,4 @@ WHERE A.idx > %d AND A.net_id = %d AND A.last_owner_address= '%s' AND A.owner_ad } } 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