From ae2042bf4d91c3fdf62c6e3e25ac2179d510bc2b Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Mon, 15 Jul 2024 15:30:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9A=AE=E8=82=A4=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/gameparam.json     | 2 +-
 public                  | 2 +-
 worldsrv/action_pets.go | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

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..e3671e3 160000
--- a/public
+++ b/public
@@ -1 +1 @@
-Subproject commit 6fefbb3db104ed096948a126db87d4e86d19362a
+Subproject commit e3671e30a6f3093cc7219f9b074e5586c3b2c011
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
 }

From 45f13936004de59d3ec8fb1d777aad369d6033c4 Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Mon, 15 Jul 2024 15:33:56 +0800
Subject: [PATCH 2/2] update develop

---
 data/DB_GiftCard.dat     | Bin 57 -> 57 bytes
 data/DB_PropExchange.dat | Bin 384 -> 384 bytes
 data/DB_Task.dat         | Bin 5299 -> 5299 bytes
 public                   |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/DB_GiftCard.dat b/data/DB_GiftCard.dat
index 96640b07f274cbbbda035ee3e52503c8356a73cb..15600367ff42a73b75826e6378f02a3bde3a8661 100644
GIT binary patch
delta 38
pcmcDtoFJjd#&NNYS%6E4lVf2oo4|o-8=15?Aj}q919mG$1^~Z739kSE

delta 38
pcmcDtoFJjd$+57PP2j+^jZ8{x92eV|1-P_0AVMv+2JBXh3;@YB39kSE

diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat
index d368145b7d20a8315112c62d78e24612b7c7d042..c1efe95d3403881301372d315336b2f188fe6407 100644
GIT binary patch
literal 384
zcmd-w<6snElw#w!+Qtl~uR-bSQ2H{Iz5=3^I5-yevI!h$vE|a^U;?YZ0hPZArEfv$
z+i2>;IUwevs|TyYV?WG1RCjQK-O;f25eru=2MgFCU<U#Xf;k+f5oW<1sKa0ep?es`
SVM^>Ai+~>e!py}$TL=JV>O3_7

literal 384
zcmd-w<6snElw#w!+{O&1uR!UmQ2H8_z7C?5I5-yevI!h$vE|a^U;?YZ1(m-IrEfs#
zn`r98IUwf4<YD^I?FHKdbPvotbaz0^<pjH<VeKOpu2>EhtPY16gv&yh$G`?6S$GHR
RaCVMGK#zW5=3<~N1OQ{=JT(9S

diff --git a/data/DB_Task.dat b/data/DB_Task.dat
index 8fa99c7915545fe54b5f41c052d85897014d0759..e169847821fd44088fb42f1162252a04f725628b 100644
GIT binary patch
delta 308
zcmdn2xmk09p&%Q_l3q3eRxb{Yg+O}2A-RoC0*r!CUN4&$L|$%lGUGiasPKe^{6OK0
zZOj5plY>~Qu!!Dev4V<TSn2~+%e7g9)re{G1TK-ydF-N0ldtoLOrFlU4d{SHK#Q56
z4mdE2XL1}@8B`R>S(Be~RY65XplTaBt0ot4pM#1rLq#7f7uxL4Bf>bjghOz039s&C
z5q81Nn|O;EB{6K`vgUYvg;_voG9$m3ys5#{B`Y;p4frjL92gO10bLJrAM@s7eg{?n
D#_Cl&

delta 295
zcmdn2xmk09p&$px!d^Ck1&8Fk*f^E|S*#nK1Q-P&Y&kEeY%km9WX5|;K;esR%mPeM
z;Ry@*CkL@qVG+H{Vg(iDf~vi+)Mv8>s}abEML=7ap~4TA3vJG3mw*YwR3B)uojiqe
z=j81iVw01(3MVgO7n%Hmt9<fuKEcTa+~+1w;1by!#3KlDC&)BLggYmf@ajTEVa_}-
zi)ZsD-eShdBJ6@3T-F?quP_S;O=jd5lQ%VZx@4sWs{y}-kpm;p|L86&=67HP0A@x}
A+W-In

diff --git a/public b/public
index e3671e3..6419023 160000
--- a/public
+++ b/public
@@ -1 +1 @@
-Subproject commit e3671e30a6f3093cc7219f9b074e5586c3b2c011
+Subproject commit 64190233130f2868d1cf6ecd2be04d9b13073ae2