首冲加赠是否翻倍

data/i18n/languages.json

@@ -9,5 +9,7 @@
 	"MatchAwardTitle": "{\"zh\":\"话费充值兑换码\",\"vi\":\"Mã nạp tiền ĐT\",\"en\":\"Phone recharge code\",\"kh\":\"កូដបញ្ចូលទូរស័ព្ទ\"}",
 	"MatchAward": "{\"zh\":\"恭喜您获得电话预付卡“%v$”话费充值奖励,兑换码:%v,请尽快使用\",\"vi\":\"Chúc mừng bạn đã nhận được Thẻ trả trước ĐT “%v$” phần thưởng nạp tiền tín dụng ĐT, mã đổi thưởng %v xin sử dụng ngay lập tức\",\"en\":\"Congratulations, you have received the phone prepaid card “%v$” mobile credit top-up reward, redemption code: %v please use it immediately.\",\"kh\":\"សូមអបអរសាទរ អ្នកទទួលបានរង្វាន់កាតបញ្ចូលទូរស័ព្ទ កាតទូរស័ព្ទបង់ប្រាក់ជាមុន “%v$”លេខកូដដោះដូរ %v សូមប្រើវាភ្លាមៗ\"}",
 	"PermitAwardTitle": "{\"zh\":\"通行证排行奖励\",\"vi\":\"Vượt qua phần thưởng xếp hạng\",\"en\":\"Pass Ranking Rewards\",\"kh\":\"រង្វាន់ចំណាត់ថ្នាក់ឆ្លងកាត់\"}",
-	"PermitAward": "{\"zh\":\"恭喜您在上个赛季通行证排行中名次达到%v名，排行奖励已发放，请查收\",\"vi\":\"Chúc mừng bạn đã đạt được %v trong bảng xếp hạng vượt qua. Phần thưởng xếp hạng đã được phân phối, vui lòng kiểm tra.\",\"en\":\"Congratulations on reaching %vth place in the pass ranking. Ranking rewards have been issued. Please check.\",\"kh\":\"សូមអបអរសាទរចំពោះការឈានដល់ចំណាត់ថ្នាក់ទី %v ក្នុងចំណាត់ថ្នាក់ឆ្លងកាត់។ រង្វាន់ចំណាត់ថ្នាក់ត្រូវបានចេញ។ សូមត្រួតពិនិត្យ។\"}"
+	"PermitAward": "{\"zh\":\"恭喜您在上个赛季通行证排行中名次达到%v名，排行奖励已发放，请查收\",\"vi\":\"Chúc mừng bạn đã đạt được %v trong bảng xếp hạng vượt qua. Phần thưởng xếp hạng đã được phân phối, vui lòng kiểm tra.\",\"en\":\"Congratulations on reaching %vth place in the pass ranking. Ranking rewards have been issued. Please check.\",\"kh\":\"សូមអបអរសាទរចំពោះការឈានដល់ចំណាត់ថ្នាក់ទី %v ក្នុងចំណាត់ថ្នាក់ឆ្លងកាត់។ រង្វាន់ចំណាត់ថ្នាក់ត្រូវបានចេញ។ សូមត្រួតពិនិត្យ។\"}",
+	"UpgradeTitle": "{\"zh\":\"更新奖励\",\"vi\":\"Phần thưởng cập nhật\",\"en\":\"Update Rewards\",\"kh\":\"រង្វាន់ដំឡើង\"}",
+	"Upgrade": "{\"zh\":\"感谢您更新客户端，更新奖励已发放至附近，请注意查收\",\"vi\":\"Cảm ơn bạn đã cập nhật ứng dụng khách. Phần thưởng cập nhật đã được phân phối gần đó, vui lòng chú ý kiểm tra nhận\",\"en\":\"Thank you for updating the client. The update reward has been distributed to everyone. Please check it carefully.\",\"kh\":\"អរគុណសម្រាប់ការធ្វើបច្ចុប្បន្នភាពហ្គេម។ រង្វាន់នៃការធ្វើបច្ចុប្បន្នភាពត្រូវបានចែកចាយទៅគ្រប់គ្នា។ សូមពិនិត្យអោយបានច្បាស់លាស់។\"}"
 }

dbproxy/svc/l_loginlog.go

@@ -20,7 +20,11 @@ func LoginLogsCollection(plt string) *mongo.Collection {
 			c_loginlogrec.EnsureIndex(mgo.Index{Key: []string{"logtype"}, Background: true, Sparse: true})
 			c_loginlogrec.EnsureIndex(mgo.Index{Key: []string{"ip"}, Background: true, Sparse: true})
 			c_loginlogrec.EnsureIndex(mgo.Index{Key: []string{"time"}, Background: true, Sparse: true})
+			c_loginlogrec.EnsureIndex(mgo.Index{Key: []string{"-time"}, Background: true, Sparse: true})
 			c_loginlogrec.EnsureIndex(mgo.Index{Key: []string{"ts"}, Background: true, Sparse: true})
+			c_loginlogrec.EnsureIndex(mgo.Index{Key: []string{"-ts"}, Background: true, Sparse: true})
+			c_loginlogrec.EnsureIndex(mgo.Index{Key: []string{"appchannel"}, Background: true, Sparse: true})
+			c_loginlogrec.EnsureIndex(mgo.Index{Key: []string{"clientver"}, Background: true, Sparse: true})
 		}
 		return c_loginlogrec
 	}

etcd/keyconf.go

@@ -45,4 +45,5 @@ const (
 	ETCDKEY_RoomType            = "/game/room_type"       // 房间类型配置
 	ETCDKEY_RoomConfig          = "/game/room_config"     // 房间配置
 	ETCDKEY_RoomConfigSystem    = "/game/room_system"     // 系统房间配置
+	ETCDKEY_ClientUpgrade = "/game/client_upgrade"        // 客户端升级奖励配置
 )

model/config.go

@@ -65,6 +65,7 @@ type ShopInfo struct {
 	RoleAddedId     int32 //加成人物ID
 	PetAddedId      int32 //加成宠物ID
 	FirstSwitch     bool  // 首冲翻倍
+	FirstGiveSwitch bool  // 首冲翻倍时加赠是否翻倍
 	AmountFinal     int64 // 实际获得数量
 }
 
@@ -152,6 +153,8 @@ type AllConfig struct {
 	RoomTypeMap map[int32][]*webapi.RoomConfig // key: 房间类型id:房间配置
 	// 系统房间配置
 	RoomConfigSystem map[int32]*webapi.RoomConfigSystem
+	// 客户端升级奖励配置
+	*webapi.ClientUpgrade
 }
 
 type GlobalConfig struct {
@@ -257,6 +260,7 @@ func (cm *ConfigMgr) UpdateItemShop(list *webapi.ItemShopList) {
 			Ratio:           itemShop.Ratio,
 			EndTime:         itemShop.EndTime,
 			FirstSwitch:     itemShop.FirstSwitch,
+			FirstGiveSwitch: itemShop.OnFirstGiveDouble == common.On,
 		}
 	}
 	cm.GetConfig(list.Platform).ShopInfos = shopInfos

model/gameparam.go

@@ -91,6 +91,7 @@ type GameParam struct {
 	UseAdminPassword           bool     // 是否使用管理员密码
 	CloseCustomRoomCreate      bool     // 关闭自定义房间创建
 	ClientVersion              int32    // 客户端版本号
+	ClientVersionChannel []string       // 客户端版本号包渠道
 }
 
 var GameParamPath = "../data/gameparam.json"

model/loginlog.go

@@ -55,11 +55,12 @@ type LoginLog struct {
 	BuildVersion string
 	AppChannel   string
 	DeviceOS     string
+	ClientVer int32
 }
 
 func NewLoginLog(snId, logType int32, tel, ip, platform, channel, promoter, packageId, city string,
 	clog *ClientLoginInfo, totalCoin int64, gameId, lastGameId int,
-	DeviceName, PackageName, AppVersion, BuildVersion, AppChannel, channelId string) *LoginLog {
+	DeviceName, PackageName, AppVersion, BuildVersion, AppChannel, channelId string, clientVer int32) *LoginLog {
 	now := time.Now()
 	cl := &LoginLog{LogId: bson.NewObjectId()}
 	cl.SnId = snId
@@ -95,6 +96,7 @@ func NewLoginLog(snId, logType int32, tel, ip, platform, channel, promoter, pack
 	cl.AppVersion = AppVersion
 	cl.BuildVersion = BuildVersion
 	cl.AppChannel = AppChannel
+	cl.ClientVer = clientVer
 
 	return cl
 }

model/message.go

@@ -73,14 +73,14 @@ type Message struct {
 	CreatTs     int64         //创建时间戳
 	AttachState int32         //附件状态
 	GiftId      string        //
-	Params      []int32       //额外参数
+	Params      []int64       //额外参数
 	Platform    string        //平台信息
 	ShowId      int64         //区分主子游戏大厅
 	Channel     []string      //渠道
 }
 
 func NewMessage(pid string, srcId int32, srcName string, snid, mType int32, title, content string, coin, diamond int64,
-	state int32, addTime int64, attachState int32, giftId string, params []int32, platform string, showId int64, channel []string) *Message {
+	state int32, addTime int64, attachState int32, giftId string, params []int64, platform string, showId int64, channel []string) *Message {
 	if srcName == "" {
 		srcName = "{\"zh\":\"系统\",\"vi\":\"GM\",\"en\":\"GM\",\"kh\":\"GM\"}"
 	}
@@ -110,7 +110,7 @@ func NewMessage(pid string, srcId int32, srcName string, snid, mType int32, titl
 	return msg
 }
 func NewMessageByPlayer(pid string, oper, srcId int32, srcName string, snid, mType int32, title, content string, coin, diamond int64,
-	state int32, addTime int64, attachState int32, giftId string, params []int32, platform string, showId int64) *Message {
+	state int32, addTime int64, attachState int32, giftId string, params []int64, platform string, showId int64) *Message {
 
 	msg := &Message{
 		Id:          bson.NewObjectId(),

protocol/doc.md

@@ -75,6 +75,10 @@
 - 2580~2599
 - 2900~2999
 
+### upgrade.proto
+
+- 3100~3199
+
 ## gamesrv
 
 ### fish

protocol/upgrade/upgrade.pb.go

@@ -0,0 +1,360 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.27.1-devel
+// 	protoc        v3.19.4
+// source: upgrade.proto
+
+package upgrade
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type PacketID int32
+
+const (
+	// 3100~3199
+	PacketID_PacketID_Zero           PacketID = 0
+	PacketID_PACKET_CSClientUpgrades PacketID = 3100
+	PacketID_PACKET_SCClientUpgrades PacketID = 3101
+)
+
+// Enum value maps for PacketID.
+var (
+	PacketID_name = map[int32]string{
+		0:    "PacketID_Zero",
+		3100: "PACKET_CSClientUpgrades",
+		3101: "PACKET_SCClientUpgrades",
+	}
+	PacketID_value = map[string]int32{
+		"PacketID_Zero":           0,
+		"PACKET_CSClientUpgrades": 3100,
+		"PACKET_SCClientUpgrades": 3101,
+	}
+)
+
+func (x PacketID) Enum() *PacketID {
+	p := new(PacketID)
+	*p = x
+	return p
+}
+
+func (x PacketID) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (PacketID) Descriptor() protoreflect.EnumDescriptor {
+	return file_upgrade_proto_enumTypes[0].Descriptor()
+}
+
+func (PacketID) Type() protoreflect.EnumType {
+	return &file_upgrade_proto_enumTypes[0]
+}
+
+func (x PacketID) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use PacketID.Descriptor instead.
+func (PacketID) EnumDescriptor() ([]byte, []int) {
+	return file_upgrade_proto_rawDescGZIP(), []int{0}
+}
+
+type PropInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ItemId  int32 `protobuf:"varint,1,opt,name=ItemId,proto3" json:"ItemId,omitempty"`   //物品ID
+	ItemNum int64 `protobuf:"varint,2,opt,name=ItemNum,proto3" json:"ItemNum,omitempty"` //物品数量
+}
+
+func (x *PropInfo) Reset() {
+	*x = PropInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_upgrade_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PropInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PropInfo) ProtoMessage() {}
+
+func (x *PropInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_upgrade_proto_msgTypes[0]
+	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 PropInfo.ProtoReflect.Descriptor instead.
+func (*PropInfo) Descriptor() ([]byte, []int) {
+	return file_upgrade_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *PropInfo) GetItemId() int32 {
+	if x != nil {
+		return x.ItemId
+	}
+	return 0
+}
+
+func (x *PropInfo) GetItemNum() int64 {
+	if x != nil {
+		return x.ItemNum
+	}
+	return 0
+}
+
+// 客户端升级奖励
+//PACKET_CSClientUpgrades
+type CSClientUpgrades struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *CSClientUpgrades) Reset() {
+	*x = CSClientUpgrades{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_upgrade_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CSClientUpgrades) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CSClientUpgrades) ProtoMessage() {}
+
+func (x *CSClientUpgrades) ProtoReflect() protoreflect.Message {
+	mi := &file_upgrade_proto_msgTypes[1]
+	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 CSClientUpgrades.ProtoReflect.Descriptor instead.
+func (*CSClientUpgrades) Descriptor() ([]byte, []int) {
+	return file_upgrade_proto_rawDescGZIP(), []int{1}
+}
+
+//PACKET_SCClientUpgrades
+type SCClientUpgrades struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	On      bool        `protobuf:"varint,1,opt,name=On,proto3" json:"On,omitempty"`           // 是否开启
+	OnForce bool        `protobuf:"varint,2,opt,name=OnForce,proto3" json:"OnForce,omitempty"` // 是否强制升级(没有关闭按钮)
+	Award   []*PropInfo `protobuf:"bytes,3,rep,name=Award,proto3" json:"Award,omitempty"`      // 奖励
+	Version int32       `protobuf:"varint,4,opt,name=Version,proto3" json:"Version,omitempty"` // 版本号
+}
+
+func (x *SCClientUpgrades) Reset() {
+	*x = SCClientUpgrades{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_upgrade_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCClientUpgrades) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCClientUpgrades) ProtoMessage() {}
+
+func (x *SCClientUpgrades) ProtoReflect() protoreflect.Message {
+	mi := &file_upgrade_proto_msgTypes[2]
+	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 SCClientUpgrades.ProtoReflect.Descriptor instead.
+func (*SCClientUpgrades) Descriptor() ([]byte, []int) {
+	return file_upgrade_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *SCClientUpgrades) GetOn() bool {
+	if x != nil {
+		return x.On
+	}
+	return false
+}
+
+func (x *SCClientUpgrades) GetOnForce() bool {
+	if x != nil {
+		return x.OnForce
+	}
+	return false
+}
+
+func (x *SCClientUpgrades) GetAward() []*PropInfo {
+	if x != nil {
+		return x.Award
+	}
+	return nil
+}
+
+func (x *SCClientUpgrades) GetVersion() int32 {
+	if x != nil {
+		return x.Version
+	}
+	return 0
+}
+
+var File_upgrade_proto protoreflect.FileDescriptor
+
+var file_upgrade_proto_rawDesc = []byte{
+	0x0a, 0x0d, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x07, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x22, 0x3c, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x70,
+	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
+	0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49,
+	0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x22, 0x12, 0x0a, 0x10, 0x43, 0x53, 0x43, 0x6c, 0x69, 0x65,
+	0x6e, 0x74, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x73, 0x22, 0x7f, 0x0a, 0x10, 0x53, 0x43,
+	0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x73, 0x12, 0x0e,
+	0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x18,
+	0x0a, 0x07, 0x4f, 0x6e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x07, 0x4f, 0x6e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72,
+	0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64,
+	0x65, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72,
+	0x64, 0x12, 0x18, 0x0a, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2a, 0x59, 0x0a, 0x08, 0x50,
+	0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x61, 0x63, 0x6b, 0x65,
+	0x74, 0x49, 0x44, 0x5f, 0x5a, 0x65, 0x72, 0x6f, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41,
+	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x70, 0x67,
+	0x72, 0x61, 0x64, 0x65, 0x73, 0x10, 0x9c, 0x18, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x53, 0x43, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x70, 0x67, 0x72, 0x61,
+	0x64, 0x65, 0x73, 0x10, 0x9d, 0x18, 0x42, 0x27, 0x5a, 0x25, 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, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_upgrade_proto_rawDescOnce sync.Once
+	file_upgrade_proto_rawDescData = file_upgrade_proto_rawDesc
+)
+
+func file_upgrade_proto_rawDescGZIP() []byte {
+	file_upgrade_proto_rawDescOnce.Do(func() {
+		file_upgrade_proto_rawDescData = protoimpl.X.CompressGZIP(file_upgrade_proto_rawDescData)
+	})
+	return file_upgrade_proto_rawDescData
+}
+
+var file_upgrade_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_upgrade_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_upgrade_proto_goTypes = []interface{}{
+	(PacketID)(0),            // 0: upgrade.PacketID
+	(*PropInfo)(nil),         // 1: upgrade.PropInfo
+	(*CSClientUpgrades)(nil), // 2: upgrade.CSClientUpgrades
+	(*SCClientUpgrades)(nil), // 3: upgrade.SCClientUpgrades
+}
+var file_upgrade_proto_depIdxs = []int32{
+	1, // 0: upgrade.SCClientUpgrades.Award:type_name -> upgrade.PropInfo
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_upgrade_proto_init() }
+func file_upgrade_proto_init() {
+	if File_upgrade_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_upgrade_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PropInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_upgrade_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CSClientUpgrades); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_upgrade_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCClientUpgrades); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_upgrade_proto_rawDesc,
+			NumEnums:      1,
+			NumMessages:   3,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_upgrade_proto_goTypes,
+		DependencyIndexes: file_upgrade_proto_depIdxs,
+		EnumInfos:         file_upgrade_proto_enumTypes,
+		MessageInfos:      file_upgrade_proto_msgTypes,
+	}.Build()
+	File_upgrade_proto = out.File
+	file_upgrade_proto_rawDesc = nil
+	file_upgrade_proto_goTypes = nil
+	file_upgrade_proto_depIdxs = nil
+}

protocol/upgrade/upgrade.proto

@@ -0,0 +1,27 @@
+syntax = "proto3";
+package upgrade;
+option go_package = "mongo.games.com/game/protocol/upgrade";
+
+enum PacketID {
+  // 3100~3199
+  PacketID_Zero = 0;
+  PACKET_CSClientUpgrades = 3100;
+  PACKET_SCClientUpgrades = 3101;
+}
+
+message PropInfo{
+  int32 ItemId = 1;//物品ID
+  int64 ItemNum = 2;//物品数量
+}
+
+// 客户端升级奖励
+//PACKET_CSClientUpgrades
+message CSClientUpgrades{
+}
+//PACKET_SCClientUpgrades
+message SCClientUpgrades{
+  bool On = 1; // 是否开启
+  bool OnForce = 2; // 是否强制升级(没有关闭按钮)
+  repeated PropInfo Award = 3; // 奖励
+  int32 Version = 4; // 版本号
+}

protocol/webapi/common.proto

@@ -449,6 +449,7 @@ message ItemShop {
   int32 Ratio = 20;                //权重
   int32 EndTime = 21;              //新手礼包结束时间间隔
   bool FirstSwitch = 22;           //首冲翻倍开关
+  int32 OnFirstGiveDouble = 23; // 首冲翻倍时赠送是否翻倍 1开启 2关闭
 }
 
 // etcd /game/item_shop
@@ -980,3 +981,11 @@ message RoomConfigSystem{
   int32 AutoCreateTime = 13; // 自动创建时间间隔，单位秒
   int32 On = 14; // 开关 1开启 2关闭
 }
+
+// etcd /game/client_upgrade
+message ClientUpgrade{
+  string Platform = 1; // 平台
+  int32 On = 2; // 开关 1开启 2关闭
+  int32 OnForce = 3; // 强制升级开关 1开启 2关闭
+  repeated ItemInfo Reward = 4; // 奖励
+}

worldsrv/action_bag.go

@@ -280,7 +280,10 @@ func CSUpBagInfo(s *netlib.Session, packetid int, data interface{}, sid int64) e
 		if acceptPlayer != nil {
 			logger.Logger.Trace("道具赠送成功", msg.ItemId)
 			remark := fmt.Sprintf("赠送给玩家(%v)", msg.AcceptSnId)
-			BagMgrSingleton.AddMailByItem(p.Platform, p.SnId, p.Name, msg.AcceptSnId, msg.ShowId, []int32{msg.ItemId, msg.ItemNum})
+			AddMailByItem(p.Platform, p.SnId, p.Name, msg.AcceptSnId, msg.ShowId, []*model.Item{{
+				ItemId:  msg.GetItemId(),
+				ItemNum: int64(msg.GetItemNum()),
+			}})
 			BagMgrSingleton.AddItems(&model.AddItemParam{
 				Platform: p.Platform,
 				SnId:     p.SnId,
@@ -305,7 +308,10 @@ func CSUpBagInfo(s *netlib.Session, packetid int, data interface{}, sid int64) e
 				if data != nil && aPlayer != nil {
 					logger.Logger.Trace("道具赠送成功", msg.ItemId)
 					remark := fmt.Sprintf("赠送给玩家(%v)", msg.AcceptSnId)
-					BagMgrSingleton.AddMailByItem(p.Platform, p.SnId, p.Name, msg.AcceptSnId, msg.ShowId, []int32{msg.ItemId, msg.ItemNum})
+					AddMailByItem(p.Platform, p.SnId, p.Name, msg.AcceptSnId, msg.ShowId, []*model.Item{{
+						ItemId:  msg.GetItemId(),
+						ItemNum: int64(msg.GetItemNum()),
+					}})
 					BagMgrSingleton.AddItems(&model.AddItemParam{
 						Platform: p.Platform,
 						SnId:     p.SnId,

worldsrv/action_player.go

@@ -10,6 +10,7 @@ import (
 	"math/rand"
 	"net/url"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -84,7 +85,7 @@ func (this *CSInviteCodePlayerHandler) Process(s *netlib.Session, packetid int,
 			}
 
 			//发送邮件
-			var otherParams []int32
+			var otherParams []int64
 			newMsg := model.NewMessage("", p.SnId, "", p.SnId, model.MSGTYPE_INVITECODE, p.Name, inviteCode, coin, 0,
 				model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", otherParams, p.Platform, model.HallAll, nil)
 			err = model.InsertMessage(p.Platform, newMsg)
@@ -1983,11 +1984,15 @@ func CSPlayerData(s *netlib.Session, packetid int, data interface{}, sid int64)
 		}
 
 		// 老版本升级
+		clientUpgradeConfig := PlatformMgrSingleton.GetConfig(p.Platform).ClientUpgrade
+		if clientUpgradeConfig != nil && clientUpgradeConfig.GetOn() == common.On &&
+			(len(model.GameParamData.ClientVersionChannel) == 0 || slices.Contains(model.GameParamData.ClientVersionChannel, p.LastChannel)) {
 			if p.ClientVer < model.GameParamData.ClientVersion {
 				if cspl.GetClientVer() == model.GameParamData.ClientVersion {
 					// 升级了
 					p.ClientVer = model.GameParamData.ClientVersion
-				//todo 发奖
+					AddMailClientUpgrade(p.SnId, clientUpgradeConfig.GetReward())
+				}
 			}
 		}
 	}

worldsrv/action_welfare.go

@@ -14,6 +14,7 @@ import (
 	"mongo.games.com/game/model"
 	"mongo.games.com/game/mq"
 	"mongo.games.com/game/proto"
+	"mongo.games.com/game/protocol/upgrade"
 	webapiproto "mongo.games.com/game/protocol/webapi"
 	"mongo.games.com/game/protocol/welfare"
 	"mongo.games.com/game/srvdata"
@@ -1309,6 +1310,39 @@ func (this *CSDiamondBankTakeDiamondHandler) Process(s *netlib.Session, packetid
 	return nil
 }*/
 
+func CSClientUpgrades(s *netlib.Session, packetid int, data interface{}, sid int64) error {
+	logger.Logger.Tracef("CSClientUpgrades Process recv %v", data)
+	_, ok := data.(*upgrade.CSClientUpgrades)
+	if !ok {
+		return nil
+	}
+
+	p := PlayerMgrSington.GetPlayer(sid)
+	if p == nil {
+		return nil
+	}
+
+	cfg := PlatformMgrSingleton.GetConfig(p.Platform).ClientUpgrade
+	if cfg == nil {
+		return nil
+	}
+
+	pack := &upgrade.SCClientUpgrades{
+		On:      cfg.GetOn() == common.On,
+		OnForce: cfg.GetOnForce() == common.On,
+		Version: model.GameParamData.ClientVersion,
+	}
+	for _, v := range cfg.GetReward() {
+		pack.Award = append(pack.Award, &upgrade.PropInfo{
+			ItemId:  v.GetItemId(),
+			ItemNum: v.GetItemNum(),
+		})
+	}
+	p.SendToClient(int(upgrade.PacketID_PACKET_SCClientUpgrades), pack)
+	logger.Logger.Tracef("SCClientUpgrades: %v", pack)
+	return nil
+}
+
 func init() {
 	// 领取救济金
 	common.RegisterHandler(int(welfare.SPacketID_PACKET_CS_WELF_GETRELIEFFUND), &CSGetReliefFundHandler{})
@@ -1374,4 +1408,6 @@ func init() {
 	common.Register(int(welfare.SPacketID_PACKET_CSPermitExchange), welfare.CSPermitExchange{}, CSPermitExchange)
 	// 赛季典藏通行证商品信息
 	common.Register(int(welfare.SPacketID_PACKET_CSPermitShop), welfare.CSPermitShop{}, CSPermitShop)
+	// 客户端升级奖励信息
+	common.Register(int(upgrade.PacketID_PACKET_CSClientUpgrades), upgrade.CSClientUpgrades{}, CSClientUpgrades)
 }

worldsrv/addmail.go

@@ -0,0 +1,127 @@
+package main
+
+import (
+	"mongo.games.com/game/protocol/webapi"
+	"time"
+
+	"github.com/globalsign/mgo/bson"
+	"mongo.games.com/goserver/core/basic"
+	"mongo.games.com/goserver/core/i18n"
+	"mongo.games.com/goserver/core/logger"
+	"mongo.games.com/goserver/core/task"
+
+	"mongo.games.com/game/model"
+)
+
+type AddMailParam struct {
+	Platform string        // 平台
+	Tp       int32         // 邮件类型
+	SrcId    int32         // 发送人
+	SrcName  string        // 发送人名字
+	SnId     int32         // 收件人玩家id
+	Title    string        // 标题
+	Content  string        // 内容
+	Items    []*model.Item // 道具
+	ShowId   int64         // 显示位置
+	Channel  []string      // 包渠道
+}
+
+func AddMail(param *AddMailParam) {
+	logger.Logger.Tracef("AddMail %+v", *param)
+	if param.SnId <= 0 || param.Title == "" || param.Content == "" {
+		return
+	}
+
+	p := PlayerMgrSington.GetPlayerBySnId(param.SnId)
+	if p != nil {
+		param.Platform = p.Platform
+	}
+
+	if param.Platform == "" {
+		return
+	}
+
+	opener := int32(1)
+	if param.SrcId <= 0 {
+		opener = 0
+	}
+
+	var params []int64
+	for _, v := range param.Items {
+		params = append(params, int64(v.ItemId))
+		params = append(params, v.ItemNum)
+	}
+
+	var msg *model.Message
+	task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
+		msg = &model.Message{
+			Id:          bson.NewObjectId(),
+			MType:       param.Tp,
+			Title:       param.Title,
+			Content:     param.Content,
+			Oper:        opener,
+			SrcId:       param.SrcId,
+			SrcName:     param.SrcName,
+			SnId:        param.SnId,
+			State:       model.MSGSTATE_UNREAD,
+			CreatTs:     time.Now().Unix(),
+			AttachState: model.MSGATTACHSTATE_DEFAULT,
+			Params:      params,
+			Platform:    param.Platform,
+			ShowId:      param.ShowId,
+			Channel:     param.Channel,
+		}
+		if msg.Pid == "" {
+			msg.Pid = msg.Id.Hex()
+		}
+		return model.InsertMessage(param.Platform, msg)
+	}), task.CompleteNotifyWrapper(func(data interface{}, t task.Task) {
+		if data == nil {
+			if p := PlayerMgrSington.GetPlayerBySnId(param.SnId); p != nil {
+				p.AddMessage(msg)
+			}
+		} else {
+			logger.Logger.Errorf("AddMail Error %v", data)
+		}
+	}), "AddMail").Start()
+}
+
+// AddMailByItem 赠送道具到邮件
+// srcId 发送人 srcName发送人名字
+// showId 显示位置
+func AddMailByItem(platform string, srcId int32, srcName string, snid int32, showId int64, items []*model.Item) {
+	content := i18n.Tr("languages", "GiftMail", srcName, srcName, srcName, srcName)
+	title := i18n.Tr("languages", "GiftMailTitle")
+	AddMail(&AddMailParam{
+		Platform: platform,
+		Tp:       model.MSGTYPE_ITEM,
+		SrcId:    srcId,
+		SrcName:  srcName,
+		SnId:     snid,
+		Title:    title,
+		Content:  content,
+		Items:    items,
+		ShowId:   showId,
+	})
+}
+
+func AddMailClientUpgrade(snid int32, items []*webapi.ItemInfo) {
+	var arr []*model.Item
+	for _, v := range items {
+		arr = append(arr, &model.Item{
+			ItemId:  v.ItemId,
+			ItemNum: v.ItemNum,
+		})
+	}
+
+	content := i18n.Tr("languages", "UpgradeTitle")
+	title := i18n.Tr("languages", "Upgrade")
+
+	AddMail(&AddMailParam{
+		Tp:      model.MSGTYPE_ITEM,
+		SnId:    snid,
+		Title:   title,
+		Content: content,
+		Items:   arr,
+	})
+}

worldsrv/bagmgr.go

@@ -806,29 +806,6 @@ func (this *BagMgr) AddItemsOffline(param *model.AddItemParam, callback func(err
 	})).StartByExecutor(fmt.Sprintf("Player%v", param.SnId))
 }
 
-// AddMailByItem 赠送道具到邮件
-// srcId 发送人 srcName发送人名字
-// showId 显示位置
-// items[0]:道具id items[1]:道具数量 items[2]:道具id items[3]:道具数量
-func (this *BagMgr) AddMailByItem(platform string, srcId int32, srcName string, snid int32, showId int64, items []int32) {
-	logger.Logger.Trace("AddMailByItem:", srcId, srcName, items)
-	var newMsg *model.Message
-	task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
-		content := i18n.Tr("languages", "GiftMail", srcName, srcName, srcName, srcName)
-		title := i18n.Tr("languages", "GiftMailTitle")
-		newMsg = model.NewMessageByPlayer("", 1, srcId, srcName, snid, model.MSGTYPE_ITEM, title, content,
-			0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, showId)
-		return model.InsertMessage(platform, newMsg)
-	}), task.CompleteNotifyWrapper(func(data interface{}, t task.Task) {
-		if data == nil {
-			p := PlayerMgrSington.GetPlayerBySnId(snid)
-			if p != nil {
-				p.AddMessage(newMsg)
-			}
-		}
-	}), "AddMailByItem").Start()
-}
-
 // VerifyUpJybInfo 兑换礼包
 func (this *BagMgr) VerifyUpJybInfo(p *Player, args *model.VerifyUpJybInfoArgs) {
 

worldsrv/etcd.go

@@ -100,6 +100,8 @@ func init() {
 	etcd.Register(etcd.ETCDKEY_RoomType, webapi.RoomType{}, handlerEvent)
 	//娃娃机配置
 	etcd.Register(etcd.ETCDKEY_MACHINE, webapi.MachineConfig{}, platformConfigEvent)
+	//客户端升级奖励配置
+	etcd.Register(etcd.ETCDKEY_ClientUpgrade, webapi.ClientUpgrade{}, platformConfigEvent)
 }
 
 func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {
@@ -334,6 +336,8 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
 		if !isInit {
 			PlayerMgrSington.BroadcastDataConfigToPlatform(config.Platform, common.DataConfigSprite)
 		}
+	case *webapi.ClientUpgrade:
+		PlatformMgrSingleton.GetConfig(config.Platform).ClientUpgrade = config
 	default:
 		logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
 	}

worldsrv/permitmgr.go

@@ -92,14 +92,14 @@ func (r *PermitMgr) OnDayTimer() {
 					rank := k + 1
 					for _, rankInfo := range cfg {
 						var has bool
-						var items []int32
+						var items []int64
 						for r := rankInfo.GetStart(); r <= rankInfo.GetEnd(); r++ {
 							if rank == int(r) {
 								has = true
 								var awards []model.AwardItem
 								for _, item := range rankInfo.GetItemId() {
-									items = append(items, item.GetItemId())
+									items = append(items, int64(item.GetItemId()))
-									items = append(items, int32(item.GetItemNum()))
+									items = append(items, item.GetItemNum())
 									awards = append(awards, model.AwardItem{
 										Id:  item.GetItemId(),
 										Num: item.GetItemNum(),

worldsrv/player.go

@@ -358,7 +358,7 @@ func (this *Player) OnLogined() {
 		}
 		mq.Write(model.NewLoginLog(this.SnId, common.LoginLogTypeLogin, this.Tel, this.Ip,
 			this.Platform, this.Channel, this.BeUnderAgentCode, this.PackageID, this.City, clog, this.GetTotalCoin(), 0, 0,
-			this.DeviceName, this.PackageName, this.AppVersion, this.BuildVersion, this.AppChannel, this.ChannelId))
+			this.DeviceName, this.PackageName, this.AppVersion, this.BuildVersion, this.AppChannel, this.ChannelId, this.ClientVer))
 
 		this.OnlineLogLogin()
 
@@ -431,7 +431,7 @@ func (this *Player) OnRehold() {
 		}
 		mq.Write(model.NewLoginLog(this.SnId, common.LoginLogTypeRehold, this.Tel, this.Ip,
 			this.Platform, this.Channel, this.BeUnderAgentCode, this.PackageID, this.City, clog, this.GetTotalCoin(),
-			gameid, 0, this.DeviceName, this.PackageName, this.AppVersion, this.BuildVersion, this.AppChannel, this.ChannelId))
+			gameid, 0, this.DeviceName, this.PackageName, this.AppVersion, this.BuildVersion, this.AppChannel, this.ChannelId, this.ClientVer))
 
 		this.OnlineLogRehold()
 	}
@@ -683,7 +683,7 @@ func (this *Player) SendMessage(showId int64) {
 					Grade:       proto.Int64(msg.Grade),
 					State:       proto.Int32(msg.State),
 					Ts:          proto.Int32(int32(msg.CreatTs)),
-					Params:      msg.Params,
+					Params:      common.CopySliceInt64ToInt32(msg.Params), //todo 修改协议
 					AttachState: proto.Int32(msg.AttachState),
 					GiftId:      proto.String(msg.GiftId),
 					GiftState:   proto.Int32(giftState),
@@ -1039,7 +1039,7 @@ func (this *Player) TestMail() {
 	var newMsg *model.Message
 
 	task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
-		var otherParams []int32
+		var otherParams []int64
 		otherParams = append(otherParams, 10001, 3)
 		otherParams = append(otherParams, 20001, 3)
 		otherParams = append(otherParams, 20002, 3)
@@ -1059,7 +1059,7 @@ func (this *Player) TestSubMail() {
 	var newMsg *model.Message
 
 	task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
-		var otherParams []int32
+		var otherParams []int64
 		otherParams = append(otherParams, 10001, 3)
 		otherParams = append(otherParams, 20001, 3)
 		otherParams = append(otherParams, 20002, 3)
@@ -1106,8 +1106,8 @@ func (this *Player) GetMessageAttach(id string) {
 						if num := len(msg.Params); num > 0 && num%2 == 0 {
 							for i := 0; i < num; i += 2 {
 								items = append(items, &model.Item{
-									ItemId:     msg.Params[i],          // 物品id
+									ItemId:     int32(msg.Params[i]), // 物品id
-									ItemNum:    int64(msg.Params[i+1]), // 数量
+									ItemNum:    msg.Params[i+1],      // 数量
 									ObtainTime: time.Now().Unix(),
 								})
 								if gainWay == common.GainWayItemPermitRank {
@@ -1119,7 +1119,7 @@ func (this *Player) GetMessageAttach(id string) {
 									}
 									if tp != -1 {
 										mq.Write(model.GenerateSystemFreeGive(this.SnId, this.Name, this.Platform, this.Channel,
-											model.SystemFreeGive_GiveType_TaskPermitRank, tp, int64(msg.Params[i+1])))
+											model.SystemFreeGive_GiveType_TaskPermitRank, tp, msg.Params[i+1]))
 									}
 								}
 							}
@@ -1283,7 +1283,7 @@ func (this *Player) DropLine() {
 		}
 		mq.Write(model.NewLoginLog(this.SnId, common.LoginLogTypeDrop, this.Tel, this.Ip,
 			this.Platform, this.Channel, this.BeUnderAgentCode, this.PackageID, this.City, clog, this.GetTotalCoin(),
-			gameid, this.LastGameId, this.DeviceName, this.PackageName, this.AppVersion, this.BuildVersion, this.AppChannel, this.ChannelId))
+			gameid, this.LastGameId, this.DeviceName, this.PackageName, this.AppVersion, this.BuildVersion, this.AppChannel, this.ChannelId, this.ClientVer))
 
 		this.SendPlayerCoin()
 		this.OnlineLogDrop()
@@ -1408,7 +1408,7 @@ func (this *Player) OnLogouted() {
 	if !this.IsRob {
 		mq.Write(model.NewLoginLog(this.SnId, common.LoginLogTypeLogout, this.Tel, this.Ip,
 			this.Platform, this.Channel, this.BeUnderAgentCode, this.PackageID, this.City, clog, this.GetTotalCoin(),
-			0, 0, this.DeviceName, this.PackageName, this.AppVersion, this.BuildVersion, this.AppChannel, this.ChannelId))
+			0, 0, this.DeviceName, this.PackageName, this.AppVersion, this.BuildVersion, this.AppChannel, this.ChannelId, this.ClientVer))
 		this.OnlineLogLogout()
 	}
 

worldsrv/rankmatch.go

@@ -61,7 +61,7 @@ func (this *PlayerRankSeason) sendEmailAward(rankType int32) {
 
 				var coin int64
 				var diamond int64
-				var otherParams []int32
+				var otherParams []int64
 				for _, v := range item.Awards {
 					switch v.Id {
 					case 1: // 金币
@@ -70,7 +70,7 @@ func (this *PlayerRankSeason) sendEmailAward(rankType int32) {
 						diamond = int64(v.Num)
 					default:
 						// 道具
-						otherParams = []int32{v.Id, v.Num}
+						otherParams = []int64{int64(v.Id), int64(v.Num)}
 					}
 				}
 
@@ -767,12 +767,12 @@ func (r *RankMatchMgr) RankAward() {
 							logger.Logger.Errorf("RankMatchMgr OnDayTimer FindPlayerPermitList player is nil %v", list.List[k].SnId)
 							continue
 						}
-						var items []int32
+						var items []int64
 						for _, award := range rankAward {
 							if award.RankLevelId == rankId {
 								for _, itemInfo := range award.Item {
-									items = append(items, itemInfo.ItemId)
+									items = append(items, int64(itemInfo.ItemId))
-									items = append(items, int32(itemInfo.ItemNum))
+									items = append(items, itemInfo.ItemNum)
 								}
 								break
 							}
@@ -839,12 +839,12 @@ func (r *RankMatchMgr) RankAward() {
 							logger.Logger.Errorf("RankMatchMgr OnDayTimer FindWinCoinListTienlen player is nil %v", ret.List[k].SnId)
 							continue
 						}
-						var items []int32
+						var items []int64
 						for _, award := range rankAward {
 							if award.RankLevelId == rankId {
 								for _, itemInfo := range award.Item {
-									items = append(items, itemInfo.ItemId)
+									items = append(items, int64(itemInfo.ItemId))
-									items = append(items, int32(itemInfo.ItemNum))
+									items = append(items, itemInfo.ItemNum)
 								}
 								break
 							}

worldsrv/shopmgr.go

@@ -661,7 +661,11 @@ func (this *ShopMgr) GetAmountFinal(p *Player, shopId, vipShopId int32) int64 {
 		// 首充翻倍
 		if shopInfo.FirstSwitch {
 			if !slices.Contains(p.ShopID, int(shopInfo.Id)) {
+				if shopInfo.FirstGiveSwitch {
 					addTotal *= 2
+				} else {
+					addTotal += shopInfo.Amount
+				}
 			}
 		}
 	default:

worldsrv/tournament.go

@@ -2059,16 +2059,16 @@ func (this *Tournament) OnHourTimer() {
 		}
 	}
 	for sortId := range this.players {
+		has := false
 		for _, tm := range this.matches {
-			if _, ok := tm[sortId]; !ok {
+			if _, ok := tm[sortId]; ok {
-				for _, v := range this.players[sortId] {
+				has = true
-					if v != nil {
-						logger.Logger.Errorf("比赛异常,比赛已经不存在了 %v", v.tm)
-					}
 				break
 			}
-				this.StopMatch(0, sortId)
 		}
+		if !has {
+			logger.Logger.Errorf("比赛异常,比赛已经不存在了 %v", sortId)
+			delete(this.players, sortId)
 		}
 	}
 }

worldsrv/trascate_webapi.go

@@ -1439,7 +1439,7 @@ func init() {
 				// var otherParams []int32
 
 				newMsg = model.NewMessage("", int32(srcSnid), "", int32(destSnid), int32(messageType), title, content, coin, diamond,
-					model.MSGSTATE_UNREAD, time.Now().Unix(), model.MSGATTACHSTATE_DEFAULT, "", otherParams, platform, showId, channel)
+					model.MSGSTATE_UNREAD, time.Now().Unix(), model.MSGATTACHSTATE_DEFAULT, "", common.CopySliceInt32ToInt64(otherParams), platform, showId, channel)
 				if newMsg != nil {
 					err := model.InsertMessage(platform, newMsg)
 					if err != nil {
@@ -1452,7 +1452,7 @@ func init() {
 				if destSnid == 0 {
 					for _, psnid := range onlinePlayerSnid {
 						newMsg := model.NewMessage(newMsg.Id.Hex(), newMsg.SrcId, "", psnid, newMsg.MType, newMsg.Title, newMsg.Content, newMsg.Coin, newMsg.Diamond,
-							newMsg.State, newMsg.CreatTs, newMsg.AttachState, newMsg.GiftId, otherParams, platform, newMsg.ShowId, channel)
+							newMsg.State, newMsg.CreatTs, newMsg.AttachState, newMsg.GiftId, common.CopySliceInt32ToInt64(otherParams), platform, newMsg.ShowId, channel)
 						if newMsg != nil {
 							dbMsgs = append(dbMsgs, newMsg)
 						}