Compare commits

..

No commits in common. "bdbf908e3648f5a6adcd0435073797fb6606585f" and "7786aeac9c7e6ef20c3bccb86e1c8a96d5210784" have entirely different histories.

4 changed files with 2 additions and 26 deletions

View File

@ -104,11 +104,6 @@ const (
SystemFreeGive_GiveType_MailSystemGive //邮件系统赠送 SystemFreeGive_GiveType_MailSystemGive //邮件系统赠送
SystemFreeGive_GiveType_RankMatch //段位奖励 SystemFreeGive_GiveType_RankMatch //段位奖励
SystemFreeGive_GiveType_BindTel // 绑定手机号奖励 SystemFreeGive_GiveType_BindTel // 绑定手机号奖励
SystemFreeGive_GiveType_TaskInvite // 邀请任务
SystemFreeGive_GiveType_TaskNewPlayer // 新手任务
SystemFreeGive_GiveType_TaskAchievement // 成就任务
SystemFreeGive_GiveType_TaskEveryDay // 每日任务
SystemFreeGive_GiveType_TaskWeekActive // 周活跃奖励
) )
const ( const (
SystemFreeGive_CoinType_Coin int32 = iota //金币 SystemFreeGive_CoinType_Coin int32 = iota //金币

View File

@ -9471,7 +9471,7 @@ type ChannelSwitch struct {
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
OnChannelName []string `protobuf:"bytes,1,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道 OnChannelName []string `protobuf:"bytes,1,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道
Tp int32 `protobuf:"varint,2,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 1兑换 2v卡掉落 3:邀请活动开关 Tp int32 `protobuf:"varint,2,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 1兑换 2v卡掉落
} }
func (x *ChannelSwitch) Reset() { func (x *ChannelSwitch) Reset() {

View File

@ -1191,7 +1191,7 @@ message CSExchangeChannel{
message ChannelSwitch { message ChannelSwitch {
repeated string OnChannelName = 1; // repeated string OnChannelName = 1; //
int32 Tp = 2; // 1 2v卡掉落 3: int32 Tp = 2; // 1 2v卡掉落
} }
// PACKET_SCExchangeChannel // PACKET_SCExchangeChannel

View File

@ -7,7 +7,6 @@ import (
"mongo.games.com/goserver/core/netlib" "mongo.games.com/goserver/core/netlib"
"mongo.games.com/game/common" "mongo.games.com/game/common"
"mongo.games.com/game/model"
taskproto "mongo.games.com/game/protocol/task" taskproto "mongo.games.com/game/protocol/task"
"mongo.games.com/game/srvdata" "mongo.games.com/game/srvdata"
) )
@ -81,37 +80,19 @@ func SendReward(p *Player, m map[int64]int64, tp int32) {
}) })
} }
gain := int32(0) gain := int32(0)
giveType := int32(-1)
switch tp { switch tp {
case 1: case 1:
gain = common.GainWayItemTaskEveryDay gain = common.GainWayItemTaskEveryDay
giveType = model.SystemFreeGive_GiveType_TaskEveryDay
case 2: case 2:
gain = common.GainWayItemWeekActive gain = common.GainWayItemWeekActive
giveType = model.SystemFreeGive_GiveType_TaskWeekActive
case 3: case 3:
gain = common.GainWayItemTaskNewPlayer gain = common.GainWayItemTaskNewPlayer
giveType = model.SystemFreeGive_GiveType_TaskNewPlayer
case 4: case 4:
gain = common.GainWayItemTaskInvite gain = common.GainWayItemTaskInvite
giveType = model.SystemFreeGive_GiveType_TaskInvite
case 5: case 5:
gain = common.GainWayItemTaskAchievement gain = common.GainWayItemTaskAchievement
giveType = model.SystemFreeGive_GiveType_TaskAchievement
} }
BagMgrSingleton.AddItems(p, items, 0, gain, "system", "任务奖励", 0, 0, false) BagMgrSingleton.AddItems(p, items, 0, gain, "system", "任务奖励", 0, 0, false)
for _, v := range items {
tp := int32(-1)
if v.ItemId == common.ItemIDCoin {
tp = model.SystemFreeGive_CoinType_Coin
} else if v.ItemId == common.ItemIDDiamond {
tp = model.SystemFreeGive_CoinType_Diamond
}
if !p.IsRob && tp >= 0 && giveType >= 0 {
LogChannelSingleton.WriteMQData(
model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel, giveType, tp, v.ItemNum))
}
}
} }
func CSTaskList(s *netlib.Session, packetId int, data interface{}, sid int64) error { func CSTaskList(s *netlib.Session, packetId int, data interface{}, sid int64) error {