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

Compare commits

base: tl_server_2:33f0d7c8aa77d24f849b53d8dce1e036c4eccf76
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:c988804222a99cec655aa9b8f05a8eee002f9409
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "33f0d7c8aa77d24f849b53d8dce1e036c4eccf76" and "c988804222a99cec655aa9b8f05a8eee002f9409" have entirely different histories.
33f0d7c8aa ... c988804222

28 changed files with 1347 additions and 2325 deletions
Show Stats Expand all files Collapse all files

12
common/constant.go
View File

@ -297,7 +297,6 @@ const (
GainWaySkinUpGrade = 101 // 皮肤升级消耗 GainWaySkinUpGrade = 101 // 皮肤升级消耗
GainWayItemFen = 102 // 道具分解消耗 GainWayItemFen = 102 // 道具分解消耗
GainWayItemFenGain = 103 // 道具分解获得 GainWayItemFenGain = 103 // 道具分解获得
GainWayGuide = 104 //新手引导奖励
) )
// 后台选择 金币变化类型 的充值 类型id号起始 // 后台选择 金币变化类型 的充值 类型id号起始
@ -839,14 +838,3 @@ var (
300003: 70, 300003: 70,
} }
) )
const (
AttributeGuideStep = 1 // 引导步骤
AttributeGuideSkip = 2 // 跳过引导
AttributeGuideTest = 3 // 测试引导
)
const (
On = 1 // 开启
Off = 2 // 关闭
)

1
etcd/keyconf.go
View File

@ -38,5 +38,4 @@ const (
ETCDKEY_SKin = "/game/skin_config" // 皮肤配置 ETCDKEY_SKin = "/game/skin_config" // 皮肤配置
ETCDKEY_RANK_TYPE = "/game/RankType" // 排行榜奖励配置 ETCDKEY_RANK_TYPE = "/game/RankType" // 排行榜奖励配置
ETCDKEY_AWARD_CONFIG = "/game/awardlog_config" //获奖记录 ETCDKEY_AWARD_CONFIG = "/game/awardlog_config" //获奖记录
ETCDKEY_GUIDE = "/game/guide_config" //新手引导配置
) )

17
gamesrv/action/action_machine.go
View File

@ -1,17 +0,0 @@
package action
import (
"mongo.games.com/game/protocol/machine"
"mongo.games.com/goserver/core/logger"
"mongo.games.com/goserver/core/netlib"
)
func TestHandler(session *netlib.Session, packetId int, data interface{}) error {
logger.Logger.Tracef("TestHandler %v", data)
return nil
}
func init() {
// 修改皮肤
netlib.Register(int(machine.PacketID_Test), &machine.SCTest{}, TestHandler)
}

11
gamesrv/base/srvsessmgr.go
View File

@ -2,13 +2,10 @@ package base
import ( import (
"mongo.games.com/game/common" "mongo.games.com/game/common"
"mongo.games.com/game/protocol/machine"
"mongo.games.com/goserver/core/logger" "mongo.games.com/goserver/core/logger"
"mongo.games.com/goserver/core/netlib" "mongo.games.com/goserver/core/netlib"
"mongo.games.com/goserver/core/timer"
"mongo.games.com/goserver/srvlib" "mongo.games.com/goserver/srvlib"
"mongo.games.com/goserver/srvlib/protocol" "mongo.games.com/goserver/srvlib/protocol"
"time"
) )
var SrvSessMgrSington = &SrvSessMgr{} var SrvSessMgrSington = &SrvSessMgr{}
@ -30,14 +27,6 @@ func (this *SrvSessMgr) OnRegiste(s *netlib.Session) {
} else if srvInfo.GetType() == int32(common.RobotServerType) { } else if srvInfo.GetType() == int32(common.RobotServerType) {
logger.Logger.Warn("(this *SrvSessMgr) OnRegiste (RobotSrv):", s) logger.Logger.Warn("(this *SrvSessMgr) OnRegiste (RobotSrv):", s)
NpcServerAgentSingleton.OnConnected() NpcServerAgentSingleton.OnConnected()
} else if srvInfo.GetType() == 10 {
logger.Logger.Warn("(this *SrvSessMgr) OnRegiste (Machine):", s)
timer.StartTimer(timer.TimerActionWrapper(func(h timer.TimerHandle, ud interface{}) bool {
s.Send(int(machine.PacketID_Test), &machine.CSTest{
Ts: time.Now().Unix(),
})
return true
}), nil, 3*time.Second, 100)
} }
} }
} }

2
gamesrv/tienlen/scenedata_tienlen.go
View File

@ -569,7 +569,7 @@ func (this *TienLenSceneData) SendHandCard_Match() {
} }
grades = append(grades, gi) grades = append(grades, gi)
} }
realWin := 1 //-1最差 0正常 1最好 realWin := 0 //-1最差 0正常 1最好
switch realWin { switch realWin {
case -1: case -1:
sort.Slice(grades, func(i, j int) bool { sort.Slice(grades, func(i, j int) bool {

3
gatesrv/clientlog.go
View File

@ -28,7 +28,6 @@ func CSClientLog(s *netlib.Session, packetid int, pack interface{}) error {
var platform string var platform string
var snid int32 var snid int32
var createTs int64
var p *model.PlayerData var p *model.PlayerData
if s != nil { if s != nil {
var pdi = s.GetAttribute(common.ClientSessionAttribute_PlayerData) var pdi = s.GetAttribute(common.ClientSessionAttribute_PlayerData)
@ -43,7 +42,6 @@ func CSClientLog(s *netlib.Session, packetid int, pack interface{}) error {
if p != nil { if p != nil {
platform = p.Platform platform = p.Platform
snid = p.SnId snid = p.SnId
createTs = p.CreateTime.Unix()
} }
//LogChannelSingleton.WriteLog(&model.ClientLog{ //LogChannelSingleton.WriteLog(&model.ClientLog{
@ -58,7 +56,6 @@ func CSClientLog(s *netlib.Session, packetid int, pack interface{}) error {
Platform: platform, Platform: platform,
Snid: snid, Snid: snid,
Ts: time.Now().Unix(), Ts: time.Now().Unix(),
CreateTs: createTs,
}) })
return nil return nil

26
machine/action/action_server.go
View File

@ -1,26 +0,0 @@
package action
import (
"mongo.games.com/game/protocol/machine"
"mongo.games.com/goserver/core/logger"
"mongo.games.com/goserver/core/netlib"
"time"
)
func TestHandler(session *netlib.Session, packetId int, data interface{}) error {
logger.Logger.Tracef("TestHandler %v", data)
msg, ok := data.(*machine.CSTest)
if !ok {
return nil
}
session.Send(int(machine.PacketID_Test), &machine.SCTest{
Ts: time.Now().Unix(),
})
logger.Logger.Tracef("PacketID_Test: %v", msg)
return nil
}
func init() {
// 修改皮肤
netlib.Register(int(machine.PacketID_Test), &machine.CSTest{}, TestHandler)
}

78
machine/config.json
View File

@ -1,78 +0,0 @@
{
"netlib": {
"SrvInfo": {
"Name": "MachineServer",
"Type": 10,
"Id": 1001,
"AreaID": 1,
"Banner": [
"=================",
"machine server",
"================="
]
},
"IoServices": [
{
"Id": 1001,
"Type": 10,
"AreaId": 1,
"Name": "Gamesrv",
"Ip": "127.0.0.1",
"Port": 7001,
"Protocol":"tcp",
"Path":"/",
"MaxDone": 20000,
"MaxPend": 20000,
"MaxPacket": 65535,
"MaxConn": 1,
"RcvBuff": 819200,
"SndBuff": 819200,
"WriteTimeout": 300,
"ReadTimeout": 300,
"IsClient": true,
"IsAutoReconn": true,
"IsInnerLink": true,
"NoDelay": true,
"SupportFragment": true,
"AuthKey": "1234567890",
"FilterChain": ["session-filter-auth"],
"HandlerChain": ["session-srv-registe","handler-game-close"]
}
]
},
"module": {
"Options": {
"QueueBacklog": 1024,
"MaxDone": 1024,
"Interval": 100
}
},
"executor": {
"Options": {
"QueueBacklog": 1024,
"MaxDone": 1024,
"Interval": 0
},
"Worker": {
"WorkerCnt": 8,
"Options": {
"QueueBacklog": 1024,
"MaxDone": 1024,
"Interval": 0
}
}
},
"timer": {
"Options": {
"QueueBacklog": 1024,
"MaxDone": 1024,
"Interval": 100
}
},
"cmdline": {
"SupportCmdLine": true
},
"signal": {
"SupportSignal": true
}
}

22
machine/logger.xml
View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<seelog type="adaptive" mininterval="2000000" maxinterval="100000000" critmsgcount="500" minlevel="info">
<exceptions>
<exception filepattern="test*" minlevel="error"/>
</exceptions>
<outputs formatid="all">
<rollingfile formatid="all" type="size" filename="./all.log" maxsize="50000000" maxrolls="5" />
<filter levels="info,trace,warn,error">
<console formatid="fmtinfo"/>
</filter>
<filter levels="error,critical" formatid="fmterror">
<console/>
<file path="errors.log"/>
</filter>
</outputs>
<formats>
<format id="fmtinfo" format="[%Date][%Time] [%Level] %Msg%n"/>
<format id="fmterror" format="[%Date][%Time] [%LEVEL] [%FuncShort @ %File.%Line] %Msg%n"/>
<format id="all" format="[%Date][%Time] [%Level] [@ %File.%Line] %Msg%n"/>
<format id="criticalemail" format="Critical error on our server!\n %Time %Date %RelFile %Func %Msg \nSent by Seelog"/>
</formats>
</seelog>

17
machine/main.go
View File

@ -1,17 +0,0 @@
package main
import (
"mongo.games.com/goserver/core"
"mongo.games.com/goserver/core/module"
_ "mongo.games.com/game"
_ "mongo.games.com/game/machine/action"
)
func main() {
defer core.ClosePackages()
core.LoadPackages("config.json")
w := module.Start()
w.Wait("main()")
}

6
model/clientlog.go
View File

@ -11,12 +11,6 @@ type ClientLog struct {
Platform string // 平台id Platform string // 平台id
Snid int32 // 玩家id Snid int32 // 玩家id
Ts int64 // 时间戳 Ts int64 // 时间戳
CreateTs int64 // 注册时间
}
type CustomData struct {
GuideTp int32 `json:"guide_tp"`
N int64 `json:"n"`
} }
type ClientLogMysql ClientLog type ClientLogMysql ClientLog

2
model/config.go
View File

@ -133,8 +133,6 @@ type AllConfig struct {
*webapi.RankTypeConfig *webapi.RankTypeConfig
//获奖记录配置 //获奖记录配置
*webapi.AwardLogConfig *webapi.AwardLogConfig
// 新手引导配置
*webapi.GuideConfig
} }
type GlobalConfig struct { type GlobalConfig struct {

4
model/gameparam.go
View File

@ -82,7 +82,6 @@ type GameParam struct {
TestRankMatchAward bool // 测试段位奖励领取通知，直接改玩家排位积分使玩家获得奖励 TestRankMatchAward bool // 测试段位奖励领取通知，直接改玩家排位积分使玩家获得奖励
RankPlayerPermitMaxNum int32 // 赛季通行证积分排行榜最大人数 RankPlayerPermitMaxNum int32 // 赛季通行证积分排行榜最大人数
PermitInitScore int64 // 赛季通行证初始积分 PermitInitScore int64 // 赛季通行证初始积分
GuideStepMaxNum int32 // 引导步骤最大值
} }
var GameParamPath = "../data/gameparam.json" var GameParamPath = "../data/gameparam.json"
@ -210,7 +209,4 @@ func InitGameParam() {
if GameParamData.RankPlayerPermitMaxNum == 0 { if GameParamData.RankPlayerPermitMaxNum == 0 {
GameParamData.RankPlayerPermitMaxNum = 20 GameParamData.RankPlayerPermitMaxNum = 20
} }
if GameParamData.GuideStepMaxNum == 0 {
GameParamData.GuideStepMaxNum = 4
}
} }

1
model/player.go
View File

@ -494,7 +494,6 @@ type PlayerData struct {
DiamondLotteryScore int64 //钻石抽奖幸运值 DiamondLotteryScore int64 //钻石抽奖幸运值
VCardCost int64 // 消耗v卡数量 VCardCost int64 // 消耗v卡数量
MoneyTotal int64 // 现金总充值金额,不包含api加币时的现金 MoneyTotal int64 // 现金总充值金额,不包含api加币时的现金
GuideStep int32 // 引导步骤；跳过引导后，该值会置为-1
} }
// 七日签到数据 // 七日签到数据

1
protocol/doc.md
View File

@ -5,7 +5,6 @@
- 2000~4999 client->worldsrv - 2000~4999 client->worldsrv
- 5000~9999 client->gamesrv - 5000~9999 client->gamesrv
- 10000~12000 client->ranksrv - 10000~12000 client->ranksrv
- 20000~29999 gamesrv->machine
-------------------------------------- --------------------------------------
# worldsrv # worldsrv

256
protocol/machine/machine.pb.go
View File

@ -1,256 +0,0 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1-devel
// protoc v3.19.4
// source: machine.proto
package machine
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 (
PacketID_Zero PacketID = 0 // 弃用消息号
PacketID_Test PacketID = 20000 // 测试
)
// Enum value maps for PacketID.
var (
PacketID_name = map[int32]string{
0: "Zero",
20000: "Test",
}
PacketID_value = map[string]int32{
"Zero": 0,
"Test": 20000,
}
)
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_machine_proto_enumTypes[0].Descriptor()
}
func (PacketID) Type() protoreflect.EnumType {
return &file_machine_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_machine_proto_rawDescGZIP(), []int{0}
}
// Test
type CSTest struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Ts int64 `protobuf:"varint,1,opt,name=Ts,proto3" json:"Ts,omitempty"`
}
func (x *CSTest) Reset() {
*x = CSTest{}
if protoimpl.UnsafeEnabled {
mi := &file_machine_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *CSTest) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*CSTest) ProtoMessage() {}
func (x *CSTest) ProtoReflect() protoreflect.Message {
mi := &file_machine_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 CSTest.ProtoReflect.Descriptor instead.
func (*CSTest) Descriptor() ([]byte, []int) {
return file_machine_proto_rawDescGZIP(), []int{0}
}
func (x *CSTest) GetTs() int64 {
if x != nil {
return x.Ts
}
return 0
}
type SCTest struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Ts int64 `protobuf:"varint,1,opt,name=Ts,proto3" json:"Ts,omitempty"`
}
func (x *SCTest) Reset() {
*x = SCTest{}
if protoimpl.UnsafeEnabled {
mi := &file_machine_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *SCTest) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*SCTest) ProtoMessage() {}
func (x *SCTest) ProtoReflect() protoreflect.Message {
mi := &file_machine_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 SCTest.ProtoReflect.Descriptor instead.
func (*SCTest) Descriptor() ([]byte, []int) {
return file_machine_proto_rawDescGZIP(), []int{1}
}
func (x *SCTest) GetTs() int64 {
if x != nil {
return x.Ts
}
return 0
}
var File_machine_proto protoreflect.FileDescriptor
var file_machine_proto_rawDesc = []byte{
0x0a, 0x0d, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
0x07, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x22, 0x18, 0x0a, 0x06, 0x43, 0x53, 0x54, 0x65,
0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02,
0x54, 0x73, 0x22, 0x18, 0x0a, 0x06, 0x53, 0x43, 0x54, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02,
0x54, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x2a, 0x20, 0x0a, 0x08,
0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x08, 0x0a, 0x04, 0x5a, 0x65, 0x72, 0x6f,
0x10, 0x00, 0x12, 0x0a, 0x0a, 0x04, 0x54, 0x65, 0x73, 0x74, 0x10, 0xa0, 0x9c, 0x01, 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,
0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
file_machine_proto_rawDescOnce sync.Once
file_machine_proto_rawDescData = file_machine_proto_rawDesc
)
func file_machine_proto_rawDescGZIP() []byte {
file_machine_proto_rawDescOnce.Do(func() {
file_machine_proto_rawDescData = protoimpl.X.CompressGZIP(file_machine_proto_rawDescData)
})
return file_machine_proto_rawDescData
}
var file_machine_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_machine_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
var file_machine_proto_goTypes = []interface{}{
(PacketID)(0), // 0: machine.PacketID
(*CSTest)(nil), // 1: machine.CSTest
(*SCTest)(nil), // 2: machine.SCTest
}
var file_machine_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type
0, // [0:0] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension type_name
0, // [0:0] is the sub-list for extension extendee
0, // [0:0] is the sub-list for field type_name
}
func init() { file_machine_proto_init() }
func file_machine_proto_init() {
if File_machine_proto != nil {
return
}
if !protoimpl.UnsafeEnabled {
file_machine_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CSTest); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_machine_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SCTest); 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_machine_proto_rawDesc,
NumEnums: 1,
NumMessages: 2,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_machine_proto_goTypes,
DependencyIndexes: file_machine_proto_depIdxs,
EnumInfos: file_machine_proto_enumTypes,
MessageInfos: file_machine_proto_msgTypes,
}.Build()
File_machine_proto = out.File
file_machine_proto_rawDesc = nil
file_machine_proto_goTypes = nil
file_machine_proto_depIdxs = nil
}

16
protocol/machine/machine.proto
View File

@ -1,16 +0,0 @@
syntax = "proto3";
package machine;
option go_package = "mongo.games.com/game/protocol/machine";
enum PacketID {
Zero = 0;// 弃用消息号
Test = 20000; // 测试
}
// Test
message CSTest {
int64 Ts = 1;
}
message SCTest {
int64 Ts = 1;
}

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

File diff suppressed because it is too large Load Diff

30
protocol/player/player.proto
View File

@ -75,13 +75,6 @@ enum OpResultCode {
OPRC_Hundred_YouHadBetCannotLeave = 7001; //赢下注不能离开 OPRC_Hundred_YouHadBetCannotLeave = 7001; //赢下注不能离开
OPRC_Hundred_YouHadBankerCannotLeave = 7002; //已上庄不能离开 OPRC_Hundred_YouHadBankerCannotLeave = 7002; //已上庄不能离开
OPRC_GuideStep_Finish = 8001; //该引导步骤已完成
OPRC_GuideStep_Front = 8002; //前一个引导步骤未完成
OPRC_GuideStep_End = 8003; //新手引导已结束
OPRC_Guide_Close = 8004; //新手引导已关闭
OPRC_Guide_Skip = 8005; //新手引导已跳过
OPRC_Guide_SkipClose = 8006; //新手引导不能跳过
} }
//获取玩家数据消息id //获取玩家数据消息id
@ -229,9 +222,7 @@ enum PlayerPacketID {
PACKET_SCAwardLog = 2837; //返回获奖记录 PACKET_SCAwardLog = 2837; //返回获奖记录
PACKET_CSPopUpWindowsConfig = 2838;//请求弹窗配置 PACKET_CSPopUpWindowsConfig = 2838;//请求弹窗配置
PACKET_SCPopUpWindowsConfig = 2839;//返回弹窗配置 PACKET_SCPopUpWindowsConfig = 2839;//返回弹窗配置
PACKET_CSUpdateAttribute = 2840;//请求更新属性
PACKET_SCUpdateAttribute = 2841;//返回更新属性
PACKET_SCGuideConfig = 2842;//返回引导配置
} }
// 账变记录 // 账变记录
@ -343,7 +334,6 @@ message PlayerData {
repeated int32 RequestAddFriend = 49;//请求添加好友信息 repeated int32 RequestAddFriend = 49;//请求添加好友信息
int32 UseSkinId = 50; // 皮肤id int32 UseSkinId = 50; // 皮肤id
string ChannelID = 51; // 渠道ID string ChannelID = 51; // 渠道ID
int32 GuideStep = 52; // 引导步骤; 最小为0，-1表示跳过引导了
} }
//周卡数据 //周卡数据
@ -1322,21 +1312,3 @@ message WindowsInfo{
int32 PartNum = 4;//参与人数 int32 PartNum = 4;//参与人数
int32 GainNum = 5;//领取人数 int32 GainNum = 5;//领取人数
} }
//PACKET_CSUpdateAttribute
message CSUpdateAttribute{
int32 Tp = 1; // 1.更新新手引导阶段 2.跳过新手引导 3.更新新手引导状态(测试用)
repeated int64 Param = 2;
}
//PACKET_SCUpdateAttribute
message SCUpdateAttribute{
OpResultCode OpRetCode = 1; //操作结果
int32 Tp = 2;
repeated int64 Param = 3;
}
//PACKET_SCGuideConfig
message SCGuideConfig{
int32 On = 2; // 引导开关 1开启 2关闭
int32 Skip = 3; // 引导跳过开关 1开启 2关闭
}

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

@ -8057,70 +8057,6 @@ func (x *AnnouncerLogInfo) GetTypeId() int32 {
return 0 return 0
} }
// etcd /game/guide_config
type GuideConfig struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台
On int32 `protobuf:"varint,2,opt,name=On,proto3" json:"On,omitempty"` // 引导开关 1开启 2关闭
Skip int32 `protobuf:"varint,3,opt,name=Skip,proto3" json:"Skip,omitempty"` // 引导跳过开关 1开启 2关闭
}
func (x *GuideConfig) Reset() {
*x = GuideConfig{}
if protoimpl.UnsafeEnabled {
mi := &file_common_proto_msgTypes[85]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *GuideConfig) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*GuideConfig) ProtoMessage() {}
func (x *GuideConfig) ProtoReflect() protoreflect.Message {
mi := &file_common_proto_msgTypes[85]
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 GuideConfig.ProtoReflect.Descriptor instead.
func (*GuideConfig) Descriptor() ([]byte, []int) {
return file_common_proto_rawDescGZIP(), []int{85}
}
func (x *GuideConfig) GetPlatform() string {
if x != nil {
return x.Platform
}
return ""
}
func (x *GuideConfig) GetOn() int32 {
if x != nil {
return x.On
}
return 0
}
func (x *GuideConfig) GetSkip() int32 {
if x != nil {
return x.Skip
}
return 0
}
var File_common_proto protoreflect.FileDescriptor var File_common_proto protoreflect.FileDescriptor
var file_common_proto_rawDesc = []byte{ var file_common_proto_rawDesc = []byte{
@ -9383,15 +9319,10 @@ var file_common_proto_rawDesc = []byte{
0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x16, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x16,
0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64,
0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x22, 0x4d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x42, 0x26,
0x0a, 0x0b, 0x47, 0x75, 0x69, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f,
0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f,
0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6b, 0x69,
0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6b, 0x69, 0x70, 0x42, 0x26, 0x5a,
0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d,
0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77,
0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -9406,7 +9337,7 @@ func file_common_proto_rawDescGZIP() []byte {
return file_common_proto_rawDescData return file_common_proto_rawDescData
} }
var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 94) var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 93)
var file_common_proto_goTypes = []interface{}{ var file_common_proto_goTypes = []interface{}{
(*MysqlDbSetting)(nil), // 0: webapi.MysqlDbSetting (*MysqlDbSetting)(nil), // 0: webapi.MysqlDbSetting
(*MongoDbSetting)(nil), // 1: webapi.MongoDbSetting (*MongoDbSetting)(nil), // 1: webapi.MongoDbSetting
@ -9493,31 +9424,30 @@ var file_common_proto_goTypes = []interface{}{
(*AwardLogData)(nil), // 82: webapi.AwardLogData (*AwardLogData)(nil), // 82: webapi.AwardLogData
(*AwardLogInfo)(nil), // 83: webapi.AwardLogInfo (*AwardLogInfo)(nil), // 83: webapi.AwardLogInfo
(*AnnouncerLogInfo)(nil), // 84: webapi.AnnouncerLogInfo (*AnnouncerLogInfo)(nil), // 84: webapi.AnnouncerLogInfo
(*GuideConfig)(nil), // 85: webapi.GuideConfig nil, // 85: webapi.Platform.BindTelRewardEntry
nil, // 86: webapi.Platform.BindTelRewardEntry nil, // 86: webapi.PlayerData.RankScoreEntry
nil, // 87: webapi.PlayerData.RankScoreEntry nil, // 87: webapi.ItemShop.AwardEntry
nil, // 88: webapi.ItemShop.AwardEntry nil, // 88: webapi.VIPcfg.AwardEntry
nil, // 89: webapi.VIPcfg.AwardEntry nil, // 89: webapi.VIPcfg.Privilege7Entry
nil, // 90: webapi.VIPcfg.Privilege7Entry nil, // 90: webapi.ActInviteConfig.PayScoreEntry
nil, // 91: webapi.ActInviteConfig.PayScoreEntry nil, // 91: webapi.SkinLevel.UpItemEntry
nil, // 92: webapi.SkinLevel.UpItemEntry nil, // 92: webapi.SkinItem.UnlockParamEntry
nil, // 93: webapi.SkinItem.UnlockParamEntry (*server.DB_GameFree)(nil), // 93: server.DB_GameFree
(*server.DB_GameFree)(nil), // 94: server.DB_GameFree (*server.DB_GameItem)(nil), // 94: server.DB_GameItem
(*server.DB_GameItem)(nil), // 95: server.DB_GameItem
} }
var file_common_proto_depIdxs = []int32{ var file_common_proto_depIdxs = []int32{
2, // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch 2, // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch
3, // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig 3, // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig
4, // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame 4, // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame
86, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry 85, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
6, // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus 6, // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus
94, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree 93, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
8, // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree 8, // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree
0, // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting 0, // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting
1, // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting 1, // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting
1, // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting 1, // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting
94, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree 93, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
87, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry 86, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
32, // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo 32, // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo
14, // 13: webapi.PlayerData.RoleUnlockList:type_name -> webapi.ModInfo 14, // 13: webapi.PlayerData.RoleUnlockList:type_name -> webapi.ModInfo
14, // 14: webapi.PlayerData.PetUnlockList:type_name -> webapi.ModInfo 14, // 14: webapi.PlayerData.PetUnlockList:type_name -> webapi.ModInfo
@ -9529,7 +9459,7 @@ var file_common_proto_depIdxs = []int32{
26, // 20: webapi.ExchangeShop.TelData:type_name -> webapi.TelChargeData 26, // 20: webapi.ExchangeShop.TelData:type_name -> webapi.TelChargeData
25, // 21: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop 25, // 21: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop
29, // 22: webapi.ExchangeShopList.Weight:type_name -> webapi.ShopWeight 29, // 22: webapi.ExchangeShopList.Weight:type_name -> webapi.ShopWeight
88, // 23: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry 87, // 23: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
30, // 24: webapi.ItemShopList.List:type_name -> webapi.ItemShop 30, // 24: webapi.ItemShopList.List:type_name -> webapi.ItemShop
32, // 25: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo 32, // 25: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo
33, // 26: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward 33, // 26: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward
@ -9550,12 +9480,12 @@ var file_common_proto_depIdxs = []int32{
38, // 41: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate 38, // 41: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate
48, // 42: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree 48, // 42: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree
48, // 43: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree 48, // 43: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree
89, // 44: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry 88, // 44: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
90, // 45: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry 89, // 45: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
51, // 46: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg 51, // 46: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg
38, // 47: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate 38, // 47: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate
55, // 48: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig 55, // 48: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig
91, // 49: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry 90, // 49: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
62, // 50: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward 62, // 50: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward
62, // 51: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward 62, // 51: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward
62, // 52: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward 62, // 52: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward
@ -9572,12 +9502,12 @@ var file_common_proto_depIdxs = []int32{
69, // 63: webapi.DiamondLotteryData.Info:type_name -> webapi.DiamondLotteryInfo 69, // 63: webapi.DiamondLotteryData.Info:type_name -> webapi.DiamondLotteryInfo
70, // 64: webapi.DiamondLotteryData.Players:type_name -> webapi.DiamondLotteryPlayers 70, // 64: webapi.DiamondLotteryData.Players:type_name -> webapi.DiamondLotteryPlayers
72, // 65: webapi.DiamondLotteryConfig.LotteryData:type_name -> webapi.DiamondLotteryData 72, // 65: webapi.DiamondLotteryConfig.LotteryData:type_name -> webapi.DiamondLotteryData
95, // 66: webapi.ItemConfig.Items:type_name -> server.DB_GameItem 94, // 66: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
32, // 67: webapi.RankAwardInfo.Item:type_name -> webapi.ItemInfo 32, // 67: webapi.RankAwardInfo.Item:type_name -> webapi.ItemInfo
75, // 68: webapi.RankTypeInfo.Award:type_name -> webapi.RankAwardInfo 75, // 68: webapi.RankTypeInfo.Award:type_name -> webapi.RankAwardInfo
76, // 69: webapi.RankTypeConfig.Info:type_name -> webapi.RankTypeInfo 76, // 69: webapi.RankTypeConfig.Info:type_name -> webapi.RankTypeInfo
92, // 70: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry 91, // 70: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
93, // 71: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry 92, // 71: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
78, // 72: webapi.SkinItem.Levels:type_name -> webapi.SkinLevel 78, // 72: webapi.SkinItem.Levels:type_name -> webapi.SkinLevel
79, // 73: webapi.SkinConfig.Items:type_name -> webapi.SkinItem 79, // 73: webapi.SkinConfig.Items:type_name -> webapi.SkinItem
82, // 74: webapi.AwardLogConfig.AwardLog:type_name -> webapi.AwardLogData 82, // 74: webapi.AwardLogConfig.AwardLog:type_name -> webapi.AwardLogData
@ -10616,18 +10546,6 @@ func file_common_proto_init() {
return nil return nil
} }
} }
file_common_proto_msgTypes[85].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GuideConfig); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
} }
type x struct{} type x struct{}
out := protoimpl.TypeBuilder{ out := protoimpl.TypeBuilder{
@ -10635,7 +10553,7 @@ func file_common_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_common_proto_rawDesc, RawDescriptor: file_common_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 94, NumMessages: 93,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

7
protocol/webapi/common.proto
View File

@ -881,10 +881,3 @@ message AnnouncerLogInfo{
int32 ItemId = 4; //获得物品ID int32 ItemId = 4; //获得物品ID
int32 TypeId = 5; //1-话费 2-实物 int32 TypeId = 5; //1-话费 2-实物
} }
// etcd /game/guide_config
message GuideConfig {
string Platform = 1; // 平台
int32 On = 2; // 引导开关 1开启 2关闭
int32 Skip = 3; // 引导跳过开关 1开启 2关闭
}

2
public

@ -1 +1 @@
Subproject commit 677abd66845fe40919e38580a3e269b5343b8b1c Subproject commit 13589ad17018a4a9d50fdc9d8223e3ccf492a0ce

31
worldsrv/aaa Normal file
View File

@ -0,0 +1,31 @@
71001,71002,71003,72001,72002,72003,72004,72005,73001,73002,73003,73004,74001,74002,74003,74004,74005,74006,75001,75002,75003,75004,75005,75006,76001,76002,76003,76004,76005,76006,77001,77002,77003,77004,77005,78001,78002,78003,79001,79002,79003,79004,79005,77006
5001,5002,5003,5004,5005,5006
"79003":NumberLong(1),
"73001":NumberLong(24),
"74006":NumberLong(1),
"79005":NumberLong(1),
"76006":NumberLong(16),
"74003":NumberLong(1),
"72004":NumberLong(1),
"73004":NumberLong(1)
"30008":NumberLong(712),
"30009":NumberLong(97),
"30010":NumberLong(20),
"30011":NumberLong(3)
"5001":NumberLong(2),
"5002":NumberLong(18),
"5003":NumberLong(6),
"5004":NumberLong(13),
"5005":NumberLong(13),
"5006":NumberLong(4)
30008 712
30009 97
30010 20
30011 3

113
worldsrv/action_player.go
View File

@ -3027,117 +3027,6 @@ func CSPopUpWindowsConfig(s *netlib.Session, packetId int, data interface{}, sid
}), "Api_PopupWindowsConfig").Start() }), "Api_PopupWindowsConfig").Start()
return nil return nil
} }
func CSUpdateAttribute(s *netlib.Session, packetId int, data interface{}, sid int64) error {
logger.Logger.Tracef("CSUpdateAttribute %v", data)
p := PlayerMgrSington.GetPlayer(sid)
if p == nil {
return nil
}
msg, ok := data.(*player_proto.CSUpdateAttribute)
if !ok {
return nil
}
stepId := p.GuideStep + 1
pack := &player_proto.SCUpdateAttribute{
OpRetCode: player_proto.OpResultCode_OPRC_Error,
Tp: msg.GetTp(),
Param: msg.GetParam(),
}
send := func() {
p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCUpdateAttribute), pack)
logger.Logger.Tracef("SCUpdateAttribute %v", pack)
// 日志
if pack.OpRetCode == player_proto.OpResultCode_OPRC_Sucess {
switch msg.GetTp() {
case common.AttributeGuideStep, common.AttributeGuideSkip:
d := model.CustomData{
GuideTp: msg.GetTp(),
N: int64(stepId),
}
b, _ := json.Marshal(d)
LogChannelSingleton.WriteLog(&model.ClientLogMysql{
Data: string(b),
Platform: p.Platform,
Snid: p.SnId,
Ts: time.Now().Unix(),
CreateTs: p.CreateTime.Unix(),
})
}
}
}
switch msg.GetTp() {
case common.AttributeGuideStep:
if len(msg.GetParam()) == 0 || msg.GetParam()[0] == 0 || p.GuideStep < 0 {
return nil
}
if PlatformMgrSingleton.GetConfig(p.Platform).GuideConfig.GetOn() != common.On {
pack.OpRetCode = player_proto.OpResultCode_OPRC_Guide_Close
send()
return nil
}
if p.GuideStep >= model.GameParamData.GuideStepMaxNum {
pack.OpRetCode = player_proto.OpResultCode_OPRC_GuideStep_End
send()
return nil
}
if int64(p.GuideStep) >= msg.GetParam()[0] {
pack.OpRetCode = player_proto.OpResultCode_OPRC_GuideStep_Finish
send()
return nil
}
if int64(p.GuideStep)+1 < msg.GetParam()[0] {
pack.OpRetCode = player_proto.OpResultCode_OPRC_GuideStep_Front
send()
return nil
}
p.GuideStep = int32(msg.GetParam()[0])
stepId = p.GuideStep
pack.OpRetCode = player_proto.OpResultCode_OPRC_Sucess
send()
// 获得10v卡
if p.GuideStep == 2 {
BagMgrSingleton.AddItemsV2(&ItemParam{
P: p,
Change: []*Item{
{
ItemId: common.ItemIDVCard,
ItemNum: 10,
},
},
GainWay: common.GainWayGuide,
Operator: "system",
Remark: "新手引导奖励",
})
}
return nil
case common.AttributeGuideSkip:
if PlatformMgrSingleton.GetConfig(p.Platform).GuideConfig.GetSkip() != common.On {
pack.OpRetCode = player_proto.OpResultCode_OPRC_Guide_SkipClose
send()
return nil
}
if p.GuideStep >= 0 && p.GuideStep < model.GameParamData.GuideStepMaxNum {
p.GuideStep = -1 // 跳过引导为 -1
pack.OpRetCode = player_proto.OpResultCode_OPRC_Sucess
send()
return nil
}
case common.AttributeGuideTest:
if !common.Config.IsDevMode {
return nil
}
p.GuideStep = int32(msg.GetParam()[0])
pack.OpRetCode = player_proto.OpResultCode_OPRC_Sucess
send()
return nil
}
return nil
}
func init() { func init() {
// 用户信息 // 用户信息
common.Register(int(player_proto.PlayerPacketID_PACKET_CS_PLAYERDATA), player_proto.CSPlayerData{}, CSPlayerData) common.Register(int(player_proto.PlayerPacketID_PACKET_CS_PLAYERDATA), player_proto.CSPlayerData{}, CSPlayerData)
@ -3169,6 +3058,4 @@ func init() {
common.Register(int(player_proto.PlayerPacketID_PACKET_CSAwardLog), player_proto.CS_AwardLog{}, CSAwardLog) common.Register(int(player_proto.PlayerPacketID_PACKET_CSAwardLog), player_proto.CS_AwardLog{}, CSAwardLog)
//弹窗配置 //弹窗配置
common.Register(int(player_proto.PlayerPacketID_PACKET_CSPopUpWindowsConfig), player_proto.CSPopUpWindowsConfig{}, CSPopUpWindowsConfig) common.Register(int(player_proto.PlayerPacketID_PACKET_CSPopUpWindowsConfig), player_proto.CSPopUpWindowsConfig{}, CSPopUpWindowsConfig)
// 更新属性；新手引导阶段
common.Register(int(player_proto.PlayerPacketID_PACKET_CSUpdateAttribute), player_proto.CSUpdateAttribute{}, CSUpdateAttribute)
} }

2
worldsrv/bagmgr.go
View File

@ -611,8 +611,6 @@ func (this *BagMgr) VerifyUpJybInfo(p *Player, args *model.VerifyUpJybInfoArgs)
LogChannelSingleton.WriteMQData(model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel, model.SystemFreeGive_GiveType_ActJybAward, model.SystemFreeGive_CoinType_Diamond, int64(jyb.Award.Diamond))) LogChannelSingleton.WriteMQData(model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel, model.SystemFreeGive_GiveType_ActJybAward, model.SystemFreeGive_CoinType_Diamond, int64(jyb.Award.Diamond)))
} }
} }
// 领取日志
p.dirty = true p.dirty = true
pack.GainItem.Coin = jyb.Award.Coin pack.GainItem.Coin = jyb.Award.Coin
pack.GainItem.Diamond = jyb.Award.Diamond pack.GainItem.Diamond = jyb.Award.Diamond

10
worldsrv/etcd.go
View File

@ -88,8 +88,6 @@ func init() {
etcd.Register(etcd.ETCDKEY_RANK_TYPE, webapi.RankTypeConfig{}, platformConfigEvent) etcd.Register(etcd.ETCDKEY_RANK_TYPE, webapi.RankTypeConfig{}, platformConfigEvent)
//获奖记录配置 //获奖记录配置
etcd.Register(etcd.ETCDKEY_AWARD_CONFIG, webapi.AwardLogConfig{}, platformConfigEvent) etcd.Register(etcd.ETCDKEY_AWARD_CONFIG, webapi.AwardLogConfig{}, platformConfigEvent)
// 新手引导
etcd.Register(etcd.ETCDKEY_GUIDE, webapi.GuideConfig{}, platformConfigEvent)
} }
func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) { func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {
@ -323,16 +321,10 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
PlatformMgrSingleton.GetConfig(config.Platform).RankTypeConfig = config PlatformMgrSingleton.GetConfig(config.Platform).RankTypeConfig = config
case *webapi.AwardLogConfig: case *webapi.AwardLogConfig:
PlatformMgrSingleton.GetConfig(config.Platform).AwardLogConfig = config PlatformMgrSingleton.GetConfig(config.Platform).AwardLogConfig = config
case *webapi.GuideConfig:
PlatformMgrSingleton.GetConfig(config.Platform).GuideConfig = config
default: default:
logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey) logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
} }
PlatformMgrSingleton.GetConfig("1").GuideConfig = &webapi.GuideConfig{
Platform: "1",
On: common.On,
Skip: common.On,
}
} }
func handlerEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) { func handlerEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {

1
worldsrv/logchannel.go
View File

@ -69,5 +69,4 @@ func init() {
LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitExchange, &model.BackendPermitExchange{}) LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitExchange, &model.BackendPermitExchange{})
LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitJoin, &model.BackendPermitJoin{}) LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitJoin, &model.BackendPermitJoin{})
LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitTask, &model.BackendPermitTask{}) LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitTask, &model.BackendPermitTask{})
LogChannelSingleton.RegisterLogCName(mq.BackClientLog, &model.ClientLogMysql{})
} }

13
worldsrv/player.go
View File

@ -3022,7 +3022,6 @@ func (this *Player) SendPlayerInfo() {
VipShopRefreshCount: proto.Int32(this.VipShopRefreshCount), VipShopRefreshCount: proto.Int32(this.VipShopRefreshCount),
Signature: this.Signature, Signature: this.Signature,
Age: this.Age, Age: this.Age,
GuideStep: this.GuideStep,
}, },
} }
if this.Roles != nil { if this.Roles != nil {
@ -3091,8 +3090,6 @@ func (this *Player) SendPlayerInfo() {
} }
this.SCItems() this.SCItems()
//this.SendJackpotInfo() //this.SendJackpotInfo()
// 引导配置
this.SCGuide()
} }
//func (this *Player) SendJackpotInfo() { //func (this *Player) SendJackpotInfo() {
@ -4870,13 +4867,3 @@ func (this *Player) AutoSkinUnlock() {
func (this *Player) GetSkillAdd(id int32) int32 { func (this *Player) GetSkillAdd(id int32) int32 {
return this.GetSkillAdd2(id, PlatformMgrSingleton.ConfigMgr) return this.GetSkillAdd2(id, PlatformMgrSingleton.ConfigMgr)
} }
func (this *Player) SCGuide() {
cfg := PlatformMgrSingleton.GetConfig(this.Platform).GuideConfig
pack := &playerproto.SCGuideConfig{
On: cfg.GetOn(),
Skip: cfg.GetSkip(),
}
this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCGuideConfig), pack)
logger.Logger.Tracef("SCGuideConfig: %v", pack)
}