Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

worldsrv/action_pushcoin.go

@@ -53,10 +53,15 @@ func CSPushCoinInfo(s *netlib.Session, packetid int, data interface{}, sid int64
 	}
 
 	if p.WelfData.PushCoin == nil {
+		// 初始化
 		p.WelfData.PushCoin = &model.PushCoinData{
 			Power:    PowerInit,
 			Exchange: make(map[int32]int32),
-			Items:    make(map[int32]int64),
+			Items: map[int32]int64{
+				common.ItemIDVCard: 1,
+				common.ItemIDCoin:  50 * 5000,
+				common.ItemIDPlum:  1,
+			},
 		}
 	}
 
@@ -216,9 +221,7 @@ func CSPushCoinPlayerOp(s *netlib.Session, packetid int, data interface{}, sid i
 		p.WelfData.PushCoin.Refresh++
 		// 1个v卡，50个金币，大梅花1个
 		p.WelfData.PushCoin.Items = map[int32]int64{
-			common.ItemIDVCard: 1,
+			common.ItemIDCoin: 50 * 5000,
-			common.ItemIDCoin:  50 * 5000,
-			common.ItemIDPlum:  1,
 		}
 
 	case activity.OpCodes_OP_Exchange:

worldsrv/welfmgr.go

@@ -2485,6 +2485,8 @@ func (this *WelfareMgr) GetRedPacket(p *Player, id int64) *welfare.SCRedPacketDr
 		ItemNum:  reward,
 	}, mq.DBRedPacket)
 
+	TaskSubjectSingleton.Touch(common.TaskTypeBuyRedBag, &TaskData{SnId: p.SnId, Num: 1})
+
 	_, pack.RemainCount = RedPacketMgrInst.GetRemainTimesByConfig(p, cfg)
 	Send(welfare.OpResultCode_OPRC_Sucess)
 	return pack