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

Compare commits

base: tl_server_2:8391b159eafb1c788f57c97dca297b92859e3599
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:8f24ca5592b130d721fd50befb15d01979a8bd47
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. "8391b159eafb1c788f57c97dca297b92859e3599" and "8f24ca5592b130d721fd50befb15d01979a8bd47" have entirely different histories.
8391b159ea ... 8f24ca5592

6 changed files with 2 additions and 7 deletions
Show Stats 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": 1000 "PermitInitScore": 0
} }

2
public

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

5
worldsrv/action_pets.go
View File

@ -605,11 +605,6 @@ 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
} }