Compare commits

..

No commits in common. "23538c0a355c7d77072397d9e9afae8246684f88" and "6f6926dd9fd50c5a9135bea351cd9f774f510145" have entirely different histories.

5 changed files with 7 additions and 8 deletions

View File

@ -10782,7 +10782,7 @@ type CSUpdateAttribute struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 1.更新引导阶段 2.跳过引导 3.更新引导状态(测试用) 4.标记竞技馆引导页面已经显示过 Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 1.更新引导阶段 2.跳过引导 3.更新引导状态(测试用)
Param []int64 `protobuf:"varint,2,rep,packed,name=Param,proto3" json:"Param,omitempty"` Param []int64 `protobuf:"varint,2,rep,packed,name=Param,proto3" json:"Param,omitempty"`
GuideId int32 `protobuf:"varint,3,opt,name=GuideId,proto3" json:"GuideId,omitempty"` //引导ID 1-新手引导 2-竞技馆引导 GuideId int32 `protobuf:"varint,3,opt,name=GuideId,proto3" json:"GuideId,omitempty"` //引导ID 1-新手引导 2-竞技馆引导
} }
@ -10968,7 +10968,7 @@ type GuideInfo struct {
On int32 `protobuf:"varint,2,opt,name=On,proto3" json:"On,omitempty"` // 引导开关 1开启 2关闭 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关闭 Skip int32 `protobuf:"varint,3,opt,name=Skip,proto3" json:"Skip,omitempty"` // 引导跳过开关 1开启 2关闭
GuideId int32 `protobuf:"varint,4,opt,name=GuideId,proto3" json:"GuideId,omitempty"` // 引导类型 1-新手引导 2-竞技馆引导 GuideId int32 `protobuf:"varint,4,opt,name=GuideId,proto3" json:"GuideId,omitempty"` // 引导类型 1-新手引导 2-竞技馆引导
Awards []*ItemInfo `protobuf:"bytes,5,rep,name=Awards,proto3" json:"Awards,omitempty"` //奖励 Awards []*ItemInfo `protobuf:"bytes,5,rep,name=Awards,proto3" json:"Awards,omitempty"` // 进入房间消耗
MaxStep int32 `protobuf:"varint,6,opt,name=MaxStep,proto3" json:"MaxStep,omitempty"` // 步骤长度 MaxStep int32 `protobuf:"varint,6,opt,name=MaxStep,proto3" json:"MaxStep,omitempty"` // 步骤长度
AwardStep int32 `protobuf:"varint,7,opt,name=AwardStep,proto3" json:"AwardStep,omitempty"` //领奖步骤 AwardStep int32 `protobuf:"varint,7,opt,name=AwardStep,proto3" json:"AwardStep,omitempty"` //领奖步骤
} }

View File

@ -1359,7 +1359,6 @@ message SCUpdateAttribute{
//PACKET_SCGuideConfig //PACKET_SCGuideConfig
message SCGuideConfig{ message SCGuideConfig{
repeated GuideInfo Info = 1; repeated GuideInfo Info = 1;
} }
message GuideInfo { message GuideInfo {
int32 On = 2; // 1 2 int32 On = 2; // 1 2

View File

@ -8241,7 +8241,7 @@ type GuideInfo struct {
On int32 `protobuf:"varint,1,opt,name=On,proto3" json:"On,omitempty"` // 引导开关 1开启 2关闭 On int32 `protobuf:"varint,1,opt,name=On,proto3" json:"On,omitempty"` // 引导开关 1开启 2关闭
Skip int32 `protobuf:"varint,2,opt,name=Skip,proto3" json:"Skip,omitempty"` // 引导跳过开关 1开启 2关闭 Skip int32 `protobuf:"varint,2,opt,name=Skip,proto3" json:"Skip,omitempty"` // 引导跳过开关 1开启 2关闭
GuideId int32 `protobuf:"varint,3,opt,name=GuideId,proto3" json:"GuideId,omitempty"` // 引导类型 1-新手引导 2-竞技馆引导 GuideId int32 `protobuf:"varint,3,opt,name=GuideId,proto3" json:"GuideId,omitempty"` // 引导类型 1-新手引导 2-竞技馆引导
Awards []*ItemInfo `protobuf:"bytes,4,rep,name=Awards,proto3" json:"Awards,omitempty"` // 奖励 Awards []*ItemInfo `protobuf:"bytes,4,rep,name=Awards,proto3" json:"Awards,omitempty"` // 进入房间消耗
MaxStep int32 `protobuf:"varint,5,opt,name=MaxStep,proto3" json:"MaxStep,omitempty"` // 步骤长度 MaxStep int32 `protobuf:"varint,5,opt,name=MaxStep,proto3" json:"MaxStep,omitempty"` // 步骤长度
AwardStep int32 `protobuf:"varint,6,opt,name=AwardStep,proto3" json:"AwardStep,omitempty"` //领奖步骤 AwardStep int32 `protobuf:"varint,6,opt,name=AwardStep,proto3" json:"AwardStep,omitempty"` //领奖步骤
} }

View File

@ -907,7 +907,7 @@ message GuideInfo {
int32 On = 1; // 1 2 int32 On = 1; // 1 2
int32 Skip = 2; // 1 2 int32 Skip = 2; // 1 2
int32 GuideId = 3; // 1- 2- int32 GuideId = 3; // 1- 2-
repeated ItemInfo Awards = 4; // repeated ItemInfo Awards = 4; //
int32 MaxStep = 5; // int32 MaxStep = 5; //
int32 AwardStep = 6;// int32 AwardStep = 6;//
} }

View File

@ -3097,6 +3097,9 @@ func CSUpdateAttribute(s *netlib.Session, packetId int, data interface{}, sid in
p.GuideData = make(map[int32]int32) p.GuideData = make(map[int32]int32)
} }
stepId := p.GuideStep + 1 stepId := p.GuideStep + 1
if msg.GuideId != 1 {
stepId = int32(msg.Param[0])
}
pack := &player_proto.SCUpdateAttribute{ pack := &player_proto.SCUpdateAttribute{
OpRetCode: player_proto.OpResultCode_OPRC_Error, OpRetCode: player_proto.OpResultCode_OPRC_Error,
Tp: msg.GetTp(), Tp: msg.GetTp(),
@ -3107,9 +3110,6 @@ func CSUpdateAttribute(s *netlib.Session, packetId int, data interface{}, sid in
send := func() { send := func() {
p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCUpdateAttribute), pack) p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCUpdateAttribute), pack)
logger.Logger.Tracef("SCUpdateAttribute %v", pack) logger.Logger.Tracef("SCUpdateAttribute %v", pack)
if msg.GuideId != 1 {
stepId = p.GuideData[msg.GuideId]
}
// 日志 // 日志
if pack.OpRetCode == player_proto.OpResultCode_OPRC_Sucess { if pack.OpRetCode == player_proto.OpResultCode_OPRC_Sucess {
switch msg.GetTp() { switch msg.GetTp() {