From 5a58823b4eb796f9e20e99fbb8bc4e1af48edd80 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5RP3AKU\\Jisol" <2858626794@qq.com>
Date: Thu, 18 Jan 2024 03:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../宠物系统/宠物升级/角色升星消耗表.xlsx     |  Bin 10194 -> 10798 bytes
 DataTables/Datas/常用/资源表.xlsx             |  Bin 10203 -> 10258 bytes
 .../resources/config/json/tbgresource.json    |    6 +
 .../resources/config/json/tbgroleupstar.json  |   80 +
 .../prefab/ui/Debugger/DebugItem.prefab       |   54 +-
 .../prefab/ui/Debugger/Debugger.prefab        |    4 +-
 .../prefab/ui/宠物/宠物升星页面.prefab        | 2481 ++++++-----------
 .../prefab/ui/阵法/阵法选择页面.prefab        |  643 +----
 JisolGameCocos/assets/script/App.ts           |    8 +-
 JisolGameCocos/assets/script/consts/API.ts    |    4 +-
 JisolGameCocos/assets/script/consts/GAPI.ts   |    2 +-
 .../assets/script/data/PlayerPetData.ts       |   14 +-
 .../assets/script/data/ResourceData.ts        |    9 +-
 .../manager/battle/mode/GOnHookManager.ts     |   26 +-
 .../assets/script/ui/Pet/PetUpStarView.ts     |  132 +-
 .../script/ui/Tactical/IntoBattleView.ts      |   11 -
 .../controller/game/GPlayerPetController.java |   82 +-
 .../game/mode/GOnHookController.java          |   15 +-
 .../java/cn/jisol/game/data/ResourceId.java   |    6 +
 .../jisol/game/service/PlayerPetService.java  |    5 +
 .../service/impl/PlayerPetServiceImpl.java    |   28 +
 .../cn/jisol/game/vo/pet/PetUpStarOV.java     |   21 -
 .../src/main/resources/json/tbgresource.json  |    6 +
 .../main/resources/json/tbgroleupstar.json    |   80 +
 24 files changed, 1341 insertions(+), 2376 deletions(-)
 delete mode 100644 JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java

diff --git a/DataTables/Datas/宠物系统/宠物升级/角色升星消耗表.xlsx b/DataTables/Datas/宠物系统/宠物升级/角色升星消耗表.xlsx
index 409bf22f7d7505701c54a51abb328029777ec14a..90d1b832dc801cd9301e86f087809b1c72be44d8 100644
GIT binary patch
delta 6509
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
JiP-*5{vQj2LQ4Pu

delta 5876
zcma)=WmuHm*2jmgp_CrF2N4EPIz$?zM39D|9y*7Pk(i+o7+M4+m5u=fMpRIS7C~}A
zx<Moqka|&{bIyCNbG@-Ytm}XM_xkO%_qspbtLDLoeq9D0QB~gyK_gTy9y|P<b{B*R
zyBoD@;Om7#yAKQp%sU8>5C|l+q=w-VJXq4#n~S~XwY)lFcZ(HcUD^jJKiKbIu4UUO
zrc+HAGs{QSt5u7u@<ibq6lEdI9o9o6sYnFtQf~D2n=2zFZ9hSj6toadMUs%)O~gy&
zb&&$#{+OZR5t%_qvmF_I3p~wBkYmWr$Y(9vDe^YsQ5c>yf63z;-j=>t9|GX_g1BZ)
z@DI&%+dc+PBIGq8gCRQ>!?RI;TcOjnNJ$xI69mrrvaI?mmqmieOv^;`B;&(MW3;w8
z<*xqT&hmamxU1<4Clh>w0_}G(cwb#n`Wj$GQ_12Rt^U`QR)X>N!yHlY*9zes9bp)y
z^5ejD!|Grx0do-Jc<yfc69<?Ws92sK&6pmc86qKTdzeJ)J24Xu>+so<tf+qX=Djo-
zn9^RBhaii$Dlp*A4Br0u>9NxCoPiDjAsqk!AO*zgE#Be!=#YS7Cg6g9)aioIU3L0W
zrB`9_u}BS@hX&4_lbuyMP}HT3KCk4~1}yHfo!KveL^LEUjHB=<c(=6w;TVaA%=FMY
zFqJ0yjw>`zZ&%_Q#;S{naD1%oWoWS@vEE3OV?-#*Q(dCxlm7@Y`*ROssv$~>m?~*a
zW85%yTA-TQcqdHeYZ}}Ir>E)pzN91|&MqwWy~9&O@8ix$3NIfRTuo9ve`nh>lm+8i
z5YefxTxmJsFrVC*;D=-`sVs>iL|x-I6pxke&dEZX3w+pQBkXF;jk+_@S9|g8aJ_zz
z*HXqmyb)Eb!7*FJVO<6COJGLCATN+yP`|rIhiql*o8R=GtTVg%+3Z9l3ApPfr1KIj
z^;YHAOE1Dq2JMGXhJ-FuOZ5RQS|k8~8y^6`1VCMYS>Ty@R)J5XX^^`|`RCM%GqoOy
zlrlactgI7Lk{)><n*-l>la)8`;m707zsp6_;B$%1T7O362HuK3)SQnQ4O9xmy|c()
z(P}GXS@m`YE}jcn37oFI^nte=_e&86)9y@slAOgFEj`Q!?G9a>Egj}KDeY%Vix5LP
z6$@EJ)!;tT%*p#>I+(<LXh_@<%~Z*hh|oNCJ2-=*LE1c9t9_@3<?-uJBHBNQK?}U6
zPsK(C`OQ8Yz`nO79ua|f6I%@N&eueHxz>u$EicD|wuEInoAx7EZVs81uz!Tfp6{d^
zXRU6OG1ZLB#x;$<?z5#s*Z8$;0!wnLtTN7n6yRq>1RV2=1?e95&xAy?rRW&#@|X6c
z<=OWaTy6Y6<#76mCnSEmEjltQFT}mHjkb*3a)$-9>De;)Y>=2?a#<t}93-W%&3Mo6
zAEv&?VxZIs>l>0^x+}S@32t@+z(Lxh9D*3a38q+4B57x|P<o4WQVZ^-4>U^tvb-u<
z5}v^{b~{h9wnebFb%=N?==y8VM98cn|JI_TD<SdGYzfveU;Yi<aFPVtlGQ)c6H0mv
zuhXG%v9C*vXmF}Ld`{H&t|C9(wWpy_7F*#vf6(JQus6(;zAe=I5+xtFuK)9fGJ2az
zu~Iur2_4T{s~x3ZK<M=G`@IUn<K+o^YPfFuUab^c%A*FY<EoL_07=V`mY;DqRa?7B
zzf8Ggv6Iw+)1vp`SzY6~t<<yyysPoatknkc_O34gZu!wiJMLk!Aq2K2nTwc82ri+n
zvTiy-<{_t&>5sbs!VcKbsd@*hat9jhD+j9X5Sh(6pad|2W>o`fO?H5SC{Y}k!*gt6
zf_VlkpkK%itaGS4!{}BYLL;uP2118yxsI0yZ2R0m{4LE;mUry$WG50SEl5r1E-tG-
zIJr&&zuVz<5VE^M`OVzC^nNw-;Wj-fi0vRzxvYVOv5AOY*1-?WoAV^l2)flwh!WXB
zBcv8_qLw4oiJ@P83fV=Ra1Lm|p%L_}QqTy-Rrm2aXy1wIpslYPsLasXeX{h@{x1oC
zzrWgdO67NjFwNZCLi`>d@^1vqF*ew9$$jZhDcyeMkg{r*eKg>Ug8$pI{^wUYQG&|y
z^*;lDKWgOz9C>OPJog=0XX6*(YayVh^y(uQ735wYkA-4tsGT4CQj@3y_Nte;UAt(~
z<nPUK$p;Lja(5@MKRGa+E!sBiN#XN@S;T+>y%K3^Ei#5W>zGk`?_?g2-R!&Sg{ink
zi&~KDx(Dr|f8u=*RAN;}4u#!haQuB_F^*dvo_p9FXJdDKS10z~WK!<PiTIlGm!&9~
zsF1&ebBl4;<V$`u6YjO~y>y*Sn!1+b$6jS&m!hsS@X4b$Ml|rX!t-aI+OnEmCc`KO
zmX6yGUiw>PmVbJ<Vt9*KU;8|{UIQGEqsfZ!1}4_%>X3ijs#~uLfq)W?t5g%l=R3a4
zvB2B+8pop~7oSf7&1=v@2eQKEmFzru)neI2w_j0wZ|U|l8lx3fkc@Sb*vu1m@;5!~
zzLrPPCx3;jnxLJ=q(~ZlkSzs_y3&HD5+DsXx$8r<7X#h#6GJifrAm!HG))rFqocnh
zsZs;@-AAr=6ulhHH?4$M8HiRykeP1qzbabHcu>0~di;<{T=fU#T?c&b^IX<0J^l}=
zrS_z6UK~w)7IQEJKEI>TLZ_0I!j))8O0=2xTOLQuDyaw>jHAIwgJ(k}Ob!0PDY`3T
z;{TH4Fu^~BFB}Gx`5W>5f5_Hfx#O_E>-qWve;Zfz{&zWk_;<a17%=$na(^WJ_ig{f
z{)emki>s1(&U80Y7G>vLWbb@eEC%0SH{p4F3fCFx!LGz@^3S)yNPbx)|KI24tuy5r
zT(!$=wEPd%Ga<HYbY)nf?EX{2|I?=XO-nrcLkkXz{Wh-X|6Q7mvKrB3lIw~f(qzVc
z98$ok+K4g{#I=r0ZY$By@R--;-f;y>m4cyqKTd2xUh^NZOI*U*54*omf_JzTGOXv9
zz&GbTm@Y;sFd1}Rh09nK!FsLHs7t_`v`!zdrN!?MY1LTicHIj^;4|CRQQ^pm$9*j+
zW!+qZ3BuasXa3?Kcf*vZH=inOP_n1gs0A*T#!*UcVlp{`s+=d}0DvCq;<_Nb^Rq8Q
zKfl2<HgaA9Vs{lzoebSa*Ax=Sx2Xt5%3k8|nGIkT%{6b^7|eb^eOf$CqtRLyx!TQ2
z-)$!Su-Tz0vI%H=Ef`QWtaa`DXvPmC=esi<F_-CyyBOXh)-|&-cIah?VQM5MUHX*T
zU8-+6xG<qfW}CMtx68t8saN1`TXUCRrXkYaJD~PvHqEzo5cj@z<+{M8`^*6WI}xF;
zHg~27UX31{MaVref|rZW9P9)HYR3KaR5QvjFP#e@_U&2N?C{d_*^pzK1BJY{ZCd(%
z!@712whdNvtzN{nu-Qd}YilXh!z(#}r72P@gt}9jB3cViAGUiNW|qPYnzAN{+C8<D
z(reC+`{-A)4#{OMR>&1k7iu-Ezx8P!t5}>ZXYoF?Gt8;YS_NGTKU#zaJ^FBOw)1|u
zCz6pI{JcCfuB1i?d^$;#a@yq9n0#yGtUROiOJb}3Z1VO1MoA@Cn{M`dQ-PGN^7w-|
z@z#b8$uOg~*#Nu&p?Cv0)=$BP9Dt&63~?O(ii0LDVRt!{!j&y{n$NlJ$nbuq^i9T>
zah(bzF3=Y-xywA2e)e>y%-!sfhp{2)hr91{ZxZni+2l_?URu)-_}C$R-v4^ERw={U
zFCc)RNK0ehXegX#(LuTH8lzBxBYi`>tgMo?3_fVSOT9jao=&<8E{mTQ1po`WgW4OF
zc^=i*GVYg{)16XfA;oW!ThDUC5vm1P%qC_K*S%^u;ltKTB!@yF^O;L=L^@9*wP#1F
zL+T@z<)JENYSLWz-%l1C%%Azc?vTM^u9KpB-XsphFz;F9`!8yz8X8jAIU=D>l_swz
z>*8b7)D8Xpwtm2MnEdO9iq-r{yEw4^D8t$s6dtXmnGMd3ByxvZSURm}=?O_Fgq7uO
zY5}0}T64e4>!lXz2gyG$A4rh}Td;Trxtr#3MHyaW%~j(JY3*#Y-o#d+b4bJBWGal1
z=0Z`QV^2esNw`nL9dkEmK+`=x<%U}n7YsaGA(>}4)wAG^9v(RdDGxI?=qCJPLb=t+
zS@#DjtHyOl-Cs1R7eiUv+Ja7uQ@u7R8_ObD`Y<Z89&e}?x5iwHEAsN556KyGpHPT5
z3W-V$XkOg!Oj;J@8-P8MzjUv;Df2JqyUfJ%7o#sk|C<G?aJZNPUf+Q0R1f}>q+r3%
z(V>z^f0F^>IT2-c`k6}hxCvJ<haeIHn-3Y@4k`iGR@b%$h(03GDjbmM@|xdC!)l9?
z+SWUVS8t&MG0HeZm-ao{%WK-EQ&DPFWvtts+z&7hhS`a%(f19wlDWUOdc351fS4(J
z=2YeAi5t#=hgrN;uTU20;@irt<k**)gwfI_ud+$r+ShOm@w6-l`(h+@QyG_B5*pQI
zSDsGRhqrGf{Upmr3Gmn*<*V@$4RKNzs?Qp1svB1#6h(#Pnxl34dMw<HpF5M%s@2nQ
zM@4a|(lJ7Lp3sWA@)QX=@o)<|^At%}CR=%-cc#hU?8TbgNWq1r$+eMtxLh6Xx?9<0
zFRD{59uy~K(Dl~~n|haQ5v>jMPg+=(d7l(`Nlb)gwHo3fLT2i%j)=keO1pe&Q=F$F
zKSG^(2;F(P5|<rniDY70*VZAzZx_gp6M4kfyAkq2FJHH;v75eqx=;1-4nPj~Ooccg
zV%9$ZP8<%pj#&teoF!XtW+ck+!s_;T=DgiVWg}#JR@dctd2VfP+(xo^{{^{9!<j)w
z*Gt&Lp;GS(WvQQ*<i>_V*M<{}#F8%cHO@V7E$an0vlPdRP!ujezwqpP_Mc}X+sy(=
z1kjaz-^3=K4nFU?tB8ni(pfdi;c0VV>4IVT;G;PiWQKD9W@(BR%Q=Y6Ood?6d}^sl
z`~zP4d&_D)tqnn9I%?i7P<lp4=Uq02ffHV9glXejl{XNT6`A5Rph>ZT3M}`2>d$^7
za^oPqm!%=(^ghGU!Q^fEE5SmQ<muK<NRx4HIZRa>N$3-uVxE5dp8E{ADeIY>%j+zg
za3zByJS_`7Hsf1%kGj%@;)%(;P4)P0UpskW&)*wHhK_-WlxNlXAx|36Cxb3#)4(<F
zUImt{irV*6U6jpzC47uNp3jWTZ?>lC=c1Rr&8A1XuCk`1eY9?gz-y_zhB6=Mu=-S^
zn_@>Bu0ofiiyL+MufVuBGS03C@4t#7i>1{H`B_&%dNJf5`zfzF4yTRYxqV$Amp2b9
zms@=04<n6;q@O!42%={<R0&%Y*g#*u>v}(X!+|-^tu&OS;V|-t7#3EaB;C0p;WIEo
zTT>33iQ|7dKZMW(SPXIFd5KSc4_nhU-S5XaJ+ez%k#YJ9zTJ8-oy!+FWv1DwGfgIL
z7gHivKaBIvM2gPfiC_14A6_)Z^lIo}asD)&n2sUO5ujBevFx=@8DVx}X^r>sz#4jo
zyPZT!fN+*-8t?t?rIsu>9wUd#!0H#|%ZHHc&9KXeY)9&cJOxLc2EGXofS-M7FXy;a
z<R^gfi2vk=hvjWAzj@rP|0RL!ZD8D^j^iwT>5BtD8u1fuT6`oA%TI=fc}_{NQ^bCy
zDGRf<MCE#-vP++Vf~pE}a}u({QC#idO=vlXLgCq0sBkP$f?4<2KQ@TNWczDvhrCRP
z&(Hbw<E22okwXVS&-#Y-F?ygEe&G{xtSp?G^nnQvey<oGe}qop@ulL$x9DCDYJtKt
zi87vI9#svWoU$ijAwfT<3hl^c)e<#hzA6PD$_Pre9>is<k1MCXs-WR`E)Cug=ym1h
zzK<|Wj7zW4UlA)J?_!|k3ntvP@=cHNNsN2uk`pHMn3^d*&hqlCc<(hKn=O78fl3uH
zy{kN)4$e*sq2T0}`H9>66de<TB|N;3pWeF`$PW*f?zoKId)<!Gf1~9bZ0X#22a#G>
z#K)sfC#st>ih^_KeGOwvEJm>ajTS7nT$oZg6m_N#Qio$wnc)5z=(SJJ$Ub?8tnGLe
z%Ij$c2|M2vPI?m@vR~W&Xm4+cq`WZPcmE<A2yeC}TqEWZxwS$vl5h(}`ItV)fJXIG
z&tF|j8jOqOSs#&DI$#sgH0glW{{5v$qCy24NY9~mCsI*V>}`zAJ1qkK(HlvWa~vC;
z9m2m9E7$uiJ83<8zKx)_l&l0?iW09oC%@&4A#w%}$?dy%9x`%E{mOf6sS;<2X97<z
zFkTa*n0q8gVZsDrZ>+oi;O*}dA6rhI3frPKGGi!T;l)nV{7AvCy>qWKL`4x1`__q6
z>`6R*HxgUL_1?Yg;T715q-o8yhPuC1niS;nC9=kgQ?tf1$%&+C{N)A>nEa!Di;$}4
zAHq1nQnD2eP&s`@De5*nd)_<A{%x!&bSDiobI()KG2l!#e1Wuxqba1Tb%!WJ&BzIR
z*yz1r(Eo+n8q^u;|LsO{SULF8$*tJa)6;BPTV=|*imA=YN~{v}<c4u^Q+=yTZbBJ4
zf+CHJBM;M7%d&QQuf)z|;9E4RF5BjI4VBe#P6-DqGYAZiwsPxR=Y3G<;7s(H>atw@
z0kSt1GI2@WIKj?=M-COK-V(qA0A}#gIT_$-y84}WuBJo$7qNpgjudpNcXjMO_k2iw
z5oFzN)CPUi&~AEmq=(~VR~TGV3|^ZZ`{{7&w38;Yktj)n8G_D4^?juXf`_)50TQ)L
z!RSWQw^Hh+*%J>d#}QrSekAGu5QX#oeVrluv1hbC%kt)VpGBC`UI0Vc!|!m}N9Vwk
zR#C!F{CF}Dk#)dJ=&Lppdc{|p&ckJR*9;O>_w9?rVtkEnB)2bc^JCz&NLb-5$W6PD
z458=3w%Vm`dm}k`6dG{&gS@i9QFnaInSw9q#d^&w*nO#VF0;zmr0s`F@8{I$U`0Oa
z*e?<l;V5#`0k1|X>?LOi2kDrGQ>b8C?NcdxaZDm;L^;@0NV`)#CA9Ozj1SgCSw(Sf
zSMZU)F=FXVY=ydUfy<l_pN$)(z^{al;6O$2i&MYk003-!9o_vzMSexpf}jv;gWuxs
zxv-XiEa=zR@>j2^@Bx79SHsL-3lG3~6-iMA0(bCiQF8(i{7;-HTEW}+$DAl{9#)it
zpb$PM8!A<hU*Mm=7DfO7<uCSX{lU$z0RTbnqJFSocSk=|od755T#yQ17>J?--^Mor
xqEx|rtpEDZ008wL_-|T_9fbhP;YFg}fw@5cJ~RB2_oqlT>KuH7xQXYN_h0tC*wFw0

diff --git a/DataTables/Datas/常用/资源表.xlsx b/DataTables/Datas/常用/资源表.xlsx
index 28dbed8d45e85545dcaafe809ea2af253b6cfc00..fab6a265d8791761da6987eb213d2634f2bb3bc1 100644
GIT binary patch
delta 3011
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
AkpKVy

delta 2953
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

diff --git a/JisolGameCocos/assets/resources/config/json/tbgresource.json b/JisolGameCocos/assets/resources/config/json/tbgresource.json
index efc4cb55..90315e3c 100644
--- a/JisolGameCocos/assets/resources/config/json/tbgresource.json
+++ b/JisolGameCocos/assets/resources/config/json/tbgresource.json
@@ -28,5 +28,11 @@
     "name": "钥匙:锻造石副本",
     "tig": "锻造石副本的钥匙",
     "args": ""
+  },
+  {
+    "id": 90006,
+    "name": "魂:一品宠物魂",
+    "tig": "用于宠物升星",
+    "args": ""
   }
 ]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/config/json/tbgroleupstar.json b/JisolGameCocos/assets/resources/config/json/tbgroleupstar.json
index 6edcb88e..12a6662d 100644
--- a/JisolGameCocos/assets/resources/config/json/tbgroleupstar.json
+++ b/JisolGameCocos/assets/resources/config/json/tbgroleupstar.json
@@ -38,5 +38,85 @@
   {
     "grade": 10,
     "merge": 512
+  },
+  {
+    "grade": 11,
+    "merge": 1024
+  },
+  {
+    "grade": 12,
+    "merge": 2048
+  },
+  {
+    "grade": 13,
+    "merge": 4096
+  },
+  {
+    "grade": 14,
+    "merge": 8192
+  },
+  {
+    "grade": 15,
+    "merge": 16384
+  },
+  {
+    "grade": 16,
+    "merge": 32768
+  },
+  {
+    "grade": 17,
+    "merge": 65536
+  },
+  {
+    "grade": 18,
+    "merge": 131072
+  },
+  {
+    "grade": 19,
+    "merge": 262144
+  },
+  {
+    "grade": 20,
+    "merge": 524288
+  },
+  {
+    "grade": 21,
+    "merge": 1048576
+  },
+  {
+    "grade": 22,
+    "merge": 2097152
+  },
+  {
+    "grade": 23,
+    "merge": 4194304
+  },
+  {
+    "grade": 24,
+    "merge": 8388608
+  },
+  {
+    "grade": 25,
+    "merge": 16777216
+  },
+  {
+    "grade": 26,
+    "merge": 33554432
+  },
+  {
+    "grade": 27,
+    "merge": 67108864
+  },
+  {
+    "grade": 28,
+    "merge": 134217728
+  },
+  {
+    "grade": 29,
+    "merge": 268435456
+  },
+  {
+    "grade": 30,
+    "merge": 536870912
   }
 ]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/Debugger/DebugItem.prefab b/JisolGameCocos/assets/resources/prefab/ui/Debugger/DebugItem.prefab
index 7c7e2a2c..69e780b1 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/Debugger/DebugItem.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/Debugger/DebugItem.prefab
@@ -32,10 +32,13 @@
       },
       {
         "__id__": 12
+      },
+      {
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 16
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -130,8 +133,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 55.60546875,
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -173,7 +176,7 @@
     "_fontSize": 20,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
-    "_overflow": 1,
+    "_overflow": 0,
     "_enableWrapText": false,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -216,7 +219,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
+      "width": 85.60546875,
       "height": 40
     },
     "_anchorPoint": {
@@ -289,7 +292,7 @@
     },
     "clickEvents": [],
     "_interactable": true,
-    "_transition": 2,
+    "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
       "r": 214,
@@ -345,6 +348,44 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "fdfZMrUD5LeJ3JUsm5gbF3"
   },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 15
+    },
+    "_resizeMode": 1,
+    "_layoutType": 1,
+    "_cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_startAxis": 0,
+    "_paddingLeft": 15,
+    "_paddingRight": 15,
+    "_paddingTop": 0,
+    "_paddingBottom": 0,
+    "_spacingX": 0,
+    "_spacingY": 0,
+    "_verticalDirection": 1,
+    "_horizontalDirection": 0,
+    "_constraint": 0,
+    "_constraintNum": 2,
+    "_affectedByScale": false,
+    "_isAlign": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "baBTXQ6nBHCZceybmU4sDK"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -354,6 +395,7 @@
       "__id__": 0
     },
     "fileId": "82Bvk1koJK0rGlT67CNSun",
+    "instance": null,
     "targetOverrides": null
   }
 ]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/Debugger/Debugger.prefab b/JisolGameCocos/assets/resources/prefab/ui/Debugger/Debugger.prefab
index 925f3fa2..d4a9b0e5 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/Debugger/Debugger.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/Debugger/Debugger.prefab
@@ -942,8 +942,8 @@
     "_paddingRight": 0,
     "_paddingTop": 0,
     "_paddingBottom": 0,
-    "_spacingX": 0,
-    "_spacingY": 0,
+    "_spacingX": 5,
+    "_spacingY": 5,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
     "_constraint": 0,
diff --git a/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab
index 0dc39b34..c5be2bce 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab
@@ -25,17 +25,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 173
+        "__id__": 143
       },
       {
-        "__id__": 175
+        "__id__": 145
       },
       {
-        "__id__": 177
+        "__id__": 147
       }
     ],
     "_prefab": {
-      "__id__": 179
+      "__id__": 149
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -82,29 +82,29 @@
         "__id__": 63
       },
       {
-        "__id__": 107
+        "__id__": 74
       },
       {
-        "__id__": 124
+        "__id__": 91
       },
       {
-        "__id__": 143
+        "__id__": 119
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 166
+        "__id__": 136
       },
       {
-        "__id__": 168
+        "__id__": 138
       },
       {
-        "__id__": 170
+        "__id__": 140
       }
     ],
     "_prefab": {
-      "__id__": 172
+      "__id__": 142
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -178,7 +178,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 300,
+      "y": 150,
       "z": 0
     },
     "_lrot": {
@@ -1433,500 +1433,145 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "宠物列表",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_prefab": {
+      "__id__": 64
+    },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 63
+    },
+    "asset": {
+      "__uuid__": "561f1c86-f948-432d-8250-f204ff864dbd",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "89WDKPsx9CX5sG3Mkwo+WZ",
+    "instance": {
+      "__id__": 65
+    },
+    "targetOverrides": null
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "96dxCpIfBLLZDe0eHER+6P",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
+      {
+        "__id__": 66
+      },
+      {
+        "__id__": 68
+      },
+      {
+        "__id__": 70
+      },
+      {
+        "__id__": 72
+      }
+    ],
+    "removedComponents": []
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 67
+    },
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "宠物预览窗口"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "89WDKPsx9CX5sG3Mkwo+WZ"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 69
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": -143.253,
+      "y": -43.287,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "89WDKPsx9CX5sG3Mkwo+WZ"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 71
+    },
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "89WDKPsx9CX5sG3Mkwo+WZ"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 73
+    },
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "89WDKPsx9CX5sG3Mkwo+WZ"
+    ]
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "升星",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 2
     },
     "_children": [
-      {
-        "__id__": 64
-      },
-      {
-        "__id__": 82
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 100
-      },
-      {
-        "__id__": 102
-      },
-      {
-        "__id__": 104
-      },
-      {
-        "__id__": 79
-      }
-    ],
-    "_prefab": {
-      "__id__": 106
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -10,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "scrollBar",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 63
-    },
-    "_children": [
-      {
-        "__id__": 65
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 71
-      },
-      {
-        "__id__": 73
-      },
       {
         "__id__": 75
-      },
-      {
-        "__id__": 77
-      }
-    ],
-    "_prefab": {
-      "__id__": 99
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 275,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "bar",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 64
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 66
-      },
-      {
-        "__id__": 68
-      }
-    ],
-    "_prefab": {
-      "__id__": 70
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -11,
-      "y": -31.25,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 65
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 67
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 10,
-      "height": 156.25
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0d0tXbkEZNX4aEx25Ed4Ai"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 65
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 69
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 0
-    },
-    "_spriteFrame": {
-      "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 1,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "05WBEjdNZAqqve8eQV0oaM"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "1bA6K4kt5LwIzW53L7WFPh",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 64
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 72
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 12,
-      "height": 520
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 1,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "73oxplRxJDr7eaD2ZCltrZ"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 64
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 74
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 0
-    },
-    "_spriteFrame": {
-      "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 1,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "c5lJVtzjJG9qumy3VIbxwv"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 64
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 76
-    },
-    "_alignFlags": 37,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 250,
-    "_alignMode": 1,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9aFjGMwbBExKjKmBppFw7+"
-  },
-  {
-    "__type__": "cc.ScrollBar",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 64
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 78
-    },
-    "_scrollView": {
-      "__id__": 79
-    },
-    "_handle": {
-      "__id__": 68
-    },
-    "_direction": 1,
-    "_enableAutoHide": false,
-    "_autoHideTime": 1,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "6eVZbRN8ZAA6kr3q3T6lxa"
-  },
-  {
-    "__type__": "563f2c1JcVKmrpHhC0vl3PI",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 63
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 80
-    },
-    "bounceDuration": 0.23,
-    "brake": 0.75,
-    "elastic": true,
-    "inertia": true,
-    "horizontal": false,
-    "vertical": true,
-    "cancelInnerEvents": true,
-    "scrollEvents": [],
-    "_content": {
-      "__id__": 81
-    },
-    "_horizontalScrollBar": null,
-    "_verticalScrollBar": {
-      "__id__": 77
-    },
-    "itemPrefab": {
-      "__uuid__": "b4e0f464-dc9f-463d-a392-7cc192779285",
-      "__expectedType__": "cc.Prefab"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "2cePl0zuxKKYTI0gsgjE1u"
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "content",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 82
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 92
-      },
-      {
-        "__id__": 94
-      },
-      {
-        "__id__": 96
-      }
-    ],
-    "_prefab": {
-      "__id__": 98
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "view",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 63
-    },
-    "_children": [
-      {
-        "__id__": 81
       }
     ],
     "_active": true,
@@ -1939,468 +1584,15 @@
       },
       {
         "__id__": 87
-      },
-      {
-        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 91
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 260,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 82
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 84
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 550,
-      "height": 520
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 1
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "4bFlnijRpAKoyePmrqfa+s"
-  },
-  {
-    "__type__": "cc.Mask",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 82
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 86
-    },
-    "_type": 0,
-    "_inverted": false,
-    "_segments": 64,
-    "_alphaThreshold": 0.1,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "518ATKhO9Gw7N8exX5W+TC"
-  },
-  {
-    "__type__": "cc.Graphics",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 82
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 88
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_lineWidth": 1,
-    "_strokeColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_lineJoin": 2,
-    "_lineCap": 0,
-    "_fillColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 0
-    },
-    "_miterLimit": 10,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "82Ll2f1PJB4ZrEkNZyzh+0"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 82
-    },
-    "_enabled": true,
-    "__prefab": {
       "__id__": 90
     },
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 240,
-    "_originalHeight": 250,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "899DSiZmFN95I6lKN+zzfy"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "c9j4sTv9ZBy4YGIbMmIRr5",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 81
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 93
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 550,
-      "height": 10
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 1
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "03ccYJ76tPc5sCIWHX1MEY"
-  },
-  {
-    "__type__": "cc.Layout",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 81
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 95
-    },
-    "_resizeMode": 1,
-    "_layoutType": 3,
-    "_cellSize": {
-      "__type__": "cc.Size",
-      "width": 40,
-      "height": 40
-    },
-    "_startAxis": 0,
-    "_paddingLeft": 10,
-    "_paddingRight": 0,
-    "_paddingTop": 10,
-    "_paddingBottom": 0,
-    "_spacingX": 8,
-    "_spacingY": 8,
-    "_verticalDirection": 1,
-    "_horizontalDirection": 0,
-    "_constraint": 0,
-    "_constraintNum": 2,
-    "_affectedByScale": false,
-    "_isAlign": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ddShn5DuZB5IN8qwyvr1Nl"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 81
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 97
-    },
-    "_alignFlags": 40,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 220,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "62SP9FQ6NOEZi8VB92ZPaI"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "30C+BYnslERpnpzQ3bqNiW",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "d9nYFuaGpFBZORlOeBddBu",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 63
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 101
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 550,
-      "height": 520
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ea586EUItLw75LP4FG6Nuv"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 63
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 103
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 1,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "96XQF/8DFF2prJbfE7k/tp"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 63
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 105
-    },
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 100,
-    "_bottom": 80,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 240,
-    "_originalHeight": 250,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "56Nhwq50xBDqPYfa9cqYjO"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "55goghBf5GPogIe1/0pw20",
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "升星",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [
-      {
-        "__id__": 108
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 116
-      },
-      {
-        "__id__": 118
-      },
-      {
-        "__id__": 120
-      }
-    ],
-    "_prefab": {
-      "__id__": 123
-    },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 95.5,
-      "y": -309.485,
+      "x": 114.942,
+      "y": -135.293,
       "z": 0
     },
     "_lrot": {
@@ -2432,23 +1624,23 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 107
+      "__id__": 74
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 109
+        "__id__": 76
       },
       {
-        "__id__": 111
+        "__id__": 78
       },
       {
-        "__id__": 113
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 115
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2485,11 +1677,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 108
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 110
+      "__id__": 77
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2513,11 +1705,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 108
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 112
+      "__id__": 79
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2558,11 +1750,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 108
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 114
+      "__id__": 81
     },
     "_color": {
       "__type__": "cc.Color",
@@ -2597,15 +1789,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 107
+      "__id__": 74
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 117
+      "__id__": 84
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
+      "width": 200,
       "height": 60
     },
     "_anchorPoint": {
@@ -2625,11 +1817,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 107
+      "__id__": 74
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 119
+      "__id__": 86
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2670,15 +1862,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 107
+      "__id__": 74
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 121
+      "__id__": 88
     },
     "clickEvents": [
       {
-        "__id__": 122
+        "__id__": 89
       }
     ],
     "_interactable": true,
@@ -2730,7 +1922,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 107
+      "__id__": 74
     },
     "_id": ""
   },
@@ -2763,7 +1955,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "升星-001",
+    "_name": "魂",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -2771,31 +1963,82 @@
     },
     "_children": [
       {
-        "__id__": 125
+        "__id__": 92
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 133
+        "__id__": 114
       },
       {
-        "__id__": 135
-      },
-      {
-        "__id__": 137
-      },
-      {
-        "__id__": 140
+        "__id__": 116
       }
     ],
     "_prefab": {
-      "__id__": 142
+      "__id__": 118
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 225,
-      "y": -309.485,
+      "x": 114.942,
+      "y": 18.459,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "内容",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 91
+    },
+    "_children": [
+      {
+        "__id__": 93
+      },
+      {
+        "__id__": 101
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 109
+      },
+      {
+        "__id__": 111
+      }
+    ],
+    "_prefab": {
+      "__id__": 113
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -2824,30 +2067,30 @@
   {
     "__type__": "cc.Node",
     "_name": "Label",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 124
+      "__id__": 92
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 126
+        "__id__": 94
       },
       {
-        "__id__": 128
+        "__id__": 96
       },
       {
-        "__id__": 130
+        "__id__": 98
       }
     ],
     "_prefab": {
-      "__id__": 132
+      "__id__": 100
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -10.0615234375,
       "y": 0,
       "z": 0
     },
@@ -2880,594 +2123,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 125
+      "__id__": 93
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 127
+      "__id__": 95
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "c6dzj7a/hK060jY0kgYhrv"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 125
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 129
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "ALL",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 1,
-    "_enableWrapText": false,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": true,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0eILyMqrtIIbd6dBeZhjnR"
-  },
-  {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 125
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 131
-    },
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_width": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0cYRdtJT5Ia5ZwI4a4gfOa"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "e6uWMFnopAbKPKYdwYzrSt",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 124
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 134
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 60,
-      "height": 60
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ecFw3k4kBMBLFJBJ/2hlAf"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 124
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 136
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 1,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "f2rDoZX4dHC6gpxDG3ix0k"
-  },
-  {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 124
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 138
-    },
-    "clickEvents": [
-      {
-        "__id__": 139
-      }
-    ],
-    "_interactable": true,
-    "_transition": 3,
-    "_normalColor": {
-      "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
-      "a": 255
-    },
-    "_hoverColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_pressedColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_normalSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_hoverSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_pressedSprite": {
-      "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_disabledSprite": {
-      "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 124
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "f0emQR4/pI7pKScgtfkNbK"
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "f8ba4N+bqdD84IUK5j+GSAq",
-    "handler": "onClickAll",
-    "customEventData": ""
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 124
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 141
-    },
-    "_alignFlags": 32,
-    "_target": null,
-    "_left": 0,
-    "_right": 20,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "15IyPJQr9C+rzy/v8RoDan"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "59hgxQA0tEpbYrqopODbWf",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "主动吞噬宠物",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [
-      {
-        "__id__": 144
-      },
-      {
-        "__id__": 150
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 158
-      },
-      {
-        "__id__": 160
-      },
-      {
-        "__id__": 162
-      }
-    ],
-    "_prefab": {
-      "__id__": 165
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -228.169,
-      "y": -310.378,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Checkmark",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 143
-    },
-    "_children": [],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 145
-      },
-      {
-        "__id__": 147
-      }
-    ],
-    "_prefab": {
-      "__id__": 149
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 144
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 146
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 26,
-      "height": 26
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "edutU3mGxB1Kwg+z00tSXd"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 144
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 148
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "158e7e52-3220-4cd7-9694-713e0e6e8278@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "2fIU3cXWxDQYiTDSu+3KyJ"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "cc89pkOEZFWYgpdUlcSPrF",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Label",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 143
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 151
-      },
-      {
-        "__id__": 153
-      },
-      {
-        "__id__": 155
-      }
-    ],
-    "_prefab": {
-      "__id__": 157
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 23.875,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 150
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 152
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 211.79296875,
+      "width": 30.66015625,
       "height": 54.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0,
+      "x": 0.5,
       "y": 0.5
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "0cS5AJcMVIVbsJLnEVKKcb"
+    "fileId": "19Pa9ntnVLcqPAxV6xBBEm"
   },
   {
     "__type__": "cc.Label",
@@ -3475,11 +2151,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 150
+      "__id__": 93
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 154
+      "__id__": 97
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3491,7 +2167,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "是否主动吞噬 0 星 宠物",
+    "_string": "魂:",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 20,
@@ -3512,7 +2188,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "58bYyo8BVJl66rlOOQA5Fg"
+    "fileId": "6474f2qgNCxr9KWD/qbgkc"
   },
   {
     "__type__": "cc.LabelOutline",
@@ -3520,11 +2196,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 150
+      "__id__": 93
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 156
+      "__id__": 99
     },
     "_color": {
       "__type__": "cc.Color",
@@ -3538,7 +2214,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f4IkouWdRAPqxACtqQi5Sm"
+    "fileId": "7dvxSj8wRIToQ1025nzKe5"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3548,27 +2224,80 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "fb76U7zyBMu77r84nqvnfK",
+    "fileId": "98e7S8UKFAk5YTj74jveDu",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label-001",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 92
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 102
+      },
+      {
+        "__id__": 104
+      },
+      {
+        "__id__": 106
+      }
+    ],
+    "_prefab": {
+      "__id__": 108
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 17.830078125,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 143
+      "__id__": 101
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 159
+      "__id__": 103
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 28,
-      "height": 28
+      "width": 15.123046875,
+      "height": 54.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3579,19 +2308,19 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "c0gJrrqNRHg4XdhNrMJyNN"
+    "fileId": "af2+Z1PAhGKLuBsKSB6n3c"
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 143
+      "__id__": 101
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 161
+      "__id__": 105
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3603,13 +2332,204 @@
       "b": 255,
       "a": 255
     },
+    "_string": "0",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4aSdu/MSxJVpHGPt7D2HMq"
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 101
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 107
+    },
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "74tsbMRT5HDL4XSXjlZHSe"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "b8Hk9ntpJHHb0cntuxc2zq",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 92
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 110
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 50.783203125,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "cahqWPdGVGZ6zayY+yak15"
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 92
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 112
+    },
+    "_resizeMode": 1,
+    "_layoutType": 1,
+    "_cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_startAxis": 0,
+    "_paddingLeft": 0,
+    "_paddingRight": 0,
+    "_paddingTop": 0,
+    "_paddingBottom": 0,
+    "_spacingX": 5,
+    "_spacingY": 0,
+    "_verticalDirection": 1,
+    "_horizontalDirection": 0,
+    "_constraint": 0,
+    "_constraintNum": 2,
+    "_affectedByScale": false,
+    "_isAlign": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c9+HS8vwFFNpi1pNpIIpvT"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "627CUwJqJHUIwnHwigGbUL",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 91
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 115
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 150,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "abg1ZL399HUIFoKPxXR1b4"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 91
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 117
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
     "_spriteFrame": {
-      "__uuid__": "11bdc4b0-64a8-4eb7-a2a7-9fb9e233e977@f9941",
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3624,19 +2544,215 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "dboDNzKTZDhbFasr2/lowH"
+    "fileId": "baotOwTGFMg6xHIU03bH5w"
   },
   {
-    "__type__": "cc.Toggle",
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "4aCODO+yJNJqE3v9G6/ooc",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Slider",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 120
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 128
+      },
+      {
+        "__id__": 130
+      },
+      {
+        "__id__": 132
+      }
+    ],
+    "_prefab": {
+      "__id__": 135
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 114.942,
+      "y": -38.303,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Handle",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 119
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 121
+      },
+      {
+        "__id__": 123
+      },
+      {
+        "__id__": 125
+      }
+    ],
+    "_prefab": {
+      "__id__": 127
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -140,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 143
+      "__id__": 120
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 163
+      "__id__": 122
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 32,
+      "height": 32
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5dpHw5sW1DDK0g8Lj2usQb"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 120
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 124
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "f12a23c4-b924-4322-a260-3d982428f1e8@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c3VF4M0u5DSIrW8JP4fqIs"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 120
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 126
     },
     "clickEvents": [],
     "_interactable": true,
@@ -3670,7 +2786,7 @@
       "a": 255
     },
     "_normalSprite": {
-      "__uuid__": "11bdc4b0-64a8-4eb7-a2a7-9fb9e233e977@f9941",
+      "__uuid__": "f12a23c4-b924-4322-a260-3d982428f1e8@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_hoverSprite": null,
@@ -3679,22 +2795,127 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 143
-    },
-    "checkEvents": [
-      {
-        "__id__": 164
-      }
-    ],
-    "_isChecked": false,
-    "_checkMark": {
-      "__id__": 147
+      "__id__": 120
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "08CaQ9IvFL9640k2qkUBoQ"
+    "fileId": "137cdZbgBIko0LROhCFfop"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "57BIWzHztMwYk62eyDgUYZ",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 119
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 129
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 280,
+      "height": 20
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "61sYi4NtxL5baK0kMbX+My"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 119
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 131
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "28765e2f-040a-4c65-8e8c-f9d0bb79d863@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "93xqBEOQFKm4Q0ClKE7hdG"
+  },
+  {
+    "__type__": "cc.Slider",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 119
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 133
+    },
+    "slideEvents": [
+      {
+        "__id__": 134
+      }
+    ],
+    "_handle": {
+      "__id__": 123
+    },
+    "_direction": 0,
+    "_progress": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "17G7FnF3dC7ZeUEyMWd0lF"
   },
   {
     "__type__": "cc.ClickEvent",
@@ -3703,7 +2924,7 @@
     },
     "component": "",
     "_componentId": "f8ba4N+bqdD84IUK5j+GSAq",
-    "handler": "onClickEngulfToggle",
+    "handler": "onSliderMove",
     "customEventData": ""
   },
   {
@@ -3714,7 +2935,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "d0DZ2qqchC74h/KCryK3cD",
+    "fileId": "57San190RCpqFfHEhM0G2H",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3729,12 +2950,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 167
+      "__id__": 137
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 550,
-      "height": 700
+      "height": 400
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3757,7 +2978,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 169
+      "__id__": 139
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3802,7 +3023,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 171
+      "__id__": 141
     },
     "_id": ""
   },
@@ -3833,7 +3054,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 174
+      "__id__": 144
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3861,7 +3082,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 176
+      "__id__": 146
     },
     "_alignFlags": 45,
     "_target": null,
@@ -3897,14 +3118,11 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 178
+      "__id__": 148
     },
     "mask": true,
     "maskOpcity": 80,
     "isClickMaskeClose": true,
-    "views": {
-      "__id__": 79
-    },
     "petNameLabel": {
       "__id__": 7
     },
@@ -3920,8 +3138,12 @@
     "viewPetExpProgress": {
       "__id__": 31
     },
-    "isEngulfToggle": {
-      "__id__": 162
+    "petPreview": null,
+    "slider": {
+      "__id__": 132
+    },
+    "qsLabel": {
+      "__id__": 104
     },
     "_id": ""
   },
@@ -3939,6 +3161,37 @@
     },
     "fileId": "08xLpDDa9NlK3pgR7XiOqb",
     "instance": null,
-    "targetOverrides": null
+    "targetOverrides": [
+      {
+        "__id__": 150
+      }
+    ],
+    "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 63
+      }
+    ]
+  },
+  {
+    "__type__": "cc.TargetOverrideInfo",
+    "source": {
+      "__id__": 147
+    },
+    "sourceInfo": null,
+    "propertyPath": [
+      "petPreview"
+    ],
+    "target": {
+      "__id__": 63
+    },
+    "targetInfo": {
+      "__id__": 151
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "bc8qV/Jc9CToUMI6ap2Chd"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab
index 7c8274ce..fa04a6c1 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab
@@ -25,17 +25,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 121
+        "__id__": 104
       },
       {
-        "__id__": 123
+        "__id__": 106
       },
       {
-        "__id__": 125
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 127
+      "__id__": 110
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -79,26 +79,26 @@
         "__id__": 3
       },
       {
-        "__id__": 51
+        "__id__": 34
       },
       {
-        "__id__": 95
+        "__id__": 78
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 114
+        "__id__": 97
       },
       {
-        "__id__": 116
+        "__id__": 99
       },
       {
-        "__id__": 118
+        "__id__": 101
       }
     ],
     "_prefab": {
-      "__id__": 120
+      "__id__": 103
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -143,22 +143,19 @@
       },
       {
         "__id__": 12
-      },
-      {
-        "__id__": 29
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 29
       },
       {
-        "__id__": 48
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 33
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -265,7 +262,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -134.352,
+      "x": -146.352,
       "y": -148.623,
       "z": 0
     }
@@ -331,8 +328,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 55.335,
-      "y": -250,
+      "x": 108.301,
+      "y": -246.74,
       "z": 0
     },
     "_lrot": {
@@ -693,398 +690,6 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "升级",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 3
-    },
-    "_children": [
-      {
-        "__id__": 30
-      }
-    ],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 38
-      },
-      {
-        "__id__": 40
-      },
-      {
-        "__id__": 42
-      }
-    ],
-    "_prefab": {
-      "__id__": 45
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 185.335,
-      "y": -250,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Label",
-    "_objFlags": 512,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 29
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 31
-      },
-      {
-        "__id__": 33
-      },
-      {
-        "__id__": 35
-      }
-    ],
-    "_prefab": {
-      "__id__": 37
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 30
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 32
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 120,
-      "height": 50
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "17cEJcA/RL34duWdqZTKpA"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 30
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 34
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "升级",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 24,
-    "_fontSize": 24,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 1,
-    "_enableWrapText": false,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": true,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "00FWHQq+VAr54r5EOahUvg"
-  },
-  {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 30
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 36
-    },
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_width": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "25cEjjThFN9I+wCFe0XNg/"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "13t7VoUf9DFKfa/JKDLMfc",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 29
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 39
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 120,
-      "height": 50
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "41HcT5BDRE7aYf/wbXKdMw"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 29
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 41
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 1,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "3fiav4BuhNxaAaG+oIySYE"
-  },
-  {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 29
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 43
-    },
-    "clickEvents": [
-      {
-        "__id__": 44
-      }
-    ],
-    "_interactable": true,
-    "_transition": 3,
-    "_normalColor": {
-      "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
-      "a": 255
-    },
-    "_hoverColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_pressedColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_normalSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_hoverSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_pressedSprite": {
-      "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_disabledSprite": {
-      "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 29
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "fa5nC7a5pDGqdZj5V01Y4g"
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "00e5fiwk55OFq7ZIZmksXGJ",
-    "handler": "onClickUpLevel",
-    "customEventData": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "b4o2Km/8BEz6xYUVBCwUVg",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -1095,7 +700,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 30
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1123,7 +728,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 32
     },
     "_alignFlags": 41,
     "_target": null,
@@ -1172,29 +777,29 @@
     },
     "_children": [
       {
-        "__id__": 52
+        "__id__": 35
       },
       {
-        "__id__": 70
+        "__id__": 53
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 88
+        "__id__": 71
       },
       {
-        "__id__": 90
+        "__id__": 73
       },
       {
-        "__id__": 92
+        "__id__": 75
       },
       {
-        "__id__": 85
+        "__id__": 68
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 77
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1231,30 +836,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 51
+      "__id__": 34
     },
     "_children": [
       {
-        "__id__": 53
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 44
       },
       {
-        "__id__": 63
+        "__id__": 46
       },
       {
-        "__id__": 65
+        "__id__": 48
       },
       {
-        "__id__": 67
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 52
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1291,23 +896,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 52
+      "__id__": 35
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 37
       },
       {
-        "__id__": 56
+        "__id__": 39
       },
       {
-        "__id__": 58
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 43
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1344,11 +949,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 38
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1372,11 +977,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 40
     },
     "_resizeMode": 1,
     "_layoutType": 3,
@@ -1410,11 +1015,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 42
     },
     "_alignFlags": 40,
     "_target": null,
@@ -1459,11 +1064,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 45
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1487,11 +1092,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 47
     },
     "_type": 0,
     "_inverted": false,
@@ -1509,11 +1114,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 49
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1555,11 +1160,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 51
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1604,30 +1209,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 51
+      "__id__": 34
     },
     "_children": [
       {
-        "__id__": 71
+        "__id__": 54
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 77
+        "__id__": 60
       },
       {
-        "__id__": 79
+        "__id__": 62
       },
       {
-        "__id__": 81
+        "__id__": 64
       },
       {
-        "__id__": 83
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 70
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1664,20 +1269,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 70
+      "__id__": 53
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 55
       },
       {
-        "__id__": 74
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 59
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1714,11 +1319,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 54
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1742,11 +1347,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 54
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 58
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1800,11 +1405,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 61
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1828,11 +1433,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 63
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1873,11 +1478,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 82
+      "__id__": 65
     },
     "_alignFlags": 37,
     "_target": null,
@@ -1909,17 +1514,17 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 84
+      "__id__": 67
     },
     "_scrollView": {
-      "__id__": 85
+      "__id__": 68
     },
     "_handle": {
-      "__id__": 74
+      "__id__": 57
     },
     "_direction": 1,
     "_enableAutoHide": true,
@@ -1936,11 +1541,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 86
+      "__id__": 69
     },
     "bounceDuration": 0.23,
     "brake": 0.75,
@@ -1951,11 +1556,11 @@
     "cancelInnerEvents": true,
     "scrollEvents": [],
     "_content": {
-      "__id__": 53
+      "__id__": 36
     },
     "_horizontalScrollBar": null,
     "_verticalScrollBar": {
-      "__id__": 83
+      "__id__": 66
     },
     "itemPrefab": {
       "__uuid__": "b4e0f464-dc9f-463d-a392-7cc192779285",
@@ -1986,11 +1591,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 72
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2014,11 +1619,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 74
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2059,11 +1664,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 76
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2112,26 +1717,26 @@
     },
     "_children": [
       {
-        "__id__": 96
+        "__id__": 79
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 104
+        "__id__": 87
       },
       {
-        "__id__": 106
+        "__id__": 89
       },
       {
-        "__id__": 108
+        "__id__": 91
       },
       {
-        "__id__": 111
+        "__id__": 94
       }
     ],
     "_prefab": {
-      "__id__": 113
+      "__id__": 96
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2168,23 +1773,23 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 95
+      "__id__": 78
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 97
+        "__id__": 80
       },
       {
-        "__id__": 99
+        "__id__": 82
       },
       {
-        "__id__": 101
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 103
+      "__id__": 86
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2221,11 +1826,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 96
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 98
+      "__id__": 81
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2249,11 +1854,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 96
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 83
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2294,11 +1899,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 96
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 102
+      "__id__": 85
     },
     "_color": {
       "__type__": "cc.Color",
@@ -2333,11 +1938,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 95
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 105
+      "__id__": 88
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2361,11 +1966,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 95
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 107
+      "__id__": 90
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2406,15 +2011,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 95
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 109
+      "__id__": 92
     },
     "clickEvents": [
       {
-        "__id__": 110
+        "__id__": 93
       }
     ],
     "_interactable": true,
@@ -2466,7 +2071,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 95
+      "__id__": 78
     },
     "_id": ""
   },
@@ -2490,11 +2095,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 95
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 112
+      "__id__": 95
     },
     "_alignFlags": 4,
     "_target": null,
@@ -2543,7 +2148,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 115
+      "__id__": 98
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2571,7 +2176,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 117
+      "__id__": 100
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2616,7 +2221,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 119
+      "__id__": 102
     },
     "_id": ""
   },
@@ -2647,7 +2252,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 122
+      "__id__": 105
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2675,7 +2280,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 124
+      "__id__": 107
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2711,17 +2316,17 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 126
+      "__id__": 109
     },
     "mask": true,
     "maskOpcity": 80,
     "isClickMaskeClose": true,
     "views": {
-      "__id__": 85
+      "__id__": 68
     },
     "petPreview": null,
     "tacticalLabel": {
-      "__id__": 99
+      "__id__": 82
     },
     "_id": ""
   },
@@ -2741,7 +2346,7 @@
     "instance": null,
     "targetOverrides": [
       {
-        "__id__": 128
+        "__id__": 111
       }
     ],
     "nestedPrefabInstanceRoots": [
@@ -2753,7 +2358,7 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 125
+      "__id__": 108
     },
     "sourceInfo": null,
     "propertyPath": [
@@ -2763,7 +2368,7 @@
       "__id__": 4
     },
     "targetInfo": {
-      "__id__": 129
+      "__id__": 112
     }
   },
   {
diff --git a/JisolGameCocos/assets/script/App.ts b/JisolGameCocos/assets/script/App.ts
index 5b024b25..54d03da9 100644
--- a/JisolGameCocos/assets/script/App.ts
+++ b/JisolGameCocos/assets/script/App.ts
@@ -28,12 +28,12 @@ import AppAction from "./AppAction";
 import { Asset } from "cc";
 import { Component } from "cc";
 
-// let APIPath = `http://localhost:8080`
-// let WsPath = `ws://localhost:8080/websocket`
+let APIPath = `http://localhost:8080`
+let WsPath = `ws://localhost:8080/websocket`
 // let APIPath = `http://192.168.1.23:8080`
 // let WsPath = `ws://192.168.1.23:8080/websocket`
-let APIPath = `http://192.168.0.118:8080`
-let WsPath = `ws://192.168.0.118:8080/websocket`
+// let APIPath = `http://192.168.0.118:8080`
+// let WsPath = `ws://192.168.0.118:8080/websocket`
 // let APIPath = `https://api.pet.jisol.cn`
 // let WsPath = `wss://api.pet.jisol.cn/websocket`
 
diff --git a/JisolGameCocos/assets/script/consts/API.ts b/JisolGameCocos/assets/script/consts/API.ts
index 2a1d2ebe..8c14ee7b 100644
--- a/JisolGameCocos/assets/script/consts/API.ts
+++ b/JisolGameCocos/assets/script/consts/API.ts
@@ -153,9 +153,7 @@ export const API = {
     /********** 宠物接口 ******************/
     GetPlayerPets: async () => RData(await app.api.get(`/game/pet/list`),false) as PlayerPetOV[],   //获取玩家全部宠物  
     //petId 需合成的Id  pets 被合成的Id列表
-    PetUpStar: async (petId:number,pets:number[]) => RData(await app.api.post(`/game/pet/up/star`,{petId,pets}),true) as PlayerPetOV,     //提升宠物星
-    //petId 升级的宠物Id
-    PetUpLevel: async (petId:number) => RData(await app.api.post(`/game/pet/up/level/${petId}`),true) as PlayerPetOV,      //升级宠物
+    PetUpStar: async (petId:number,consume:number) => RData(await app.api.post(`/game/pet/up/star/${petId}/${consume}`),true) as PlayerPetOV,     //提升宠物星
 
     /********** 阵法接口 ******************/
     GetPlayerTactical: async () => RData(await app.api.get(`/game/tactical/get`),false) as PlayerTacticalOV, //获取玩家阵法
diff --git a/JisolGameCocos/assets/script/consts/GAPI.ts b/JisolGameCocos/assets/script/consts/GAPI.ts
index ecf66be1..7624b35a 100644
--- a/JisolGameCocos/assets/script/consts/GAPI.ts
+++ b/JisolGameCocos/assets/script/consts/GAPI.ts
@@ -26,7 +26,7 @@ export const GAPI = {
     //生成野怪
     GOnHookSpawnCreeps : async () => RProto(await app.api.get(`/game/mode/onHook/onSpawnCreeps`,{responseType:'arraybuffer'},false),GActionType.GOnHookPets) as GOnHookPets,
     //捕捉野怪
-    GOnHookCatchCreeps : async (creepId) => RData(await app.api.post(`/game/mode/onHook/onCatchCreeps/${creepId}`),true) as PlayerPetOV,
+    GOnHookCatchCreeps : async (creepId) => RData(await app.api.post(`/game/mode/onHook/onCatchCreeps/${creepId}`),true) as boolean,
     //出售野怪
     GOnHookSellCreeps : async (creepId) => RData(await app.api.post(`/game/mode/onHook/onSellCreeps/${creepId}`),true) as boolean,
     //下一关
diff --git a/JisolGameCocos/assets/script/data/PlayerPetData.ts b/JisolGameCocos/assets/script/data/PlayerPetData.ts
index 2313ef02..1ad717db 100644
--- a/JisolGameCocos/assets/script/data/PlayerPetData.ts
+++ b/JisolGameCocos/assets/script/data/PlayerPetData.ts
@@ -98,23 +98,23 @@ export default class PlayerPetData extends BaseData{
         if(operation == ResourceUpdateType.UPDATE){
             //更新资源
             //找到需要被刷新的宠物 然后刷新 找不到则添加
-            let pet = this.datas.filter(pet => pet.petId == resource.petId)[0];
-            if(pet){
+            let pet1 = this.datas.filter(pet => pet.petId == resource.petId)[0];
+            if(pet1){
                 //更新数据
-                Object.assign(pet,resource);
-                app.event.emit(PlayerPetEvent.UPDATE_INFO,pet)
+                Object.assign(pet1,resource);
+                app.event.emit(PlayerPetEvent.UPDATE_INFO,pet1)
             }else{
                 operation = ResourceUpdateType.ADD;
                 this.onUpdateOV(operation,resource);
             }
         }else if(operation == ResourceUpdateType.ADD){
             //查询如果没有这个宠物则添加 负责 刷新
-            let pet = this.datas.filter(pet => pet.petId != resource.petId)[0];
-            if(!pet){
+            let pet1 = this.datas.filter(pet => pet.petId == resource.petId)[0];
+            if(!pet1){
                 //没有则添加
                 this.datas.push(resource);
                 app.event.emit(PlayerPetEvent.UPDATE)
-                app.event.emit(PlayerPetEvent.UPDATE_ADD,pet)
+                app.event.emit(PlayerPetEvent.UPDATE_ADD,resource)
             }else{
                 operation = ResourceUpdateType.UPDATE;
                 this.onUpdateOV(operation,resource);
diff --git a/JisolGameCocos/assets/script/data/ResourceData.ts b/JisolGameCocos/assets/script/data/ResourceData.ts
index d80c8098..d40616a4 100644
--- a/JisolGameCocos/assets/script/data/ResourceData.ts
+++ b/JisolGameCocos/assets/script/data/ResourceData.ts
@@ -8,9 +8,12 @@ export enum ResourceEvent{
 
 //资源类型
 export enum ResourceType{
-    Gold = 90001,           //金币
-    ForgedStones = 90002,   //锻造石
-    SpeedUp = 90003,        //加速卷
+    Gold = 90001,                   //金币
+    ForgedStones = 90002,           //锻造石
+    SpeedUp = 90003,                //加速卷
+    DungeonGold = 90004,            //钥匙:金币副本
+    DungeonForgedStones = 90005,    //钥匙:锻造石副本
+    Q1S = 90006,                    //魂:一品宠物魂
 }
 
 //资源刷新类型
diff --git a/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts
index 23fa63b4..f4787f9c 100644
--- a/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts
+++ b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts
@@ -52,8 +52,6 @@ export default class GOnHookManager extends Singleton{
 
     //需要捕捉的宠物
     onHookCatchPets:TB.TbGRole[] = [];
-    //需要主动吞噬的宠物 (主动吞噬其他 0星 宠物 升星)
-    onHookEngulfPets:PlayerPetOV[] = [];
 
     //是否挂机
     _isOnHook:boolean = false;
@@ -93,21 +91,6 @@ export default class GOnHookManager extends Singleton{
                 await this.onSellCreeps(pet)
             }
         }
-
-        //自动吞噬
-        for (const item of this.onHookEngulfPets) {
-
-            //获取可吞噬的宠物 ( 等级0, 同类宠物, 不是自己, 不在阵法中)
-            let engulfs = PlayerPetData.getIns().getData()
-                            .filter(value => (value.petStar || 0) == 0 && item.petTbId == value.petTbId && item.petId != value.petId && PlayerTacticalData.getIns().getItemIndex(value.petId) != -1)
-                            .map(value => value.petId);
-            
-            //吞噬
-            if(engulfs.length){
-                await API.PetUpStar(item.petId,engulfs);
-            }
-            
-        }
         
     }).bind(this))
 
@@ -161,14 +144,7 @@ export default class GOnHookManager extends Singleton{
         //通知添加野怪被删除
         app.event.emit(GOnHookManagerEvent.DEL_KILL_SREEP,creeps);
 
-        let pet:PlayerPetOV = await GAPI.GOnHookCatchCreeps(creeps.key);
-
-        //保存宠物
-        if(pet){
-            PlayerPetData.getIns().addPet(pet);
-        }
-
-        return !!pet;
+        return !!await GAPI.GOnHookCatchCreeps(creeps.key);
 
     }
 
diff --git a/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts b/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts
index d4240cce..099cc015 100644
--- a/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts
+++ b/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts
@@ -4,23 +4,18 @@ import JNScrollView from '../../../../extensions/ngame/assets/ngame/util/compone
 import PlayerPetData, { PlayerPetEvent } from '../../data/PlayerPetData';
 import { API, PlayerPetOV } from '../../consts/API';
 import { PetOV, PlayerPetOVSelect } from '../VO/PetOV';
-import { PetIconSelectScroll } from '../Consts/Pet/PetIconSelectScroll';
-import { NodeEventType } from 'cc';
 import { Label } from 'cc';
 import { app, TD } from '../../App';
-import { GUI } from '../UIConfig';
-import { ProgressBar } from 'cc';
 import JProgressBar from '../../../../extensions/ngame/assets/ngame/util/components/Progress/JProgressBar';
-import { Toggle } from 'cc';
-import GOnHookManager from '../../manager/battle/mode/GOnHookManager';
+import { Slider } from 'cc';
+import ResourceData, { ResourceType } from '../../data/ResourceData';
+import { GUI } from '../UIConfig';
+import { PetPreviewWindow } from '../Consts/Pet/info/PetPreviewWindow';
 const { ccclass, property } = _decorator;
 
 @ccclass('PetUpStarView')
 export class PetUpStarView extends JNLayerBase {
 
-    @property(JNScrollView)
-    views:JNScrollView; //宠物列表
-
     @property(Label)
     petNameLabel:Label; //宠物名称
     @property(Label)
@@ -32,8 +27,27 @@ export class PetUpStarView extends JNLayerBase {
     @property(JProgressBar)
     viewPetExpProgress:JProgressBar; //预览宠物经验条
 
-    @property(Toggle)
-    isEngulfToggle:Toggle; //是否主动吞噬 0 星 宠物
+    @property(PetPreviewWindow)
+    petPreview:PetPreviewWindow; //宠物显示窗口
+
+    @property(Slider)
+    slider:Slider; //滑块
+
+    @property(Label)
+    qsLabel:Label;      //魂数量
+
+    //消耗数量
+    _consume:number = 0;
+    get consume(){
+        return Math.min(ResourceData.getIns().getValue(ResourceType.Q1S),this._consume);
+    }
+    set consume(value:number){
+        let max = ResourceData.getIns().getValue(ResourceType.Q1S);
+        this._consume = value;
+        //修正
+        this.slider.progress = this.consume / max;
+        this.qsLabel.string = `${ResourceData.getIns().getValue(ResourceType.Q1S) - this.consume}`
+    }
 
     data:PlayerPetOV;
     
@@ -45,39 +59,20 @@ export class PetUpStarView extends JNLayerBase {
 
         //监听
         app.event.on(PlayerPetEvent.UPDATE_INFO,this.onUpdateInfo,this);    //刷新宠物信息
-        app.event.on(PlayerPetEvent.UPDATE_MINUS,this.onPetMinus,this);    //减少宠物
 
     }
 
     onJNClose(): void {
         //取消监听
         app.event.off(PlayerPetEvent.UPDATE_INFO,this.onUpdateInfo,this);    //刷新宠物信息
-        app.event.off(PlayerPetEvent.UPDATE_MINUS,this.onPetMinus,this);    //减少宠物
     }
 
 
     //刷新页面
     onUpdateView(){
-
+        //显示选中宠物
+        this.petPreview.bind(this.data);
         this.onUpdateInfo();
-
-        //当前需要升星的宠物并且未上阵 并且排除自己
-        let pets = PetOV.PlayerPetOVSelects(
-            PlayerPetData.getIns().getPetIdData(
-                this.data.petTbId,                              //同一种宠物
-                PlayerPetData.getIns().getNoTacticalData()      //非上阵宠物
-                ).filter(pet => pet.petId != this.data.petId)   //排除自己
-            );
-        this.views.refreshData(pets);
-        
-        //向子节点添加点击事件
-        this.views.addItemEvent(NodeEventType.TOUCH_START,this.onClickItem.bind(this));
-
-        this.onUpdateSelect();
-
-        //更新吞噬
-        this.isEngulfToggle.isChecked = GOnHookManager.getIns().onHookEngulfPets.indexOf(this.data) >= 0;
-
     }
 
     //刷新信息
@@ -91,37 +86,15 @@ export class PetUpStarView extends JNLayerBase {
         this.petStarExp.string = `升级进度: ${upStarExp} / ${this.data.petStarExp}`;
         this.petExpProgress.value = this.data.petStar + (this.data.petStarExp / upStarExp);
 
-    }
-
-    //减少宠物
-    onPetMinus(pet:PlayerPetOV){
-        this.views.getItems<PetIconSelectScroll>().forEach(item => {
-            if(item.data.petId == pet.petId)
-                this.views.delData(item.data);
-        });
-    }
-
-    //刷新选择
-    onUpdateSelect(){
-
-        //刷新
-        this.views.getItems<PetIconSelectScroll>().forEach((item) => {
-            let data = item.data as PlayerPetOVSelect;
-            item.select.isSelect = data.isSelect;
-        })
-
-        this.onUpdatePreview();
+        this.qsLabel.string = `${ResourceData.getIns().getValue(ResourceType.Q1S) - this.consume}`
 
     }
 
     //更新预览进度条
     onUpdatePreview(){
 
-        //选择得到的经验
-        let exp = this.views.getItems<PetIconSelectScroll>().filter(item => item.select.isSelect).length;
-
         let upStarExp;
-        let petStarExp = this.data.petStarExp + exp;
+        let petStarExp = this.data.petStarExp + this.consume;
         let petStar = this.data.petStar;
 
         while(petStarExp >= (upStarExp = TD.TbGRoleUpStar.get(petStar + 1).merge)){
@@ -133,50 +106,41 @@ export class PetUpStarView extends JNLayerBase {
         this.petStarExp.string = `升级进度: ${upStarExp} / ${petStarExp}`;
         //预览进度
         this.viewPetExpProgress.value = petStar + (petStarExp / upStarExp);
+        this.qsLabel.string = `${ResourceData.getIns().getValue(ResourceType.Q1S) - this.consume}`
+
+    }
+
+    //滑动滑块
+    onSliderMove(slider: Slider){
+
+        let max = ResourceData.getIns().getValue(ResourceType.Q1S);
+        if(!max){
+            this.consume = 0;
+            return;
+        }
+        this.consume = Math.ceil(max * slider.progress);
+
+        this.onUpdatePreview();
 
     }
 
     //选择全部
     onClickAll(){
-        let pets = this.views.getData<PlayerPetOVSelect>();
-        //如果全部选择则全部取消
-        if(pets.filter(pet => pet.isSelect).length == pets.length){
-            pets.forEach(pet => pet.isSelect = false);
-        }else{
-            pets.forEach(pet => pet.isSelect = true);
-        }
-        this.onUpdateSelect();
-    }
 
-    //点击Item
-    onClickItem(index:number){
-        let pets = this.views.getData<PlayerPetOVSelect>();
-        pets[index].isSelect = !pets[index].isSelect;
-        this.onUpdateSelect();
     }
 
     //点击合成
     async onClickUp(){
 
-        //获取被合成的Id
-        let pets = this.views.getData<PlayerPetOVSelect>().filter(pet => pet.isSelect).map(pet => pet.petId);
-
-        if(pets.length <= 0){
-            app.layer.Open(GUI.Tips,{text:"请选择需要被合成的宠物"});
+        if(!this.consume){
+            app.layer.Open(GUI.Tips,{text:"拖拽进行升星吧~"})
             return;
         }
 
-        await API.PetUpStar(this.data.petId,pets);
+        await API.PetUpStar(this.data.petId,this.consume);
+        this.consume = 0;
 
     }
-
-    //点击吞噬选择
-    onClickEngulfToggle(){
-        GOnHookManager.getIns().onHookEngulfPets.splice(GOnHookManager.getIns().onHookEngulfPets.indexOf(this.data),1);
-        if(this.isEngulfToggle.isChecked){
-            GOnHookManager.getIns().onHookEngulfPets.push(this.data);
-        }
-    }
     
 }
 
diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts
index 0a1b7f8e..d3f44e24 100644
--- a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts
+++ b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts
@@ -193,17 +193,6 @@ export class IntoBattleView extends JNLayerBase {
 
     }
 
-    //点击升级
-    async onClickUpLevel(){
-        if(this.index < 0){
-            app.layer.Open(GUI.Tips,{text:"请选择宠物."})
-            return;
-        }
-        await API.PetUpLevel(this.pets[this.index].petId)
-    }
-    
-
-    
 }
 
 
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java
index ad259817..7b88cc3b 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java
@@ -1,6 +1,7 @@
 package cn.jisol.game.controller.game;
 
 import cn.jisol.game.controller.argsresolver.CurrentPlayer;
+import cn.jisol.game.data.ResourceId;
 import cn.jisol.game.data.TD;
 import cn.jisol.game.entity.table.Player;
 import cn.jisol.game.entity.table.PlayerPet;
@@ -8,7 +9,6 @@ import cn.jisol.game.service.PlayerPetService;
 import cn.jisol.game.service.ResourceService;
 import cn.jisol.game.vo.news.NewsResource;
 import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
-import cn.jisol.game.vo.pet.PetUpStarOV;
 import cn.jisol.ngame.util.NewsContext;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
@@ -23,6 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import static java.awt.SystemColor.info;
+
 /**
  * 玩家宠物
  */
@@ -54,43 +56,30 @@ public class GPlayerPetController {
     //提升宠物星
     @ApiImplicitParams({})
     @ApiOperation(value = "提升宠物星")
-    @PostMapping("/up/star")
+    @PostMapping("/up/star/{petId}/{num}")
     @Transactional
-    public NewsResource<PlayerPet> onUpStar(@RequestBody PetUpStarOV info, @CurrentPlayer Player player){
+    public NewsResource<PlayerPet> onUpStar(@CurrentPlayer Player player, @PathVariable String petId, @PathVariable Integer num){
 
         //判断参数
-        if(info.getPets().size() <= 0 || Objects.isNull(info.getPetId())){
+        if(Objects.isNull(num) || num <= 0 || Objects.isNull(petId)){
             return NewsResource.onFail("参数错误");
         }
-
-        //查询被合成的宠物列表
-        //合成数量
-        long petCount = playerPetService.count(
-                Wrappers.lambdaQuery(PlayerPet.class)
-                        .eq(PlayerPet::getPetPlayerId, player.getPlayerId())
-                        .and(qr -> {
-                            //遍历被合成的宠物
-                            info.getPets().forEach(petId -> {
-                                qr.eq(PlayerPet::getPetId, petId);
-                                qr.or();
-                            });
-                        })
-        );
-
-        if(info.getPets().size() != petCount){
-            return NewsResource.onFail("合成宠物信息错误");
-        }
+        //整理刷新数据
+        ArrayList<ResourceUpdateOV> resources = new ArrayList<>();
 
         //查询被升级的宠物
-        PlayerPet pet = playerPetService.getById(info.getPetId());
+        PlayerPet pet = playerPetService.getById(petId);
 
         //判断宠物是否是自己的
         if(!Objects.equals(pet.getPetPlayerId(), player.getPlayerId())){
             return NewsResource.onFail("宠物不是自己的");
         }
 
+        //扣除魂
+        resources.add(ResourceUpdateOV.onUpdate(resourceService.addResourceValue(player.getPlayerId(), ResourceId.Q1S.id, (long) -num)));
+
         //升级星
-        pet.setPetStarExp(pet.getPetStarExp() + info.getPets().size());
+        pet.setPetStarExp(pet.getPetStarExp() + num);
 
         //判断是否可以升下一星 如果可以则 升
         int upStarExp;
@@ -104,56 +93,11 @@ public class GPlayerPetController {
         //保存宠物信息 (保存失败则重试)
         if(!playerPetService.updateById(pet)) throw new RetryException("");
 
-        //删除被合成的宠物
-        playerPetService.removeByIds(info.getPets());
-
-        //整理刷新数据
-        ArrayList<ResourceUpdateOV> resources = new ArrayList<>();
         //刷新宠物
         resources.add(ResourceUpdateOV.onPet(ResourceUpdateOV.ResourceUpdateType.UPDATE,pet));
-        //删除被合成的宠物
-        info.getPets().forEach(item -> {
-            resources.add(ResourceUpdateOV.onPet(ResourceUpdateOV.ResourceUpdateType.MINUS,PlayerPet.builder().petId(new Long(item)).build()));
-        });
 
         return NewsResource.onSuccess("升星成功",null, resources.toArray(new ResourceUpdateOV[0]));
 
     }
 
-//    //提升宠物等级
-//    @ApiImplicitParams({})
-//    @ApiOperation(value = "提升宠物等级")
-//    @PostMapping("/up/level/{petId}")
-//    @Transactional
-//    public NewsResource<PlayerPet> onUpLevel(@PathVariable Integer petId, @CurrentPlayer Player player){
-//
-//
-//        //获取需要升级的宠物
-//        PlayerPet pet = playerPetService.getById(petId);
-//        if(Objects.isNull(pet) || !Objects.equals(pet.getPetPlayerId(), player.getPlayerId())){
-//            return NewsResource.onFail("你未拥有这个宠物");
-//        }
-//
-//        TbGRoleUpLevel resource = TD.DATA.getTbGRoleUpLevel().get(pet.getPetLevel() + 1);
-//
-//        if(Objects.isNull(resource)) return NewsResource.onFail("无法升级");
-//
-//        //星级不够则 无法升级
-//        if(pet.getPetStar() * 10 <= pet.getPetLevel()){
-//            return NewsResource.onFail("突破星级 可升级");
-//        }
-//        //扣除玩家材料
-//        ArrayList<ResourceUpdateOV> resources = new ArrayList<>(resourceService.deduct(player, resource.materials));
-//
-//        //升级
-//        pet.setPetLevel(pet.getPetLevel() + 1);
-//
-//        //保存
-//        if(!playerPetService.updateById(pet)) throw new RetryException("");
-//        resources.add(ResourceUpdateOV.onPet(ResourceUpdateOV.ResourceUpdateType.UPDATE,pet));  //刷新宠物
-//
-//        return NewsResource.onSuccess("升级成功",pet,resources.toArray(new ResourceUpdateOV[0]));
-//
-//    }
-
 }
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java
index 27e0b780..3d29b5b8 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java
@@ -22,6 +22,7 @@ import cn.jisol.game.vo.mode.ModeOnHookRankingOV;
 import cn.jisol.game.vo.news.NewsResource;
 import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
 import cn.jisol.ngame.util.NewsContext;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -228,7 +229,7 @@ public class GOnHookController {
     @ApiImplicitParams({})
     @ApiOperation(value = "捕捉野怪")
     @PostMapping("/onCatchCreeps/{creepId}")
-    public NewsContext<PlayerPet> onCatchCreeps(@PathVariable String creepId,@CurrentPlayer Player player){
+    public NewsResource<Boolean> onCatchCreeps(@PathVariable String creepId,@CurrentPlayer Player player){
 
         //(目前测试阶段 捕捉概率 100%)
 
@@ -238,22 +239,22 @@ public class GOnHookController {
         //如果没有则生成类
         if(Objects.isNull(creeps)){
             CREEPS.put(player.getPlayerId(),creeps = new HashMap<>());
-            return NewsContext.onFail("捕捉失败");
+            return NewsResource.onFail("捕捉失败",false);
         }
 
         GOnHookMessage.GOnHookPet onHookPet;
         if(Objects.isNull(onHookPet = creeps.remove(creepId))){
-            return NewsContext.onFail("捕捉失败");
+            return NewsResource.onFail("捕捉失败",false);
         }
 
         //捕捉
         PlayerPet pet = PlayerPet.builder().petPlayerId(player.getPlayerId()).petTbId(onHookPet.getPetTbId()).build();
-        if(playerPetService.save(pet)){
-            return NewsContext.onSuccess("捕捉成功",pet);
+        ResourceUpdateOV ov = playerPetService.addPlayerPet(player, pet);
+        if (Objects.nonNull(ov)){
+            return NewsResource.onSuccess("捕捉成功",true,ov);
         }else{
-            return NewsContext.onFail("捕捉失败");
+            return NewsResource.onSuccess("捕捉失败",false);
         }
-
     }
 
     //排行榜
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/data/ResourceId.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/data/ResourceId.java
index a0865fef..bc05d0f0 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/data/ResourceId.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/data/ResourceId.java
@@ -8,6 +8,12 @@ public enum ResourceId {
     ForgedStones(90002),
     //加速卷
     SpeedUp(90003),
+    //钥匙:金币副本
+    DungeonGold(90004),
+    //钥匙:锻造石副本
+    DungeonForgedStones(90005),
+    //魂:一品宠物魂
+    Q1S(90006),
     ;
 
     public int id;
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerPetService.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerPetService.java
index 845a7886..050b89bf 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerPetService.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/PlayerPetService.java
@@ -1,8 +1,13 @@
 package cn.jisol.game.service;
 
+import cn.jisol.game.entity.table.Player;
 import cn.jisol.game.entity.table.PlayerPet;
+import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface PlayerPetService extends IService<PlayerPet> {
 
+    //给指定的玩家添加宠物
+    ResourceUpdateOV addPlayerPet(Player player, PlayerPet pet);
+
 }
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerPetServiceImpl.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerPetServiceImpl.java
index 96786822..2960f458 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerPetServiceImpl.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/PlayerPetServiceImpl.java
@@ -1,12 +1,40 @@
 package cn.jisol.game.service.impl;
 
+import cn.jisol.game.data.ResourceId;
+import cn.jisol.game.entity.table.Player;
 import cn.jisol.game.entity.table.PlayerPet;
+import cn.jisol.game.entity.table.Resource;
 import cn.jisol.game.mapper.PlayerPetMapper;
 import cn.jisol.game.service.PlayerPetService;
+import cn.jisol.game.service.ResourceService;
+import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class PlayerPetServiceImpl extends ServiceImpl<PlayerPetMapper, PlayerPet> implements PlayerPetService {
 
+    @Autowired
+    ResourceService resourceService;
+
+    @Override
+    public ResourceUpdateOV addPlayerPet(Player player, PlayerPet pet) {
+
+        //是否有这个宠物
+        long count = this.count(Wrappers.lambdaQuery(PlayerPet.class)
+                .eq(PlayerPet::getPetPlayerId,player.getPlayerId())
+                .eq(PlayerPet::getPetTbId,pet.getPetTbId()));
+
+        if(count > 0){
+            //如果有这个宠物则转换成材料
+            return ResourceUpdateOV.onUpdate(resourceService.addResourceValue(player.getPlayerId(),ResourceId.Q1S.id, 1L));
+        }else{
+            if (this.save(pet)){
+                return ResourceUpdateOV.onPet(ResourceUpdateOV.ResourceUpdateType.ADD,pet);
+            }
+            return null;
+        }
+    }
 }
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java
deleted file mode 100644
index aa6896c6..00000000
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/PetUpStarOV.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.jisol.game.vo.pet;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
-import lombok.Data;
-
-import java.util.ArrayList;
-
-@ApiModel(value = "升星请求体")
-@Builder
-@Data
-public class PetUpStarOV {
-
-    @ApiModelProperty(value = "需要升级的宠物Id", required = true)
-    private Integer petId;
-
-    @ApiModelProperty(value = "被吸收的宠物列表", required = true)
-    ArrayList<Integer> pets;
-
-}
diff --git a/JisolGameServer/Main/src/main/resources/json/tbgresource.json b/JisolGameServer/Main/src/main/resources/json/tbgresource.json
index efc4cb55..90315e3c 100644
--- a/JisolGameServer/Main/src/main/resources/json/tbgresource.json
+++ b/JisolGameServer/Main/src/main/resources/json/tbgresource.json
@@ -28,5 +28,11 @@
     "name": "钥匙:锻造石副本",
     "tig": "锻造石副本的钥匙",
     "args": ""
+  },
+  {
+    "id": 90006,
+    "name": "魂:一品宠物魂",
+    "tig": "用于宠物升星",
+    "args": ""
   }
 ]
\ No newline at end of file
diff --git a/JisolGameServer/Main/src/main/resources/json/tbgroleupstar.json b/JisolGameServer/Main/src/main/resources/json/tbgroleupstar.json
index 6edcb88e..12a6662d 100644
--- a/JisolGameServer/Main/src/main/resources/json/tbgroleupstar.json
+++ b/JisolGameServer/Main/src/main/resources/json/tbgroleupstar.json
@@ -38,5 +38,85 @@
   {
     "grade": 10,
     "merge": 512
+  },
+  {
+    "grade": 11,
+    "merge": 1024
+  },
+  {
+    "grade": 12,
+    "merge": 2048
+  },
+  {
+    "grade": 13,
+    "merge": 4096
+  },
+  {
+    "grade": 14,
+    "merge": 8192
+  },
+  {
+    "grade": 15,
+    "merge": 16384
+  },
+  {
+    "grade": 16,
+    "merge": 32768
+  },
+  {
+    "grade": 17,
+    "merge": 65536
+  },
+  {
+    "grade": 18,
+    "merge": 131072
+  },
+  {
+    "grade": 19,
+    "merge": 262144
+  },
+  {
+    "grade": 20,
+    "merge": 524288
+  },
+  {
+    "grade": 21,
+    "merge": 1048576
+  },
+  {
+    "grade": 22,
+    "merge": 2097152
+  },
+  {
+    "grade": 23,
+    "merge": 4194304
+  },
+  {
+    "grade": 24,
+    "merge": 8388608
+  },
+  {
+    "grade": 25,
+    "merge": 16777216
+  },
+  {
+    "grade": 26,
+    "merge": 33554432
+  },
+  {
+    "grade": 27,
+    "merge": 67108864
+  },
+  {
+    "grade": 28,
+    "merge": 134217728
+  },
+  {
+    "grade": 29,
+    "merge": 268435456
+  },
+  {
+    "grade": 30,
+    "merge": 536870912
   }
 ]
\ No newline at end of file