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

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

# Conflicts:
#	etcd/keyconf.go
#	model/config.go
#	protocol/player/player.pb.go
#	protocol/player/player.proto
#	protocol/webapi/common.pb.go
#	protocol/webapi/common.proto
#	worldsrv/etcd.go
This commit is contained in:
by 2024-07-09 17:43:14 +08:00
parent 0484f1f47b d29c485c87
commit c671da56e6
37 changed files with 2886 additions and 3276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/esayfunc.go
View File

@ -95,17 +95,9 @@ func GetIntegerBit(num int32, index int32) bool {
} }
// 校验身份证是否合法 // 校验身份证是否合法
var IDReg, _ = regexp.Compile(`(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)`) var REGEXP_IPRule, _ = regexp.Compile(`^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){6}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^::([\da-fA-F]{1,4}:){0,4}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:):([\da-fA-F]{1,4}:){0,3}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){2}:([\da-fA-F]{1,4}:){0,2}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){3}:([\da-fA-F]{1,4}:){0,1}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){4}:((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){7}[\da-fA-F]{1,4}$|^:((:[\da-fA-F]{1,4}){1,6}|:)$|^[\da-fA-F]{1,4}:((:[\da-fA-F]{1,4}){1,5}|:)$|^([\da-fA-F]{1,4}:){2}((:[\da-fA-F]{1,4}){1,4}|:)$|^([\da-fA-F]{1,4}:){3}((:[\da-fA-F]{1,4}){1,3}|:)$|^([\da-fA-F]{1,4}:){4}((:[\da-fA-F]{1,4}){1,2}|:)$|^([\da-fA-F]{1,4}:){5}:([\da-fA-F]{1,4})?$|^([\da-fA-F]{1,4}:){6}:$`)
var REGEXP_IPRule, _ = regexp.Compile(`^(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$`)
var ClubNameRule, _ = regexp.Compile("^[\u4e00-\u9fa5a-zA-Z-z0-9]+$") var ClubNameRule, _ = regexp.Compile("^[\u4e00-\u9fa5a-zA-Z-z0-9]+$")
func IsValidID(id string) bool {
if IDReg != nil {
return IDReg.Match([]byte(id))
}
return false
}
func IsValidIP(Ip string) bool { func IsValidIP(Ip string) bool {
const UNKNOWIP = "0.0.0.0" const UNKNOWIP = "0.0.0.0"
if Ip == "" || Ip == UNKNOWIP { if Ip == "" || Ip == UNKNOWIP {

BIN
data/DB_PropExchange.dat
View File

Binary file not shown.

BIN
data/DB_Task.dat
View File

Binary file not shown.

4
data/DB_Task.json
View File

@ -4,11 +4,11 @@
"Id": 1, "Id": 1,
"Order": 1, "Order": 1,
"ActivityType": 1, "ActivityType": 1,
"TaskType": 1, "TaskType": 7,
"TargetTimes": 1, "TargetTimes": 1,
"FinishTimes": 1, "FinishTimes": 1,
"Award": { "Award": {
"100001": 50000, "100001": 500000,
"100004": 5 "100004": 5
}, },
"Position": [ "Position": [

3
deploy.bat
View File

@ -9,7 +9,6 @@ call shell/gen_go.bat
call shell/update_public.bat call shell/update_public.bat
git add . git add .
git add public
git commit -m "update develop" git commit -m "update develop"
git checkout release git checkout release
@ -17,7 +16,7 @@ git checkout release
git merge develop git merge develop
git add . git add .
git add public git reset public
git commit -m "update release" git commit -m "update release"
set CGO_ENABLED=0 set CGO_ENABLED=0

2
etcd/keyconf.go
View File

@ -34,4 +34,6 @@ const (
ETCDKEY_ACT_Invite = "/game/act_invite" // 邀请活动配置 ETCDKEY_ACT_Invite = "/game/act_invite" // 邀请活动配置
ETCDKEY_ACT_Permit = "/game/act_permit" // 赛季通行证配置 ETCDKEY_ACT_Permit = "/game/act_permit" // 赛季通行证配置
ETCDKEY_DIAMOND_LOTTERY = "/game/diamond_lottery" // 钻石抽奖配置 ETCDKEY_DIAMOND_LOTTERY = "/game/diamond_lottery" // 钻石抽奖配置
ETCDKEY_Item = "/game/item" // 道具列表
) )

8
gamesrv/action/action_game.go
View File

@ -261,16 +261,18 @@ func CSRoomEvent(s *netlib.Session, packetid int, data interface{}, sid int64) e
case 2: // 互动表情 case 2: // 互动表情
var totalCoin int64 var totalCoin int64
for _, v := range msg.GetParam() { for _, v := range msg.GetParam() {
item := srvdata.PBDB_GameItemMgr.GetData(v) item := srvdata.GameItemMgr.Get(p.Platform, v)
if item != nil {
switch item.GetType() { switch item.GetType() {
case common.ItemTypeInteract: case common.ItemTypeInteract:
totalCoin += item.GetNum() totalCoin += item.GetNum()
} }
} }
}
if p.GetCoin() >= totalCoin { if p.GetCoin() >= totalCoin {
for _, v := range msg.GetParam() { for _, v := range msg.GetParam() {
item := srvdata.PBDB_GameItemMgr.GetData(v) item := srvdata.GameItemMgr.Get(p.Platform, v)
if item.GetNum() > 0 { if item != nil && item.GetNum() > 0 {
p.AddCoin(-item.GetNum(), common.GainWay_Interact, base.SyncFlag_ToClient|base.SyncFlag_Broadcast, "system", "互动表情") p.AddCoin(-item.GetNum(), common.GainWay_Interact, base.SyncFlag_ToClient|base.SyncFlag_Broadcast, "system", "互动表情")
} }
} }

4
gamesrv/base/scene.go
View File

@ -2164,7 +2164,7 @@ func (this *Scene) TryBillExGameDrop(p *Player) {
for id, num := range realDrop { for id, num := range realDrop {
remark := fmt.Sprintf("游戏掉落%v", id) remark := fmt.Sprintf("游戏掉落%v", id)
pack.Items[id] = proto.Int32(num) pack.Items[id] = proto.Int32(num)
itemData := srvdata.PBDB_GameItemMgr.GetData(id) itemData := srvdata.GameItemMgr.Get(p.Platform, id)
if itemData != nil { if itemData != nil {
//logType 0获得 1消耗 //logType 0获得 1消耗
log := model.NewItemLogEx(model.ItemParam{ log := model.NewItemLogEx(model.ItemParam{
@ -2208,7 +2208,7 @@ func (this *Scene) DropCollectBox(p *Player) {
if n < int(data.GetRate()) { if n < int(data.GetRate()) {
pack := &player.SCGameExDropItems{} pack := &player.SCGameExDropItems{}
pack.Items = make(map[int32]int32) pack.Items = make(map[int32]int32)
itemData := srvdata.PBDB_GameItemMgr.GetData(common.ItemIDCollectBox) itemData := srvdata.GameItemMgr.Get(p.Platform, common.ItemIDCollectBox)
if itemData != nil { if itemData != nil {
p.Items[itemData.Id] = p.Items[itemData.Id] + 1 p.Items[itemData.Id] = p.Items[itemData.Id] + 1
pack.Items = map[int32]int32{itemData.Id: 1} pack.Items = map[int32]int32{itemData.Id: 1}

2
gamesrv/tienlen/scenedata_tienlen.go
View File

@ -2047,7 +2047,7 @@ func (this *TienLenSceneData) SendFirstGiveTimeItem(p *base.Player) {
if !p.PlayerData.IsTakeExpireItem { if !p.PlayerData.IsTakeExpireItem {
itemID := int32(60001) itemID := int32(60001)
itemData := srvdata.PBDB_GameItemMgr.GetData(itemID) itemData := srvdata.GameItemMgr.Get(p.Platform, itemID)
if itemData == nil { if itemData == nil {
return return
} }

2
model/config.go
View File

@ -125,6 +125,8 @@ type AllConfig struct {
PermitStartTs int64 // 开始时间戳 PermitStartTs int64 // 开始时间戳
PermitEndTs int64 // 结束时间戳 PermitEndTs int64 // 结束时间戳
*webapi.DiamondLotteryConfig *webapi.DiamondLotteryConfig
// 道具配置
*webapi.ItemConfig
} }
type GlobalConfig struct { type GlobalConfig struct {

3
model/itemdatalog.go
View File

@ -24,6 +24,7 @@ type ItemLog struct {
TypeId int32 // 变化类型 TypeId int32 // 变化类型
GameId int32 // 游戏id,游戏中获得时有值 GameId int32 // 游戏id,游戏中获得时有值
GameFreeId int32 // 场次id,游戏中获得时有值 GameFreeId int32 // 场次id,游戏中获得时有值
Cost []*ItemInfo // 消耗的道具
} }
func NewItemLog() *ItemLog { func NewItemLog() *ItemLog {
@ -42,6 +43,7 @@ type ItemParam struct {
TypeId int32 // 变化类型 TypeId int32 // 变化类型
GameId int64 // 游戏id,游戏中获得时有值 GameId int64 // 游戏id,游戏中获得时有值
GameFreeId int64 // 场次id,游戏中获得时有值 GameFreeId int64 // 场次id,游戏中获得时有值
Cost []*ItemInfo // 消耗的道具
} }
func NewItemLogEx(param ItemParam) *ItemLog { func NewItemLogEx(param ItemParam) *ItemLog {
@ -57,5 +59,6 @@ func NewItemLogEx(param ItemParam) *ItemLog {
itemLog.TypeId = param.TypeId itemLog.TypeId = param.TypeId
itemLog.GameId = int32(param.GameId) itemLog.GameId = int32(param.GameId)
itemLog.GameFreeId = int32(param.GameFreeId) itemLog.GameFreeId = int32(param.GameFreeId)
itemLog.Cost = param.Cost
return itemLog return itemLog
} }

40
model/player.go
View File

@ -113,6 +113,10 @@ const (
SystemFreeGive_GiveType_PermitAward // 赛季通行证奖励 SystemFreeGive_GiveType_PermitAward // 赛季通行证奖励
SystemFreeGive_GiveType_TaskPermit // 赛季通行证任务奖励 SystemFreeGive_GiveType_TaskPermit // 赛季通行证任务奖励
SystemFreeGive_GiveType_TaskPermitRank // 赛季通行证排名奖励 SystemFreeGive_GiveType_TaskPermitRank // 赛季通行证排名奖励
SystemFreeGive_PhoneLottery // 手机积分抽奖奖励
SystemFreeGive_PhoneLotterySwap // 手机积分兑换奖励
SystemFreeGive_CollectBox // 开启卡片礼盒奖励
SystemFreeGive_CollectBoxSwap // 卡片礼盒兑换奖励
) )
const ( const (
SystemFreeGive_CoinType_Coin int32 = iota //金币 SystemFreeGive_CoinType_Coin int32 = iota //金币
@ -775,6 +779,40 @@ func (this *PlayerData) GetPlayerDataEncoder() (bytes.Buffer, error) {
return buf, err return buf, err
} }
func (this *PlayerData) UpdateParams(params string) *PlayerParams {
if this.WhiteFlag > 0 {
return nil
}
this.Params = params
var pp PlayerParams
err := json.Unmarshal([]byte(params), &pp)
if err == nil {
if common.IsValidIP(pp.Ip) {
this.Ip = pp.Ip
} else if common.IsValidIP(this.RegIp) {
this.Ip = this.RegIp
} else {
this.Ip = ""
}
//if pp.City != "" {
// this.City = pp.City
//}
//switch pp.Platform {
//case 0:
// this.DeviceOS = common.WebStr
//case 1:
// this.DeviceOS = common.IOSStr
//case 2:
// this.DeviceOS = common.AndroidStr
//}
//if pp.Name != "" {
// this.Name = pp.Name
//}
}
return &pp
}
func NewPlayerData(acc string, name string, id int32, channel, platform string, params, tel string, func NewPlayerData(acc string, name string, id int32, channel, platform string, params, tel string,
packTag, ip string, addCoin int64, unionid, deviceInfo string, packTag, ip string, addCoin int64, unionid, deviceInfo string,
tagkey, accountType int32) *PlayerData { tagkey, accountType int32) *PlayerData {
@ -899,7 +937,7 @@ func (this *PlayerData) InitNewData(params string) {
this.Sex = 0 this.Sex = 0
} }
//更新参数 //更新参数
//this.UpdateParams(params) this.UpdateParams(params)
//生成校验和 //生成校验和
RecalcuPlayerCheckSum(this) RecalcuPlayerCheckSum(this)

31
model/rabbit_mq.go
View File

@ -52,34 +52,3 @@ func GeneratePhoneLottery(snid int32, platform string, items string, lotteryType
params["Ts"] = strconv.Itoa(int(time.Now().Unix())) params["Ts"] = strconv.Itoa(int(time.Now().Unix()))
return NewRabbitMQData(mq.BackPhoneLottery, params) return NewRabbitMQData(mq.BackPhoneLottery, params)
} }
//type PlayerGameEntryEvent struct {
// RecordId string //游戏记录ID
// SnId int32 //用户ID
// Platform int32 //平台
// OS int //0 Windows 1 Android 2 iOS
// GameId int //游戏id
// ModeId int //游戏模式
// Time int64 //入场时间 RFC3339
// Id int32 //游戏id
//}
// GenerateEnterEvent 玩家或观众进场事件
//func GenerateEnterEvent(recordId string, snId int32, platform, os string, gameId, modeId int, gameFreeId int32) *RabbitMQData {
// m := &PlayerGameEntryEvent{
// RecordId: recordId,
// SnId: snId,
// GameId: gameId,
// ModeId: modeId,
// Time: time.Now().Unix(),
// Id: gameFreeId,
// }
// pf, err := strconv.Atoi(platform)
// if err != nil {
// logger.Error(err)
// return nil
// }
// m.Platform = int32(pf)
// m.OS = common.DeviceNum[os]
// return NewRabbitMQData(string(MqNameEnterEvent), m)
//}

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

File diff suppressed because it is too large Load Diff

9
protocol/player/player.proto
View File

@ -2,6 +2,8 @@ syntax = "proto3";
package player; package player;
option go_package = "mongo.games.com/game/protocol/player"; option go_package = "mongo.games.com/game/protocol/player";
import "mongo.games.com/game/protocol/server/pbdata.proto";
//操作结果 //操作结果
enum OpResultCode { enum OpResultCode {
OPRC_Sucess = 0; //成功 OPRC_Sucess = 0; //成功
@ -209,13 +211,14 @@ enum PlayerPacketID {
PACKET_SCExchangeChannel = 2826; // 开启兑换的渠道 PACKET_SCExchangeChannel = 2826; // 开启兑换的渠道
PACKET_CSSMSConfig = 2827; //获取运营商配置 PACKET_CSSMSConfig = 2827; //获取运营商配置
PACKET_SCSMSConfig = 2828; //返回运营商配置 PACKET_SCSMSConfig = 2828; //返回运营商配置
PACKET_CS_DiamondLotteryInfo = 2829; //请求钻石抽奖信息 PACKET_CS_DiamondLotteryInfo = 2829; //请求钻石抽奖信息
PACKET_SC_DiamondLotteryInfo = 2830; //返回钻石抽奖信息 PACKET_SC_DiamondLotteryInfo = 2830; //返回钻石抽奖信息
PACKET_CS_DiamondLottery = 2831; //请求钻石抽奖 PACKET_CS_DiamondLottery = 2831; //请求钻石抽奖
PACKET_SC_DiamondLottery = 2832; //钻石抽奖返回 PACKET_SC_DiamondLottery = 2832; //钻石抽奖返回
PACKET_CSDiamondLotteryLuckyAward = 2833; //请求领取钻石抽奖幸运奖励 PACKET_CSDiamondLotteryLuckyAward = 2833; //请求领取钻石抽奖幸运奖励
PACKET_SCDiamondLotteryLuckyAward = 2834; //返回领取钻石抽奖幸运奖励 PACKET_SCDiamondLotteryLuckyAward = 2834; //返回领取钻石抽奖幸运奖励
PACKET_SCItem = 2835; // 返回道具列表
} }
// 账变记录 // 账变记录
@ -1252,4 +1255,8 @@ message CSDiamondLotteryLuckyAward{
message SCDiamondLotteryLuckyAward{ message SCDiamondLotteryLuckyAward{
int64 LuckyScore = 1; //幸运积分 int64 LuckyScore = 1; //幸运积分
repeated LotteryItem Item = 2; //获得的物品 repeated LotteryItem Item = 2; //获得的物品
// PACKET_SCItem
message SCItem{
repeated server.DB_GameItem Items = 1; // 道具列表
} }

1308
protocol/server/pbdata.pb.go
View File

File diff suppressed because it is too large Load Diff

2
protocol/server/pbdata.proto
View File

@ -879,6 +879,8 @@ message DB_GameItem {
int32 Entity = 17; int32 Entity = 17;
string Icon = 18;
} }
message DB_GameItemArray { message DB_GameItemArray {

405
protocol/webapi/common.pb.go
View File

@ -6028,7 +6028,7 @@ type ChannelSwitchConfig struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 1.兑换 2.道具掉落 3.邀请活动开关 4.钻石抽奖 Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 1.兑换 2.道具掉落 3.邀请活动开关
Platform string `protobuf:"bytes,2,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台id Platform string `protobuf:"bytes,2,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台id
OnChannelName []string `protobuf:"bytes,3,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道 OnChannelName []string `protobuf:"bytes,3,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道
} }
@ -6636,264 +6636,33 @@ func (x *ActPermitConfig) GetConfigs() []*PermitChannelConfig {
return nil return nil
} }
//钻石抽奖 // etcd /game/item
type DiamondLotteryInfo struct { type ItemConfig struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
Type int32 `protobuf:"varint,2,opt,name=Type,proto3" json:"Type,omitempty"`
Name string `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`
ItemId int32 `protobuf:"varint,4,opt,name=ItemId,proto3" json:"ItemId,omitempty"`
Grade int32 `protobuf:"varint,5,opt,name=Grade,proto3" json:"Grade,omitempty"`
Oddrate int32 `protobuf:"varint,6,opt,name=Oddrate,proto3" json:"Oddrate,omitempty"`
}
func (x *DiamondLotteryInfo) Reset() {
*x = DiamondLotteryInfo{}
if protoimpl.UnsafeEnabled {
mi := &file_common_proto_msgTypes[66]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DiamondLotteryInfo) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DiamondLotteryInfo) ProtoMessage() {}
func (x *DiamondLotteryInfo) ProtoReflect() protoreflect.Message {
mi := &file_common_proto_msgTypes[66]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DiamondLotteryInfo.ProtoReflect.Descriptor instead.
func (*DiamondLotteryInfo) Descriptor() ([]byte, []int) {
return file_common_proto_rawDescGZIP(), []int{66}
}
func (x *DiamondLotteryInfo) GetId() int32 {
if x != nil {
return x.Id
}
return 0
}
func (x *DiamondLotteryInfo) GetType() int32 {
if x != nil {
return x.Type
}
return 0
}
func (x *DiamondLotteryInfo) GetName() string {
if x != nil {
return x.Name
}
return ""
}
func (x *DiamondLotteryInfo) GetItemId() int32 {
if x != nil {
return x.ItemId
}
return 0
}
func (x *DiamondLotteryInfo) GetGrade() int32 {
if x != nil {
return x.Grade
}
return 0
}
func (x *DiamondLotteryInfo) GetOddrate() int32 {
if x != nil {
return x.Oddrate
}
return 0
}
//钻石抽奖白名单
type DiamondLotteryPlayers struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Uid int32 `protobuf:"varint,1,opt,name=uid,proto3" json:"uid,omitempty"`
Count int32 `protobuf:"varint,2,opt,name=Count,proto3" json:"Count,omitempty"` //抽奖次数
AwatdId []int32 `protobuf:"varint,3,rep,packed,name=AwatdId,proto3" json:"AwatdId,omitempty"` //配置表里的奖励ID
}
func (x *DiamondLotteryPlayers) Reset() {
*x = DiamondLotteryPlayers{}
if protoimpl.UnsafeEnabled {
mi := &file_common_proto_msgTypes[67]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DiamondLotteryPlayers) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DiamondLotteryPlayers) ProtoMessage() {}
func (x *DiamondLotteryPlayers) ProtoReflect() protoreflect.Message {
mi := &file_common_proto_msgTypes[67]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DiamondLotteryPlayers.ProtoReflect.Descriptor instead.
func (*DiamondLotteryPlayers) Descriptor() ([]byte, []int) {
return file_common_proto_rawDescGZIP(), []int{67}
}
func (x *DiamondLotteryPlayers) GetUid() int32 {
if x != nil {
return x.Uid
}
return 0
}
func (x *DiamondLotteryPlayers) GetCount() int32 {
if x != nil {
return x.Count
}
return 0
}
func (x *DiamondLotteryPlayers) GetAwatdId() []int32 {
if x != nil {
return x.AwatdId
}
return nil
}
type DiamondLotteryData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Channel string `protobuf:"bytes,1,opt,name=Channel,proto3" json:"Channel,omitempty"` //渠道
Info []*DiamondLotteryInfo `protobuf:"bytes,2,rep,name=Info,proto3" json:"Info,omitempty"`
MaxScore int32 `protobuf:"varint,3,opt,name=MaxScore,proto3" json:"MaxScore,omitempty"` //保底奖励最大值
DiamondNum int32 `protobuf:"varint,4,opt,name=DiamondNum,proto3" json:"DiamondNum,omitempty"` //单次抽奖消耗钻石数量
Players []*DiamondLotteryPlayers `protobuf:"bytes,5,rep,name=Players,proto3" json:"Players,omitempty"` //白名单
}
func (x *DiamondLotteryData) Reset() {
*x = DiamondLotteryData{}
if protoimpl.UnsafeEnabled {
mi := &file_common_proto_msgTypes[68]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DiamondLotteryData) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DiamondLotteryData) ProtoMessage() {}
func (x *DiamondLotteryData) ProtoReflect() protoreflect.Message {
mi := &file_common_proto_msgTypes[68]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DiamondLotteryData.ProtoReflect.Descriptor instead.
func (*DiamondLotteryData) Descriptor() ([]byte, []int) {
return file_common_proto_rawDescGZIP(), []int{68}
}
func (x *DiamondLotteryData) GetChannel() string {
if x != nil {
return x.Channel
}
return ""
}
func (x *DiamondLotteryData) GetInfo() []*DiamondLotteryInfo {
if x != nil {
return x.Info
}
return nil
}
func (x *DiamondLotteryData) GetMaxScore() int32 {
if x != nil {
return x.MaxScore
}
return 0
}
func (x *DiamondLotteryData) GetDiamondNum() int32 {
if x != nil {
return x.DiamondNum
}
return 0
}
func (x *DiamondLotteryData) GetPlayers() []*DiamondLotteryPlayers {
if x != nil {
return x.Players
}
return nil
}
// etcd /game/diamond_lottery
type DiamondLotteryConfig struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台 Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台
LotteryData []*DiamondLotteryData `protobuf:"bytes,2,rep,name=LotteryData,proto3" json:"LotteryData,omitempty"` Items []*server.DB_GameItem `protobuf:"bytes,2,rep,name=Items,proto3" json:"Items,omitempty"` // 道具列表
} }
func (x *DiamondLotteryConfig) Reset() { func (x *ItemConfig) Reset() {
*x = DiamondLotteryConfig{} *x = ItemConfig{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_common_proto_msgTypes[69] mi := &file_common_proto_msgTypes[66]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
} }
func (x *DiamondLotteryConfig) String() string { func (x *ItemConfig) String() string {
return protoimpl.X.MessageStringOf(x) return protoimpl.X.MessageStringOf(x)
} }
func (*DiamondLotteryConfig) ProtoMessage() {} func (*ItemConfig) ProtoMessage() {}
func (x *DiamondLotteryConfig) ProtoReflect() protoreflect.Message { func (x *ItemConfig) ProtoReflect() protoreflect.Message {
mi := &file_common_proto_msgTypes[69] mi := &file_common_proto_msgTypes[66]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -6904,21 +6673,21 @@ func (x *DiamondLotteryConfig) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use DiamondLotteryConfig.ProtoReflect.Descriptor instead. // Deprecated: Use ItemConfig.ProtoReflect.Descriptor instead.
func (*DiamondLotteryConfig) Descriptor() ([]byte, []int) { func (*ItemConfig) Descriptor() ([]byte, []int) {
return file_common_proto_rawDescGZIP(), []int{69} return file_common_proto_rawDescGZIP(), []int{66}
} }
func (x *DiamondLotteryConfig) GetPlatform() string { func (x *ItemConfig) GetPlatform() string {
if x != nil { if x != nil {
return x.Platform return x.Platform
} }
return "" return ""
} }
func (x *DiamondLotteryConfig) GetLotteryData() []*DiamondLotteryData { func (x *ItemConfig) GetItems() []*server.DB_GameItem {
if x != nil { if x != nil {
return x.LotteryData return x.Items
} }
return nil return nil
} }
@ -7996,45 +7765,15 @@ var file_common_proto_rawDesc = []byte{
0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x43, 0x68, 0x61, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x43, 0x68, 0x61,
0x6e, 0x6e, 0x65, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x66, 0x6e, 0x6e, 0x65, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x66,
0x69, 0x67, 0x73, 0x22, 0x94, 0x01, 0x0a, 0x12, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4c, 0x69, 0x67, 0x73, 0x22, 0x53, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69,
0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x29, 0x0a,
0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73,
0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x74, 0x65,
0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x6d, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67,
0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x47, 0x72, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65,
0x61, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x47, 0x72, 0x61, 0x64, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69,
0x12, 0x18, 0x0a, 0x07, 0x4f, 0x64, 0x64, 0x72, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x05, 0x52, 0x07, 0x4f, 0x64, 0x64, 0x72, 0x61, 0x74, 0x65, 0x22, 0x59, 0x0a, 0x15, 0x44, 0x69,
0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x50, 0x6c, 0x61, 0x79,
0x65, 0x72, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x41,
0x77, 0x61, 0x74, 0x64, 0x49, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x41, 0x77,
0x61, 0x74, 0x64, 0x49, 0x64, 0x22, 0xd3, 0x01, 0x0a, 0x12, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e,
0x64, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07,
0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x43,
0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x2e, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x44, 0x69,
0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x66, 0x6f,
0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x78, 0x53, 0x63, 0x6f,
0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x4d, 0x61, 0x78, 0x53, 0x63, 0x6f,
0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x75, 0x6d,
0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e,
0x75, 0x6d, 0x12, 0x37, 0x0a, 0x07, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x44, 0x69, 0x61,
0x6d, 0x6f, 0x6e, 0x64, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x50, 0x6c, 0x61, 0x79, 0x65,
0x72, 0x73, 0x52, 0x07, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x22, 0x70, 0x0a, 0x14, 0x44,
0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x6e,
0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12,
0x3c, 0x0a, 0x0b, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x44, 0x69,
0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61,
0x52, 0x0b, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61, 0x42, 0x26, 0x5a,
0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d,
0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77,
0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -8049,7 +7788,7 @@ func file_common_proto_rawDescGZIP() []byte {
return file_common_proto_rawDescData return file_common_proto_rawDescData
} }
var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 76) var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 73)
var file_common_proto_goTypes = []interface{}{ var file_common_proto_goTypes = []interface{}{
(*MysqlDbSetting)(nil), // 0: webapi.MysqlDbSetting (*MysqlDbSetting)(nil), // 0: webapi.MysqlDbSetting
(*MongoDbSetting)(nil), // 1: webapi.MongoDbSetting (*MongoDbSetting)(nil), // 1: webapi.MongoDbSetting
@ -8117,37 +7856,35 @@ var file_common_proto_goTypes = []interface{}{
(*PermitRankConfig)(nil), // 63: webapi.PermitRankConfig (*PermitRankConfig)(nil), // 63: webapi.PermitRankConfig
(*PermitChannelConfig)(nil), // 64: webapi.PermitChannelConfig (*PermitChannelConfig)(nil), // 64: webapi.PermitChannelConfig
(*ActPermitConfig)(nil), // 65: webapi.ActPermitConfig (*ActPermitConfig)(nil), // 65: webapi.ActPermitConfig
(*DiamondLotteryInfo)(nil), // 66: webapi.DiamondLotteryInfo (*ItemConfig)(nil), // 66: webapi.ItemConfig
(*DiamondLotteryPlayers)(nil), // 67: webapi.DiamondLotteryPlayers nil, // 67: webapi.Platform.BindTelRewardEntry
(*DiamondLotteryData)(nil), // 68: webapi.DiamondLotteryData nil, // 68: webapi.PlayerData.RankScoreEntry
(*DiamondLotteryConfig)(nil), // 69: webapi.DiamondLotteryConfig nil, // 69: webapi.ItemShop.AwardEntry
nil, // 70: webapi.Platform.BindTelRewardEntry nil, // 70: webapi.VIPcfg.AwardEntry
nil, // 71: webapi.PlayerData.RankScoreEntry nil, // 71: webapi.VIPcfg.Privilege7Entry
nil, // 72: webapi.ItemShop.AwardEntry nil, // 72: webapi.ActInviteConfig.PayScoreEntry
nil, // 73: webapi.VIPcfg.AwardEntry (*server.DB_GameFree)(nil), // 73: server.DB_GameFree
nil, // 74: webapi.VIPcfg.Privilege7Entry (*server.DB_GameItem)(nil), // 74: server.DB_GameItem
nil, // 75: webapi.ActInviteConfig.PayScoreEntry
(*server.DB_GameFree)(nil), // 76: server.DB_GameFree
} }
var file_common_proto_depIdxs = []int32{ var file_common_proto_depIdxs = []int32{
2, // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch 2, // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch
3, // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig 3, // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig
4, // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame 4, // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame
70, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry 67, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
6, // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus 6, // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus
76, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree 73, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
8, // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree 8, // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree
0, // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting 0, // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting
1, // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting 1, // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting
1, // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting 1, // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting
76, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree 73, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
71, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry 68, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
29, // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo 29, // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo
20, // 13: webapi.OnlineReport.GameCount:type_name -> webapi.OnlineGameCnt 20, // 13: webapi.OnlineReport.GameCount:type_name -> webapi.OnlineGameCnt
22, // 14: webapi.CommonNoticeList.List:type_name -> webapi.CommonNotice 22, // 14: webapi.CommonNoticeList.List:type_name -> webapi.CommonNotice
25, // 15: webapi.ExchangeShop.ExType:type_name -> webapi.ExchangeType 25, // 15: webapi.ExchangeShop.ExType:type_name -> webapi.ExchangeType
24, // 16: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop 24, // 16: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop
72, // 17: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry 69, // 17: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
27, // 18: webapi.ItemShopList.List:type_name -> webapi.ItemShop 27, // 18: webapi.ItemShopList.List:type_name -> webapi.ItemShop
29, // 19: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo 29, // 19: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo
30, // 20: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward 30, // 20: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward
@ -8168,12 +7905,12 @@ var file_common_proto_depIdxs = []int32{
35, // 35: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate 35, // 35: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate
45, // 36: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree 45, // 36: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree
45, // 37: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree 45, // 37: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree
73, // 38: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry 70, // 38: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
74, // 39: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry 71, // 39: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
48, // 40: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg 48, // 40: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg
35, // 41: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate 35, // 41: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate
52, // 42: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig 52, // 42: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig
75, // 43: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry 72, // 43: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
59, // 44: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward 59, // 44: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward
59, // 45: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward 59, // 45: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward
59, // 46: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward 59, // 46: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward
@ -8186,14 +7923,12 @@ var file_common_proto_depIdxs = []int32{
62, // 53: webapi.PermitChannelConfig.ExchangeConfig:type_name -> webapi.PermitExchangeConfig 62, // 53: webapi.PermitChannelConfig.ExchangeConfig:type_name -> webapi.PermitExchangeConfig
63, // 54: webapi.PermitChannelConfig.RankConfig:type_name -> webapi.PermitRankConfig 63, // 54: webapi.PermitChannelConfig.RankConfig:type_name -> webapi.PermitRankConfig
64, // 55: webapi.ActPermitConfig.Configs:type_name -> webapi.PermitChannelConfig 64, // 55: webapi.ActPermitConfig.Configs:type_name -> webapi.PermitChannelConfig
66, // 56: webapi.DiamondLotteryData.Info:type_name -> webapi.DiamondLotteryInfo 74, // 56: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
67, // 57: webapi.DiamondLotteryData.Players:type_name -> webapi.DiamondLotteryPlayers 57, // [57:57] is the sub-list for method output_type
68, // 58: webapi.DiamondLotteryConfig.LotteryData:type_name -> webapi.DiamondLotteryData 57, // [57:57] is the sub-list for method input_type
59, // [59:59] is the sub-list for method output_type 57, // [57:57] is the sub-list for extension type_name
59, // [59:59] is the sub-list for method input_type 57, // [57:57] is the sub-list for extension extendee
59, // [59:59] is the sub-list for extension type_name 0, // [0:57] is the sub-list for field type_name
59, // [59:59] is the sub-list for extension extendee
0, // [0:59] is the sub-list for field type_name
} }
func init() { file_common_proto_init() } func init() { file_common_proto_init() }
@ -8995,43 +8730,7 @@ func file_common_proto_init() {
} }
} }
file_common_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} { file_common_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DiamondLotteryInfo); i { switch v := v.(*ItemConfig); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_common_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DiamondLotteryPlayers); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_common_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DiamondLotteryData); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_common_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DiamondLotteryConfig); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -9049,7 +8748,7 @@ func file_common_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_common_proto_rawDesc, RawDescriptor: file_common_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 76, NumMessages: 73,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

7
protocol/webapi/common.proto
View File

@ -736,6 +736,7 @@ message ActPermitConfig{
int32 Days = 3; // 持续天数 int32 Days = 3; // 持续天数
repeated PermitChannelConfig Configs = 4; // 渠道配置 repeated PermitChannelConfig Configs = 4; // 渠道配置
} }
//钻石抽奖 //钻石抽奖
message DiamondLotteryInfo{ message DiamondLotteryInfo{
int32 Id = 1; int32 Id = 1;
@ -765,3 +766,9 @@ message DiamondLotteryConfig{
string Platform = 1; // 平台 string Platform = 1; // 平台
repeated DiamondLotteryData LotteryData = 2; repeated DiamondLotteryData LotteryData = 2;
} }
// etcd /game/item
message ItemConfig {
string Platform = 1; // 平台
repeated server.DB_GameItem Items = 2; // 道具列表
}

2
public

@ -1 +1 @@
Subproject commit 1979cd52fb471bf87bce124133da8d9996ffa3e4 Subproject commit 7fba2cfaa48724a929e7b393ec9951b6bee61545

69
srvdata/gameitem.go Normal file
View File

@ -0,0 +1,69 @@
package srvdata
import (
"mongo.games.com/game/protocol/server"
"mongo.games.com/game/protocol/webapi"
)
func init() {
DataMgr.RegisterLoader("DB_GameItem.dat", GameItemMgr)
}
var GameItemMgr = &GameItem{
Data: make(map[int32]*server.DB_GameItem),
Items: make(map[string]map[int32]*server.DB_GameItem),
AllItems: make(map[string][]*server.DB_GameItem),
}
type GameItem struct {
Data map[int32]*server.DB_GameItem // 配置表
Items map[string]map[int32]*server.DB_GameItem // 后台动态配置
AllItems map[string][]*server.DB_GameItem
}
func (m *GameItem) Load(fileFullPath string) error {
m.Data = make(map[int32]*server.DB_GameItem)
m.AllItems = make(map[string][]*server.DB_GameItem)
for _, v := range PBDB_GameItemMgr.Datas.GetArr() {
m.Data[v.GetId()] = v
}
return nil
}
func (m *GameItem) Reload(fileFullPath string) error {
return m.Load(fileFullPath)
}
func (m *GameItem) SetConfig(config *webapi.ItemConfig) {
if config != nil && len(config.GetItems()) > 0 {
m.AllItems = make(map[string][]*server.DB_GameItem)
m.Items[config.GetPlatform()] = make(map[int32]*server.DB_GameItem)
for _, vv := range config.GetItems() {
m.Items[config.GetPlatform()][vv.GetId()] = vv
}
}
}
func (m *GameItem) Get(platform string, id int32) *server.DB_GameItem {
if v, ok := m.Data[id]; ok {
return v
}
if v, ok := m.Items[platform]; ok {
if v, ok := v[id]; ok {
return v
}
}
return nil
}
func (m *GameItem) GetArr(platform string) []*server.DB_GameItem {
if len(m.AllItems[platform]) == 0 {
for _, v := range m.Data {
m.AllItems[platform] = append(m.AllItems[platform], v)
}
for _, v := range m.Items[platform] {
m.AllItems[platform] = append(m.AllItems[platform], v)
}
}
return m.AllItems[platform]
}

33
worldsrv/action_bag.go
View File

@ -34,7 +34,7 @@ func CSBagInfo(s *netlib.Session, packetid int, data interface{}, sid int64) err
pack := &bag.SCBagInfo{RetCode: bag.OpResultCode_OPRC_Sucess, BagNumMax: BagItemMax} pack := &bag.SCBagInfo{RetCode: bag.OpResultCode_OPRC_Sucess, BagNumMax: BagItemMax}
if bagInfo != nil { if bagInfo != nil {
for _, v := range bagInfo.BagItem { for _, v := range bagInfo.BagItem {
item := srvdata.PBDB_GameItemMgr.GetData(v.ItemId) item := srvdata.GameItemMgr.Get(p.Platform, v.ItemId)
if item != nil && v.ItemNum > 0 && (tp <= 0 || item.GetType() == tp) /*&& (nowLocation == -1 || (nowLocation < len(item.ShowLocation) && item.ShowLocation[nowLocation] == 1))*/ { if item != nil && v.ItemNum > 0 && (tp <= 0 || item.GetType() == tp) /*&& (nowLocation == -1 || (nowLocation < len(item.ShowLocation) && item.ShowLocation[nowLocation] == 1))*/ {
pack.Infos = append(pack.Infos, &bag.ItemInfo{ pack.Infos = append(pack.Infos, &bag.ItemInfo{
ItemId: v.ItemId, ItemId: v.ItemId,
@ -154,6 +154,20 @@ func CSUpBagInfo(s *netlib.Session, packetid int, data interface{}, sid int64) e
ObtainTime: v.ObtainTime, ObtainTime: v.ObtainTime,
}) })
} }
if gainWay == common.GainWay_Collect {
for _, v := range items {
tp1 := int32(-1)
if v.ItemId == common.ItemIDCoin {
tp1 = model.SystemFreeGive_CoinType_Coin
} else if v.ItemId == common.ItemIDDiamond {
tp1 = model.SystemFreeGive_CoinType_Diamond
}
if !p.IsRob && tp1 >= 0 {
LogChannelSingleton.WriteMQData(
model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel, model.SystemFreeGive_CollectBox, tp1, v.ItemNum))
}
}
}
} }
} }
@ -286,7 +300,7 @@ func CSUpBagInfo(s *netlib.Session, packetid int, data interface{}, sid int64) e
} }
case ItemCanExchange: case ItemCanExchange:
logger.Logger.Trace("道具兑换", msg.ItemId) logger.Logger.Trace("道具兑换", msg.ItemId)
itemInfo := srvdata.PBDB_GameItemMgr.GetData(msg.ItemId) itemInfo := srvdata.GameItemMgr.Get(p.Platform, msg.ItemId)
if itemInfo == nil || itemInfo.Type != common.ItemTypeChange { if itemInfo == nil || itemInfo.Type != common.ItemTypeChange {
pack.RetCode = bag.OpResultCode_OPRC_NotChange pack.RetCode = bag.OpResultCode_OPRC_NotChange
send() send()
@ -385,7 +399,7 @@ func CSPropExchange(s *netlib.Session, packetid int, data interface{}, sid int64
send(bag.OpResultCode_OPRC_UseUp) send(bag.OpResultCode_OPRC_UseUp)
return nil return nil
} }
info := srvdata.PBDB_GameItemMgr.GetData(int32(k)) info := srvdata.GameItemMgr.Get(p.Platform, int32(k))
if info != nil { if info != nil {
costItems = append(costItems, &Item{ costItems = append(costItems, &Item{
ItemId: int32(k), ItemId: int32(k),
@ -395,7 +409,7 @@ func CSPropExchange(s *netlib.Session, packetid int, data interface{}, sid int64
} }
} }
for k, v := range info.GetGain() { for k, v := range info.GetGain() {
info := srvdata.PBDB_GameItemMgr.GetData(int32(k)) info := srvdata.GameItemMgr.Get(p.Platform, int32(k))
if info != nil { if info != nil {
items = append(items, &Item{ items = append(items, &Item{
ItemId: int32(k), ItemId: int32(k),
@ -415,6 +429,17 @@ func CSPropExchange(s *netlib.Session, packetid int, data interface{}, sid int64
ItemId: v.ItemId, ItemId: v.ItemId,
ItemNum: v.ItemNum, ItemNum: v.ItemNum,
}) })
tp1 := int32(-1)
if v.ItemId == common.ItemIDCoin {
tp1 = model.SystemFreeGive_CoinType_Coin
} else if v.ItemId == common.ItemIDDiamond {
tp1 = model.SystemFreeGive_CoinType_Diamond
}
if !p.IsRob && tp1 >= 0 {
LogChannelSingleton.WriteMQData(
model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel, model.SystemFreeGive_CollectBoxSwap, tp1, v.ItemNum))
}
} }
send(bag.OpResultCode_OPRC_Sucess) send(bag.OpResultCode_OPRC_Sucess)

12
worldsrv/action_phonelottery.go
View File

@ -190,6 +190,18 @@ func (this *CSPhoneLotteryHandler) Process(s *netlib.Session, packetid int, data
return err return err
} }
LogChannelSingleton.WriteMQData(model.GeneratePhoneLottery(p.SnId, p.Platform, string(jsonData), 1, 0, 0, 0)) LogChannelSingleton.WriteMQData(model.GeneratePhoneLottery(p.SnId, p.Platform, string(jsonData), 1, 0, 0, 0))
for _, v := range items {
tp1 := int32(-1)
if v.ItemId == common.ItemIDCoin {
tp1 = model.SystemFreeGive_CoinType_Coin
} else if v.ItemId == common.ItemIDDiamond {
tp1 = model.SystemFreeGive_CoinType_Diamond
}
if !p.IsRob && tp1 >= 0 {
LogChannelSingleton.WriteMQData(
model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel, model.SystemFreeGive_PhoneLottery, tp1, v.ItemNum))
}
}
} }
return nil return nil
} }

2
worldsrv/action_player.go
View File

@ -1926,7 +1926,7 @@ func CSPlayerData(s *netlib.Session, packetid int, data interface{}, sid int64)
//伪造IP地址 //伪造IP地址
p.Ip = fmt.Sprintf("%v.%v.%v.%v", 1+rand.Int31n(255), 1+rand.Int31n(255), 1+rand.Int31n(255), 1+rand.Int31n(255)) p.Ip = fmt.Sprintf("%v.%v.%v.%v", 1+rand.Int31n(255), 1+rand.Int31n(255), 1+rand.Int31n(255), 1+rand.Int31n(255))
} }
//p.params = p.UpdateParams(msg.GetParams()) p.params = p.UpdateParams(msg.GetParams())
//player.DeviceInfo = deviceInfo //player.DeviceInfo = deviceInfo
p.DeviceId = msg.GetDeviceId() p.DeviceId = msg.GetDeviceId()
p.DeviceName = msg.GetDeviceName() p.DeviceName = msg.GetDeviceName()

6
worldsrv/action_server.go
View File

@ -166,16 +166,16 @@ func init() {
if !p.IsRob && !scene.IsTestScene() { if !p.IsRob && !scene.IsTestScene() {
// 同步背包数据 // 同步背包数据
diffItems := []*Item{} diffItems := []*Item{}
dbItemArr := srvdata.PBDB_GameItemMgr.Datas.Arr dbItemArr := srvdata.GameItemMgr.GetArr(p.Platform)
if dbItemArr != nil { if dbItemArr != nil {
items := msg.GetItems() items := msg.GetItems()
if items != nil { if items != nil {
for _, dbItem := range dbItemArr { for _, dbItem := range dbItemArr {
if itemNum, exist := items[dbItem.Id]; exist { if itemNum, exist := items[dbItem.Id]; exist {
oldItem := BagMgrSingleton.GetItem(p.SnId, dbItem.Id) oldItem := BagMgrSingleton.GetItem(p.SnId, dbItem.Id)
diffNum := int64(itemNum) diffNum := itemNum
if oldItem != nil { if oldItem != nil {
diffNum = int64(itemNum) - oldItem.ItemNum diffNum = itemNum - oldItem.ItemNum
} }
if diffNum != 0 { if diffNum != 0 {
item := &Item{ item := &Item{

25
worldsrv/action_welfare.go
View File

@ -1029,13 +1029,14 @@ func CSPermitExchange(s *netlib.Session, packetid int, data interface{}, sid int
var items []*Item var items []*Item
var costItems []*Item var costItems []*Item
var cost, gain []model.AwardItem var cost, gain []model.AwardItem
var cost1 []*model.ItemInfo
for _, v := range exchangeConfig.GetCost() { for _, v := range exchangeConfig.GetCost() {
item := BagMgrSingleton.GetItem(p.SnId, v.GetItemId()) item := BagMgrSingleton.GetItem(p.SnId, v.GetItemId())
if item == nil || item.ItemNum < v.GetItemNum() { if item == nil || item.ItemNum < v.GetItemNum() {
send(welfare.OpResultCode_OPRC_ErrCost) send(welfare.OpResultCode_OPRC_ErrCost)
return nil return nil
} }
info := srvdata.PBDB_GameItemMgr.GetData(v.GetItemId()) info := srvdata.GameItemMgr.Get(p.Platform, v.GetItemId())
if info != nil { if info != nil {
costItems = append(costItems, &Item{ costItems = append(costItems, &Item{
ItemId: v.GetItemId(), ItemId: v.GetItemId(),
@ -1046,10 +1047,14 @@ func CSPermitExchange(s *netlib.Session, packetid int, data interface{}, sid int
Id: v.GetItemId(), Id: v.GetItemId(),
Num: v.GetItemNum(), Num: v.GetItemNum(),
}) })
cost1 = append(cost1, &model.ItemInfo{
ItemId: v.GetItemId(),
ItemNum: v.GetItemNum(),
})
} }
} }
for _, v := range exchangeConfig.GetGain() { for _, v := range exchangeConfig.GetGain() {
info := srvdata.PBDB_GameItemMgr.GetData(v.GetItemId()) info := srvdata.GameItemMgr.Get(p.Platform, v.GetItemId())
if info != nil { if info != nil {
items = append(items, &Item{ items = append(items, &Item{
ItemId: v.GetItemId(), ItemId: v.GetItemId(),
@ -1064,10 +1069,22 @@ func CSPermitExchange(s *netlib.Session, packetid int, data interface{}, sid int
} }
// 扣除背包物品 // 扣除背包物品
for _, item := range costItems { for _, item := range costItems {
BagMgrSingleton.AddItem(p, int64(item.ItemId), -item.ItemNum, 0, common.GainWayPermitExchangeCost, "system", "赛季通行证兑换消耗", 0, 0, false) BagMgrSingleton.AddItem(p, int64(item.ItemId), -item.ItemNum, 0,
common.GainWayPermitExchangeCost, "system", "赛季通行证兑换消耗", 0, 0, false)
} }
// 增加背包物品 // 增加背包物品
BagMgrSingleton.AddItems(p, items, 0, common.GainWayPermitExchangeGain, "system", "赛季通行证兑换获得", 0, 0, false) BagMgrSingleton.AddItemsV2(&ItemParam{
P: p,
Change: items,
Cost: cost1,
Add: 0,
GainWay: common.GainWayPermitExchangeGain,
Operator: "system",
Remark: "赛季通行证兑换获得",
gameId: 0,
gameFreeId: 0,
noLog: false,
})
p.WelfData.PermitExchange[msg.GetId()] = append(p.WelfData.PermitExchange[msg.GetId()], now.Unix()) p.WelfData.PermitExchange[msg.GetId()] = append(p.WelfData.PermitExchange[msg.GetId()], now.Unix())
// 兑换记录 // 兑换记录
LogChannelSingleton.WriteLog(&model.BackendPermitExchange{ LogChannelSingleton.WriteLog(&model.BackendPermitExchange{

47
worldsrv/bagmgr.go
View File

@ -99,7 +99,7 @@ func (this *BagMgr) GetItem(snid, itemId int32) *Item {
ItemId: itemId, ItemId: itemId,
} }
f := func() { f := func() {
itemX := srvdata.PBDB_GameItemMgr.GetData(itemId) itemX := srvdata.GameItemMgr.Get(p.Platform, itemId)
if itemX != nil { if itemX != nil {
item.Name = itemX.Name item.Name = itemX.Name
//item.ShowLocation = itemX.ShowLocation //item.ShowLocation = itemX.ShowLocation
@ -139,6 +139,27 @@ func (this *BagMgr) GetItem(snid, itemId int32) *Item {
return item return item
} }
type ItemParam struct {
P *Player
Change []*Item // 道具变化数量
Cost []*model.ItemInfo // 获得道具时消耗的道具数量
Add int64 // 加成数量
GainWay int32 // 记录类型
Operator, Remark string // 操作人，备注
gameId, gameFreeId int64 // 游戏id,场次id
noLog bool // 是否不记录日志
}
type AddItemParam struct {
Cost []*model.ItemInfo // 获得道具时消耗的道具数量
}
func (this *BagMgr) AddItemsV2(args *ItemParam) (*BagInfo, bag.OpResultCode, bool) {
return this.AddItems(args.P, args.Change, args.Add, args.GainWay, args.Operator, args.Remark, args.gameId, args.gameFreeId, args.noLog, AddItemParam{
Cost: args.Cost,
})
}
// AddItems 给玩家背包添加道具 // AddItems 给玩家背包添加道具
// add 加成数量 // add 加成数量
// gainWay 记录类型 // gainWay 记录类型
@ -147,15 +168,21 @@ func (this *BagMgr) GetItem(snid, itemId int32) *Item {
// gameId 游戏id // gameId 游戏id
// gameFreeId 场次id // gameFreeId 场次id
// noLog 是否不记录日志 // noLog 是否不记录日志
// Deprecated: use [ AddItemsV2 ] instead
func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int32, operator, remark string, func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int32, operator, remark string,
gameId, gameFreeId int64, noLog bool) (*BagInfo, bag.OpResultCode, bool) { gameId, gameFreeId int64, noLog bool, params ...AddItemParam) (*BagInfo, bag.OpResultCode, bool) {
var cost []*model.ItemInfo
if len(params) > 0 {
cost = params[0].Cost
}
longItem := this.GetItem(p.SnId, common.ItemIDPermit) longItem := this.GetItem(p.SnId, common.ItemIDPermit)
var items []*Item var items []*Item
for _, v := range addItems { for _, v := range addItems {
if v == nil || v.ItemNum == 0 { if v == nil || v.ItemNum == 0 {
continue continue
} }
item := srvdata.PBDB_GameItemMgr.GetData(v.ItemId) item := srvdata.GameItemMgr.Get(p.Platform, v.ItemId)
switch item.Type { switch item.Type {
case common.ItemTypeCoin: case common.ItemTypeCoin:
//增加金币 //增加金币
@ -216,7 +243,7 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
continue continue
} }
item := srvdata.PBDB_GameItemMgr.GetData(v.ItemId) item := srvdata.GameItemMgr.Get(p.Platform, v.ItemId)
if item == nil { if item == nil {
code = bag.OpResultCode_OPRC_IdErr code = bag.OpResultCode_OPRC_IdErr
return newBagInfo, code, false return newBagInfo, code, false
@ -234,7 +261,7 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
continue continue
} }
item := srvdata.PBDB_GameItemMgr.GetData(v.ItemId) item := srvdata.GameItemMgr.Get(p.Platform, v.ItemId)
if item == nil { if item == nil {
code = bag.OpResultCode_OPRC_IdErr code = bag.OpResultCode_OPRC_IdErr
continue continue
@ -278,6 +305,7 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
TypeId: gainWay, TypeId: gainWay,
GameId: gameId, GameId: gameId,
GameFreeId: gameFreeId, GameFreeId: gameFreeId,
Cost: cost,
}) })
if log != nil { if log != nil {
LogChannelSingleton.WriteLog(log) LogChannelSingleton.WriteLog(log)
@ -340,9 +368,10 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
} }
// Deprecated: use [ AddItemsV2 ] instead
func (this *BagMgr) AddItem(p *Player, itemId, itemNum int64, add int64, gainWay int32, operator, remark string, func (this *BagMgr) AddItem(p *Player, itemId, itemNum int64, add int64, gainWay int32, operator, remark string,
gameId, gameFreeId int64, noLog bool) (*BagInfo, bag.OpResultCode, bool) { gameId, gameFreeId int64, noLog bool, params ...AddItemParam) (*BagInfo, bag.OpResultCode, bool) {
return this.AddItems(p, []*Item{{ItemId: int32(itemId), ItemNum: itemNum}}, add, gainWay, operator, remark, gameId, gameFreeId, noLog) return this.AddItems(p, []*Item{{ItemId: int32(itemId), ItemNum: itemNum}}, add, gainWay, operator, remark, gameId, gameFreeId, noLog, params...)
} }
func (this *BagMgr) AddItemsOffline(platform string, snid int32, addItems []*Item, gainWay int32, operator, remark string, func (this *BagMgr) AddItemsOffline(platform string, snid int32, addItems []*Item, gainWay int32, operator, remark string,
@ -374,7 +403,7 @@ func (this *BagMgr) AddItemsOffline(platform string, snid int32, addItems []*Ite
return return
} }
for _, v := range addItems { for _, v := range addItems {
itemData := srvdata.PBDB_GameItemMgr.GetData(v.ItemId) itemData := srvdata.GameItemMgr.Get(platform, v.ItemId)
if itemData == nil { if itemData == nil {
continue continue
} }
@ -658,7 +687,7 @@ func (this *BagMgr) Callback(player any, ret *internal.PlayerLoadReplay) {
BagItem: make(map[int32]*Item), BagItem: make(map[int32]*Item),
} }
for k, bi := range bagInfo.BagItem { for k, bi := range bagInfo.BagItem {
item := srvdata.PBDB_GameItemMgr.GetData(bi.ItemId) item := srvdata.GameItemMgr.Get(ret.Platform, bi.ItemId)
if item != nil { if item != nil {
if bi.ItemNum > 0 { if bi.ItemNum > 0 {
newBagInfo.BagItem[k] = &Item{ newBagInfo.BagItem[k] = &Item{

42
worldsrv/etcd.go
View File

@ -18,7 +18,9 @@ import (
hallproto "mongo.games.com/game/protocol/gamehall" hallproto "mongo.games.com/game/protocol/gamehall"
loginproto "mongo.games.com/game/protocol/login" loginproto "mongo.games.com/game/protocol/login"
playerproto "mongo.games.com/game/protocol/player" playerproto "mongo.games.com/game/protocol/player"
serverproto "mongo.games.com/game/protocol/server"
"mongo.games.com/game/protocol/webapi" "mongo.games.com/game/protocol/webapi"
"mongo.games.com/game/srvdata"
) )
func init() { func init() {
@ -78,6 +80,8 @@ func init() {
etcd.Register(etcd.ETCDKEY_ACT_Permit, webapi.ActPermitConfig{}, platformConfigEvent) etcd.Register(etcd.ETCDKEY_ACT_Permit, webapi.ActPermitConfig{}, platformConfigEvent)
// 钻石抽奖 // 钻石抽奖
etcd.Register(etcd.ETCDKEY_DIAMOND_LOTTERY, webapi.DiamondLotteryConfig{}, platformConfigEvent) etcd.Register(etcd.ETCDKEY_DIAMOND_LOTTERY, webapi.DiamondLotteryConfig{}, platformConfigEvent)
// 道具列表
etcd.Register(etcd.ETCDKEY_Item, webapi.ItemConfig{}, platformConfigEvent)
} }
func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) { func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {
@ -267,6 +271,44 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
f() f()
} }
case *webapi.ItemConfig:
PlatformMgrSingleton.GetConfig(config.Platform).ItemConfig = config
srvdata.GameItemMgr.SetConfig(config)
if !isInit {
var items []*serverproto.DB_GameItem
for _, v := range config.GetItems() {
items = append(items, &serverproto.DB_GameItem{
Id: v.GetId(),
Name: v.GetName(),
ShowLocation: v.GetShowLocation(),
Classify: v.GetClassify(),
Type: v.GetType(),
Effect0: v.GetEffect0(),
Effect: v.GetEffect(),
SaleType: v.GetSaleType(),
SaleGold: v.GetSaleGold(),
Composition: v.GetComposition(),
CompositionMax: v.GetCompositionMax(),
Time: v.GetTime(),
Location: v.GetLocation(),
Describe: v.GetDescribe(),
Num: v.GetNum(),
Value: v.GetValue(),
Entity: v.GetEntity(),
Icon: v.GetIcon(),
})
}
if len(items) > 0 {
for _, v := range PlayerMgrSington.playerOfPlatform[config.Platform] {
if v != nil && v.IsOnLine() {
v.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCItem), &playerproto.SCItem{
Items: items,
})
}
}
}
}
default: default:
logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey) logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
} }

306
worldsrv/player.go
View File

@ -27,14 +27,14 @@ import (
"mongo.games.com/game/model" "mongo.games.com/game/model"
"mongo.games.com/game/proto" "mongo.games.com/game/proto"
"mongo.games.com/game/protocol/bag" "mongo.games.com/game/protocol/bag"
hall_proto "mongo.games.com/game/protocol/gamehall" hallproto "mongo.games.com/game/protocol/gamehall"
login_proto "mongo.games.com/game/protocol/login" loginproto "mongo.games.com/game/protocol/login"
msg_proto "mongo.games.com/game/protocol/message" msgproto "mongo.games.com/game/protocol/message"
player_proto "mongo.games.com/game/protocol/player" playerproto "mongo.games.com/game/protocol/player"
"mongo.games.com/game/protocol/rankmatch" "mongo.games.com/game/protocol/rankmatch"
server_proto "mongo.games.com/game/protocol/server" serverproto "mongo.games.com/game/protocol/server"
shop_proto "mongo.games.com/game/protocol/shop" shopproto "mongo.games.com/game/protocol/shop"
webapi_proto "mongo.games.com/game/protocol/webapi" webapiproto "mongo.games.com/game/protocol/webapi"
"mongo.games.com/game/srvdata" "mongo.games.com/game/srvdata"
"mongo.games.com/game/worldsrv/internal" "mongo.games.com/game/worldsrv/internal"
) )
@ -373,6 +373,7 @@ func (this *Player) OnLogined() {
this.SendToRepSrv(this.PlayerData) this.SendToRepSrv(this.PlayerData)
//红点检测 //红点检测
this.CheckShowRed() this.CheckShowRed()
this.SCItems()
TaskSubjectSingleton.Touch(common.TaskTypeLogin, &TaskData{SnId: this.SnId, Num: 1}) // 登录游戏 TaskSubjectSingleton.Touch(common.TaskTypeLogin, &TaskData{SnId: this.SnId, Num: 1}) // 登录游戏
@ -399,14 +400,14 @@ func (this *Player) OnRehold() {
gateSid = sessionId.Get() gateSid = sessionId.Get()
} }
} }
pack := &server_proto.WGPlayerRehold{ pack := &serverproto.WGPlayerRehold{
Id: proto.Int32(this.SnId), Id: proto.Int32(this.SnId),
Sid: proto.Int64(this.sid), Sid: proto.Int64(this.sid),
SceneId: proto.Int(this.scene.sceneId), SceneId: proto.Int(this.scene.sceneId),
GateSid: proto.Int64(gateSid), GateSid: proto.Int64(gateSid),
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToGame(int(server_proto.SSPacketID_PACKET_WG_PLAYERREHOLD), pack) this.SendToGame(int(serverproto.SSPacketID_PACKET_WG_PLAYERREHOLD), pack)
logger.Logger.Tracef("WG PlayerRehold: %v", pack) logger.Logger.Tracef("WG PlayerRehold: %v", pack)
//} //}
gameid = this.scene.gameId gameid = this.scene.gameId
@ -517,7 +518,7 @@ func (this *Player) RandRobotExData() {
// SendGameConfig 玩家断线重连时，获取玩家所有游戏的配置信息 // SendGameConfig 玩家断线重连时，获取玩家所有游戏的配置信息
func (this *Player) SendGameConfig(gameId int32, plf, chl string) { func (this *Player) SendGameConfig(gameId int32, plf, chl string) {
pack := &hall_proto.SCGetGameConfig{ pack := &hallproto.SCGetGameConfig{
GameId: gameId, GameId: gameId,
} }
@ -526,7 +527,7 @@ func (this *Player) SendGameConfig(gameId int32, plf, chl string) {
if v.Status && PlatformMgrSingleton.GetGlobalConfig().GameStatus[v.DbGameFree.Id] { if v.Status && PlatformMgrSingleton.GetGlobalConfig().GameStatus[v.DbGameFree.Id] {
if v.DbGameFree.GetGameRule() != 0 && v.DbGameFree.GetGameId() == gameId { if v.DbGameFree.GetGameRule() != 0 && v.DbGameFree.GetGameId() == gameId {
// 场次配置 // 场次配置
lgc := &hall_proto.GameConfig1{ lgc := &hallproto.GameConfig1{
LogicId: proto.Int32(v.DbGameFree.Id), LogicId: proto.Int32(v.DbGameFree.Id),
LimitCoin: proto.Int64(v.DbGameFree.GetLimitCoin()), LimitCoin: proto.Int64(v.DbGameFree.GetLimitCoin()),
MaxCoinLimit: proto.Int64(v.DbGameFree.GetMaxCoinLimit()), MaxCoinLimit: proto.Int64(v.DbGameFree.GetMaxCoinLimit()),
@ -556,14 +557,14 @@ func (this *Player) SendGameConfig(gameId int32, plf, chl string) {
if srvdata.GameFreeMgr.IsGameDif(gameId, common.GameDifChess) { if srvdata.GameFreeMgr.IsGameDif(gameId, common.GameDifChess) {
cfg := ChessRankMgrSington.GetChessRankConfig(this.GetPlatform().Name, gameId) cfg := ChessRankMgrSington.GetChessRankConfig(this.GetPlatform().Name, gameId)
for _, v := range cfg.GetDatas() { for _, v := range cfg.GetDatas() {
pack.ChessRanks = append(pack.ChessRanks, &hall_proto.ChessRankInfo{ pack.ChessRanks = append(pack.ChessRanks, &hallproto.ChessRankInfo{
Score: v.Score, Score: v.Score,
Name: v.Name, Name: v.Name,
}) })
} }
} }
this.SendToClient(int(hall_proto.GameHallPacketID_PACKET_SC_GETGAMECONFIG), pack) this.SendToClient(int(hallproto.GameHallPacketID_PACKET_SC_GETGAMECONFIG), pack)
logger.Logger.Tracef("SendGameConfig:%v", pack) logger.Logger.Tracef("SendGameConfig:%v", pack)
} }
@ -663,7 +664,7 @@ func (this *Player) LoadMessage(lastLogoutTime int64, isFirstLogin, isSkipWeek b
} }
func (this *Player) SendMessage(showId int64) { func (this *Player) SendMessage(showId int64) {
pack := &msg_proto.SCMessageList{} pack := &msgproto.SCMessageList{}
if len(this.msgs) != 0 { if len(this.msgs) != 0 {
for _, msg := range this.msgs { for _, msg := range this.msgs {
@ -681,7 +682,7 @@ func (this *Player) SendMessage(showId int64) {
// logger.Logger.Error("player: ", this.SnId, " not find gift : ", msg.GiftId) // logger.Logger.Error("player: ", this.SnId, " not find gift : ", msg.GiftId)
// } // }
//} //}
pack.Msgs = append(pack.Msgs, &msg_proto.MessageData{ pack.Msgs = append(pack.Msgs, &msgproto.MessageData{
Id: proto.String(msg.Id.Hex()), Id: proto.String(msg.Id.Hex()),
Title: proto.String(msg.Title), Title: proto.String(msg.Title),
Content: proto.String(msg.Content), Content: proto.String(msg.Content),
@ -704,7 +705,7 @@ func (this *Player) SendMessage(showId int64) {
proto.SetDefaults(pack) proto.SetDefaults(pack)
} }
//nil的msg需要发给前端便于覆盖前一个玩家的信息 //nil的msg需要发给前端便于覆盖前一个玩家的信息
this.SendToClient(int(msg_proto.MSGPacketID_PACKET_SC_MESSAGELIST), pack) this.SendToClient(int(msgproto.MSGPacketID_PACKET_SC_MESSAGELIST), pack)
} }
func (this *Player) ReadMessage(id string) { func (this *Player) ReadMessage(id string) {
@ -718,11 +719,11 @@ func (this *Player) ReadMessage(id string) {
}), }),
task.CompleteNotifyWrapper(func(data interface{}, tt task.Task) { task.CompleteNotifyWrapper(func(data interface{}, tt task.Task) {
if data == nil { if data == nil {
pack := &msg_proto.SCMessageRead{ pack := &msgproto.SCMessageRead{
Id: proto.String(id), Id: proto.String(id),
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToClient(int(msg_proto.MSGPacketID_PACKET_SC_MESSAGEREAD), pack) this.SendToClient(int(msgproto.MSGPacketID_PACKET_SC_MESSAGEREAD), pack)
} }
}), "ReadMessage").StartByFixExecutor("logic_message") }), "ReadMessage").StartByFixExecutor("logic_message")
} }
@ -732,12 +733,12 @@ func (this *Player) ReadMessage(id string) {
func (this *Player) WebDelMessage(id string) { func (this *Player) WebDelMessage(id string) {
if msg, exist := this.msgs[id]; exist { if msg, exist := this.msgs[id]; exist {
if msg.State != model.MSGSTATE_REMOVEED { // 未删除状态通知客户端 if msg.State != model.MSGSTATE_REMOVEED { // 未删除状态通知客户端
pack := &msg_proto.SCMessageDel{ pack := &msgproto.SCMessageDel{
Id: id, Id: id,
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToClient(int(msg_proto.MSGPacketID_PACKET_SC_MESSAGEDEL), pack) this.SendToClient(int(msgproto.MSGPacketID_PACKET_SC_MESSAGEDEL), pack)
} }
//删除此邮件 //删除此邮件
delete(this.msgs, id) delete(this.msgs, id)
@ -759,12 +760,12 @@ func (this *Player) DelMessage(id string, del int32) bool {
}), }),
task.CompleteNotifyWrapper(func(data interface{}, tt task.Task) { task.CompleteNotifyWrapper(func(data interface{}, tt task.Task) {
if data == nil { if data == nil {
pack := &msg_proto.SCMessageDel{ pack := &msgproto.SCMessageDel{
Id: id, Id: id,
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToClient(int(msg_proto.MSGPacketID_PACKET_SC_MESSAGEDEL), pack) this.SendToClient(int(msgproto.MSGPacketID_PACKET_SC_MESSAGEDEL), pack)
msg.State = model.MSGSTATE_REMOVEED msg.State = model.MSGSTATE_REMOVEED
//删除此邮件 //删除此邮件
@ -793,7 +794,7 @@ func (this *Player) MessageShowRed() {
} }
} }
for showId := range msgMap { for showId := range msgMap {
this.SendShowRed(hall_proto.ShowRedCode_Mail, int32(showId), 1) this.SendShowRed(hallproto.ShowRedCode_Mail, int32(showId), 1)
} }
} }
@ -911,7 +912,7 @@ func (this *Player) AddMessage(msg *model.Message) {
msgMap[msg.ShowId] = 1 msgMap[msg.ShowId] = 1
} }
for showId := range msgMap { for showId := range msgMap {
this.SendShowRed(hall_proto.ShowRedCode_Mail, int32(showId), 1) this.SendShowRed(hallproto.ShowRedCode_Mail, int32(showId), 1)
} }
} }
} }
@ -1153,11 +1154,11 @@ func (this *Player) GetMessageAttach(id string) {
} }
if _, code, _ := BagMgrSingleton.AddItems(this, items, 0, gainWay, "mail", remark, 0, 0, false); code != bag.OpResultCode_OPRC_Sucess { // 领取失败 if _, code, _ := BagMgrSingleton.AddItems(this, items, 0, gainWay, "mail", remark, 0, 0, false); code != bag.OpResultCode_OPRC_Sucess { // 领取失败
logger.Logger.Errorf("CSPlayerSettingHandler AddItems err", code) logger.Logger.Errorf("CSPlayerSettingHandler AddItems err", code)
pack := &msg_proto.SCGetMessageAttach{ pack := &msgproto.SCGetMessageAttach{
Id: proto.String(""), Id: proto.String(""),
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToClient(int(msg_proto.MSGPacketID_PACKET_SC_GETMESSAGEATTACH), pack) this.SendToClient(int(msgproto.MSGPacketID_PACKET_SC_GETMESSAGEATTACH), pack)
} }
this.dirty = true this.dirty = true
} }
@ -1270,11 +1271,11 @@ func (this *Player) GetMessageAttach(id string) {
} }
} }
} }
pack := &msg_proto.SCGetMessageAttach{ pack := &msgproto.SCGetMessageAttach{
Id: proto.String(id), Id: proto.String(id),
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToClient(int(msg_proto.MSGPacketID_PACKET_SC_GETMESSAGEATTACH), pack) this.SendToClient(int(msgproto.MSGPacketID_PACKET_SC_GETMESSAGEATTACH), pack)
} }
}), "GetMessageAttach").StartByFixExecutor("logic_message") }), "GetMessageAttach").StartByFixExecutor("logic_message")
} }
@ -1317,7 +1318,7 @@ func (this *Player) GetMessageAttachs(ids []string) {
} }
} }
pack := &msg_proto.SCGetMessageAttach{ pack := &msgproto.SCGetMessageAttach{
// Id: proto.String(id), // Id: proto.String(id),
} }
@ -1451,7 +1452,7 @@ func (this *Player) GetMessageAttachs(ids []string) {
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToClient(int(msg_proto.MSGPacketID_PACKET_SC_GETMESSAGEATTACH), pack) this.SendToClient(int(msgproto.MSGPacketID_PACKET_SC_GETMESSAGEATTACH), pack)
} }
}), "GetMessageAttach").StartByFixExecutor("logic_message") }), "GetMessageAttach").StartByFixExecutor("logic_message")
@ -1470,12 +1471,12 @@ func (this *Player) GetMessageByGiftId(id string) *model.Message {
func (this *Player) Kickout(reason int32) { func (this *Player) Kickout(reason int32) {
if this.IsOnLine() { if this.IsOnLine() {
logger.Logger.Trace("(this *Player) Kickout()", this.SnId) logger.Logger.Trace("(this *Player) Kickout()", this.SnId)
scDisconnect := &login_proto.SSDisconnect{ scDisconnect := &loginproto.SSDisconnect{
SessionId: proto.Int64(this.sid), SessionId: proto.Int64(this.sid),
Type: proto.Int32(reason), Type: proto.Int32(reason),
} }
proto.SetDefaults(scDisconnect) proto.SetDefaults(scDisconnect)
this.SendToClient(int(login_proto.GatePacketID_PACKET_SS_DICONNECT), scDisconnect) this.SendToClient(int(loginproto.GatePacketID_PACKET_SS_DICONNECT), scDisconnect)
LoginStateMgrSington.LogoutBySid(this.sid) LoginStateMgrSington.LogoutBySid(this.sid)
this.DropLine() this.DropLine()
@ -1517,12 +1518,12 @@ func (this *Player) DropLine() {
this.PlayerData.LastLogoutTime = time.Now().Local() this.PlayerData.LastLogoutTime = time.Now().Local()
FriendMgrSington.UpdateLogoutTime(this.Platform, this.SnId) FriendMgrSington.UpdateLogoutTime(this.Platform, this.SnId)
if this.scene != nil && this.scene.gameSess != nil { if this.scene != nil && this.scene.gameSess != nil {
pack := &server_proto.WGPlayerDropLine{ pack := &serverproto.WGPlayerDropLine{
Id: proto.Int32(this.SnId), Id: proto.Int32(this.SnId),
SceneId: proto.Int(this.scene.sceneId), SceneId: proto.Int(this.scene.sceneId),
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToGame(int(server_proto.SSPacketID_PACKET_WG_PLAYERDROPLINE), pack) this.SendToGame(int(serverproto.SSPacketID_PACKET_WG_PLAYERDROPLINE), pack)
} }
PlayerMgrSington.DroplinePlayer(this) PlayerMgrSington.DroplinePlayer(this)
this.sid = 0 this.sid = 0
@ -1544,11 +1545,11 @@ func (this *Player) Logout() {
// 在线奖励：累计在线时长 // 在线奖励：累计在线时长
//this.OnlineRewardAddUpOnlineDuration() //this.OnlineRewardAddUpOnlineDuration()
scLogout := &login_proto.SCLogout{ scLogout := &loginproto.SCLogout{
OpRetCode: login_proto.OpResultCode_OPRC_Sucess, OpRetCode: loginproto.OpResultCode_OPRC_Sucess,
} }
proto.SetDefaults(scLogout) proto.SetDefaults(scLogout)
this.SendToClient(int(login_proto.LoginPacketID_PACKET_SC_LOGOUT), scLogout) this.SendToClient(int(loginproto.LoginPacketID_PACKET_SC_LOGOUT), scLogout)
this.SetOffline() this.SetOffline()
this.LastLogoutTime = time.Now().Local() this.LastLogoutTime = time.Now().Local()
FriendMgrSington.UpdateLogoutTime(this.Platform, this.SnId) FriendMgrSington.UpdateLogoutTime(this.Platform, this.SnId)
@ -1727,10 +1728,10 @@ func (this *Player) UnmarshalData(data []byte, scene *Scene) {
this.dirty = true this.dirty = true
} }
func (this *Player) MarshalIParam() []*server_proto.PlayerIParam { func (this *Player) MarshalIParam() []*serverproto.PlayerIParam {
var params []*server_proto.PlayerIParam var params []*serverproto.PlayerIParam
for i, v := range this.Iparams { for i, v := range this.Iparams {
params = append(params, &server_proto.PlayerIParam{ params = append(params, &serverproto.PlayerIParam{
ParamId: proto.Int(i), ParamId: proto.Int(i),
IntVal: proto.Int64(v), IntVal: proto.Int64(v),
}) })
@ -1738,16 +1739,16 @@ func (this *Player) MarshalIParam() []*server_proto.PlayerIParam {
return params return params
} }
func (this *Player) UnmarshalIParam(params []*server_proto.PlayerIParam) { func (this *Player) UnmarshalIParam(params []*serverproto.PlayerIParam) {
for _, p := range params { for _, p := range params {
this.Iparams[int(p.GetParamId())] = p.GetIntVal() this.Iparams[int(p.GetParamId())] = p.GetIntVal()
} }
} }
func (this *Player) MarshalSParam() []*server_proto.PlayerSParam { func (this *Player) MarshalSParam() []*serverproto.PlayerSParam {
var params []*server_proto.PlayerSParam var params []*serverproto.PlayerSParam
for i, v := range this.sparams { for i, v := range this.sparams {
params = append(params, &server_proto.PlayerSParam{ params = append(params, &serverproto.PlayerSParam{
ParamId: proto.Int(i), ParamId: proto.Int(i),
StrVal: proto.String(v), StrVal: proto.String(v),
}) })
@ -1755,16 +1756,16 @@ func (this *Player) MarshalSParam() []*server_proto.PlayerSParam {
return params return params
} }
func (this *Player) UnmarshalSParam(params []*server_proto.PlayerSParam) { func (this *Player) UnmarshalSParam(params []*serverproto.PlayerSParam) {
for _, p := range params { for _, p := range params {
this.sparams[int(p.GetParamId())] = p.GetStrVal() this.sparams[int(p.GetParamId())] = p.GetStrVal()
} }
} }
func (this *Player) MarshalCParam() []*server_proto.PlayerCParam { func (this *Player) MarshalCParam() []*serverproto.PlayerCParam {
var params []*server_proto.PlayerCParam var params []*serverproto.PlayerCParam
for k, v := range this.cparams { for k, v := range this.cparams {
params = append(params, &server_proto.PlayerCParam{ params = append(params, &serverproto.PlayerCParam{
StrKey: proto.String(k), StrKey: proto.String(k),
StrVal: proto.String(v), StrVal: proto.String(v),
}) })
@ -1913,11 +1914,15 @@ func (this *Player) AddDiamond(num, add int64, gainWay int32, oper, remark strin
} else { } else {
this.Diamond += num this.Diamond += num
} }
switch gainWay {
case common.GainWay_MatchSignup: // 排除的
default:
TaskSubjectSingleton.Touch(common.TaskTypeCostDiamond, &TaskData{ TaskSubjectSingleton.Touch(common.TaskTypeCostDiamond, &TaskData{
SnId: this.SnId, SnId: this.SnId,
Num: -num, Num: -num,
}) })
} }
}
this.SendDiffData() this.SendDiffData()
if !this.IsRob { if !this.IsRob {
@ -2392,36 +2397,36 @@ func (this *Player) GetIP() string {
return this.Ip return this.Ip
} }
func (this *Player) CreateScene(sceneId, gameId, gameMode, sceneMode int, numOfGames int32, params []int64, dbGameFree *server_proto.DB_GameFree) (*Scene, hall_proto.OpResultCode_Game) { func (this *Player) CreateScene(sceneId, gameId, gameMode, sceneMode int, numOfGames int32, params []int64, dbGameFree *serverproto.DB_GameFree) (*Scene, hallproto.OpResultCode_Game) {
gs := GameSessMgrSington.GetMinLoadSess(gameId) gs := GameSessMgrSington.GetMinLoadSess(gameId)
if gs == nil { if gs == nil {
logger.Logger.Warnf("(this *Player) EnterScene %v, %v GameSessMgrSington.GetMinLoadSess() = nil ", this.SnId, gameId) logger.Logger.Warnf("(this *Player) EnterScene %v, %v GameSessMgrSington.GetMinLoadSess() = nil ", this.SnId, gameId)
return nil, hall_proto.OpResultCode_Game_OPRC_SceneServerMaintain_Game return nil, hallproto.OpResultCode_Game_OPRC_SceneServerMaintain_Game
} }
s := SceneMgrSingleton.CreateScene(0, this.SnId, sceneId, gameId, gameMode, sceneMode, 1, numOfGames, params, gs, this.GetPlatform(), 0, dbGameFree, dbGameFree.GetId()) s := SceneMgrSingleton.CreateScene(0, this.SnId, sceneId, gameId, gameMode, sceneMode, 1, numOfGames, params, gs, this.GetPlatform(), 0, dbGameFree, dbGameFree.GetId())
if s == nil { if s == nil {
logger.Logger.Tracef("(this *Player) EnterScene %v, SceneMgrSingleton.CreateScene() = nil ", this.SnId) logger.Logger.Tracef("(this *Player) EnterScene %v, SceneMgrSingleton.CreateScene() = nil ", this.SnId)
return nil, hall_proto.OpResultCode_Game_OPRC_Error_Game return nil, hallproto.OpResultCode_Game_OPRC_Error_Game
} }
return s, hall_proto.OpResultCode_Game_OPRC_Sucess_Game return s, hallproto.OpResultCode_Game_OPRC_Sucess_Game
} }
func (this *Player) CreateLocalGameScene(sceneId, gameId, gameSite, sceneMode, playerNum int, params []int64, func (this *Player) CreateLocalGameScene(sceneId, gameId, gameSite, sceneMode, playerNum int, params []int64,
dbGameFree *server_proto.DB_GameFree, baseScore, groupId int32) (*Scene, hall_proto.OpResultCode_Game) { dbGameFree *serverproto.DB_GameFree, baseScore, groupId int32) (*Scene, hallproto.OpResultCode_Game) {
gs := GameSessMgrSington.GetMinLoadSess(gameId) gs := GameSessMgrSington.GetMinLoadSess(gameId)
if gs == nil { if gs == nil {
logger.Logger.Warnf("(this *Player) CreateLocalGameScene %v, %v GameSessMgrSington.GetMinLoadSess() = nil ", this.SnId, gameId) logger.Logger.Warnf("(this *Player) CreateLocalGameScene %v, %v GameSessMgrSington.GetMinLoadSess() = nil ", this.SnId, gameId)
return nil, hall_proto.OpResultCode_Game_OPRC_SceneServerMaintain_Game return nil, hallproto.OpResultCode_Game_OPRC_SceneServerMaintain_Game
} }
s := SceneMgrSingleton.CreateLocalGameScene(this.SnId, sceneId, gameId, gameSite, sceneMode, 1, params, gs, s := SceneMgrSingleton.CreateLocalGameScene(this.SnId, sceneId, gameId, gameSite, sceneMode, 1, params, gs,
this.GetPlatform(), playerNum, dbGameFree, baseScore, groupId, dbGameFree.GetId()) this.GetPlatform(), playerNum, dbGameFree, baseScore, groupId, dbGameFree.GetId())
if s == nil { if s == nil {
logger.Logger.Tracef("(this *Player) EnterScene %v, SceneMgrSingleton.CreateScene() = nil ", this.SnId) logger.Logger.Tracef("(this *Player) EnterScene %v, SceneMgrSingleton.CreateScene() = nil ", this.SnId)
return nil, hall_proto.OpResultCode_Game_OPRC_Error_Game return nil, hallproto.OpResultCode_Game_OPRC_Error_Game
} }
return s, hall_proto.OpResultCode_Game_OPRC_Sucess_Game return s, hallproto.OpResultCode_Game_OPRC_Sucess_Game
} }
func (this *Player) ReturnScene(isLoaded bool) *Scene { func (this *Player) ReturnScene(isLoaded bool) *Scene {
@ -2435,7 +2440,7 @@ func (this *Player) ReturnScene(isLoaded bool) *Scene {
return nil return nil
} }
pack := &server_proto.WGPlayerReturn{ pack := &serverproto.WGPlayerReturn{
PlayerId: proto.Int32(this.SnId), PlayerId: proto.Int32(this.SnId),
IsLoaded: proto.Bool(isLoaded), IsLoaded: proto.Bool(isLoaded),
RoomId: proto.Int(this.scene.sceneId), RoomId: proto.Int(this.scene.sceneId),
@ -2445,7 +2450,7 @@ func (this *Player) ReturnScene(isLoaded bool) *Scene {
pack.EnterTs = proto.Int64(ctx.enterTs) pack.EnterTs = proto.Int64(ctx.enterTs)
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
if this.SendToGame(int(server_proto.SSPacketID_PACKET_WG_PLAYERRETURN), pack) { if this.SendToGame(int(serverproto.SSPacketID_PACKET_WG_PLAYERRETURN), pack) {
//比赛场返场检查 //比赛场返场检查
//MatchMgrSington.OnPlayerReturnScene(this.scene, this) //MatchMgrSington.OnPlayerReturnScene(this.scene, this)
return this.scene return this.scene
@ -2479,7 +2484,7 @@ func (this *Player) AddMoneyPayTotal(amount int64) {
func (this *Player) SendDiffData() { func (this *Player) SendDiffData() {
this.UpdateVip() this.UpdateVip()
var dirty bool var dirty bool
pack := &player_proto.SCPlayerDataUpdate{} pack := &playerproto.SCPlayerDataUpdate{}
pack.UpdateField = 0 pack.UpdateField = 0
//金币 //金币
if this.diffData.Coin != this.Coin { if this.diffData.Coin != this.Coin {
@ -2581,7 +2586,7 @@ func (this *Player) SendDiffData() {
if dirty { if dirty {
FriendMgrSington.UpdateInfo(this.Platform, this.SnId) FriendMgrSington.UpdateInfo(this.Platform, this.SnId)
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_PLAYERDATAUPDATE), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_PLAYERDATAUPDATE), pack)
logger.Logger.Trace("(this *Player) SendDiffData() ", pack) logger.Logger.Trace("(this *Player) SendDiffData() ", pack)
} }
} }
@ -2964,9 +2969,9 @@ func (this *Player) GetPromoterKey() (string, error) {
func (this *Player) SendPlayerInfo() { func (this *Player) SendPlayerInfo() {
this.UpdateVip() this.UpdateVip()
scPlayerData := &player_proto.SCPlayerData{ scPlayerData := &playerproto.SCPlayerData{
OpRetCode: player_proto.OpResultCode_OPRC_Sucess, OpRetCode: playerproto.OpResultCode_OPRC_Sucess,
Data: &player_proto.PlayerData{ Data: &playerproto.PlayerData{
AccId: proto.String(this.AccountId), //账号ID AccId: proto.String(this.AccountId), //账号ID
Platform: proto.String(this.Platform), //平台 Platform: proto.String(this.Platform), //平台
Channel: proto.String(this.Channel), //渠道 Channel: proto.String(this.Channel), //渠道
@ -3050,14 +3055,14 @@ func (this *Player) SendPlayerInfo() {
if endTime == 0 { if endTime == 0 {
continue continue
} }
weekInfo := player_proto.WeekInfo{ weekInfo := playerproto.WeekInfo{
Id: id, Id: id,
WeekCardTime: endTime, WeekCardTime: endTime,
WeekCardAward: this.WeekCardAward[id], WeekCardAward: this.WeekCardAward[id],
} }
scPlayerData.Data.WeekCard = append(scPlayerData.Data.WeekCard, &weekInfo) scPlayerData.Data.WeekCard = append(scPlayerData.Data.WeekCard, &weekInfo)
} }
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_PLAYERDATA), scPlayerData) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_PLAYERDATA), scPlayerData)
logger.Logger.Tracef("Send SCPlayerData %v", scPlayerData) logger.Logger.Tracef("Send SCPlayerData %v", scPlayerData)
if !this.IsRob { if !this.IsRob {
@ -3272,13 +3277,13 @@ func ReportSystemGiveEvent(pd *model.PlayerData, amount, tag int32, notifyClient
player := PlayerMgrSington.GetPlayerBySnId(pd.SnId) player := PlayerMgrSington.GetPlayerBySnId(pd.SnId)
if player != nil { if player != nil {
//通知客户端 //通知客户端
sendPack := &shop_proto.SCNotifyGiveCoinInfo{ sendPack := &shopproto.SCNotifyGiveCoinInfo{
GiveCoin: proto.Int64(int64(amount)), GiveCoin: proto.Int64(int64(amount)),
GiveTag: proto.Int32(tag), GiveTag: proto.Int32(tag),
} }
proto.SetDefaults(sendPack) proto.SetDefaults(sendPack)
player.SendToClient(int(shop_proto.SPacketID_SHOP_SC_GIVECOIN_INFO), sendPack) player.SendToClient(int(shopproto.SPacketID_SHOP_SC_GIVECOIN_INFO), sendPack)
} }
} }
} }
@ -3303,7 +3308,7 @@ func (this *Player) ReportBankRuptcy(gameid, gamemode, gamefreeid int32) {
//} //}
} }
func (this *Player) CheckType(gameid, gamefreeId int32) *server_proto.DB_PlayerType { func (this *Player) CheckType(gameid, gamefreeId int32) *serverproto.DB_PlayerType {
types := srvdata.PlayerTypeMgrSington.GetPlayerType(gamefreeId) types := srvdata.PlayerTypeMgrSington.GetPlayerType(gamefreeId)
cnt := len(types) cnt := len(types)
if cnt > 0 { if cnt > 0 {
@ -3400,14 +3405,14 @@ func (this *Player) AddPayCoinLog(coin int64, coinType int32, oper string) {
// 充值回调 // 充值回调
func (this *Player) SendPlayerRechargeAnswer(coin int64) { func (this *Player) SendPlayerRechargeAnswer(coin int64) {
if this.Tel == "" { if this.Tel == "" {
pack := &player_proto.SCPlayerRechargeAnswer{ pack := &playerproto.SCPlayerRechargeAnswer{
OpParam: proto.Int64(1), OpParam: proto.Int64(1),
AddCoin: proto.Int64(coin), AddCoin: proto.Int64(coin),
Coin: proto.Int64(this.Coin), Coin: proto.Int64(this.Coin),
SafeBoxCoin: proto.Int64(this.SafeBoxCoin), SafeBoxCoin: proto.Int64(this.SafeBoxCoin),
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_PLAYERRECHARGEANSWER), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_PLAYERRECHARGEANSWER), pack)
} }
} }
@ -3459,12 +3464,12 @@ func (this *Player) SendPlayerRechargeAnswer(coin int64) {
//} //}
func (this *Player) SyncSafeBoxCoinToGame() { func (this *Player) SyncSafeBoxCoinToGame() {
pack := &server_proto.WGSyncPlayerSafeBoxCoin{ pack := &serverproto.WGSyncPlayerSafeBoxCoin{
SnId: proto.Int32(this.SnId), SnId: proto.Int32(this.SnId),
SafeBoxCoin: proto.Int64(this.SafeBoxCoin), SafeBoxCoin: proto.Int64(this.SafeBoxCoin),
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToGame(int(server_proto.SSPacketID_PACKET_WG_SyncPlayerSafeBoxCoin), pack) this.SendToGame(int(serverproto.SSPacketID_PACKET_WG_SyncPlayerSafeBoxCoin), pack)
} }
//func (this *Player) GetDgHboPlayerName(plt *Platform) (string, string) { //func (this *Player) GetDgHboPlayerName(plt *Platform) (string, string) {
@ -3518,12 +3523,12 @@ func OnPlayerPay(pd *model.PlayerData, coin int64) {
buf, err := pd.GetPlayerDataEncoder() buf, err := pd.GetPlayerDataEncoder()
if err == nil { if err == nil {
pack := &server_proto.WTPlayerPay{ pack := &serverproto.WTPlayerPay{
AddCoin: proto.Int64(coin), AddCoin: proto.Int64(coin),
PlayerData: buf.Bytes(), PlayerData: buf.Bytes(),
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
common.SendToActThrSrv(int(server_proto.SSPacketID_PACKET_WT_PLAYERPAY), pack) common.SendToActThrSrv(int(serverproto.SSPacketID_PACKET_WT_PLAYERPAY), pack)
} }
//ActFPayMgrSington.OnPlayerPay(pd.SnId, pd.Platform, coin) //ActFPayMgrSington.OnPlayerPay(pd.SnId, pd.Platform, coin)
@ -3541,12 +3546,12 @@ func (this *Player) SendPlatformCanUsePromoterBind() {
} }
} }
pack := &player_proto.SCBindPromoterState{ pack := &playerproto.SCBindPromoterState{
BindState: proto.Int32(state), BindState: proto.Int32(state),
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_BINDPROMOTERSTATE), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_BINDPROMOTERSTATE), pack)
} }
func (this *Player) RedirectByGame(packetid int, rawpack interface{}) bool { func (this *Player) RedirectByGame(packetid int, rawpack interface{}) bool {
@ -3561,13 +3566,13 @@ func (this *Player) RedirectByGame(packetid int, rawpack interface{}) bool {
data, err := netlib.MarshalPacket(packetid, rawpack) data, err := netlib.MarshalPacket(packetid, rawpack)
if err == nil { if err == nil {
pack := &server_proto.SSRedirectToPlayer{ pack := &serverproto.SSRedirectToPlayer{
SnId: proto.Int32(this.SnId), SnId: proto.Int32(this.SnId),
PacketId: proto.Int(packetid), PacketId: proto.Int(packetid),
Data: data, Data: data,
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
return this.SendToGame(int(server_proto.SSPacketID_PACKET_SS_REDIRECTTOPLAYER), pack) return this.SendToGame(int(serverproto.SSPacketID_PACKET_SS_REDIRECTTOPLAYER), pack)
} }
return false return false
} }
@ -3580,12 +3585,12 @@ func (this *Player) SyncPlayerDataToGateSrv(pd *model.PlayerData) {
if err != nil { if err != nil {
logger.Logger.Info("(this *Player) UpdateToGateSrv gob.Marshal error", err) logger.Logger.Info("(this *Player) UpdateToGateSrv gob.Marshal error", err)
} else { } else {
pack := &server_proto.WRPlayerData{ pack := &serverproto.WRPlayerData{
Sid: this.sid, Sid: this.sid,
PlayerData: buf.Bytes(), PlayerData: buf.Bytes(),
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.gateSess.Send(int(server_proto.SSPacketID_PACKET_WR_PlayerData), pack) this.gateSess.Send(int(serverproto.SSPacketID_PACKET_WR_PlayerData), pack)
} }
} }
@ -3593,26 +3598,26 @@ func (this *Player) BindGroupTag(tags []string) {
if this.gateSess == nil { if this.gateSess == nil {
return return
} }
pack := &server_proto.SGBindGroupTag{ pack := &serverproto.SGBindGroupTag{
Sid: proto.Int64(this.sid), Sid: proto.Int64(this.sid),
Code: server_proto.SGBindGroupTag_OpCode_Add, Code: serverproto.SGBindGroupTag_OpCode_Add,
Tags: tags, Tags: tags,
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.gateSess.Send(int(server_proto.SSPacketID_PACKET_SG_BINDGROUPTAG), pack) this.gateSess.Send(int(serverproto.SSPacketID_PACKET_SG_BINDGROUPTAG), pack)
} }
func (this *Player) UnBindGroupTag(tags []string) { func (this *Player) UnBindGroupTag(tags []string) {
if this.gateSess == nil { if this.gateSess == nil {
return return
} }
pack := &server_proto.SGBindGroupTag{ pack := &serverproto.SGBindGroupTag{
Sid: proto.Int64(this.sid), Sid: proto.Int64(this.sid),
Code: server_proto.SGBindGroupTag_OpCode_Del, Code: serverproto.SGBindGroupTag_OpCode_Del,
Tags: tags, Tags: tags,
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
this.gateSess.Send(int(server_proto.SSPacketID_PACKET_SG_BINDGROUPTAG), pack) this.gateSess.Send(int(serverproto.SSPacketID_PACKET_SG_BINDGROUPTAG), pack)
} }
func (this *Player) TryRetrieveLostGameCoin(sceneid int) { func (this *Player) TryRetrieveLostGameCoin(sceneid int) {
@ -3658,9 +3663,9 @@ func (this *Player) SyncGameCoin(sceneid int, enterts int64) {
this.SendDiffData() this.SendDiffData()
}), "GetCoinWALBySnidAndInGameAndGreaterTs").Start() }), "GetCoinWALBySnidAndInGameAndGreaterTs").Start()
} }
func (this *Player) SendShowRed(showType hall_proto.ShowRedCode, showChild, isShow int32) { func (this *Player) SendShowRed(showType hallproto.ShowRedCode, showChild, isShow int32) {
pack := &hall_proto.SCShowRed{ pack := &hallproto.SCShowRed{
ShowRed: &hall_proto.ShowRed{ ShowRed: &hallproto.ShowRed{
ShowType: showType, ShowType: showType,
ShowChild: proto.Int32(showChild), ShowChild: proto.Int32(showChild),
IsShow: proto.Int32(isShow), IsShow: proto.Int32(isShow),
@ -3668,19 +3673,19 @@ func (this *Player) SendShowRed(showType hall_proto.ShowRedCode, showChild, isSh
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
logger.Logger.Trace("SCShowRed:", pack) logger.Logger.Trace("SCShowRed:", pack)
this.SendToClient(int(hall_proto.HallPacketID_PACKET_SC_SHOWRED), pack) this.SendToClient(int(hallproto.HallPacketID_PACKET_SC_SHOWRED), pack)
} }
func (this *Player) SCVIPBuy(buy int64) { func (this *Player) SCVIPBuy(buy int64) {
//buy *= 10000 //buy *= 10000
//this.AddMoneyPayTotal(buy) //this.AddMoneyPayTotal(buy)
//this.GetVIPLevel(0) // 更新下vip等级 //this.GetVIPLevel(0) // 更新下vip等级
pack := &player_proto.SCVIPBuy{ pack := &playerproto.SCVIPBuy{
OpRetCode: player_proto.OpResultCode_OPRC_Sucess, OpRetCode: playerproto.OpResultCode_OPRC_Sucess,
} }
pack.TolVipExp, pack.Money = this.GetCurrentVIPExp() // 获取经验会更新vip等级 pack.TolVipExp, pack.Money = this.GetCurrentVIPExp() // 获取经验会更新vip等级
pack.Vip = this.VIP pack.Vip = this.VIP
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_VIPBUY), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_VIPBUY), pack)
} }
func (this *Player) SCVIPInfo() { func (this *Player) SCVIPInfo() {
@ -3688,15 +3693,15 @@ func (this *Player) SCVIPInfo() {
return return
} }
pack := &player_proto.SCVIPInfo{ pack := &playerproto.SCVIPInfo{
OpRetCode: player_proto.OpResultCode_OPRC_Error, OpRetCode: playerproto.OpResultCode_OPRC_Error,
} }
vips := VipMgrSington.GetVIPcfg(this.Platform) vips := VipMgrSington.GetVIPcfg(this.Platform)
if vips != nil { if vips != nil {
pack.MoneyRatio = int32(vips.MoneyRatio) pack.MoneyRatio = int32(vips.MoneyRatio)
for _, cfg := range vips.List { for _, cfg := range vips.List {
data := &player_proto.VIPcfg{ data := &playerproto.VIPcfg{
VipId: cfg.VipId, VipId: cfg.VipId,
VipEx: cfg.VipEx, VipEx: cfg.VipEx,
Price: cfg.Price, Price: cfg.Price,
@ -3714,13 +3719,13 @@ func (this *Player) SCVIPInfo() {
MatchFreeTimes: cfg.MatchFreeTimes, MatchFreeTimes: cfg.MatchFreeTimes,
} }
for itemId, itemNum := range cfg.Award { for itemId, itemNum := range cfg.Award {
data.Item = append(data.Item, &player_proto.ItemInfo{ data.Item = append(data.Item, &playerproto.ItemInfo{
ItemId: int32(itemId), ItemId: int32(itemId),
ItemNum: itemNum, ItemNum: itemNum,
}) })
} }
for itemId, itemNum := range cfg.Privilege7 { for itemId, itemNum := range cfg.Privilege7 {
data.Privilege7 = append(data.Privilege7, &player_proto.ItemInfo{ data.Privilege7 = append(data.Privilege7, &playerproto.ItemInfo{
ItemId: int32(itemId), ItemId: int32(itemId),
ItemNum: itemNum, ItemNum: itemNum,
}) })
@ -3741,11 +3746,11 @@ func (this *Player) SCVIPInfo() {
pack.TolVipExp, pack.Money = this.GetCurrentVIPExp(vips) pack.TolVipExp, pack.Money = this.GetCurrentVIPExp(vips)
pack.Vip = this.VIP pack.Vip = this.VIP
pack.OpRetCode = player_proto.OpResultCode_OPRC_Sucess pack.OpRetCode = playerproto.OpResultCode_OPRC_Sucess
//WelfareMgrSington.MonitorWelfData(this) //WelfareMgrSington.MonitorWelfData(this)
//pack.VipId = append(pack.VipId, this.WelfData.VIPGift...) //pack.VipId = append(pack.VipId, this.WelfData.VIPGift...)
} }
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_VIPINFO), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_VIPINFO), pack)
} }
func (this *Player) GetVIPExpByPay(payTotal int32) int32 { func (this *Player) GetVIPExpByPay(payTotal int32) int32 {
vips := VipMgrSington.GetVIPcfg(this.Platform) vips := VipMgrSington.GetVIPcfg(this.Platform)
@ -3753,12 +3758,12 @@ func (this *Player) GetVIPExpByPay(payTotal int32) int32 {
} }
func (this *Player) VIPDraw(id int32) { func (this *Player) VIPDraw(id int32) {
//WelfareMgrSington.MonitorWelfData(this) //WelfareMgrSington.MonitorWelfData(this)
pack := &player_proto.SCVIPDraw{ pack := &playerproto.SCVIPDraw{
Id: id, Id: id,
OpRetCode: player_proto.OpResultCode_OPRC_Error, OpRetCode: playerproto.OpResultCode_OPRC_Error,
} }
if id != 0 { if id != 0 {
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_DRAWVIPGIFT), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_DRAWVIPGIFT), pack)
return return
} }
if this.WelfData.VIPBag == nil { if this.WelfData.VIPBag == nil {
@ -3767,7 +3772,7 @@ func (this *Player) VIPDraw(id int32) {
if innerMap, ok := this.WelfData.VIPBag[this.VIP]; ok { if innerMap, ok := this.WelfData.VIPBag[this.VIP]; ok {
if _, ok := innerMap[0]; ok { if _, ok := innerMap[0]; ok {
logger.Logger.Trace("VIPDraw VIP is repeat id%v ", id) logger.Logger.Trace("VIPDraw VIP is repeat id%v ", id)
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_DRAWVIPGIFT), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_DRAWVIPGIFT), pack)
return return
} }
} else { } else {
@ -3778,7 +3783,7 @@ func (this *Player) VIPDraw(id int32) {
if vips != nil { if vips != nil {
for _, data := range vips.List { for _, data := range vips.List {
if data.VipId == this.VIP { if data.VipId == this.VIP {
pack.OpRetCode = player_proto.OpResultCode_OPRC_Sucess pack.OpRetCode = playerproto.OpResultCode_OPRC_Sucess
this.WelfData.VIPBag[this.VIP][0] = 1 this.WelfData.VIPBag[this.VIP][0] = 1
//金币数量 //金币数量
money := data.Privilege1[0] money := data.Privilege1[0]
@ -3804,12 +3809,12 @@ func (this *Player) VIPDraw(id int32) {
} }
} }
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_DRAWVIPGIFT), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_DRAWVIPGIFT), pack)
} }
func (this *Player) GetCurrentVIPExp(vipcfg ...*webapi_proto.VIPcfgDataList) (exp int64, money int64) { func (this *Player) GetCurrentVIPExp(vipcfg ...*webapiproto.VIPcfgDataList) (exp int64, money int64) {
var vips *webapi_proto.VIPcfgDataList var vips *webapiproto.VIPcfgDataList
if len(vipcfg) == 0 { if len(vipcfg) == 0 {
vips = VipMgrSington.GetVIPcfg(this.Platform) vips = VipMgrSington.GetVIPcfg(this.Platform)
} else { } else {
@ -3913,7 +3918,7 @@ func (this *Player) GetPayGoodsInfo() {
case ShopPageBackend: case ShopPageBackend:
logger.Logger.Tracef("GetPayGoodsInfo ShopPageBackend %+v", *info) logger.Logger.Tracef("GetPayGoodsInfo ShopPageBackend %+v", *info)
default: default:
var itemInfo []*player_proto.PayItem var itemInfo []*playerproto.PayItem
var items []*Item var items []*Item
if len(info.Amount) > 0 { if len(info.Amount) > 0 {
this.AddCoin(int64(info.Amount[0]), 0, info.GainWay, "Callback_login", info.Remark) this.AddCoin(int64(info.Amount[0]), 0, info.GainWay, "Callback_login", info.Remark)
@ -3923,7 +3928,7 @@ func (this *Player) GetPayGoodsInfo() {
if info.ItemInfo != nil { if info.ItemInfo != nil {
for _, v := range info.ItemInfo { for _, v := range info.ItemInfo {
items = append(items, &Item{ItemId: v.ItemId, ItemNum: v.ItemNum}) items = append(items, &Item{ItemId: v.ItemId, ItemNum: v.ItemNum})
itemInfo = append(itemInfo, &player_proto.PayItem{ itemInfo = append(itemInfo, &playerproto.PayItem{
ItemId: v.ItemId, ItemId: v.ItemId,
ItemNum: v.ItemNum, ItemNum: v.ItemNum,
}) })
@ -3975,12 +3980,12 @@ func (this *Player) GetPayGoodsInfo() {
BagMgrSingleton.AddItems(this, items, 0, info.GainWay, info.Operator, info.Remark, 0, 0, false) BagMgrSingleton.AddItems(this, items, 0, info.GainWay, info.Operator, info.Remark, 0, 0, false)
PayGoodsInfo := &player_proto.SCPayGoodsInfo{ PayGoodsInfo := &playerproto.SCPayGoodsInfo{
Gold: info.Amount, Gold: info.Amount,
Item: itemInfo, Item: itemInfo,
} }
proto.SetDefaults(PayGoodsInfo) proto.SetDefaults(PayGoodsInfo)
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_PAYGOODSINFO), PayGoodsInfo) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_PAYGOODSINFO), PayGoodsInfo)
} }
if info.ConsumeNum > 0 { if info.ConsumeNum > 0 {
TaskSubjectSingleton.Touch(common.TaskTypePay, &TaskData{ TaskSubjectSingleton.Touch(common.TaskTypePay, &TaskData{
@ -3995,7 +4000,7 @@ func (this *Player) GetPayGoodsInfo() {
} }
func (this *Player) SendJackPotInit() { func (this *Player) SendJackPotInit() {
var pack = &hall_proto.SCHundredSceneGetGameJackpot{} var pack = &hallproto.SCHundredSceneGetGameJackpot{}
gameFreeIds := []int32{ gameFreeIds := []int32{
3010001, 3010002, 3010003, 3010004, 3010001, 3010002, 3010003, 3010004,
3020001, 3020002, 3020003, 3020004, 3020001, 3020002, 3020003, 3020004,
@ -4005,7 +4010,7 @@ func (this *Player) SendJackPotInit() {
for _, id := range gameFreeIds { for _, id := range gameFreeIds {
data := srvdata.PBDB_GameFreeMgr.GetData(id) data := srvdata.PBDB_GameFreeMgr.GetData(id)
if data != nil && len(data.Jackpot) > 0 { if data != nil && len(data.Jackpot) > 0 {
jpfi := &hall_proto.GameJackpotFundInfo{ jpfi := &hallproto.GameJackpotFundInfo{
GameFreeId: proto.Int32(data.Id), GameFreeId: proto.Int32(data.Id),
JackPotFund: proto.Int64(int64(data.BaseScore * data.Jackpot[0])), JackPotFund: proto.Int64(int64(data.BaseScore * data.Jackpot[0])),
} }
@ -4013,7 +4018,7 @@ func (this *Player) SendJackPotInit() {
} }
} }
if len(pack.GameJackpotFund) > 0 { if len(pack.GameJackpotFund) > 0 {
this.SendToClient(int(hall_proto.HundredScenePacketID_PACKET_SC_GAMEJACKPOT), pack) this.SendToClient(int(hallproto.HundredScenePacketID_PACKET_SC_GAMEJACKPOT), pack)
} }
} }
@ -4150,11 +4155,11 @@ func (this *Player) SendPlayerCoin() {
func (this *Player) UnPlayerPowerEx(power int64) { func (this *Player) UnPlayerPowerEx(power int64) {
logger.Logger.Tracef("解锁炮倍 当前最大解锁炮倍：%v,要解锁的炮倍：%v", this.UnMaxPower, power) logger.Logger.Tracef("解锁炮倍 当前最大解锁炮倍：%v,要解锁的炮倍：%v", this.UnMaxPower, power)
if this.UnPlayerPower(power) { if this.UnPlayerPower(power) {
pack := &player_proto.SCPlayerUnPower{ pack := &playerproto.SCPlayerUnPower{
UnMaxpower: power, UnMaxpower: power,
} }
this.UnMaxPower = power this.UnMaxPower = power
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_PlayerUnPower), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_PlayerUnPower), pack)
logger.Logger.Tracef("通知客户端解锁最大炮倍,snid = %v,power = %v", this.SnId, power) logger.Logger.Tracef("通知客户端解锁最大炮倍,snid = %v,power = %v", this.SnId, power)
} }
} }
@ -4178,10 +4183,10 @@ func (this *Player) ItemUnPlayerPowerListEx(itemId int32) {
if this.UnPlayerPowerList(powerId) { if this.UnPlayerPowerList(powerId) {
//通知客户端解锁炮台 //通知客户端解锁炮台
pack := &player_proto.SCPlayerUnPowerList{ pack := &playerproto.SCPlayerUnPowerList{
UnPowerList: powerId, UnPowerList: powerId,
} }
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_PlayerUnPowerList), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_PlayerUnPowerList), pack)
logger.Logger.Trace("通知客户端解锁炮台 snid = %v,解锁的炮台：%v,当前已有的炮台 = %v", this.SnId, powerId, this.PowerList) logger.Logger.Trace("通知客户端解锁炮台 snid = %v,解锁的炮台：%v,当前已有的炮台 = %v", this.SnId, powerId, this.PowerList)
} }
} }
@ -4194,10 +4199,10 @@ func (this *Player) UnPlayerPowerListEx(powerId int32) {
} }
if this.UnPlayerPowerList(powerId) { if this.UnPlayerPowerList(powerId) {
//通知客户端解锁炮台 //通知客户端解锁炮台
pack := &player_proto.SCPlayerUnPowerList{ pack := &playerproto.SCPlayerUnPowerList{
UnPowerList: powerId, UnPowerList: powerId,
} }
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_PlayerUnPowerList), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_PlayerUnPowerList), pack)
logger.Logger.Trace("通知客户端解锁炮台 snid = %v,解锁的炮台：%v,当前已有的炮台 = %v", this.SnId, powerId, this.PowerList) logger.Logger.Trace("通知客户端解锁炮台 snid = %v,解锁的炮台：%v,当前已有的炮台 = %v", this.SnId, powerId, this.PowerList)
} }
} }
@ -4214,12 +4219,12 @@ func (this *Player) UpdatePlayerVipBag(shopId int32) {
} }
this.WelfData.VIPBag[shopInfo.VipLevel][shopInfo.Id] = shopInfo.Type this.WelfData.VIPBag[shopInfo.VipLevel][shopInfo.Id] = shopInfo.Type
logger.Logger.Tracef("玩家购买VIP商品成功,更新购买状态！snid = %v shopId = %v,VIP = %v", this.SnId, shopInfo.Id, shopInfo.VipLevel) logger.Logger.Tracef("玩家购买VIP商品成功,更新购买状态！snid = %v shopId = %v,VIP = %v", this.SnId, shopInfo.Id, shopInfo.VipLevel)
pack := &player_proto.SCVIPDraw{ pack := &playerproto.SCVIPDraw{
Id: shopInfo.Type, Id: shopInfo.Type,
Vip: shopInfo.VipLevel, Vip: shopInfo.VipLevel,
OpRetCode: player_proto.OpResultCode_OPRC_Sucess, OpRetCode: playerproto.OpResultCode_OPRC_Sucess,
} }
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_DRAWVIPGIFT), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_DRAWVIPGIFT), pack)
//VIP金币礼包&VIP固定礼包统计数据 //VIP金币礼包&VIP固定礼包统计数据
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} { task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
var item []model.ItemInfo var item []model.ItemInfo
@ -4363,10 +4368,10 @@ func (this *Player) addLotteryCount(count int32) {
this.LotteryCount = math.MaxInt32 this.LotteryCount = math.MaxInt32
} }
//通知客户端 //通知客户端
pack := &player_proto.SCPhoneLotteryCount{ pack := &playerproto.SCPhoneLotteryCount{
Count: this.LotteryCount, Count: this.LotteryCount,
} }
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_PhoneLotteryCount), pack) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_PhoneLotteryCount), pack)
} }
@ -4610,7 +4615,7 @@ func (this *Player) GetWeekCardAwary(id int32) {
logger.Logger.Trace("周卡已过期，不能领取！") logger.Logger.Trace("周卡已过期，不能领取！")
return return
} }
ret := &player_proto.SCGetWeekCardAwary{} ret := &playerproto.SCGetWeekCardAwary{}
if !this.WeekCardAward[id] { if !this.WeekCardAward[id] {
//获取周卡奖励 //获取周卡奖励
items := data.GetDayRewards() items := data.GetDayRewards()
@ -4618,7 +4623,7 @@ func (this *Player) GetWeekCardAwary(id int32) {
for itemId, itemNum := range items { for itemId, itemNum := range items {
item := &Item{ItemId: int32(itemId), ItemNum: itemNum, ObtainTime: time.Now().Unix()} item := &Item{ItemId: int32(itemId), ItemNum: itemNum, ObtainTime: time.Now().Unix()}
addItem = append(addItem, item) addItem = append(addItem, item)
itemInfo := &player_proto.PayItem{} itemInfo := &playerproto.PayItem{}
itemInfo.ItemId = int32(itemId) itemInfo.ItemId = int32(itemId)
itemInfo.ItemNum = itemNum itemInfo.ItemNum = itemNum
ret.Items = append(ret.Items, itemInfo) ret.Items = append(ret.Items, itemInfo)
@ -4628,13 +4633,13 @@ func (this *Player) GetWeekCardAwary(id int32) {
this.WeekCardAward[id] = true this.WeekCardAward[id] = true
ret.WeekCardAward = this.WeekCardAward[id] ret.WeekCardAward = this.WeekCardAward[id]
} }
info := &player_proto.WeekInfo{ info := &playerproto.WeekInfo{
Id: id, Id: id,
WeekCardTime: this.WeekCardTime[id], WeekCardTime: this.WeekCardTime[id],
WeekCardAward: this.WeekCardAward[id], WeekCardAward: this.WeekCardAward[id],
} }
ret.WeekCard = info ret.WeekCard = info
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCGetWeekCardAwary), ret) this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCGetWeekCardAwary), ret)
return return
} }
@ -4668,7 +4673,7 @@ func (this *Player) AddItemRecExpireTime(itemId int32, num, add int64, gainWay i
if num != 0 /*&& !async*/ { if num != 0 /*&& !async*/ {
this.dirty = true this.dirty = true
if num > 0 { if num > 0 {
itemData := srvdata.PBDB_GameItemMgr.GetData(itemId) itemData := srvdata.GameItemMgr.Get(this.Platform, itemId)
if itemData == nil { if itemData == nil {
return return
} }
@ -4684,14 +4689,14 @@ func (this *Player) AddItemRecExpireTime(itemId int32, num, add int64, gainWay i
} }
if this.scene != nil && this.scene.gameSess != nil { if this.scene != nil && this.scene.gameSess != nil {
msg := &server_proto.WGBuyRecTimeItem{ msg := &serverproto.WGBuyRecTimeItem{
SnId: this.SnId, SnId: this.SnId,
ExpireTime: this.ItemRecExpireTime, ExpireTime: this.ItemRecExpireTime,
Diamond: this.Diamond, Diamond: this.Diamond,
} }
proto.SetDefaults(msg) proto.SetDefaults(msg)
this.SendToGame(int(server_proto.SSPacketID_PACKET_WG_BUYRECTIMEITEM), msg) this.SendToGame(int(serverproto.SSPacketID_PACKET_WG_BUYRECTIMEITEM), msg)
} }
} }
@ -4711,3 +4716,38 @@ func (this *Player) GetIsPermit() bool {
} }
return false return false
} }
func (this *Player) SCItems() {
cfg := PlatformMgrSingleton.GetConfig(this.Platform).ItemConfig
if cfg == nil {
return
}
var items []*serverproto.DB_GameItem
for _, v := range cfg.GetItems() {
items = append(items, &serverproto.DB_GameItem{
Id: v.GetId(),
Name: v.GetName(),
ShowLocation: v.GetShowLocation(),
Classify: v.GetClassify(),
Type: v.GetType(),
Effect0: v.GetEffect0(),
Effect: v.GetEffect(),
SaleType: v.GetSaleType(),
SaleGold: v.GetSaleGold(),
Composition: v.GetComposition(),
CompositionMax: v.GetCompositionMax(),
Time: v.GetTime(),
Location: v.GetLocation(),
Describe: v.GetDescribe(),
Num: v.GetNum(),
Value: v.GetValue(),
Entity: v.GetEntity(),
Icon: v.GetIcon(),
})
}
pack := &playerproto.SCItem{
Items: items,
}
this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCItem), pack)
logger.Logger.Tracef("SCItem: %v", pack)
}

2
worldsrv/scene.go
View File

@ -515,7 +515,7 @@ func (this *Scene) PlayerEnter(p *Player, pos int, ischangeroom bool) bool {
} }
// 道具 // 道具
dbItemArr := srvdata.PBDB_GameItemMgr.Datas.Arr dbItemArr := srvdata.GameItemMgr.GetArr(p.Platform)
if dbItemArr != nil { if dbItemArr != nil {
msg.Items = make(map[int32]int64) msg.Items = make(map[int32]int64)
for _, dbItem := range dbItemArr { for _, dbItem := range dbItemArr {

12
worldsrv/shopmgr.go
View File

@ -576,6 +576,18 @@ func (this *ShopMgr) createPhoneScore(p *Player, shopInfo *model.ShopInfo, costN
if err == nil { if err == nil {
LogChannelSingleton.WriteMQData(model.GeneratePhoneLottery(p.SnId, p.Platform, string(jsonData), 2, 0, 0, int(costNum))) LogChannelSingleton.WriteMQData(model.GeneratePhoneLottery(p.SnId, p.Platform, string(jsonData), 2, 0, 0, int(costNum)))
} }
for _, v := range items {
tp1 := int32(-1)
if v.ItemId == common.ItemIDCoin {
tp1 = model.SystemFreeGive_CoinType_Coin
} else if v.ItemId == common.ItemIDDiamond {
tp1 = model.SystemFreeGive_CoinType_Diamond
}
if !p.IsRob && tp1 >= 0 {
LogChannelSingleton.WriteMQData(
model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel, model.SystemFreeGive_PhoneLotterySwap, tp1, v.ItemNum))
}
}
} }
} }

1
worldsrv/taskmgr.go
View File

@ -204,6 +204,7 @@ func (t *TaskHandle) AllTask(id int, data any) {
TargetN: v.TargetTimes, TargetN: v.TargetTimes,
Status: 0, Status: 0,
Reward: v.Award, Reward: v.Award,
TaskType: v.TaskType,
} }
if item.N > item.TargetN { if item.N > item.TargetN {
item.N = item.TargetN item.N = item.TargetN

8
worldsrv/tournament.go
View File

@ -732,6 +732,12 @@ func (this *Tournament) Start(platform string, tmId int32) {
GameFreeID: tm.dbGameFree.GetId(), GameFreeID: tm.dbGameFree.GetId(),
Num: 1, Num: 1,
}) })
if matchInfo.GetSignupCostDiamond() > 0 {
TaskSubjectSingleton.Touch(common.TaskTypeCostDiamond, &TaskData{
SnId: v.SnId,
Num: matchInfo.GetSignupCostDiamond(),
})
}
} }
this.signupPlayers[platform][tmId].signup = make(map[int32]*TmPlayer) this.signupPlayers[platform][tmId].signup = make(map[int32]*TmPlayer)
} }
@ -1213,7 +1219,7 @@ func (this *Tournament) sendPromotionInfo(mc *PlayerMatchContext, sortId int64,
wg := new(sync.WaitGroup) wg := new(sync.WaitGroup)
if pack.GetRankAward() != nil { if pack.GetRankAward() != nil {
for _, v := range pack.GetRankAward().GetItemInfo() { for _, v := range pack.GetRankAward().GetItemInfo() {
data := srvdata.PBDB_GameItemMgr.GetData(v.ItemId) data := srvdata.GameItemMgr.Get(mc.p.Platform, v.ItemId)
if data != nil && data.GetType() == common.ItemTypePhoneCode { if data != nil && data.GetType() == common.ItemTypePhoneCode {
has = true has = true
item := v // 并发需要复制 item := v // 并发需要复制

8
worldsrv/trascate_webapi.go
View File

@ -3927,7 +3927,7 @@ func init() {
award.Diamond = msg.GetAward().Diamond award.Diamond = msg.GetAward().Diamond
if msg.GetAward().GetItemId() != nil { if msg.GetAward().GetItemId() != nil {
for _, item := range msg.GetAward().ItemId { for _, item := range msg.GetAward().ItemId {
if v := srvdata.PBDB_GameItemMgr.GetData(item.ItemId); item != nil { if v := srvdata.GameItemMgr.Get(msg.Platform, item.ItemId); item != nil {
if item.ItemNum == 0 { if item.ItemNum == 0 {
pack.Tag = webapiproto.TagCode_JYB_DATA_ERROR pack.Tag = webapiproto.TagCode_JYB_DATA_ERROR
pack.Msg = "ItemNum failed" pack.Msg = "ItemNum failed"
@ -4026,7 +4026,7 @@ func init() {
return common.ResponseTag_ParamError, pack return common.ResponseTag_ParamError, pack
} }
//cdata := ShopMgrSington.GetExchangeData(msg.GoodsId) //cdata := ShopMgrSington.GetExchangeData(msg.GoodsId)
item := srvdata.PBDB_GameItemMgr.GetData(VCard) item := srvdata.GameItemMgr.Get(platform, VCard)
if item == nil { if item == nil {
pack.Tag = webapiproto.TagCode_FAILED pack.Tag = webapiproto.TagCode_FAILED
pack.Msg = "item is nil" pack.Msg = "item is nil"
@ -4458,7 +4458,7 @@ func getPlayerDataParam(param *playerDataParam) *model.WebPlayerDataParam {
if param.Items == nil { if param.Items == nil {
b := BagMgrSingleton.GetBagInfo(param.P.SnId) b := BagMgrSingleton.GetBagInfo(param.P.SnId)
for _, v := range b.BagItem { for _, v := range b.BagItem {
e := srvdata.PBDB_GameItemMgr.GetData(v.ItemId) e := srvdata.GameItemMgr.Get(param.P.Platform, v.ItemId)
if e == nil || v.ItemNum <= 0 { if e == nil || v.ItemNum <= 0 {
continue continue
} }
@ -4476,7 +4476,7 @@ func getPlayerDataParam(param *playerDataParam) *model.WebPlayerDataParam {
} }
} else { } else {
for _, v := range param.Items.BagItem { for _, v := range param.Items.BagItem {
e := srvdata.PBDB_GameItemMgr.GetData(v.ItemId) e := srvdata.GameItemMgr.Get(param.P.Platform, v.ItemId)
if e == nil || v.ItemNum <= 0 { if e == nil || v.ItemNum <= 0 {
continue continue
} }

18
worldsrv/welfmgr.go
View File

@ -846,6 +846,7 @@ func (this *WelfareMgr) GetAddUp2Award(p *Player, day int32) {
} }
typeId := addUpDate2Type[0].Id typeId := addUpDate2Type[0].Id
addUpDate2Num := addUpDate2Type[0].Num addUpDate2Num := addUpDate2Type[0].Num
var cost []*model.ItemInfo
if typeId == 1 { if typeId == 1 {
Num += 1 Num += 1
//看广告任务 //看广告任务
@ -861,6 +862,10 @@ func (this *WelfareMgr) GetAddUp2Award(p *Player, day int32) {
p.AddDiamond(int64(-addUpDate2Num), 0, common.GainWaySign7Con, "system", "累计签到进阶奖励钻石消耗") p.AddDiamond(int64(-addUpDate2Num), 0, common.GainWaySign7Con, "system", "累计签到进阶奖励钻石消耗")
logger.Logger.Trace("累计签到进阶奖励，扣除钻石uid = ", p.SnId) logger.Logger.Trace("累计签到进阶奖励，扣除钻石uid = ", p.SnId)
EndTime = -1 EndTime = -1
cost = append(cost, &model.ItemInfo{
ItemId: common.ItemIDDiamond,
ItemNum: int64(addUpDate2Num),
})
} }
p.WelfData.Sign7.Addup2Data[day] = make(map[int32]int64) p.WelfData.Sign7.Addup2Data[day] = make(map[int32]int64)
p.WelfData.Sign7.Addup2Data[day][Num+1] = EndTime p.WelfData.Sign7.Addup2Data[day][Num+1] = EndTime
@ -879,7 +884,18 @@ func (this *WelfareMgr) GetAddUp2Award(p *Player, day int32) {
items = append(items, item) items = append(items, item)
} }
} }
BagMgrSingleton.AddItems(p, items, 0, common.GainWaySign7Add, "system", "累计签到进阶奖励获得", 0, 0, false) BagMgrSingleton.AddItemsV2(&ItemParam{
P: p,
Change: items,
Cost: cost,
Add: 0,
GainWay: common.GainWaySign7Add,
Operator: "system",
Remark: "累计签到进阶奖励获得",
gameId: 0,
gameFreeId: 0,
noLog: false,
})
} }
//通知客户端 //通知客户端
this.UpdateAddUp2Date(p, Num, day, EndTime) this.UpdateAddUp2Date(p, Num, day, EndTime)

BIN
xlsx/DB_GameItem.xlsx
View File

Binary file not shown.

BIN
xlsx/DB_Task.xlsx
View File

Binary file not shown.