tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into dev_slots

This commit is contained in:
sk 2025-01-06 16:24:10 +08:00
parent cd0f2bf097 4923b057df
commit 8eb8db1d5e
10 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/constant.go
View File

@ -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 //累消活动获得
)

3
model/player.go
View File

@ -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 {

13
model/rank.go
View File

@ -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
}

1
mq/keyconf.go
View File

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

2
protocol/player/player.pb.go
View File

@ -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() {

2
protocol/player/player.proto
View File

@ -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 {

2
worldsrv/action_nian.go
View File

@ -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{

1
worldsrv/mq.go
View File

@ -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() {

20
worldsrv/rankmatch.go
View File

@ -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")
}
}

6
worldsrv/taskmgr.go
View File

@ -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
}