From fff05f747025f262e0c123c703f9136c039bfbc9 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Thu, 25 Jul 2024 16:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=A0=E9=81=93=E6=B4=BB=E5=8A=A8=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/DB_PropExchange.dat | Bin 384 -> 384 bytes data/DB_Skin.dat | 16 ++--- data/DB_Skin.json | 24 +++++-- data/DB_Task.dat | Bin 5299 -> 5299 bytes gamesrv/base/scene.go | 3 +- model/config.go | 13 ++++ protocol/server/pbdata.pb.go | 108 +++++++++++++++++--------------- protocol/server/pbdata.proto | 2 +- public | 2 +- worldsrv/action_phonelottery.go | 12 ++-- worldsrv/action_shop.go | 4 ++ worldsrv/action_welfare.go | 12 ++++ xlsx/DB_Skin.xlsx | Bin 11815 -> 11811 bytes 13 files changed, 120 insertions(+), 76 deletions(-) diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 8dead4cf762ffb3ba73ec5b24aee0f869cc021eb..4cdf831e2003b1c5f421bb850515aea3feda1592 100644 GIT binary patch literal 384 zcmd-w<6snElw#w!(#8y?uR`f-Q2IKQz6_$3I5-yevI!h$vE|a^U;?YZ36;MErEf#& z8))joIk1}#(+@Tu$sOqC!Q25cmlN!chP97axMDe2@Ol8O0cbF~MKA-=ExH4CI6KE8 Nphv$jb1~2s0svz&JT(9S literal 384 zcmd-w<6snElw#w!+{O&1uR!UmQ2H8_z7C?5I5-yevI!h$vE|a^U;?YZ0hPZArEfv$ z+i2>;IUwf4)WggNn+vobW)D_#(A}rR33f-r+D9y0u^cR5hoBpX;t-$#Fpt43f;j|c X;T@>M!2zMf&anvS(J#zg477y+WwJaq diff --git a/data/DB_Skin.dat b/data/DB_Skin.dat index 9f74014..bb067c8 100644 --- a/data/DB_Skin.dat +++ b/data/DB_Skin.dat @@ -1,11 +1,11 @@ 6juese" icon_300001* 活力-黄2mg_01J0R0Z0 -qjuese" icon_300002* 财神送福2mg_068B300000,1J 福气东来RSkillIcon-30002Z排位赛积分提升 -juese" icon_300003* -活力-粉2mg_028B 300003,20J 活力满满RSkillIcon-30003Z$VIP赛每日免费报名次数提升 -yjuese" icon_300004* -活力-青2mg_038B 300004,20J 金币满满RSkillIcon-30004Z每日礼包金币奖励提升 -{juese" icon_300005* 摇滚小子2mg_048B 300005,20J 金币加成RSkillIcon-30005Z每日任务金币奖励加成 -Bjuese" icon_300006* 潜水员2mg_058B 300006,20J0R0Z0 -~juese" icon_300007* 冲浪健将2mg_078B 300007,20J 好运加成RSkillIcon-30007Z!每次钻石抽奖幸运值提升 \ No newline at end of file +ojuese" icon_300002* 财神送福2mg_068BJ 福气东来RSkillIcon-30002Z排位赛积分提升 +|juese" icon_300003* +活力-粉2mg_028BJ 活力满满RSkillIcon-30003Z$VIP赛每日免费报名次数提升 +vjuese" icon_300004* +活力-青2mg_038BJ 金币满满RSkillIcon-30004Z每日礼包金币奖励提升 +xjuese" icon_300005* 摇滚小子2mg_048BJ 金币加成RSkillIcon-30005Z每日任务金币奖励加成 +?juese" icon_300006* 潜水员2mg_058BJ0R0Z0 +{juese" icon_300007* 冲浪健将2mg_078BJ 好运加成RSkillIcon-30007Z!每次钻石抽奖幸运值提升 \ No newline at end of file diff --git a/data/DB_Skin.json b/data/DB_Skin.json index 62236d2..33d4665 100644 --- a/data/DB_Skin.json +++ b/data/DB_Skin.json @@ -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": "每次钻石抽奖幸运值提升" diff --git a/data/DB_Task.dat b/data/DB_Task.dat index ea218b81156ca70ea5011e0799979b3805a0ad06..212d85b4feacdf161e9b3b5d4cd4667f9f36541d 100644 GIT binary patch delta 246 zcmdn2xmj~UxgZjo@Mo>{EsOW)NJd@+N%AlgGFtvx|CO_q>n!KD( zaB>0nxyci_L?#FESWLbGr04Nif~|PLW5p;7u>wh36cZyOmjlPuHf90Y$qu~Ylf(G< afQ}QKT*_CB#X&#$mIDnH+`N&Wi4_0_L`NS0 delta 232 zcmdn2xmj~UxgZC}!d^Ck1-)!uY#d8~ERl&Fje-y+mls6xLL2jDDaP9@K;cC|6--d! z11+|j+1Q>iPEO$y-29uJpJ{RlhuCBVF5Su7fpjug;p9c^B9mWml|%K3K=n0rR!uJ8 zJ_i+LhKfE|E;QMn$9nP=E|JOecq}JxWfoxM+WdmYicuEo#6xmGCxRTn8pXuO$mPIs qwT)RocCrJn_~bA?zRA~l1SgmB6$2e1IQb{va-czin>X?^u>t@F%0#FD diff --git a/gamesrv/base/scene.go b/gamesrv/base/scene.go index cdb65d1..f638b54 100644 --- a/gamesrv/base/scene.go +++ b/gamesrv/base/scene.go @@ -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 } diff --git a/model/config.go b/model/config.go index 1ebacad..7393846 100644 --- a/model/config.go +++ b/model/config.go @@ -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 { diff --git a/protocol/server/pbdata.pb.go b/protocol/server/pbdata.pb.go index 04d92e4..8506909 100644 --- a/protocol/server/pbdata.pb.go +++ b/protocol/server/pbdata.pb.go @@ -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, }, diff --git a/protocol/server/pbdata.proto b/protocol/server/pbdata.proto index 4abca06..252bed3 100644 --- a/protocol/server/pbdata.proto +++ b/protocol/server/pbdata.proto @@ -1531,7 +1531,7 @@ message DB_Skin { int32 UnlockType = 7; - string UnlockItem = 8; + map UnlockItem = 8; string SkinSkillName = 9; diff --git a/public b/public index b7306cf..fef0f33 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit b7306cff45c7f810df6dcd700fe6c45c47031dc3 +Subproject commit fef0f333d536e78ff29ba403f6b6bf1590ecface diff --git a/worldsrv/action_phonelottery.go b/worldsrv/action_phonelottery.go index dc888b9..65503c1 100644 --- a/worldsrv/action_phonelottery.go +++ b/worldsrv/action_phonelottery.go @@ -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) diff --git a/worldsrv/action_shop.go b/worldsrv/action_shop.go index da91248..92a22da 100644 --- a/worldsrv/action_shop.go +++ b/worldsrv/action_shop.go @@ -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: // 自提 //自提 直接增加道具到背包 diff --git a/worldsrv/action_welfare.go b/worldsrv/action_welfare.go index 98e11e5..72b6e23 100644 --- a/worldsrv/action_welfare.go +++ b/worldsrv/action_welfare.go @@ -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) diff --git a/xlsx/DB_Skin.xlsx b/xlsx/DB_Skin.xlsx index 88b716875ee4f5a1e5613652f0b78ebb0d6aa3bf..803a3346df66e3a12ef900de73a0b14a5cfb7b83 100644 GIT binary patch delta 1675 zcmV;626XwST%%mDpaBHsThaWJqya5|lD4vvR07l$m5?X`v9s)H8xcE}ZAg0>F2bF- z0#4F~R3Mf!|NG6Kk+a2KR>3Wm~|12_aJ~ z!7;%c!!0n>0}&mOf)7ajW~vS#IED%&C}(jT#rVhTz)1V&gH9PaW$6yu?{thiW((en zgL`kw!PqoS)J(bh^XOvu@?jyeUCk zABwNfj|~5AdrB9&M}Y`@4BCe~J}FO=o7?pg6$wd_kj%m)U6YiiQ%cB7JN4{+8>?@~ zG{%9F z#0jPeY>fYmXJ+@Qf1xuwA$Dfhrj{SZ_uM)6o_oi0CvxLgJsElk(oi#vNon|sB87kv zHxrsMGb!D>`+fMD6oQs&B-EsTX@E)T5rEQ-=+|FGAhbesuK_2eS<6aYmt`2A1-c5a zm?>aT$&s}}v4o{?cH4b%jj1;Emi@`$30%etx=QYdcD85WJJj7y<8L;Gb8+~k&t zYf>}(>6ERMR0x_rl zms`ooXfaRoA%}KAWbWdBZf2ZUSvUI!${mXVcyL_IIFDO245>E;dEipXX%F-um2JFQ zz+2Uh{g24>^BjOcG-|Yw_eT}_85SYjv{7**?AlL6M4!3uckeQdi2hFVC8<4kGg6~oht(v&!{9K0FZeI>~X{FOzblz`&koo~VL%39?ofA2_ z8b(FvtQzEKK}47WUpP;}=;aYb^yWO+uF|iFU6kNU;m6o*nm;}$;k6pdEjrB)xLBj7 z2EVQ1)y9_;jfv4d_jhYWM3^F9bWhP(fFd`)j83xuN0C1TPYc;OMNe~_2G#yV#ltUY zxhiIim-ECLT zIN3>lTXk1#vi%MhTdegTP8eC{H245eKBMp0V1wb%CVLBi^g90cbp6|JhL!Jz>0)~N zj<+6RYi~8mR@^v7mv_Vh@L@vMpE&guXW?kj5a9QB-`R43U_M7FIazEf97g*uap9Q! zeb8yONo7||LZO+t_A_UHhfk4nJb!oOh!3aPm0m+`-gm{bw(+A7{D$fsg8s43yMYP~ zRy}V}`h9vCs2ke;NUE8@X~|xT*I`PH(^n*Y4nmNA2&8E5*rXNo^s)xec2llm(y2~1eItLp;*0MWBBECvAqY?C)FqzSfu VNPuYr0088Z@0iQM#PR~8`7SJi*P5d zfRnT#6^P}`|9ZbLP&}w zI3}25xCMrKAff|O@ByjcOw|Dd$54R;THMPw7JUC=h{?@~ z!|eZw7e``B`tQ!~CR!NHCbcfE;z;D{gJ`MnyW#UaW4BCnD__1_N;$|TX%Rt z-TeoXfh8J~uqy;u#yC)tIKeal#rV&7 zccmx(LU*-k?Ci>>9zU%1+&$->yDQy|-1yZF<6 zefV1`1Z>rROsGlA)Fz}y8jx;8FMJgNzz&hMCYX?BY&&&bmO*?*GgNTJN@*rR?ptX? zwaH_8S_Y}KrY69QrrAbP9#)hw*-&*;3dOBi(DKgmzwxVCI^c95wW;s4(6EDz~F$sS>m-l_qXlXBwuPa4-0enW1Yuf z?wy;hpq(mw{=0x}H{s(FK6#B-YHJv3we?cK5zn* zS%|lPk#S#Tz3d+_cf<=Yaa7E>k6T0r*BgT(P^sj$2S(t^7FsEw&1%Q_hiCeERs$M8 zsgsSoH=>Z=5D%fI1B>fn&w0Wl#`HZgyvsDq$Ggp!xc1!3WbvyKk5R5Me$r1!xh$ka z)}uzHbG(5zYy6tCa~YMW7 zfR(PoI8OxU4$=EJFk6F-IUb|+5*GL(;{hVD)^gkBV2kJLC2-P{{I=>XJ9z6IDz@m> ze>kROnUmlHK={nQZG$$30|)QUlh5&g=aaRsFAgc+4Uxgr)NOw}OvnCcgpSzcC>h@7 z3&5HQUVGx!m)-fpK}~>tzx(!