渠道活动开关
This commit is contained in:
sk
parent
25c7f68dac
commit
fff05f7470
Binary file not shown.
|
|
@ -1,11 +1,11 @@
|
|||
|
||||
6á§juese" icon_300001*
|
||||
活力-黄2mg_01J0R0Z0
|
||||
q漰juese" icon_300002* 韐Ｙ<E99F90><EFBCB9><EFBFBD><EFBFBD>2mg_068B300000,1J 蝳𤩺<E89DB3>銝𨀣䔉RSkillIcon-30002Z<15>雴<EFBFBD>韏𤤿妖<F0A4A4BF><E5A696><EFBFBD><EFBFBD><EFBFBD>
|
||||
膇juese" icon_300003*
|
||||
瘣餃<EFBFBD>-蝎<>2mg_028B 300003,20J 瘣餃<E798A3>皛⊥說RSkillIcon-30003Z$VIP韏𥟇<E99F8F><F0A59F87>亙<EFBFBD>韐寞𥁒<E5AF9E>齿活<E9BDBF>唳<EFBFBD><E594B3><EFBFBD>
|
||||
y銣juese" icon_300004*
|
||||
瘣餃<EFBFBD>-<2D><>2mg_038B 300004,20J <0C>穃<EFBFBD>皛⊥說RSkillIcon-30004Z 瘥𤩺𠯫蝷澆<E89DB7><E6BE86>穃<EFBFBD>憟硋<E6869F><E7A18B>𣂼<EFBFBD>
|
||||
{憪juese" icon_300005* <0C><><EFBFBD>撠誩<E692A0>2mg_048B 300005,20J <0C>穃<EFBFBD><E7A983>䭾<EFBFBD>RSkillIcon-30005Z 瘥𤩺𠯫隞餃𦛚<E9A483>穃<EFBFBD>憟硋<E6869F><E7A18B>䭾<EFBFBD>
|
||||
B瑽juese" icon_300006* 瞏𨀣偌<F0A880A3><E5818C>2mg_058B 300006,20J0R0Z0
|
||||
~蝘juese" icon_300007* <0C>脫答<E884AB>亙<EFBFBD>2mg_078B 300007,20J 憟質<E6869F><E8B3AA>䭾<EFBFBD>RSkillIcon-30007Z!瘥𤩺活<F0A4A9BA>餌𨺗<E9A48C>賢<EFBFBD>撟貉<E6929F><E8B289>潭<EFBFBD><E6BDAD><EFBFBD>
|
||||
o漰juese" icon_300002* 韐Ｙ<E99F90><EFBCB9><EFBFBD><EFBFBD>2mg_068B鄑J 蝳𤩺<E89DB3>銝𨀣䔉RSkillIcon-30002Z<15>雴<EFBFBD>韏𤤿妖<F0A4A4BF><E5A696><EFBFBD><EFBFBD><EFBFBD>
|
||||
|膇juese" icon_300003*
|
||||
瘣餃<EFBFBD>-蝎<>2mg_028B膇J 瘣餃<E798A3>皛⊥說RSkillIcon-30003Z$VIP韏𥟇<E99F8F><F0A59F87>亙<EFBFBD>韐寞𥁒<E5AF9E>齿活<E9BDBF>唳<EFBFBD><E594B3><EFBFBD>
|
||||
v銣juese" icon_300004*
|
||||
瘣餃<EFBFBD>-<2D><>2mg_038B銣J <0C>穃<EFBFBD>皛⊥說RSkillIcon-30004Z 瘥𤩺𠯫蝷澆<E89DB7><E6BE86>穃<EFBFBD>憟硋<E6869F><E7A18B>𣂼<EFBFBD>
|
||||
x憪juese" icon_300005* <0C><><EFBFBD>撠誩<E692A0>2mg_048B憪J <0C>穃<EFBFBD><E7A983>䭾<EFBFBD>RSkillIcon-30005Z 瘥𤩺𠯫隞餃𦛚<E9A483>穃<EFBFBD>憟硋<E6869F><E7A18B>䭾<EFBFBD>
|
||||
?瑽juese" icon_300006* 瞏𨀣偌<F0A880A3><E5818C>2mg_058B瑽J0R0Z0
|
||||
{蝘juese" icon_300007* <0C>脫答<E884AB>亙<EFBFBD>2mg_078B蝘J 憟質<E6869F><E8B3AA>䭾<EFBFBD>RSkillIcon-30007Z!瘥𤩺活<F0A4A9BA>餌𨺗<E9A48C>賢<EFBFBD>撟貉<E6929F><E8B289>潭<EFBFBD><E6BDAD><EFBFBD>
|
||||
|
|
@ -19,7 +19,9 @@
|
|||
"SkinName": "财神送福",
|
||||
"SkinType": "mg_06",
|
||||
"UnlockType": 1,
|
||||
"UnlockItem": "300000,1",
|
||||
"UnlockItem": {
|
||||
"300000": 1
|
||||
},
|
||||
"SkinSkillName": "福气东来",
|
||||
"SkinSkillIcon": "SkillIcon-30002",
|
||||
"SkinSkillDes": "排位赛积分提升"
|
||||
|
|
@ -32,7 +34,9 @@
|
|||
"SkinName": "活力-粉",
|
||||
"SkinType": "mg_02",
|
||||
"UnlockType": 2,
|
||||
"UnlockItem": "300003,20",
|
||||
"UnlockItem": {
|
||||
"300003": 20
|
||||
},
|
||||
"SkinSkillName": "活力满满",
|
||||
"SkinSkillIcon": "SkillIcon-30003",
|
||||
"SkinSkillDes": "VIP赛每日免费报名次数提升"
|
||||
|
|
@ -45,7 +49,9 @@
|
|||
"SkinName": "活力-青",
|
||||
"SkinType": "mg_03",
|
||||
"UnlockType": 2,
|
||||
"UnlockItem": "300004,20",
|
||||
"UnlockItem": {
|
||||
"300004": 20
|
||||
},
|
||||
"SkinSkillName": "金币满满",
|
||||
"SkinSkillIcon": "SkillIcon-30004",
|
||||
"SkinSkillDes": "每日礼包金币奖励提升"
|
||||
|
|
@ -58,7 +64,9 @@
|
|||
"SkinName": "摇滚小子",
|
||||
"SkinType": "mg_04",
|
||||
"UnlockType": 2,
|
||||
"UnlockItem": "300005,20",
|
||||
"UnlockItem": {
|
||||
"300005": 20
|
||||
},
|
||||
"SkinSkillName": "金币加成",
|
||||
"SkinSkillIcon": "SkillIcon-30005",
|
||||
"SkinSkillDes": "每日任务金币奖励加成"
|
||||
|
|
@ -71,7 +79,9 @@
|
|||
"SkinName": "潜水员",
|
||||
"SkinType": "mg_05",
|
||||
"UnlockType": 2,
|
||||
"UnlockItem": "300006,20",
|
||||
"UnlockItem": {
|
||||
"300006": 20
|
||||
},
|
||||
"SkinSkillName": "0",
|
||||
"SkinSkillIcon": "0",
|
||||
"SkinSkillDes": "0"
|
||||
|
|
@ -84,7 +94,9 @@
|
|||
"SkinName": "冲浪健将",
|
||||
"SkinType": "mg_07",
|
||||
"UnlockType": 2,
|
||||
"UnlockItem": "300007,20",
|
||||
"UnlockItem": {
|
||||
"300007": 20
|
||||
},
|
||||
"SkinSkillName": "好运加成",
|
||||
"SkinSkillIcon": "SkillIcon-30007",
|
||||
"SkinSkillDes": "每次钻石抽奖幸运值提升"
|
||||
|
|
|
|||
BIN
data/DB_Task.dat
BIN
data/DB_Task.dat
Binary file not shown.
|
|
@ -2132,8 +2132,7 @@ func (this *Scene) TryBillExGameDrop(p *Player) {
|
|||
}
|
||||
|
||||
// 渠道开关
|
||||
conf := ConfigMgrInst.GetConfig(p.Platform).ChannelSwitch[common.ChannelSwitchDropItem]
|
||||
if !model.GameParamData.CloseChannelSwitch && (conf == nil || !common.InSliceString(conf.OnChannelName, p.LastChannel)) {
|
||||
if !ConfigMgrInst.IsOn(p.Platform, common.ChannelSwitchDropItem, p.LastChannel) {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package model
|
|||
import (
|
||||
"strconv"
|
||||
|
||||
"mongo.games.com/game/common"
|
||||
"mongo.games.com/game/protocol/shop"
|
||||
"mongo.games.com/game/protocol/webapi"
|
||||
)
|
||||
|
|
@ -178,6 +179,18 @@ func (cm *ConfigMgr) GetConfigs() map[string]*AllConfig {
|
|||
return cm.platform
|
||||
}
|
||||
|
||||
// IsOn 活动开关
|
||||
// tp 活动类型
|
||||
// playerLastChannel 玩家当前登录渠道包
|
||||
func (cm *ConfigMgr) IsOn(plt string, tp int32, playerLastChannel string) bool {
|
||||
cm.GetConfig(plt)
|
||||
conf := cm.GetConfig(plt).ChannelSwitch[tp]
|
||||
if !GameParamData.CloseChannelSwitch && (conf == nil || !common.InSliceString(conf.OnChannelName, playerLastChannel)) {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// UpdateItemShop 更新商品信息
|
||||
func (cm *ConfigMgr) UpdateItemShop(list *webapi.ItemShopList) {
|
||||
if list == nil {
|
||||
|
|
|
|||
|
|
@ -9362,18 +9362,18 @@ type DB_Skin struct {
|
|||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
|
||||
SkinClass int32 `protobuf:"varint,2,opt,name=SkinClass,proto3" json:"SkinClass,omitempty"`
|
||||
Model string `protobuf:"bytes,3,opt,name=Model,proto3" json:"Model,omitempty"`
|
||||
SkinPic string `protobuf:"bytes,4,opt,name=SkinPic,proto3" json:"SkinPic,omitempty"`
|
||||
SkinName string `protobuf:"bytes,5,opt,name=SkinName,proto3" json:"SkinName,omitempty"`
|
||||
SkinType string `protobuf:"bytes,6,opt,name=SkinType,proto3" json:"SkinType,omitempty"`
|
||||
UnlockType int32 `protobuf:"varint,7,opt,name=UnlockType,proto3" json:"UnlockType,omitempty"`
|
||||
UnlockItem string `protobuf:"bytes,8,opt,name=UnlockItem,proto3" json:"UnlockItem,omitempty"`
|
||||
SkinSkillName string `protobuf:"bytes,9,opt,name=SkinSkillName,proto3" json:"SkinSkillName,omitempty"`
|
||||
SkinSkillIcon string `protobuf:"bytes,10,opt,name=SkinSkillIcon,proto3" json:"SkinSkillIcon,omitempty"`
|
||||
SkinSkillDes string `protobuf:"bytes,11,opt,name=SkinSkillDes,proto3" json:"SkinSkillDes,omitempty"`
|
||||
SkinSkillType int32 `protobuf:"varint,12,opt,name=SkinSkillType,proto3" json:"SkinSkillType,omitempty"`
|
||||
Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
|
||||
SkinClass int32 `protobuf:"varint,2,opt,name=SkinClass,proto3" json:"SkinClass,omitempty"`
|
||||
Model string `protobuf:"bytes,3,opt,name=Model,proto3" json:"Model,omitempty"`
|
||||
SkinPic string `protobuf:"bytes,4,opt,name=SkinPic,proto3" json:"SkinPic,omitempty"`
|
||||
SkinName string `protobuf:"bytes,5,opt,name=SkinName,proto3" json:"SkinName,omitempty"`
|
||||
SkinType string `protobuf:"bytes,6,opt,name=SkinType,proto3" json:"SkinType,omitempty"`
|
||||
UnlockType int32 `protobuf:"varint,7,opt,name=UnlockType,proto3" json:"UnlockType,omitempty"`
|
||||
UnlockItem map[int64]int64 `protobuf:"bytes,8,rep,name=UnlockItem,proto3" json:"UnlockItem,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
|
||||
SkinSkillName string `protobuf:"bytes,9,opt,name=SkinSkillName,proto3" json:"SkinSkillName,omitempty"`
|
||||
SkinSkillIcon string `protobuf:"bytes,10,opt,name=SkinSkillIcon,proto3" json:"SkinSkillIcon,omitempty"`
|
||||
SkinSkillDes string `protobuf:"bytes,11,opt,name=SkinSkillDes,proto3" json:"SkinSkillDes,omitempty"`
|
||||
SkinSkillType int32 `protobuf:"varint,12,opt,name=SkinSkillType,proto3" json:"SkinSkillType,omitempty"`
|
||||
}
|
||||
|
||||
func (x *DB_Skin) Reset() {
|
||||
|
|
@ -9457,11 +9457,11 @@ func (x *DB_Skin) GetUnlockType() int32 {
|
|||
return 0
|
||||
}
|
||||
|
||||
func (x *DB_Skin) GetUnlockItem() string {
|
||||
func (x *DB_Skin) GetUnlockItem() map[int64]int64 {
|
||||
if x != nil {
|
||||
return x.UnlockItem
|
||||
}
|
||||
return ""
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DB_Skin) GetSkinSkillName() string {
|
||||
|
|
@ -11913,7 +11913,7 @@ var file_pbdata_proto_rawDesc = []byte{
|
|||
0x72, 0x72, 0x61, 0x79, 0x12, 0x2c, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x53, 0x65,
|
||||
0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x52, 0x03, 0x41,
|
||||
0x72, 0x72, 0x22, 0xf5, 0x02, 0x0a, 0x07, 0x44, 0x42, 0x5f, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x0e,
|
||||
0x72, 0x72, 0x22, 0xd5, 0x03, 0x0a, 0x07, 0x44, 0x42, 0x5f, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x0e,
|
||||
0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1c,
|
||||
0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6e, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x09, 0x53, 0x6b, 0x69, 0x6e, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05,
|
||||
|
|
@ -11925,18 +11925,24 @@ var file_pbdata_proto_rawDesc = []byte{
|
|||
0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x53, 0x6b, 0x69, 0x6e,
|
||||
0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x79,
|
||||
0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b,
|
||||
0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x74,
|
||||
0x65, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b,
|
||||
0x49, 0x74, 0x65, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c,
|
||||
0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x6b, 0x69,
|
||||
0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x6b,
|
||||
0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x63, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x63, 0x6f, 0x6e,
|
||||
0x12, 0x22, 0x0a, 0x0c, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x65, 0x73,
|
||||
0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c,
|
||||
0x6c, 0x44, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c,
|
||||
0x6c, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x53, 0x6b, 0x69,
|
||||
0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x22, 0x31, 0x0a, 0x0c, 0x44, 0x42,
|
||||
0x54, 0x79, 0x70, 0x65, 0x12, 0x3f, 0x0a, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x74,
|
||||
0x65, 0x6d, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65,
|
||||
0x72, 0x2e, 0x44, 0x42, 0x5f, 0x53, 0x6b, 0x69, 0x6e, 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b,
|
||||
0x49, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63,
|
||||
0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69,
|
||||
0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x6b,
|
||||
0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x53,
|
||||
0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x63, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x63, 0x6f,
|
||||
0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x65,
|
||||
0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69,
|
||||
0x6c, 0x6c, 0x44, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69,
|
||||
0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x53, 0x6b,
|
||||
0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x55,
|
||||
0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x31, 0x0a, 0x0c, 0x44, 0x42,
|
||||
0x5f, 0x53, 0x6b, 0x69, 0x6e, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x21, 0x0a, 0x03, 0x41, 0x72,
|
||||
0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
|
||||
0x2e, 0x44, 0x42, 0x5f, 0x53, 0x6b, 0x69, 0x6e, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xd7, 0x02,
|
||||
|
|
@ -12134,7 +12140,7 @@ func file_pbdata_proto_rawDescGZIP() []byte {
|
|||
return file_pbdata_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_pbdata_proto_msgTypes = make([]protoimpl.MessageInfo, 150)
|
||||
var file_pbdata_proto_msgTypes = make([]protoimpl.MessageInfo, 151)
|
||||
var file_pbdata_proto_goTypes = []interface{}{
|
||||
(*DB_ActSign)(nil), // 0: server.DB_ActSign
|
||||
(*DB_ActSignArray)(nil), // 1: server.DB_ActSignArray
|
||||
|
|
@ -12282,10 +12288,11 @@ var file_pbdata_proto_goTypes = []interface{}{
|
|||
nil, // 143: server.DB_PetSkill.ItemConsumEntry
|
||||
nil, // 144: server.DB_PropExchange.CostEntry
|
||||
nil, // 145: server.DB_PropExchange.GainEntry
|
||||
nil, // 146: server.DB_SkinLevel.UpItemEntry
|
||||
nil, // 147: server.DB_Task.AwardEntry
|
||||
nil, // 148: server.DB_VIP.Privilege7Entry
|
||||
nil, // 149: server.DB_VIP.AwardEntry
|
||||
nil, // 146: server.DB_Skin.UnlockItemEntry
|
||||
nil, // 147: server.DB_SkinLevel.UpItemEntry
|
||||
nil, // 148: server.DB_Task.AwardEntry
|
||||
nil, // 149: server.DB_VIP.Privilege7Entry
|
||||
nil, // 150: server.DB_VIP.AwardEntry
|
||||
}
|
||||
var file_pbdata_proto_depIdxs = []int32{
|
||||
0, // 0: server.DB_ActSignArray.Arr:type_name -> server.DB_ActSign
|
||||
|
|
@ -12357,23 +12364,24 @@ var file_pbdata_proto_depIdxs = []int32{
|
|||
116, // 66: server.DB_RankLevelArray.Arr:type_name -> server.DB_RankLevel
|
||||
118, // 67: server.DB_RankRewardArray.Arr:type_name -> server.DB_RankReward
|
||||
120, // 68: server.DB_Sensitive_WordsArray.Arr:type_name -> server.DB_Sensitive_Words
|
||||
122, // 69: server.DB_SkinArray.Arr:type_name -> server.DB_Skin
|
||||
146, // 70: server.DB_SkinLevel.UpItem:type_name -> server.DB_SkinLevel.UpItemEntry
|
||||
124, // 71: server.DB_SkinLevelArray.Arr:type_name -> server.DB_SkinLevel
|
||||
126, // 72: server.DB_SlotRateWeightArray.Arr:type_name -> server.DB_SlotRateWeight
|
||||
128, // 73: server.DB_SystemChanceArray.Arr:type_name -> server.DB_SystemChance
|
||||
147, // 74: server.DB_Task.Award:type_name -> server.DB_Task.AwardEntry
|
||||
130, // 75: server.DB_TaskArray.Arr:type_name -> server.DB_Task
|
||||
132, // 76: server.DB_ThirdPlatformGameMappingArray.Arr:type_name -> server.DB_ThirdPlatformGameMapping
|
||||
134, // 77: server.DB_TipsArray.Arr:type_name -> server.DB_Tips
|
||||
148, // 78: server.DB_VIP.Privilege7:type_name -> server.DB_VIP.Privilege7Entry
|
||||
149, // 79: server.DB_VIP.Award:type_name -> server.DB_VIP.AwardEntry
|
||||
136, // 80: server.DB_VIPArray.Arr:type_name -> server.DB_VIP
|
||||
81, // [81:81] is the sub-list for method output_type
|
||||
81, // [81:81] is the sub-list for method input_type
|
||||
81, // [81:81] is the sub-list for extension type_name
|
||||
81, // [81:81] is the sub-list for extension extendee
|
||||
0, // [0:81] is the sub-list for field type_name
|
||||
146, // 69: server.DB_Skin.UnlockItem:type_name -> server.DB_Skin.UnlockItemEntry
|
||||
122, // 70: server.DB_SkinArray.Arr:type_name -> server.DB_Skin
|
||||
147, // 71: server.DB_SkinLevel.UpItem:type_name -> server.DB_SkinLevel.UpItemEntry
|
||||
124, // 72: server.DB_SkinLevelArray.Arr:type_name -> server.DB_SkinLevel
|
||||
126, // 73: server.DB_SlotRateWeightArray.Arr:type_name -> server.DB_SlotRateWeight
|
||||
128, // 74: server.DB_SystemChanceArray.Arr:type_name -> server.DB_SystemChance
|
||||
148, // 75: server.DB_Task.Award:type_name -> server.DB_Task.AwardEntry
|
||||
130, // 76: server.DB_TaskArray.Arr:type_name -> server.DB_Task
|
||||
132, // 77: server.DB_ThirdPlatformGameMappingArray.Arr:type_name -> server.DB_ThirdPlatformGameMapping
|
||||
134, // 78: server.DB_TipsArray.Arr:type_name -> server.DB_Tips
|
||||
149, // 79: server.DB_VIP.Privilege7:type_name -> server.DB_VIP.Privilege7Entry
|
||||
150, // 80: server.DB_VIP.Award:type_name -> server.DB_VIP.AwardEntry
|
||||
136, // 81: server.DB_VIPArray.Arr:type_name -> server.DB_VIP
|
||||
82, // [82:82] is the sub-list for method output_type
|
||||
82, // [82:82] is the sub-list for method input_type
|
||||
82, // [82:82] is the sub-list for extension type_name
|
||||
82, // [82:82] is the sub-list for extension extendee
|
||||
0, // [0:82] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_pbdata_proto_init() }
|
||||
|
|
@ -14045,7 +14053,7 @@ func file_pbdata_proto_init() {
|
|||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_pbdata_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 150,
|
||||
NumMessages: 151,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1531,7 +1531,7 @@ message DB_Skin {
|
|||
|
||||
int32 UnlockType = 7;
|
||||
|
||||
string UnlockItem = 8;
|
||||
map<int64, int64> UnlockItem = 8;
|
||||
|
||||
string SkinSkillName = 9;
|
||||
|
||||
|
|
|
|||
2
public
2
public
|
|
@ -1 +1 @@
|
|||
Subproject commit b7306cff45c7f810df6dcd700fe6c45c47031dc3
|
||||
Subproject commit fef0f333d536e78ff29ba403f6b6bf1590ecface
|
||||
|
|
@ -80,8 +80,7 @@ func (this *CSPhoneLotteryHandler) Process(s *netlib.Session, packetid int, data
|
|||
logger.Logger.Warn("CSPhoneLottery p == nil")
|
||||
return nil
|
||||
}
|
||||
conf := PlatformMgrSingleton.GetConfig(p.Platform).ChannelSwitch[common.ChannelSwitchDiamondLottery]
|
||||
if !model.GameParamData.CloseChannelSwitch && (conf == nil || !common.InSliceString(conf.OnChannelName, p.LastChannel)) {
|
||||
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchDiamondLottery, p.LastChannel) {
|
||||
return nil
|
||||
}
|
||||
countType := msg.GetLotteryType()
|
||||
|
|
@ -227,8 +226,7 @@ func (this *CSDiamondLotteryInfoHandler) Process(s *netlib.Session, packetid int
|
|||
return nil
|
||||
}
|
||||
// 渠道开关
|
||||
conf := PlatformMgrSingleton.GetConfig(p.Platform).ChannelSwitch[common.ChannelSwitchDiamondLottery]
|
||||
if !model.GameParamData.CloseChannelSwitch && (conf == nil || !common.InSliceString(conf.OnChannelName, p.LastChannel)) {
|
||||
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchDiamondLottery, p.LastChannel) {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -278,8 +276,7 @@ func (this *CSDiamondLotteryHandler) Process(s *netlib.Session, packetid int, da
|
|||
return nil
|
||||
}
|
||||
// 渠道开关
|
||||
conf := PlatformMgrSingleton.GetConfig(p.Platform).ChannelSwitch[common.ChannelSwitchDiamondLottery]
|
||||
if !model.GameParamData.CloseChannelSwitch && (conf == nil || !common.InSliceString(conf.OnChannelName, p.LastChannel)) {
|
||||
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchDiamondLottery, p.LastChannel) {
|
||||
return nil
|
||||
}
|
||||
countType := msg.GetLotteryType()
|
||||
|
|
@ -438,8 +435,7 @@ func (this *CSDiamondLotteryLuckyAwardHandler) Process(s *netlib.Session, packet
|
|||
return nil
|
||||
}
|
||||
// 渠道开关
|
||||
conf := PlatformMgrSingleton.GetConfig(p.Platform).ChannelSwitch[common.ChannelSwitchDiamondLottery]
|
||||
if !model.GameParamData.CloseChannelSwitch && (conf == nil || !common.InSliceString(conf.OnChannelName, p.LastChannel)) {
|
||||
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchDiamondLottery, p.LastChannel) {
|
||||
return nil
|
||||
}
|
||||
info := WelfareMgrSington.GetConfig(p.Platform)
|
||||
|
|
|
|||
|
|
@ -285,6 +285,10 @@ func (this *CSShopExchangeHandler) Process(s *netlib.Session, packetid int, data
|
|||
return nil
|
||||
}
|
||||
|
||||
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchExchange, p.LastChannel) {
|
||||
return nil
|
||||
}
|
||||
|
||||
/* switch msg.ExchangeType {
|
||||
case 1: // 自提
|
||||
//自提 直接增加道具到背包
|
||||
|
|
|
|||
|
|
@ -384,6 +384,11 @@ func CSBindInvite(s *netlib.Session, packetid int, data interface{}, sid int64)
|
|||
if p == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchInvite, p.LastChannel) {
|
||||
return nil
|
||||
}
|
||||
|
||||
ret := &welfare.SCBindInvite{
|
||||
OpRetCode: welfare.OpResultCode_OPRC_Error,
|
||||
}
|
||||
|
|
@ -691,6 +696,10 @@ func CSPermitAward(s *netlib.Session, packetid int, data interface{}, sid int64)
|
|||
return nil
|
||||
}
|
||||
|
||||
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchPermit, p.LastChannel) {
|
||||
return nil
|
||||
}
|
||||
|
||||
channelConfig := PlatformMgrSingleton.GetPermitConfig(p.Platform, p.LastChannel)
|
||||
if channelConfig == nil {
|
||||
logger.Logger.Errorf("CSPermitAward not channelConfig %v", p.SnId)
|
||||
|
|
@ -980,6 +989,9 @@ func CSPermitExchange(s *netlib.Session, packetid int, data interface{}, sid int
|
|||
logger.Logger.Errorf("CSPermitExchange not channel %v", p.SnId)
|
||||
return nil
|
||||
}
|
||||
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchPermit, p.LastChannel) {
|
||||
return nil
|
||||
}
|
||||
channelConfig := PlatformMgrSingleton.GetPermitConfig(p.Platform, p.LastChannel)
|
||||
if channelConfig == nil {
|
||||
logger.Logger.Errorf("CSPermitExchange not channelConfig %v", p.SnId)
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue