排行榜代码（已屏蔽） + 获奖记录

etcd/keyconf.go

@@ -36,4 +36,5 @@ const (
 	ETCDKEY_DIAMOND_LOTTERY     = "/game/diamond_lottery" // 钻石抽奖配置
 	ETCDKEY_Item                = "/game/item"            // 道具列表
 	ETCDKEY_SKin                = "/game/skin_config"     // 皮肤配置
+	ETCDKEY_RANK_TYPE           = "/game/RankType"        // 排行榜奖励配置
 )

model/config.go

@@ -130,6 +130,8 @@ type AllConfig struct {
 	*webapi.ItemConfig
 	// 皮肤配置
 	*webapi.SkinConfig
+	//排行榜配置
+	*webapi.RankTypeConfig
 }
 
 type GlobalConfig struct {

protocol/player/player.proto

@@ -218,6 +218,8 @@ enum PlayerPacketID {
   PACKET_CSDiamondLotteryLuckyAward = 2833;	//请求领取钻石抽奖幸运奖励
   PACKET_SCDiamondLotteryLuckyAward = 2834;	//返回领取钻石抽奖幸运奖励
   PACKET_SCItem = 2835; // 返回道具列表
+  PACKET_CSAwardLog = 2836;//请求获奖记录
+  PACKET_SCAwardLog = 2837;	//返回获奖记录
 
 }
 
@@ -1263,3 +1265,25 @@ message SCDiamondLotteryLuckyAward{
 message SCItem{
   repeated server.DB_GameItem Items = 1; // 道具列表
 }
+//获奖记录
+//PACKET_CSAwardLog
+message CS_AwardLog{
+}
+//PACKET_SCAwardLog
+message SCAwardLog{
+  repeated AwardLogInfo AwardLog =1;
+  repeated AnnouncerLogInfo AnnouncerLog = 2;
+}
+message AwardLogInfo{
+  int32 TypeId = 1; //1话费 2实物
+  int32 ItemId = 2; //道具ID
+  string Name = 3;  //物品名字
+  int64 Num  = 4;   //数量
+}
+//实时播报
+message AnnouncerLogInfo{
+  int32 Snid = 1; //玩家ID
+  int32 Name = 2; //玩家名字
+  int32 Phone = 3;  //电话
+  int32 ItemName = 4; //获得物品名字
+}

protocol/webapi/webapi.pb.go

@@ -8883,6 +8883,276 @@ func (x *SMSInfo) GetSmsName() string {
 	return ""
 }
 
+//获取获奖记录 [/get_AwardLog]
+type ASAwardLog struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台id
+	SnId     int32  `protobuf:"varint,2,opt,name=SnId,proto3" json:"SnId,omitempty"`        // 玩家id
+}
+
+func (x *ASAwardLog) Reset() {
+	*x = ASAwardLog{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_webapi_proto_msgTypes[130]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ASAwardLog) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ASAwardLog) ProtoMessage() {}
+
+func (x *ASAwardLog) ProtoReflect() protoreflect.Message {
+	mi := &file_webapi_proto_msgTypes[130]
+	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 ASAwardLog.ProtoReflect.Descriptor instead.
+func (*ASAwardLog) Descriptor() ([]byte, []int) {
+	return file_webapi_proto_rawDescGZIP(), []int{130}
+}
+
+func (x *ASAwardLog) GetPlatform() string {
+	if x != nil {
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *ASAwardLog) GetSnId() int32 {
+	if x != nil {
+		return x.SnId
+	}
+	return 0
+}
+
+type SAAwardLog struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	AwardLog     []*AwardLogInfo     `protobuf:"bytes,1,rep,name=AwardLog,proto3" json:"AwardLog,omitempty"`
+	AnnouncerLog []*AnnouncerLogInfo `protobuf:"bytes,2,rep,name=AnnouncerLog,proto3" json:"AnnouncerLog,omitempty"`
+	Tag          TagCode             `protobuf:"varint,4,opt,name=Tag,proto3,enum=webapi.TagCode" json:"Tag,omitempty"` //错误码
+	Msg          string              `protobuf:"bytes,5,opt,name=Msg,proto3" json:"Msg,omitempty"`                      //错误信息(选填)
+}
+
+func (x *SAAwardLog) Reset() {
+	*x = SAAwardLog{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_webapi_proto_msgTypes[131]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SAAwardLog) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SAAwardLog) ProtoMessage() {}
+
+func (x *SAAwardLog) ProtoReflect() protoreflect.Message {
+	mi := &file_webapi_proto_msgTypes[131]
+	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 SAAwardLog.ProtoReflect.Descriptor instead.
+func (*SAAwardLog) Descriptor() ([]byte, []int) {
+	return file_webapi_proto_rawDescGZIP(), []int{131}
+}
+
+func (x *SAAwardLog) GetAwardLog() []*AwardLogInfo {
+	if x != nil {
+		return x.AwardLog
+	}
+	return nil
+}
+
+func (x *SAAwardLog) GetAnnouncerLog() []*AnnouncerLogInfo {
+	if x != nil {
+		return x.AnnouncerLog
+	}
+	return nil
+}
+
+func (x *SAAwardLog) GetTag() TagCode {
+	if x != nil {
+		return x.Tag
+	}
+	return TagCode_UNKNOWN
+}
+
+func (x *SAAwardLog) GetMsg() string {
+	if x != nil {
+		return x.Msg
+	}
+	return ""
+}
+
+type AwardLogInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	TypeId int32  `protobuf:"varint,1,opt,name=TypeId,proto3" json:"TypeId,omitempty"` //1话费 2实物
+	ItemId int32  `protobuf:"varint,2,opt,name=itemId,proto3" json:"itemId,omitempty"` //道具ID
+	Name   string `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`      //物品名字
+	Num    int64  `protobuf:"varint,4,opt,name=Num,proto3" json:"Num,omitempty"`       //数量
+}
+
+func (x *AwardLogInfo) Reset() {
+	*x = AwardLogInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_webapi_proto_msgTypes[132]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AwardLogInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AwardLogInfo) ProtoMessage() {}
+
+func (x *AwardLogInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_webapi_proto_msgTypes[132]
+	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 AwardLogInfo.ProtoReflect.Descriptor instead.
+func (*AwardLogInfo) Descriptor() ([]byte, []int) {
+	return file_webapi_proto_rawDescGZIP(), []int{132}
+}
+
+func (x *AwardLogInfo) GetTypeId() int32 {
+	if x != nil {
+		return x.TypeId
+	}
+	return 0
+}
+
+func (x *AwardLogInfo) GetItemId() int32 {
+	if x != nil {
+		return x.ItemId
+	}
+	return 0
+}
+
+func (x *AwardLogInfo) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *AwardLogInfo) GetNum() int64 {
+	if x != nil {
+		return x.Num
+	}
+	return 0
+}
+
+//实时播报
+type AnnouncerLogInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Snid     int32 `protobuf:"varint,1,opt,name=Snid,proto3" json:"Snid,omitempty"`         //玩家ID
+	Name     int32 `protobuf:"varint,2,opt,name=Name,proto3" json:"Name,omitempty"`         //玩家名字
+	Phone    int32 `protobuf:"varint,3,opt,name=Phone,proto3" json:"Phone,omitempty"`       //电话
+	ItemName int32 `protobuf:"varint,4,opt,name=ItemName,proto3" json:"ItemName,omitempty"` //获得物品名字
+}
+
+func (x *AnnouncerLogInfo) Reset() {
+	*x = AnnouncerLogInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_webapi_proto_msgTypes[133]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AnnouncerLogInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AnnouncerLogInfo) ProtoMessage() {}
+
+func (x *AnnouncerLogInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_webapi_proto_msgTypes[133]
+	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 AnnouncerLogInfo.ProtoReflect.Descriptor instead.
+func (*AnnouncerLogInfo) Descriptor() ([]byte, []int) {
+	return file_webapi_proto_rawDescGZIP(), []int{133}
+}
+
+func (x *AnnouncerLogInfo) GetSnid() int32 {
+	if x != nil {
+		return x.Snid
+	}
+	return 0
+}
+
+func (x *AnnouncerLogInfo) GetName() int32 {
+	if x != nil {
+		return x.Name
+	}
+	return 0
+}
+
+func (x *AnnouncerLogInfo) GetPhone() int32 {
+	if x != nil {
+		return x.Phone
+	}
+	return 0
+}
+
+func (x *AnnouncerLogInfo) GetItemName() int32 {
+	if x != nil {
+		return x.ItemName
+	}
+	return 0
+}
+
 var File_webapi_proto protoreflect.FileDescriptor
 
 var file_webapi_proto_rawDesc = []byte{
@@ -9844,23 +10114,51 @@ var file_webapi_proto_rawDesc = []byte{
 	0x03, 0x4d, 0x73, 0x67, 0x22, 0x33, 0x0a, 0x07, 0x53, 0x4d, 0x53, 0x49, 0x6e, 0x66, 0x6f, 0x12,
 	0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12,
 	0x18, 0x0a, 0x07, 0x53, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x53, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x2a, 0xce, 0x01, 0x0a, 0x07, 0x54, 0x61,
+	0x52, 0x07, 0x53, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x3c, 0x0a, 0x0a, 0x41, 0x53, 0x41,
-	0x67, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e,
+	0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66,
-	0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12,
+	0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66,
-	0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x53,
+	0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x49, 0x47, 0x4e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x50,
+	0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x22, 0xb1, 0x01, 0x0a, 0x0a, 0x53, 0x41, 0x41, 0x77,
-	0x52, 0x4f, 0x54, 0x4f, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10,
+	0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x12, 0x30, 0x0a, 0x08, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4c,
-	0x04, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x45, 0x52,
+	0x6f, 0x67, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70,
-	0x52, 0x4f, 0x52, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f, 0x43, 0x4f, 0x44,
+	0x69, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08,
-	0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x6c, 0x61,
+	0x41, 0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x12, 0x3c, 0x0a, 0x0c, 0x41, 0x6e, 0x6e, 0x6f,
-	0x79, 0x5f, 0x4e, 0x6f, 0x74, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05,
+	0x75, 0x6e, 0x63, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18,
-	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x08, 0x12, 0x0c, 0x0a, 0x08, 0x54, 0x65, 0x6c, 0x45, 0x78,
+	0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65,
-	0x69, 0x73, 0x74, 0x10, 0x09, 0x12, 0x13, 0x0a, 0x0f, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x72, 0x4c, 0x6f, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0c, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e,
-	0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0a, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x65,
+	0x63, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20,
-	0x6c, 0x4e, 0x6f, 0x74, 0x42, 0x69, 0x6e, 0x64, 0x10, 0x0b, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f,
+	0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67,
-	0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61,
+	0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67,
-	0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x64, 0x0a, 0x0c, 0x41,
-	0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x54,
+	0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70,
+	0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x4e, 0x75,
+	0x6d, 0x22, 0x6c, 0x0a, 0x10, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x72, 0x4c, 0x6f,
+	0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a,
+	0x05, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x50, 0x68,
+	0x6f, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x2a,
+	0xce, 0x01, 0x0a, 0x07, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55,
+	0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43,
+	0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10,
+	0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x49, 0x47, 0x4e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10,
+	0x03, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f,
+	0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f, 0x44,
+	0x41, 0x54, 0x41, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x4a,
+	0x59, 0x42, 0x5f, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x06, 0x12,
+	0x11, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x79, 0x5f, 0x4e, 0x6f, 0x74, 0x45, 0x58, 0x49, 0x53, 0x54,
+	0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x08, 0x12, 0x0c, 0x0a,
+	0x08, 0x54, 0x65, 0x6c, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x09, 0x12, 0x13, 0x0a, 0x0f, 0x41,
+	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0a,
+	0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x65, 0x6c, 0x4e, 0x6f, 0x74, 0x42, 0x69, 0x6e, 0x64, 0x10, 0x0b,
+	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 (
@@ -9876,7 +10174,7 @@ func file_webapi_proto_rawDescGZIP() []byte {
 }
 
 var file_webapi_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_webapi_proto_msgTypes = make([]protoimpl.MessageInfo, 130)
+var file_webapi_proto_msgTypes = make([]protoimpl.MessageInfo, 134)
 var file_webapi_proto_goTypes = []interface{}{
 	(TagCode)(0),                      // 0: webapi.TagCode
 	(*SAPlatformInfo)(nil),            // 1: webapi.SAPlatformInfo
@@ -10009,93 +10307,97 @@ var file_webapi_proto_goTypes = []interface{}{
 	(*ASSMSConfig)(nil),               // 128: webapi.ASSMSConfig
 	(*SASMSConfig)(nil),               // 129: webapi.SASMSConfig
 	(*SMSInfo)(nil),                   // 130: webapi.SMSInfo
-	(*Platform)(nil),                  // 131: webapi.Platform
+	(*ASAwardLog)(nil),                // 131: webapi.ASAwardLog
-	(*PlatformGameConfig)(nil),        // 132: webapi.PlatformGameConfig
+	(*SAAwardLog)(nil),                // 132: webapi.SAAwardLog
-	(*GameConfigGroup)(nil),           // 133: webapi.GameConfigGroup
+	(*AwardLogInfo)(nil),              // 133: webapi.AwardLogInfo
-	(*GameConfigGlobal)(nil),          // 134: webapi.GameConfigGlobal
+	(*AnnouncerLogInfo)(nil),          // 134: webapi.AnnouncerLogInfo
-	(*PlatformDbConfig)(nil),          // 135: webapi.PlatformDbConfig
+	(*Platform)(nil),                  // 135: webapi.Platform
-	(*CoinPoolSetting)(nil),           // 136: webapi.CoinPoolSetting
+	(*PlatformGameConfig)(nil),        // 136: webapi.PlatformGameConfig
-	(*RoomInfo)(nil),                  // 137: webapi.RoomInfo
+	(*GameConfigGroup)(nil),           // 137: webapi.GameConfigGroup
-	(*PlayerSingleAdjust)(nil),        // 138: webapi.PlayerSingleAdjust
+	(*GameConfigGlobal)(nil),          // 138: webapi.GameConfigGlobal
-	(*PlayerData)(nil),                // 139: webapi.PlayerData
+	(*PlatformDbConfig)(nil),          // 139: webapi.PlatformDbConfig
-	(*HorseRaceLamp)(nil),             // 140: webapi.HorseRaceLamp
+	(*CoinPoolSetting)(nil),           // 140: webapi.CoinPoolSetting
-	(*MessageInfo)(nil),               // 141: webapi.MessageInfo
+	(*RoomInfo)(nil),                  // 141: webapi.RoomInfo
-	(*ServerInfo)(nil),                // 142: webapi.ServerInfo
+	(*PlayerSingleAdjust)(nil),        // 142: webapi.PlayerSingleAdjust
-	(*OnlineReport)(nil),              // 143: webapi.OnlineReport
+	(*PlayerData)(nil),                // 143: webapi.PlayerData
-	(*ItemInfo)(nil),                  // 144: webapi.ItemInfo
+	(*HorseRaceLamp)(nil),             // 144: webapi.HorseRaceLamp
-	(*ExchangeShop)(nil),              // 145: webapi.ExchangeShop
+	(*MessageInfo)(nil),               // 145: webapi.MessageInfo
-	(*ShopWeight)(nil),                // 146: webapi.ShopWeight
+	(*ServerInfo)(nil),                // 146: webapi.ServerInfo
+	(*OnlineReport)(nil),              // 147: webapi.OnlineReport
+	(*ItemInfo)(nil),                  // 148: webapi.ItemInfo
+	(*ExchangeShop)(nil),              // 149: webapi.ExchangeShop
+	(*ShopWeight)(nil),                // 150: webapi.ShopWeight
 }
 var file_webapi_proto_depIdxs = []int32{
 	0,   // 0: webapi.ASPlatformInfo.Tag:type_name -> webapi.TagCode
-	131, // 1: webapi.ASPlatformInfo.Platforms:type_name -> webapi.Platform
+	135, // 1: webapi.ASPlatformInfo.Platforms:type_name -> webapi.Platform
 	0,   // 2: webapi.ASGameConfig.Tag:type_name -> webapi.TagCode
-	132, // 3: webapi.ASGameConfig.Configs:type_name -> webapi.PlatformGameConfig
+	136, // 3: webapi.ASGameConfig.Configs:type_name -> webapi.PlatformGameConfig
 	0,   // 4: webapi.ASGameConfigGroup.Tag:type_name -> webapi.TagCode
-	133, // 5: webapi.ASGameConfigGroup.GameConfigGroup:type_name -> webapi.GameConfigGroup
+	137, // 5: webapi.ASGameConfigGroup.GameConfigGroup:type_name -> webapi.GameConfigGroup
 	0,   // 6: webapi.ASGameConfigGlobal.Tag:type_name -> webapi.TagCode
-	134, // 7: webapi.ASGameConfigGlobal.GameStatus:type_name -> webapi.GameConfigGlobal
+	138, // 7: webapi.ASGameConfigGlobal.GameStatus:type_name -> webapi.GameConfigGlobal
 	0,   // 8: webapi.ASDbConfig.Tag:type_name -> webapi.TagCode
-	135, // 9: webapi.ASDbConfig.DbConfigs:type_name -> webapi.PlatformDbConfig
+	139, // 9: webapi.ASDbConfig.DbConfigs:type_name -> webapi.PlatformDbConfig
-	131, // 10: webapi.ASUpdatePlatform.Platforms:type_name -> webapi.Platform
+	135, // 10: webapi.ASUpdatePlatform.Platforms:type_name -> webapi.Platform
 	0,   // 11: webapi.SAUpdatePlatform.Tag:type_name -> webapi.TagCode
-	134, // 12: webapi.ASUpdateGameConfigGlobal.GameStatus:type_name -> webapi.GameConfigGlobal
+	138, // 12: webapi.ASUpdateGameConfigGlobal.GameStatus:type_name -> webapi.GameConfigGlobal
 	0,   // 13: webapi.SAUpdateGameConfigGlobal.Tag:type_name -> webapi.TagCode
-	132, // 14: webapi.ASUpdateGameConfig.Config:type_name -> webapi.PlatformGameConfig
+	136, // 14: webapi.ASUpdateGameConfig.Config:type_name -> webapi.PlatformGameConfig
 	0,   // 15: webapi.SAUpdateGameConfig.Tag:type_name -> webapi.TagCode
-	133, // 16: webapi.ASUpdateGameConfigGroup.GameConfigGroup:type_name -> webapi.GameConfigGroup
+	137, // 16: webapi.ASUpdateGameConfigGroup.GameConfigGroup:type_name -> webapi.GameConfigGroup
 	0,   // 17: webapi.SAUpdateGameConfigGroup.Tag:type_name -> webapi.TagCode
 	0,   // 18: webapi.SAAddCoinById.Tag:type_name -> webapi.TagCode
 	0,   // 19: webapi.SAResetGamePool.Tag:type_name -> webapi.TagCode
-	136, // 20: webapi.ASUpdateGamePool.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
+	140, // 20: webapi.ASUpdateGamePool.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
 	0,   // 21: webapi.SAUpdateGamePool.Tag:type_name -> webapi.TagCode
 	0,   // 22: webapi.SAQueryGamePoolByGameId.Tag:type_name -> webapi.TagCode
-	136, // 23: webapi.SAQueryGamePoolByGameId.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
+	140, // 23: webapi.SAQueryGamePoolByGameId.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
-	136, // 24: webapi.CoinPoolStatesInfo.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
+	140, // 24: webapi.CoinPoolStatesInfo.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
 	0,   // 25: webapi.SAQueryAllGamePool.Tag:type_name -> webapi.TagCode
 	26,  // 26: webapi.SAQueryAllGamePool.CoinPoolStatesInfo:type_name -> webapi.CoinPoolStatesInfo
 	0,   // 27: webapi.SAListRoom.Tag:type_name -> webapi.TagCode
-	137, // 28: webapi.SAListRoom.RoomInfo:type_name -> webapi.RoomInfo
+	141, // 28: webapi.SAListRoom.RoomInfo:type_name -> webapi.RoomInfo
 	0,   // 29: webapi.SAGetRoom.Tag:type_name -> webapi.TagCode
-	137, // 30: webapi.SAGetRoom.RoomInfo:type_name -> webapi.RoomInfo
+	141, // 30: webapi.SAGetRoom.RoomInfo:type_name -> webapi.RoomInfo
 	0,   // 31: webapi.SADestroyRoom.Tag:type_name -> webapi.TagCode
-	138, // 32: webapi.ASSinglePlayerAdjust.PlayerSingleAdjust:type_name -> webapi.PlayerSingleAdjust
+	142, // 32: webapi.ASSinglePlayerAdjust.PlayerSingleAdjust:type_name -> webapi.PlayerSingleAdjust
 	0,   // 33: webapi.SASinglePlayerAdjust.Tag:type_name -> webapi.TagCode
-	138, // 34: webapi.SASinglePlayerAdjust.PlayerSingleAdjust:type_name -> webapi.PlayerSingleAdjust
+	142, // 34: webapi.SASinglePlayerAdjust.PlayerSingleAdjust:type_name -> webapi.PlayerSingleAdjust
 	0,   // 35: webapi.SAGetPlayerData.Tag:type_name -> webapi.TagCode
-	139, // 36: webapi.SAGetPlayerData.PlayerData:type_name -> webapi.PlayerData
+	143, // 36: webapi.SAGetPlayerData.PlayerData:type_name -> webapi.PlayerData
 	0,   // 37: webapi.SAMorePlayerData.Tag:type_name -> webapi.TagCode
-	139, // 38: webapi.SAMorePlayerData.PlayerData:type_name -> webapi.PlayerData
+	143, // 38: webapi.SAMorePlayerData.PlayerData:type_name -> webapi.PlayerData
 	0,   // 39: webapi.SAKickPlayer.Tag:type_name -> webapi.TagCode
 	42,  // 40: webapi.ASUpdatePlayerElement.PlayerEleArgs:type_name -> webapi.PlayerEleArgs
 	0,   // 41: webapi.SAUpdatePlayerElement.Tag:type_name -> webapi.TagCode
 	0,   // 42: webapi.SAWhiteBlackControl.Tag:type_name -> webapi.TagCode
 	0,   // 43: webapi.SAQueryHorseRaceLampList.Tag:type_name -> webapi.TagCode
-	140, // 44: webapi.SAQueryHorseRaceLampList.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
+	144, // 44: webapi.SAQueryHorseRaceLampList.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
 	0,   // 45: webapi.SACreateHorseRaceLamp.Tag:type_name -> webapi.TagCode
 	0,   // 46: webapi.SAGetHorseRaceLampById.Tag:type_name -> webapi.TagCode
-	140, // 47: webapi.SAGetHorseRaceLampById.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
+	144, // 47: webapi.SAGetHorseRaceLampById.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
-	140, // 48: webapi.ASEditHorseRaceLamp.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
+	144, // 48: webapi.ASEditHorseRaceLamp.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
 	0,   // 49: webapi.SAEditHorseRaceLamp.Tag:type_name -> webapi.TagCode
 	0,   // 50: webapi.SARemoveHorseRaceLampById.Tag:type_name -> webapi.TagCode
 	0,   // 51: webapi.SABlackBySnId.Tag:type_name -> webapi.TagCode
 	0,   // 52: webapi.SACreateShortMessage.Tag:type_name -> webapi.TagCode
 	0,   // 53: webapi.SAQueryShortMessageList.Tag:type_name -> webapi.TagCode
-	141, // 54: webapi.SAQueryShortMessageList.MessageInfo:type_name -> webapi.MessageInfo
+	145, // 54: webapi.SAQueryShortMessageList.MessageInfo:type_name -> webapi.MessageInfo
 	0,   // 55: webapi.SADeleteShortMessage.Tag:type_name -> webapi.TagCode
 	0,   // 56: webapi.SAQueryOnlineReportList.Tag:type_name -> webapi.TagCode
-	139, // 57: webapi.SAQueryOnlineReportList.PlayerData:type_name -> webapi.PlayerData
+	143, // 57: webapi.SAQueryOnlineReportList.PlayerData:type_name -> webapi.PlayerData
 	0,   // 58: webapi.SASrvCtrlClose.Tag:type_name -> webapi.TagCode
 	0,   // 59: webapi.SASrvCtrlNotice.Tag:type_name -> webapi.TagCode
 	0,   // 60: webapi.SASrvCtrlStartScript.Tag:type_name -> webapi.TagCode
 	0,   // 61: webapi.SAListServerStates.Tag:type_name -> webapi.TagCode
-	142, // 62: webapi.SAListServerStates.ServerInfo:type_name -> webapi.ServerInfo
+	146, // 62: webapi.SAListServerStates.ServerInfo:type_name -> webapi.ServerInfo
 	0,   // 63: webapi.SAServerStateSwitch.Tag:type_name -> webapi.TagCode
 	0,   // 64: webapi.SAResetEtcdData.Tag:type_name -> webapi.TagCode
 	0,   // 65: webapi.SAOnlineReportTotal.Tag:type_name -> webapi.TagCode
-	143, // 66: webapi.SAOnlineReportTotal.OnlineReport:type_name -> webapi.OnlineReport
+	147, // 66: webapi.SAOnlineReportTotal.OnlineReport:type_name -> webapi.OnlineReport
 	0,   // 67: webapi.SAAddCoinByIdAndPT.Tag:type_name -> webapi.TagCode
-	144, // 68: webapi.JybInfoAward.ItemId:type_name -> webapi.ItemInfo
+	148, // 68: webapi.JybInfoAward.ItemId:type_name -> webapi.ItemInfo
 	83,  // 69: webapi.ASCreateJYB.Award:type_name -> webapi.JybInfoAward
 	0,   // 70: webapi.SACreateJYB.Tag:type_name -> webapi.TagCode
 	0,   // 71: webapi.SAUpdateJYB.Tag:type_name -> webapi.TagCode
@@ -10107,10 +10409,10 @@ var file_webapi_proto_depIdxs = []int32{
 	94,  // 77: webapi.SAGetExchangeOrder.OrderList:type_name -> webapi.ExchangeOrderInfo
 	0,   // 78: webapi.SAUpExchangeStatus.Tag:type_name -> webapi.TagCode
 	0,   // 79: webapi.SAGetExchangeShop.Tag:type_name -> webapi.TagCode
-	145, // 80: webapi.SAGetExchangeShop.List:type_name -> webapi.ExchangeShop
+	149, // 80: webapi.SAGetExchangeShop.List:type_name -> webapi.ExchangeShop
-	146, // 81: webapi.SAGetExchangeShop.Weight:type_name -> webapi.ShopWeight
+	150, // 81: webapi.SAGetExchangeShop.Weight:type_name -> webapi.ShopWeight
 	0,   // 82: webapi.SAThdUpdatePlayerCoin.Tag:type_name -> webapi.TagCode
-	144, // 83: webapi.SACreateOrder.ItemInfo:type_name -> webapi.ItemInfo
+	148, // 83: webapi.SACreateOrder.ItemInfo:type_name -> webapi.ItemInfo
 	0,   // 84: webapi.SACallbackPayment.Tag:type_name -> webapi.TagCode
 	0,   // 85: webapi.SAResource.Tag:type_name -> webapi.TagCode
 	0,   // 86: webapi.SASendSms.Tag:type_name -> webapi.TagCode
@@ -10119,15 +10421,18 @@ var file_webapi_proto_depIdxs = []int32{
 	0,   // 89: webapi.SAGetImgVerify.Tag:type_name -> webapi.TagCode
 	0,   // 90: webapi.SAPlayerDelete.Tag:type_name -> webapi.TagCode
 	0,   // 91: webapi.SAPlayerInviteLink.Tag:type_name -> webapi.TagCode
-	144, // 92: webapi.ASAddItemById.ItemInfo:type_name -> webapi.ItemInfo
+	148, // 92: webapi.ASAddItemById.ItemInfo:type_name -> webapi.ItemInfo
 	0,   // 93: webapi.SAAddItemById.Tag:type_name -> webapi.TagCode
 	130, // 94: webapi.SASMSConfig.Info:type_name -> webapi.SMSInfo
 	0,   // 95: webapi.SASMSConfig.Tag:type_name -> webapi.TagCode
-	96,  // [96:96] is the sub-list for method output_type
+	133, // 96: webapi.SAAwardLog.AwardLog:type_name -> webapi.AwardLogInfo
-	96,  // [96:96] is the sub-list for method input_type
+	134, // 97: webapi.SAAwardLog.AnnouncerLog:type_name -> webapi.AnnouncerLogInfo
-	96,  // [96:96] is the sub-list for extension type_name
+	0,   // 98: webapi.SAAwardLog.Tag:type_name -> webapi.TagCode
-	96,  // [96:96] is the sub-list for extension extendee
+	99,  // [99:99] is the sub-list for method output_type
-	0,   // [0:96] is the sub-list for field type_name
+	99,  // [99:99] is the sub-list for method input_type
+	99,  // [99:99] is the sub-list for extension type_name
+	99,  // [99:99] is the sub-list for extension extendee
+	0,   // [0:99] is the sub-list for field type_name
 }
 
 func init() { file_webapi_proto_init() }
@@ -11697,6 +12002,54 @@ func file_webapi_proto_init() {
 				return nil
 			}
 		}
+		file_webapi_proto_msgTypes[130].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ASAwardLog); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_webapi_proto_msgTypes[131].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SAAwardLog); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_webapi_proto_msgTypes[132].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AwardLogInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_webapi_proto_msgTypes[133].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AnnouncerLogInfo); 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{
@@ -11704,7 +12057,7 @@ func file_webapi_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_webapi_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   130,
+			NumMessages:   134,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/webapi/webapi.proto

@@ -938,10 +938,35 @@ message SASMSConfig{
 	int32 SnId = 2; // 玩家id
 	repeated SMSInfo Info  = 3;
 	TagCode Tag = 4; //错误码
-    string Msg = 5;  //错误信息(选填)
+  string Msg = 5;  //错误信息(选填)
 }
 message SMSInfo{
 	int32 Id = 1;
 	string SmsName = 2;
 }
 
+//获取获奖记录 [/get_AwardLog]
+message ASAwardLog{
+  string Platform = 1; // 平台id
+  int32 SnId = 2; // 玩家id
+}
+
+message SAAwardLog{
+  repeated AwardLogInfo AwardLog =1;
+  repeated AnnouncerLogInfo AnnouncerLog = 2;
+  TagCode Tag = 4; //错误码
+  string Msg = 5;  //错误信息(选填)
+}
+message AwardLogInfo{
+  int32 TypeId = 1; //1话费 2实物
+  int32 itemId = 2; //道具ID
+  string Name = 3;  //物品名字
+  int64 Num  = 4;   //数量
+}
+//实时播报
+message AnnouncerLogInfo{
+  int32 Snid = 1; //玩家ID
+  int32 Name = 2; //玩家名字
+  int32 Phone = 3;  //电话
+  int32 ItemName = 4; //获得物品名字
+}

public

@@ -1 +1 @@
-Subproject commit 84def613235479511266c5e6f331d7e81ed5cde5
+Subproject commit d789cca81a36ddbaf30e5414b6c4fe530e0631f6

webapi/deprecated.go

@@ -92,6 +92,10 @@ func ApiSMSConfig(appId string, body proto.Message) ([]byte, error) {
 	return postRequest(appId, "/get_SMSConfig", nil, body, "http", DEFAULT_TIMEOUT)
 }
 
+func ApiAwardLog(appId string, body proto.Message) ([]byte, error) {
+	return postRequest(appId, "/get_AwardLog", nil, body, "http", DEFAULT_TIMEOUT)
+}
+
 // 支付订单 商城
 func API_CreateOrder(appId, orderId string, configid, SnId, shopId int32, platform string, packageTag string, os, deviceId, shopname string,
 	amount [3]int32, consumptionamount int32, itemInfo []*webapi.ItemInfo, exchangeOrderId, channel, channelId string) *webapi.ASCreateOrder {

worldsrv/action_player.go

@@ -2889,6 +2889,55 @@ func CSSMSConfig(s *netlib.Session, packetId int, data interface{}, sid int64) e
 	return nil
 }
 
+// 获取获奖记录
+func CSAwardLog(s *netlib.Session, packetId int, data interface{}, sid int64) error {
+	logger.Logger.Tracef("CSAwardLog Process %v", data)
+	p := PlayerMgrSington.GetPlayer(sid)
+	if p == nil {
+		return nil
+	}
+	var res []byte
+	var err error
+	task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
+		param := &webapi_proto.ASAwardLog{
+			SnId:     p.SnId,
+			Platform: p.Platform,
+		}
+		res, err = webapi.ApiAwardLog(common.GetAppId(), param)
+		return nil
+	}), task.CompleteNotifyWrapper(func(data interface{}, t task.Task) {
+		if err != nil || res == nil {
+			logger.Logger.Errorf("ApiAwardLog err %v", err)
+			return
+		}
+		var info webapi_proto.SAAwardLog
+		proto.Unmarshal(res, &info)
+		if info.Tag == webapi_proto.TagCode_SUCCESS {
+			ret := &player_proto.SCAwardLog{}
+			for _, value := range info.AwardLog {
+				infoData := &player_proto.AwardLogInfo{}
+				infoData.TypeId = value.TypeId
+				infoData.ItemId = value.ItemId
+				infoData.Name = value.Name
+				infoData.Num = value.Num
+				ret.AwardLog = append(ret.AwardLog, infoData)
+			}
+			for _, logInfo := range info.AnnouncerLog {
+				infoData := &player_proto.AnnouncerLogInfo{}
+				infoData.Snid = logInfo.Snid
+				infoData.Name = logInfo.Name
+				infoData.Phone = logInfo.Phone
+				infoData.ItemName = logInfo.ItemName
+				ret.AnnouncerLog = append(ret.AnnouncerLog, infoData)
+			}
+			p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCAwardLog), ret)
+		} else {
+			logger.Logger.Errorf("API_AwardLog err %v", info.Msg)
+		}
+	}), "API_AwardLog").Start()
+	return nil
+}
+
 func init() {
 	// 用户信息
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CS_PLAYERDATA), player_proto.CSPlayerData{}, CSPlayerData)
@@ -2916,4 +2965,6 @@ func init() {
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CSExchangeChannel), player_proto.CSExchangeChannel{}, CSExchangeChannel)
 	//获取运营商配置
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CSSMSConfig), player_proto.CSSMSConfig{}, CSSMSConfig)
+	//获奖记录
+	common.Register(int(player_proto.PlayerPacketID_PACKET_CSAwardLog), player_proto.CS_AwardLog{}, CSAwardLog)
 }

worldsrv/etcd.go

@@ -84,6 +84,8 @@ func init() {
 	etcd.Register(etcd.ETCDKEY_Item, webapi.ItemConfig{}, platformConfigEvent)
 	// 皮肤配置
 	etcd.Register(etcd.ETCDKEY_SKin, webapi.SkinConfig{}, platformConfigEvent)
+	//排行榜奖励配置
+	etcd.Register(etcd.ETCDKEY_RANK_TYPE, webapi.RankTypeConfig{}, platformConfigEvent)
 }
 
 func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {
@@ -313,7 +315,8 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
 
 	case *webapi.SkinConfig:
 		PlatformMgrSingleton.GetConfig(config.Platform).SkinConfig = config
-
+	case *webapi.RankTypeConfig:
+		PlatformMgrSingleton.GetConfig(config.Platform).RankTypeConfig = config
 	default:
 		logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
 	}

worldsrv/rankmatch.go

@@ -643,6 +643,8 @@ func (r *RankMatchMgr) InterestClockEvent() int {
 
 func (r *RankMatchMgr) OnDayTimer() {
 	logger.Logger.Info("(this *RankMatchMgr) OnDayTimer")
+	//排行榜发奖
+	//r.RankAward()
 	for _, platform := range PlatformMgrSingleton.GetPlatforms() {
 		if platform.IdStr == DefaultPlatform {
 			continue
@@ -702,6 +704,190 @@ func (r *RankMatchMgr) Callback(player any, ret *internal.PlayerLoadReplay) {
 	}
 }
 
+// 排行榜发奖
+func (r *RankMatchMgr) RankAward() {
+	logger.Logger.Trace("排行榜开始发奖！！！！")
+	for _, v := range PlatformMgrSingleton.GetPlatforms() {
+		platform := v.IdStr
+		rankConfig := PlatformMgrSingleton.GetConfig(platform).RankTypeConfig
+		if rankConfig == nil {
+			continue
+		}
+		for _, info := range rankConfig.Info {
+			if info.TurnOff == 0 {
+				continue
+			}
+			now := time.Now()
+			//获取排行榜数据 进行发奖
+			if info.RankType == 2 {
+				//判断是不是周一
+				if now.Weekday() != time.Monday {
+					continue
+				}
+			}
+			if info.RankType == 3 {
+				//判断是不是每月1号
+				if now.Day() != 1 {
+					continue
+				}
+			}
+			rankAward := info.Award
+			if rankAward == nil {
+				continue
+			}
+			var players []*model.PlayerBaseInfo
+			if info.RankType == model.RankType_Coin {
+				list, err := model.FindPlayerCoinList(&model.FindPlayerCoinListArgs{
+					Platform: platform,
+				})
+				task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
+					for _, vv := range list.List {
+						player := PlayerMgrSington.GetPlayerBySnId(vv.SnId)
+						if player != nil {
+							players = append(players, &model.PlayerBaseInfo{
+								SnId:        player.SnId,
+								LastChannel: player.LastChannel,
+							})
+						} else {
+							baseInfo := model.GetPlayerBaseInfo(platform, vv.SnId)
+							players = append(players, baseInfo)
+						}
+					}
+					return nil
+				}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
+					if err != nil {
+						logger.Logger.Errorf("RankMatchMgr OnDayTimer FindPlayerPermitList err:%v", err)
+						return
+					}
+					rankId := int32(1)
+					for k, player := range players {
+						if player == nil {
+							logger.Logger.Errorf("RankMatchMgr OnDayTimer FindPlayerPermitList player is nil %v", list.List[k].SnId)
+							continue
+						}
+						var items []int32
+						for _, award := range rankAward {
+							if award.RankLevelId == rankId {
+								for _, itemInfo := range award.Item {
+									items = append(items, itemInfo.ItemId)
+									items = append(items, int32(itemInfo.ItemNum))
+								}
+								break
+							}
+						}
+						if len(items) == 0 {
+							break
+						}
+						// 发邮件
+						var newMsg *model.Message
+						task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
+							title := i18n.Tr("languages", "PermitAwardTitle")
+							content := i18n.Tr("languages", "PermitAward", []int{int(rankId), int(rankId), int(rankId), int(rankId)})
+							newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD,
+								title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil)
+							err := model.InsertMessage(platform, newMsg)
+							if err != nil {
+								logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err)
+								return err
+							}
+							return nil
+						}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
+							p := PlayerMgrSington.GetPlayerBySnId(player.SnId)
+							if p != nil {
+								p.AddMessage(newMsg)
+							}
+						})).Start()
+						rankId += 1
+					}
+				})).StartByExecutor("PlayerCoin_Award")
+			} else if info.RankType == model.RankType_WinCoin {
+				//从数据库读取前一天的数据
+				startTime, endTime := StartEndTs()
+				logger.Logger.Tracef("-----------------排行榜发奖 startTime = %d, endTime = %d------------------", startTime, endTime)
+				ret, err := model.FindWinCoinListTienlen(&model.FindWinCoinListArgs{
+					Platform: platform,
+					StartTs:  startTime,
+					EndTs:    endTime,
+				})
+				if err != nil {
+					return
+				}
+				task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
+					for _, vv := range ret.List {
+						player := PlayerMgrSington.GetPlayerBySnId(vv.SnId)
+						if player != nil {
+							players = append(players, &model.PlayerBaseInfo{
+								SnId:        player.SnId,
+								LastChannel: player.LastChannel,
+							})
+						} else {
+							baseInfo := model.GetPlayerBaseInfo(platform, vv.SnId)
+							players = append(players, baseInfo)
+						}
+					}
+					return nil
+				}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
+					if err != nil {
+						logger.Logger.Errorf("RankMatchMgr OnDayTimer FindWinCoinListTienlen err:%v", err)
+						return
+					}
+					rankId := int32(1)
+					for k, player := range players {
+						if player == nil {
+							logger.Logger.Errorf("RankMatchMgr OnDayTimer FindWinCoinListTienlen player is nil %v", ret.List[k].SnId)
+							continue
+						}
+						var items []int32
+						for _, award := range rankAward {
+							if award.RankLevelId == rankId {
+								for _, itemInfo := range award.Item {
+									items = append(items, itemInfo.ItemId)
+									items = append(items, int32(itemInfo.ItemNum))
+								}
+								break
+							}
+						}
+						if len(items) == 0 {
+							break
+						}
+						// 发邮件
+						var newMsg *model.Message
+						task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
+							title := i18n.Tr("languages", "PermitAwardTitle")
+							content := i18n.Tr("languages", "PermitAward", []int{int(rankId), int(rankId), int(rankId), int(rankId)})
+							newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD,
+								title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil)
+							err := model.InsertMessage(platform, newMsg)
+							if err != nil {
+								logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err)
+								return err
+							}
+							return nil
+						}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
+							p := PlayerMgrSington.GetPlayerBySnId(player.SnId)
+							if p != nil {
+								p.AddMessage(newMsg)
+							}
+						})).Start()
+						rankId += 1
+					}
+				})).StartByExecutor("WinCoin_Award")
+			}
+		}
+	}
+}
+
+func StartEndTs() (startTs int64, endTs int64) {
+	now := time.Now()
+	year, month, day := now.Date()
+	lastTs := time.Date(year, month, day, model.GameParamData.WinCoinUpdateTime, 0, 0, 0, now.Location())
+	if now.Before(lastTs) {
+		lastTs = lastTs.AddDate(0, 0, -1)
+	}
+	endTs = lastTs.Unix()
+	return endTs - 24*int64(time.Hour.Seconds()), endTs
+}
+
 func (r *RankMatchMgr) LoadAfter(platform string, snid int32) *internal.PlayerLoadReplay {
 	return nil
 }