worldsrv/player.go

@@ -2892,14 +2892,7 @@ func (this *Player) DoShopInfo(info *model.DbShop, isLogin bool) {
 
 		//钻石存储罐
 		if info.PageId == ShopPageDiamondBank {
-
+			WelfareMgrSington.DiamondBankTakeCoin(this)
-			arrItems := WelfareMgrSington.DiamondBankTakeCoin(this)
-			for _, v := range arrItems {
-				itemInfo = append(itemInfo, &playerproto.PayItem{
-					ItemId:  v.ItemId,
-					ItemNum: v.ItemNum,
-				})
-			}
 		}
 
 		// 通行证

worldsrv/welfmgr.go

@@ -1988,7 +1988,7 @@ func (this *WelfareMgr) DiamondBankGetInfo(p *Player) {
 }
 
 // DiamondBankTakeCoin 钻石存钱罐领取钻石
-func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) (retItemArr []*model.Item) {
+func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) {
 	pack := &welfare.SCDiamondBankTakeDiamond{
 		OpRetCode: welfare.OpResultCode_OPRC_Error,
 	}
@@ -2034,13 +2034,7 @@ func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) (retItemArr []*model.Item
 					ItemId:  int32(k),
 					ItemNum: v,
 				})
-
-				retItemArr = append(retItemArr, &model.Item{
-					ItemId:  int32(k),
-					ItemNum: v,
-				})
 			}
-
 			BagMgrSingleton.AddItems(&model.AddItemParam{
 				Platform:   p.Platform,
 				SnId:       p.SnId,
@@ -2075,8 +2069,6 @@ func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) (retItemArr []*model.Item
 		logger.Logger.Tracef("DiamondBankTakeCoin  snid: %v pack: %v", p.SnId, pack)
 		p.SendToClient(int(welfare.SPacketID_PACKET_SCDiamondBankTakeDiamond), pack)
 	}
-
-	return retItemArr
 }
 
 // 更新钻石存储罐数据