From 9a2930cec4ec6b3b8ad4cc034d34c7972c0dec2e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 15 Oct 2024 17:47:36 +0800
Subject: [PATCH] 1

---
 server/matchserver/common/types.go      | 1 -
 server/matchserver/player/player.go     | 6 ------
 server/matchserver/proto/cs_proto.proto | 1 -
 server/matchserver/team/team.go         | 1 -
 4 files changed, 9 deletions(-)

diff --git a/server/matchserver/common/types.go b/server/matchserver/common/types.go
index 10a67f7d..f1540b1a 100644
--- a/server/matchserver/common/types.go
+++ b/server/matchserver/common/types.go
@@ -149,7 +149,6 @@ type Player interface {
 	SetSortIdx(int32)
 	IsBattling() bool
 	SetBattling(bool)
-	HasLuckySymbol() int32
 	GenNextCopy() Player
 	GetBattleItems() []*BattleItem
 }
diff --git a/server/matchserver/player/player.go b/server/matchserver/player/player.go
index cdf2ab7d..fc793778 100644
--- a/server/matchserver/player/player.go
+++ b/server/matchserver/player/player.go
@@ -47,7 +47,6 @@ type player struct {
 	vipLv int32
 	vipExp int64
 	hasVipLucky int32
-	hasLuckySymbol int32
 	battleItems []*common.BattleItem
 }
 
@@ -67,7 +66,6 @@ func (this *player) parseUserInfo(userInfo *common.UserInfo){
 	q5.DuckToSimple(userInfo.VipLv, &this.vipLv)
 	q5.DuckToSimple(userInfo.VipExp, &this.vipExp)
 	q5.DuckToSimple(userInfo.HasVipLucky, &this.hasVipLucky)
-	q5.DuckToSimple(userInfo.HasLuckySymbol, &this.hasLuckySymbol)
 }
 
 func (this *player) parseHeroInfo(heroInfo *common.HeroInfo){
@@ -188,10 +186,6 @@ func (this *player) SetSortIdx(sortIdx int32) {
 	this.sortIdx = sortIdx
 }
 
-func (this *player) HasLuckySymbol() int32 {
-	return this.hasLuckySymbol
-}
-
 func (this *player) GenNextCopy() common.Player {
 	nextCopy := newPlayer()
 	//nextCopy.socket
diff --git a/server/matchserver/proto/cs_proto.proto b/server/matchserver/proto/cs_proto.proto
index 62f706cc..5f27ac97 100644
--- a/server/matchserver/proto/cs_proto.proto
+++ b/server/matchserver/proto/cs_proto.proto
@@ -152,7 +152,6 @@ message MFTeamMember
     optional int64 vip_exp = 18; //vip经验
     optional int32 has_vip_lucky = 19; //是否有vip幸运值加成
     repeated MFBattleItem battle_items = 20; //带入战斗的道具
-    optional int32 has_lucky_symbol = 21; //是否已使用幸运符
 }
 
 //队伍信息
diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go
index 838f2ce6..319aa9c3 100644
--- a/server/matchserver/team/team.go
+++ b/server/matchserver/team/team.go
@@ -438,7 +438,6 @@ func (this *team) genStartGameInfo() {
 					ele2.AccountId = m.GetAccountId()
 					ele2.SpecSkill = m.GetSpecSkill()
 					ele2.HeroUniId = m.GetHeroUniid()
-					ele2.HasLuckySymbol = m.HasLuckySymbol()
 					ele2.BattleItems = m.GetBattleItems()
 					GetHistoryMgr().AddBattle(m.GetAccountId(),
 						this.mapInfo.MapId,