diff --git a/data/DB_GiftCard.dat b/data/DB_GiftCard.dat index 96640b0..1560036 100644 Binary files a/data/DB_GiftCard.dat and b/data/DB_GiftCard.dat differ diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index d368145..c1efe95 100644 Binary files a/data/DB_PropExchange.dat and b/data/DB_PropExchange.dat differ diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 8fa99c7..e169847 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/data/gameparam.json b/data/gameparam.json index d0956de..95b9b04 100644 --- a/data/gameparam.json +++ b/data/gameparam.json @@ -24,5 +24,5 @@ "AgoraAddress": "http://47.105.78.29:8081", "InviteUrl": "http://47.105.78.29:8000/", "RankTimeout": 2, - "PermitInitScore": 0 + "PermitInitScore": 1000 } \ No newline at end of file diff --git a/public b/public index 6fefbb3..6419023 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit 6fefbb3db104ed096948a126db87d4e86d19362a +Subproject commit 64190233130f2868d1cf6ecd2be04d9b13073ae2 diff --git a/worldsrv/action_pets.go b/worldsrv/action_pets.go index 9dbe027..3c3b277 100644 --- a/worldsrv/action_pets.go +++ b/worldsrv/action_pets.go @@ -605,6 +605,11 @@ func CSSKinUnLock(s *netlib.Session, packetid int, data interface{}, sid int64) pack.Info, pack.RetCode = SkinUnLock(p, msg.GetId()) if pack.GetRetCode() != pets.OpResultCode_OPRC_Sucess { 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 }