mirrors2/hk4e
1
0
Fork 0
mirror of https://github.com/FlourishingWorld/hk4e.git synced 2026-02-04 16:32:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复编译不过

Browse Source
This commit is contained in:
huangxiaolei
2022-11-23 20:23:38 +08:00
parent 1e4c9e6422
commit 01bcaa0309
3 changed files with 1049 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gate/forward/login_hk4e.go
View File

@@ -99,7 +99,7 @@ func (f *ForwardManager) getPlayerToken(convId uint64, req *proto.GetPlayerToken
logger.LOG.Error("parse rsa priv key error: %v", err) logger.LOG.Error("parse rsa priv key error: %v", err)
return nil return nil
} }
clientSeedBase64 := req.GetClientSeed() clientSeedBase64 := req.GetClientRandKey()
clientSeedEnc, err := base64.StdEncoding.DecodeString(clientSeedBase64) clientSeedEnc, err := base64.StdEncoding.DecodeString(clientSeedBase64)
if err != nil { if err != nil {
logger.LOG.Error("parse client seed base64 error: %v", err) logger.LOG.Error("parse client seed base64 error: %v", err)
@@ -109,8 +109,8 @@ func (f *ForwardManager) getPlayerToken(convId uint64, req *proto.GetPlayerToken
clientSeedEncCopy := make([]byte, len(clientSeedEnc)) clientSeedEncCopy := make([]byte, len(clientSeedEnc))
copy(clientSeedEncCopy, clientSeedEnc) copy(clientSeedEncCopy, clientSeedEnc)
endec.Xor(clientSeedEncCopy, []byte{0x9f, 0x26, 0xb2, 0x17, 0x61, 0x5f, 0xc8, 0x00}) endec.Xor(clientSeedEncCopy, []byte{0x9f, 0x26, 0xb2, 0x17, 0x61, 0x5f, 0xc8, 0x00})
rsp.EncryptedSeed = base64.StdEncoding.EncodeToString(clientSeedEncCopy) rsp.ServerRandKey = base64.StdEncoding.EncodeToString(clientSeedEncCopy)
rsp.SeedSignature = "bm90aGluZyBoZXJl" rsp.Sign = "bm90aGluZyBoZXJl"
// do // do
clientSeed, err := endec.RsaDecrypt(clientSeedEnc, signPrivkey) clientSeed, err := endec.RsaDecrypt(clientSeedEnc, signPrivkey)
if err != nil { if err != nil {
@@ -141,8 +141,8 @@ func (f *ForwardManager) getPlayerToken(convId uint64, req *proto.GetPlayerToken
logger.LOG.Error("rsa sign error: %v", err) logger.LOG.Error("rsa sign error: %v", err)
return rsp return rsp
} }
rsp.EncryptedSeed = base64.StdEncoding.EncodeToString(seedEnc) rsp.ServerRandKey = base64.StdEncoding.EncodeToString(seedEnc)
rsp.SeedSignature = base64.StdEncoding.EncodeToString(seedSign) rsp.Sign = base64.StdEncoding.EncodeToString(seedSign)
} }
return rsp return rsp
} }

4
gs/game/user_gacha.go
View File

@@ -286,10 +286,10 @@ func (g *GameManager) DoGachaReq(player *model.Player, payloadMsg pb.Message) {
xh := uint32(random.GetRandomInt32(0, 10)) xh := uint32(random.GetRandomInt32(0, 10))
gachaItem := new(proto.GachaItem) gachaItem := new(proto.GachaItem)
gachaItem.GachaItem_ = &proto.ItemParam{ gachaItem.TokenItemList = []*proto.ItemParam{{
ItemId: itemId, ItemId: itemId,
Count: 1, Count: 1,
} }}
// 星尘 // 星尘
if xc != 0 { if xc != 0 {
g.AddUserItem(player.PlayerID, []*UserItem{{ g.AddUserItem(player.PlayerID, []*UserItem{{

1042
protocol/proto/Retcode.proto Normal file
View File

File diff suppressed because it is too large Load Diff