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

Merge branch 'develop' into release

This commit is contained in:
sk 2024-07-15 15:33:56 +08:00
parent 8f24ca5592 45f1393600
commit 8391b159ea
6 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/DB_GiftCard.dat
View File

Binary file not shown.

BIN
data/DB_PropExchange.dat
View File

Binary file not shown.

BIN
data/DB_Task.dat
View File

Binary file not shown.

2
data/gameparam.json
View File

@ -24,5 +24,5 @@
"AgoraAddress": "http://47.105.78.29:8081", "AgoraAddress": "http://47.105.78.29:8081",
"InviteUrl": "http://47.105.78.29:8000/", "InviteUrl": "http://47.105.78.29:8000/",
"RankTimeout": 2, "RankTimeout": 2,
"PermitInitScore": 0 "PermitInitScore": 1000
} }

2
public

@ -1 +1 @@
Subproject commit 6fefbb3db104ed096948a126db87d4e86d19362a Subproject commit 64190233130f2868d1cf6ecd2be04d9b13073ae2

5
worldsrv/action_pets.go
View File

@ -605,6 +605,11 @@ func CSSKinUnLock(s *netlib.Session, packetid int, data interface{}, sid int64)
pack.Info, pack.RetCode = SkinUnLock(p, msg.GetId()) pack.Info, pack.RetCode = SkinUnLock(p, msg.GetId())
if pack.GetRetCode() != pets.OpResultCode_OPRC_Sucess { if pack.GetRetCode() != pets.OpResultCode_OPRC_Sucess {
send() send()
} else {
// 自动使用
if srvdata.PBDB_SkinMgr.GetData(msg.GetId()).GetUnlockType() == common.SkinGetAuto {
CSSkinUse(s, int(pets.PetsPacketID_PACKET_CS_SKIN_USE), new(pets.CSSkinUse), sid)
}
} }
return nil return nil
} }