protocol/player/player.proto

@@ -997,7 +997,6 @@ message SCVIPDraw {
   int32 Id = 1; // 领取编号
   int32 Vip = 2; //领取的礼包vip等级
   OpResultCode OpRetCode = 3; //操作结果
-  map<int64,int64> Award = 4; //获得奖励
 }
 
 //VIP信息 

public

@@ -1 +1 @@
-Subproject commit 5fe34aa85258f2526bd1e28693bc74b38750d587
+Subproject commit ad1f72f58fe9edb6d812dd58066366cf586332eb

worldsrv/player.go

@@ -3769,7 +3769,7 @@ func (this *Player) SCVIPInfo() {
 				LineId:          cfg.RewardOutlineID,
 				ShopId2:         cfg.ShopId2,
 				ShopId7:         cfg.ShopId7,
-				MatchFreeTimes:  cfg.MatchFreeTimes,
+				MatchFreeTimes:  cfg.MatchFreeTimes + this.GetSkillAdd(common.SkillIdVipTimes),
 				Privilege9:      cfg.Privilege9,
 			}
 			d := srvdata.PBDB_VIPMgr.GetData(cfg.VipId)
@@ -3782,7 +3782,7 @@ func (this *Player) SCVIPInfo() {
 					// 皮肤技能加成
 					add := this.GetSkillAdd(common.SkillIdVipGift)
 					if add > 0 {
-						//v += int64((float64(v) * float64(add)) / 100.00)
+						v += int64((float64(v) * float64(add)) / 100.00)
 					}
 				}
 				data.Privilege1[k] = v
@@ -3833,7 +3833,6 @@ func (this *Player) VIPDraw(id, vip int32) {
 	pack := &playerproto.SCVIPDraw{
 		Id:        id,
 		OpRetCode: playerproto.OpResultCode_OPRC_Error,
-		Award:     make(map[int64]int64),
 	}
 	send := func() {
 		pack.Vip = vip
@@ -3887,12 +3886,10 @@ func (this *Player) VIPDraw(id, vip int32) {
 						money += int64((float64(money) * float64(add)) / 100.00)
 					}
 					this.AddCoin(money, 0, common.GainWay_VIPGift, "sys", "VIP每日礼包")
-					pack.Award[common.ItemIDCoin] = money
 				case common.ItemIDVipExp:
 					vips := VipMgrSington.GetVIPcfg(this.Platform)
 					addVipExp = int64(float64(v) / vips.MoneyRatio)
 					this.AddMoneyPayTotal(addVipExp)
-					pack.Award[common.ItemIDVipExp] = addVipExp
 				default:
 					BagMgrSingleton.AddItemsV2(&ItemParam{
 						P: this,
@@ -3906,7 +3903,6 @@ func (this *Player) VIPDraw(id, vip int32) {
 						Operator: "system",
 						Remark:   "VIP每日礼包",
 					})
-					pack.Award[k] += v
 				}
 			}
 			logger.Logger.Tracef("玩家领取VIP每日礼包成功！snid = %v,Vip = %v,金币数量 = %v，addVipEx = %v", this.SnId, this.VIP, money, addVipExp)