Merge branch 'develop' into dev_slots

# Conflicts:
#	common/constant.go
#	worldsrv/taskmgr.go

common/constant.go

@@ -340,6 +340,8 @@ const (
 	GainWayNianGain_Attack_BigOther              = 129 //年兽活动大爆竹攻击年兽获得额外奖励
 	GainWayNianGain_Attack_BigGuarantee          = 130 //年兽活动大爆竹攻击年兽获得保底奖励
 	GainWayNianGain_Attack_Coin                  = 131 //攻击年兽获得金币奖励
+	GainWayNianGain_EveryDayTask                 = 132 //年兽活动每日任务
+	GainWayNianGain_Task                         = 133 //年兽活动任务
 	GainWayConsume                               = 134 //累消活动获得
 )
 

gamesrv/slotspkg/internal/exported/excel2go/base/fortune_dragon.go

@@ -49,79 +49,79 @@ func init() {
 	FortuneDragonBetBetChangeList = map[int64]*structs.FortuneDragonBetBetChangeList{
 		0: {
 			Index:         0,
-			BetChangeList: 75000,
+			BetChangeList: 6000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 0,
 		},
 		1: {
 			Index:         1,
-			BetChangeList: 150000,
+			BetChangeList: 12000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 1,
 		},
 		2: {
 			Index:         2,
-			BetChangeList: 225000,
+			BetChangeList: 18000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 2,
 		},
 		3: {
 			Index:         3,
-			BetChangeList: 250000,
+			BetChangeList: 20000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 0,
 		},
 		4: {
 			Index:         4,
-			BetChangeList: 375000,
+			BetChangeList: 30000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 4,
 		},
 		5: {
 			Index:         5,
-			BetChangeList: 750000,
+			BetChangeList: 60000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 9,
 		},
 		6: {
 			Index:         6,
-			BetChangeList: 1250000,
+			BetChangeList: 100000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 4,
 		},
 		7: {
 			Index:         7,
-			BetChangeList: 2250000,
+			BetChangeList: 180000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 0,
 		},
 		8: {
 			Index:         8,
-			BetChangeList: 2500000,
+			BetChangeList: 200000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 9,
 		},
 		9: {
 			Index:         9,
-			BetChangeList: 3750000,
+			BetChangeList: 300000,
 			BetSizeIndex:  2,
 			BetLevelIndex: 4,
 		},
 		10: {
 			Index:         10,
-			BetChangeList: 7500000,
+			BetChangeList: 600000,
 			BetSizeIndex:  2,
 			BetLevelIndex: 9,
 		},
 		11: {
 			Index:         11,
-			BetChangeList: 11250000,
+			BetChangeList: 900000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 4,
 		},
 		12: {
 			Index:         12,
-			BetChangeList: 22500000,
+			BetChangeList: 1800000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 9,
 		},
@@ -181,19 +181,19 @@ func init() {
 	FortuneDragonBetBetSize = map[int64]*structs.FortuneDragonBetBetSize{
 		0: {
 			Index:   0,
-			BetSize: 150000000,
+			BetSize: 6000000,
 		},
 		1: {
 			Index:   1,
-			BetSize: 500000000,
+			BetSize: 20000000,
 		},
 		2: {
 			Index:   2,
-			BetSize: 1500000000,
+			BetSize: 60000000,
 		},
 		3: {
 			Index:   3,
-			BetSize: 4500000000,
+			BetSize: 180000000,
 		},
 	}
 

gamesrv/slotspkg/internal/exported/excel2go/base/fortune_mouse.go

@@ -10,79 +10,79 @@ func init() {
 	FortuneMouseBetBetChangeList = map[int64]*structs.FortuneMouseBetBetChangeList{
 		0: {
 			Index:         0,
-			BetChangeList: 150000,
+			BetChangeList: 3000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 0,
 		},
 		1: {
 			Index:         1,
-			BetChangeList: 300000,
+			BetChangeList: 6000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 1,
 		},
 		2: {
 			Index:         2,
-			BetChangeList: 450000,
+			BetChangeList: 9000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 2,
 		},
 		3: {
 			Index:         3,
-			BetChangeList: 500000,
+			BetChangeList: 10000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 0,
 		},
 		4: {
 			Index:         4,
-			BetChangeList: 750000,
+			BetChangeList: 15000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 4,
 		},
 		5: {
 			Index:         5,
-			BetChangeList: 1500000,
+			BetChangeList: 30000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 9,
 		},
 		6: {
 			Index:         6,
-			BetChangeList: 2500000,
+			BetChangeList: 50000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 4,
 		},
 		7: {
 			Index:         7,
-			BetChangeList: 4500000,
+			BetChangeList: 90000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 0,
 		},
 		8: {
 			Index:         8,
-			BetChangeList: 5000000,
+			BetChangeList: 100000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 9,
 		},
 		9: {
 			Index:         9,
-			BetChangeList: 7500000,
+			BetChangeList: 150000,
 			BetSizeIndex:  2,
 			BetLevelIndex: 4,
 		},
 		10: {
 			Index:         10,
-			BetChangeList: 15000000,
+			BetChangeList: 300000,
 			BetSizeIndex:  2,
 			BetLevelIndex: 9,
 		},
 		11: {
 			Index:         11,
-			BetChangeList: 22500000,
+			BetChangeList: 450000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 4,
 		},
 		12: {
 			Index:         12,
-			BetChangeList: 45000000,
+			BetChangeList: 900000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 9,
 		},
@@ -142,19 +142,19 @@ func init() {
 	FortuneMouseBetBetSize = map[int64]*structs.FortuneMouseBetBetSize{
 		0: {
 			Index:   0,
-			BetSize: 300000000,
+			BetSize: 6000000,
 		},
 		1: {
 			Index:   1,
-			BetSize: 1000000000,
+			BetSize: 20000000,
 		},
 		2: {
 			Index:   2,
-			BetSize: 3000000000,
+			BetSize: 60000000,
 		},
 		3: {
 			Index:   3,
-			BetSize: 9000000000,
+			BetSize: 180000000,
 		},
 	}
 

gamesrv/slotspkg/internal/exported/excel2go/base/fortune_ox.go

@@ -10,79 +10,79 @@ func init() {
 	FortuneOxBetBetChangeList = map[int64]*structs.FortuneOxBetBetChangeList{
 		0: {
 			Index:         0,
-			BetChangeList: 300000,
+			BetChangeList: 6000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 0,
 		},
 		1: {
 			Index:         1,
-			BetChangeList: 600000,
+			BetChangeList: 12000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 1,
 		},
 		2: {
 			Index:         2,
-			BetChangeList: 900000,
+			BetChangeList: 18000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 2,
 		},
 		3: {
 			Index:         3,
-			BetChangeList: 1000000,
+			BetChangeList: 20000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 0,
 		},
 		4: {
 			Index:         4,
-			BetChangeList: 1500000,
+			BetChangeList: 30000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 4,
 		},
 		5: {
 			Index:         5,
-			BetChangeList: 3000000,
+			BetChangeList: 60000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 9,
 		},
 		6: {
 			Index:         6,
-			BetChangeList: 5000000,
+			BetChangeList: 100000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 4,
 		},
 		7: {
 			Index:         7,
-			BetChangeList: 9000000,
+			BetChangeList: 180000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 0,
 		},
 		8: {
 			Index:         8,
-			BetChangeList: 10000000,
+			BetChangeList: 200000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 9,
 		},
 		9: {
 			Index:         9,
-			BetChangeList: 15000000,
+			BetChangeList: 300000,
 			BetSizeIndex:  2,
 			BetLevelIndex: 4,
 		},
 		10: {
 			Index:         10,
-			BetChangeList: 30000000,
+			BetChangeList: 600000,
 			BetSizeIndex:  2,
 			BetLevelIndex: 9,
 		},
 		11: {
 			Index:         11,
-			BetChangeList: 45000000,
+			BetChangeList: 900000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 4,
 		},
 		12: {
 			Index:         12,
-			BetChangeList: 90000000,
+			BetChangeList: 1800000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 9,
 		},
@@ -142,19 +142,19 @@ func init() {
 	FortuneOxBetBetSize = map[int64]*structs.FortuneOxBetBetSize{
 		0: {
 			Index:   0,
-			BetSize: 300000000,
+			BetSize: 6000000,
 		},
 		1: {
 			Index:   1,
-			BetSize: 1000000000,
+			BetSize: 20000000,
 		},
 		2: {
 			Index:   2,
-			BetSize: 3000000000,
+			BetSize: 60000000,
 		},
 		3: {
 			Index:   3,
-			BetSize: 9000000000,
+			BetSize: 180000000,
 		},
 	}
 

gamesrv/slotspkg/internal/exported/excel2go/base/fortune_rabbit.go

@@ -10,79 +10,79 @@ func init() {
 	FortuneRabbitBetBetChangeList = map[int64]*structs.FortuneRabbitBetBetChangeList{
 		0: {
 			Index:         0,
-			BetChangeList: 300000,
+			BetChangeList: 6000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 0,
 		},
 		1: {
 			Index:         1,
-			BetChangeList: 600000,
+			BetChangeList: 12000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 1,
 		},
 		2: {
 			Index:         2,
-			BetChangeList: 900000,
+			BetChangeList: 18000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 2,
 		},
 		3: {
 			Index:         3,
-			BetChangeList: 1000000,
+			BetChangeList: 20000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 0,
 		},
 		4: {
 			Index:         4,
-			BetChangeList: 1500000,
+			BetChangeList: 30000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 4,
 		},
 		5: {
 			Index:         5,
-			BetChangeList: 3000000,
+			BetChangeList: 60000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 9,
 		},
 		6: {
 			Index:         6,
-			BetChangeList: 5000000,
+			BetChangeList: 100000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 4,
 		},
 		7: {
 			Index:         7,
-			BetChangeList: 9000000,
+			BetChangeList: 180000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 0,
 		},
 		8: {
 			Index:         8,
-			BetChangeList: 10000000,
+			BetChangeList: 200000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 9,
 		},
 		9: {
 			Index:         9,
-			BetChangeList: 15000000,
+			BetChangeList: 300000,
 			BetSizeIndex:  2,
 			BetLevelIndex: 4,
 		},
 		10: {
 			Index:         10,
-			BetChangeList: 30000000,
+			BetChangeList: 600000,
 			BetSizeIndex:  2,
 			BetLevelIndex: 9,
 		},
 		11: {
 			Index:         11,
-			BetChangeList: 45000000,
+			BetChangeList: 900000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 4,
 		},
 		12: {
 			Index:         12,
-			BetChangeList: 90000000,
+			BetChangeList: 1800000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 9,
 		},
@@ -142,19 +142,19 @@ func init() {
 	FortuneRabbitBetBetSize = map[int64]*structs.FortuneRabbitBetBetSize{
 		0: {
 			Index:   0,
-			BetSize: 300000000,
+			BetSize: 6000000,
 		},
 		1: {
 			Index:   1,
-			BetSize: 1000000000,
+			BetSize: 20000000,
 		},
 		2: {
 			Index:   2,
-			BetSize: 3000000000,
+			BetSize: 60000000,
 		},
 		3: {
 			Index:   3,
-			BetSize: 9000000000,
+			BetSize: 180000000,
 		},
 	}
 

gamesrv/slotspkg/internal/exported/excel2go/base/fortune_tiger.go

@@ -10,79 +10,79 @@ func init() {
 	FortuneTigerBetBetChangeList = map[int64]*structs.FortuneTigerBetBetChangeList{
 		0: {
 			Index:         0,
-			BetChangeList: 150000,
+			BetChangeList: 3000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 0,
 		},
 		1: {
 			Index:         1,
-			BetChangeList: 300000,
+			BetChangeList: 6000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 1,
 		},
 		2: {
 			Index:         2,
-			BetChangeList: 450000,
+			BetChangeList: 9000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 2,
 		},
 		3: {
 			Index:         3,
-			BetChangeList: 500000,
+			BetChangeList: 10000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 0,
 		},
 		4: {
 			Index:         4,
-			BetChangeList: 750000,
+			BetChangeList: 15000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 4,
 		},
 		5: {
 			Index:         5,
-			BetChangeList: 1500000,
+			BetChangeList: 30000,
 			BetSizeIndex:  0,
 			BetLevelIndex: 9,
 		},
 		6: {
 			Index:         6,
-			BetChangeList: 2500000,
+			BetChangeList: 50000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 4,
 		},
 		7: {
 			Index:         7,
-			BetChangeList: 4500000,
+			BetChangeList: 90000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 0,
 		},
 		8: {
 			Index:         8,
-			BetChangeList: 5000000,
+			BetChangeList: 100000,
 			BetSizeIndex:  1,
 			BetLevelIndex: 9,
 		},
 		9: {
 			Index:         9,
-			BetChangeList: 7500000,
+			BetChangeList: 150000,
 			BetSizeIndex:  2,
 			BetLevelIndex: 4,
 		},
 		10: {
 			Index:         10,
-			BetChangeList: 15000000,
+			BetChangeList: 300000,
 			BetSizeIndex:  2,
 			BetLevelIndex: 9,
 		},
 		11: {
 			Index:         11,
-			BetChangeList: 22500000,
+			BetChangeList: 450000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 4,
 		},
 		12: {
 			Index:         12,
-			BetChangeList: 45000000,
+			BetChangeList: 900000,
 			BetSizeIndex:  3,
 			BetLevelIndex: 9,
 		},
@@ -142,19 +142,19 @@ func init() {
 	FortuneTigerBetBetSize = map[int64]*structs.FortuneTigerBetBetSize{
 		0: {
 			Index:   0,
-			BetSize: 300000000,
+			BetSize: 6000000,
 		},
 		1: {
 			Index:   1,
-			BetSize: 1000000000,
+			BetSize: 20000000,
 		},
 		2: {
 			Index:   2,
-			BetSize: 3000000000,
+			BetSize: 60000000,
 		},
 		3: {
 			Index:   3,
-			BetSize: 9000000000,
+			BetSize: 180000000,
 		},
 	}
 

model/player.go

@@ -112,6 +112,8 @@ const (
 	SystemFreeGive_CollectBoxSwap                          // 卡片礼盒兑换奖励
 	SystemFreeGive_ClientUpgrade                           // 客户端升级奖励
 	SystemFreeGive_Guide                                   // 新手引导奖励
+	SystemFreeGive_NianEveryDayTask                        // 年兽每日任务
+	SystemFreeGive_NianTask                                //年兽活动任务
 )
 const (
 	SystemFreeGive_CoinType_Coin    int32 = iota //金币
@@ -132,6 +134,7 @@ const (
 	ActivityLog_Shop                      //商城购买
 	ActivityLog_Exchange                  //商城兑换
 	ActivityLog_CoinPigBank               //金币存钱罐
+	ActivityLog_NianBuff                  //年兽领取Buff
 )
 
 type PlayerGameCtrlData struct {

model/rank.go

@@ -406,3 +406,16 @@ func DelNianRank(args *FindNianListArgs) error {
 	}
 	return nil
 }
+
+// 年兽排行榜记录
+type NianPlayerRankLog struct {
+	TypeId   int32 //1-幸运榜 2：伤害榜
+	RankData []*NianPlayerRankData
+	Platform string
+	Ts       int64
+}
+type NianPlayerRankData struct {
+	RankId int32
+	Snid   int32
+	Score  int64
+}

mq/keyconf.go

@@ -20,6 +20,7 @@ const (
 	BackActivityLog          = "back_activitylog"
 	BackOnlineGame           = "back_onlinegame"
 	BackRedPacket            = "back_redpacket"
+	NianPlayerRank           = "log_nianplayerrank"
 )
 
 // go后端

protocol/player/player.pb.go

@@ -7986,7 +7986,7 @@ type SCEasyWelfaredInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	WelfareSwitch []int32 `protobuf:"varint,1,rep,packed,name=WelfareSwitch,proto3" json:"WelfareSwitch,omitempty"` // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动5集卡活动  1显示 2不显示
+	WelfareSwitch []int32 `protobuf:"varint,1,rep,packed,name=WelfareSwitch,proto3" json:"WelfareSwitch,omitempty"` // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动5集卡活动6年兽活动  1显示 2不显示
 }
 
 func (x *SCEasyWelfaredInfo) Reset() {

protocol/player/player.proto

@@ -1057,7 +1057,7 @@ message SCVIPInfo {
 // 
 //PACKET_SC_SWELFAREINFO
 message SCEasyWelfaredInfo{
-	repeated int32    WelfareSwitch     = 1;     // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动5集卡活动  1显示 2不显示
+	repeated int32    WelfareSwitch     = 1;     // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动5集卡活动6年兽活动  1显示 2不显示
 }
 
 message CSVIPPrivilegeInfo {

worldsrv/action_nian.go

@@ -606,7 +606,7 @@ func CSNianBuff(s *netlib.Session, packetid int, data interface{}, sid int64) er
 			}
 			p.SendToClient(int(activity.NianPacketID_PACKET_SCNianBuff), pack)
 			//统计领取BUff
-			//mq.Write()
+			mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_NianBuff, 1))
 		} else {
 			logger.Logger.Trace("CSNianSignAward 活动时间未到！")
 			pack := &activity.SCNianBuff{

worldsrv/mq.go

@@ -35,6 +35,7 @@ func init() {
 	mq.RegisterMessage(&mq.RegisterMessageParam{Name: mq.DBLotteryCode, Data: &model.LotteryCode{}})
 	mq.RegisterMessage(&mq.RegisterMessageParam{Name: mq.DBLotteryLog, Data: &model.LotteryLog{}})
 	mq.RegisterMessage(&mq.RegisterMessageParam{Name: model.MQRankNian, Data: &model.NianInfo{}})
+	mq.RegisterMessage(&mq.RegisterMessageParam{Name: mq.NianPlayerRank, Data: &model.NianPlayerRankLog{}})
 }
 
 func init() {

worldsrv/rankmatch.go

@@ -959,8 +959,12 @@ func (r *RankMatchMgr) NianRankAward() {
 		if nowTime < timestamp || nowTime > endTimestamp {
 			return
 		}
+		log := &model.NianPlayerRankLog{}
+		log.Ts = time.Now().Unix()
+		log.Platform = platform
 		for _, info := range rankConfig.RankData {
 			if info.TypeId == 1 {
+				log.TypeId = info.TypeId
 				rankAward := info.RankInfo
 				if rankAward == nil {
 					continue
@@ -1021,6 +1025,13 @@ func (r *RankMatchMgr) NianRankAward() {
 								p.AddMessage(newMsg)
 							}
 						})).Start()
+						//记录log
+						rankData := &model.NianPlayerRankData{
+							RankId: rankId,
+							Snid:   player.SnId,
+							Score:  list.List[rankId-1].Luck,
+						}
+						log.RankData = append(log.RankData, rankData)
 						rankId += 1
 					}
 					//清除幸运榜数值
@@ -1030,6 +1041,7 @@ func (r *RankMatchMgr) NianRankAward() {
 					if err != nil {
 						logger.Logger.Errorf("清除幸运榜数值失败 err:%v", err)
 					}
+					mq.Write(log)
 
 				})).StartByExecutor("NianLuck_Award")
 			} else if info.TypeId == 2 {
@@ -1041,6 +1053,7 @@ func (r *RankMatchMgr) NianRankAward() {
 					continue
 				}
 				var players []*model.PlayerBaseInfo
+				log.TypeId = info.TypeId
 				list, err := model.FindDamageNianRankList(&model.FindNianListArgs{
 					Platform: platform,
 				})
@@ -1096,6 +1109,12 @@ func (r *RankMatchMgr) NianRankAward() {
 								p.AddMessage(newMsg)
 							}
 						})).Start()
+						rankData := &model.NianPlayerRankData{
+							RankId: rankId,
+							Snid:   player.SnId,
+							Score:  list.List[rankId-1].Damage,
+						}
+						log.RankData = append(log.RankData, rankData)
 						rankId += 1
 					}
 					//删除数据库数据
@@ -1105,6 +1124,7 @@ func (r *RankMatchMgr) NianRankAward() {
 					if err != nil {
 						logger.Logger.Errorf("删除年兽排行榜数据库数据 err:%v", err)
 					}
+					mq.Write(log)
 				})).StartByExecutor("NianDamage_Award")
 			}
 		}

worldsrv/taskmgr.go

@@ -402,6 +402,12 @@ func SendTaskReward(p *Player, m map[int64]int64, tp int32) {
 	case 6:
 		gain = common.GainWayItemTaskPermit
 		giveType = model.SystemFreeGive_GiveType_TaskPermit
+	case 8:
+		gain = common.GainWayNianGain_EveryDayTask
+		giveType = model.SystemFreeGive_NianEveryDayTask
+	case 9:
+		gain = common.GainWayNianGain_Task
+		giveType = model.SystemFreeGive_NianTask
 	case 10:
 		gain = common.GainWayConsume
 	}