From 053de388f218046cd0d8c69b541bc23df3229232 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 14 Jan 2022 14:52:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A5=9E=E5=B0=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/HeroAtlas/r_hero_jineng_tian.png | Bin 0 -> 12379 bytes .../HeroAtlas/r_hero_jineng_tian.png.meta | 110 +++ .../r_tongyong_shenhun_icon.png.meta | 26 +- .../Prefabs/UI/Popup/SkillInfoPopup.prefab | 96 -- .../UI/Recruit/SingleRecruitPanel.prefab | 856 ++++++++++-------- .../Prefabs/UI/RoleInfo/RoleInfoLayout.prefab | 84 +- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 28 +- .../~Lua/Common/GlobalDefine.lua | 3 +- .../~Lua/Modules/Popup/SkillInfoPopup.lua | 2 - .../Modules/Recruit/SingleRecruitPanel.lua | 8 +- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 15 +- 11 files changed, 718 insertions(+), 510 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png create mode 100644 Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png.meta diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png new file mode 100644 index 0000000000000000000000000000000000000000..353675df65290c1eca4c479ecc37e3b0b02f459e GIT binary patch literal 12379 zcmV-hFr?3kP)j&;8g_mVG%)47G+m~i*VVDD6**t zggp?lk_`yilSwj3X3H!+J-t`ga?bypQ`J445Hz{}|6HH{xtuU`cXd@))%Tund%y1# zqLjk_<}vxnXO8Ud5&MS#NSWXefQ$wBMr#vzB@uK&_-3~#LT5S)FL&&-_bU@M#TJYY zRlo~hIqQ(85&u`Ca%2PZKZ61=OaufVfCY3!+%VofFMv6`fjB4# zDb%tIYFGrjWQpqlMhqMI*7r-3eU~0mooxOh6tn+;s z;MP?u|AvU*W!ots1Q5b`YH2`02SV9D4kwn;2vA2bz5wQ*4T}PG`~_fy5wYA``g#(U zD1u-@l|`&-N{lE4lOhmv*sXShfcDdZrO{l0U{wOZ7{DS&eCjWN`DcT<5dniN%Q&Cc zFo=S>va@S6xkkhG@>Xzkjqt8G3qSi5A+mlS6 zaAI5AnMF|87*`R&XEwK-uA6$Zq)5TR!9gjL%PB|{T!276l&tH#-p`f97r-2P2mr_f z0u6u*N3g0k52lB!*7WSJIe*5{7uQ9jUz^iV7diOINfqI0EK3ti!*V5uhCPLJ29ca@ zfe9f1P!8Cc0DSkTNeBM~b|%Faz5 zeNtO1ZVd(@=5;|`WdsELS!2@}@B>ynp^paoI}pX~l#&bpH8o1pUQrU#nLI(VXdzkP ztN=oo>&JWhI-oHSgfZdJ$OSyKkiz7^63p~xeR3|D>R*C4B$1}yyg1<(}m^WP8!H^A3VJ&E4;*kfV{b_g9q06w}y;PIlztz@$~ z^x9J|=H6Ynkg;*-rsWnzqAh$X09bg03L@B!XPD4QIb}355ADws0Z*vu2#|zzpWHzfY+J+tVs}6oNb{5gdEUhPH4wHe@9$al`*k0U{=tmt{Q3)~35xjn zUSM1(P|=Z&d#Pq-n*7n$JLjEn*?F(Oep|}W;$Sf(%9v@UIZSBSg8NpjgWFD+X^ZOd z)f_aq=|lnDaL28fQnnXZ_uYCs9TBCi5VyTy(b6Zu7LFy@?-?kxD0n7F>|_GSmOXWZ zQ%>cv%VU62(*~1oBZLD^*gs@)M`PSd*Hz_KED10R&7ShyoHY z%=WCqd)jxZp{lAD#%F!HVr9qVc_*D?6mt84m~qMDtN+I%kH0nMmKO}_T+b6zegD)b zU3K5j@gvvYNva6u}^l>EiF5-{8Mz+MpJ{Gfe`- zG=W+MP+|Zf2IFvTzr*b@b%4SU8GP2~_WA29fLbk|i{JU<>-OIJ^6Sr109i})ysHL+ zF+Ck$>WNlOH(Zf3l1lY>ndb9uGQ5op?7CU?y1IUR+6C<#ghLJHp-mDH4dWQi)Xx9y zmrl9x)bVYuI~T7Qcy9B?c1cpB7mjHTU)a_b-H^@=+`Me%A}gDFx3#KfD4rN3o7 zMA$`5V1w0*Oh+O-)b;^o@b<^;Q zs=F$aNm=RPl)7uj4m|6ui|#Ju2KN^7T388HG`Fu_{A6+{-gV3w=X?wMDvlZoPHjPK z?qLj^z7jEn%-)P_r3VF?+mDcyVKi#dyyWxAUFS>5^ zK;Lp|SWL~cSd}c0F?H%QpAXDJN=tzh8nH+vu*#1t+O?t<@y|@)#D3+VIKm|bN8omV z#Q`YRiumsq&7n1-iC{WG8QamaST+WP8vIA2@qZ{w7kyyO{nAOXWMW89rLw-}36m}t zRL@vb%k?8ks>`L4B+xK^CNT|)Wmzl??%m{#)sHeF<7>rSw~kc5WGWGaIXI3vMF3K! z%g|H3Lj+*~SBwf{YEp!OT7rTpSQHsKUDq`;HQe93VcV`ZGKOEvnRLgR?%wSfiy}i% z!dNs2$)D8HEPm3puXmKkJK=k$obam$maV;GM}OZ3_5J|q%VaYJff`5>;9mmsHl-!a z_>4CyPescj0qlTx@P5Q`=vL8OIY1Q=W!Hk8sJK{h6^IQWcFZ34?~V_rJWR6SyKM^k z%~KC3rfK*aMvXegvMkrGE!+G2;m9eKO{3=A&LUcBx^WmwtxpD%h3E8p=8RO_bitw zrZGkTXGe3a?}3M#sdYPwm~)7yh3MRr#-*H3%>`Ip!Bb}eW>cHZm>v4*-)qfb5m z%SnZ>v>iyp6t6w0xac9%*9D9I@CSaa?mz%0pLGs|>KpiE(LGg|h5b@01;cFegrZQ; zEgrI)gaVR-7zI4;_?8!X{`8CAz9hFz?Dl`{A~Wa}Wok$+uZlc)iO;$Wx_sK_)zADgfdMkhrOsp zMUYrjX5kUjMeUrDM_m+;gwF=zR*Z+-rtNC@D|bBtz`2)wT}i9*QDUt6%L=7(&(he|s0)@RLjU=X9nA{(kw_ z!I(4?PW|0OJlJ5@GSMYNRySdYP{`;SSf&Y9p};j*bjc7s>Zq}i#`?^Km&_+aLB-gW z7&7W=$BlXLq!WMkqlIt(eCbes0wIxFoHNr>Sd;~<$QDv%W)u)&zNH+NVgh)G7!j?Z z^Z@^IFhB?Fd|+Z<0^xvUr|hp31X#{K#0I4(_?qD*;b zUV;rzJPs!|_~H6%z5@;QRR`S9{SQ3@uf{RVec(4>872?ES;VIo3Sgu%5GoX)Ka+(^ zTbki7J$oUl7};QA-wP|BdgdobpLe#ps;6LeX)fP{NN@_FnceO2^u9=Cu&}SA-}uRK zGnzMN^7+?x?e6E^S40$nB=az{2#P@{)h$4-&nBxJ7+UJhIdBwbK0XK(QU+W(k3s23 z7|p<7zQ%OGV1i~Em0SL}R8e2ol1?TK(c^8gh?OOjYFI#i&9IQ-^ET_b+%}`2^+_(( zM-Ye-lvNB=O)6XrQcj<*^x|&AMwL~RE0g0rb5%5JkJOBP%Zd*bObuC*8 zUCWok55IpQT=ezRVcgi}&rV5aTzvV>;Q9G|5Scg$FeN}N0=aYsQiFqV3KF5(t-$!o z3b^^xO(4Z8p(VYeJwWqsNh01m&^NS{2okFF$?g@KdwX^d>%DPzI4>Ip`NjNst!sMv z(*M}9Wj`xWBLQ=Rf^9m4S}a5@SUm1O6fmNB2!B#CMddaq-rAVI)}Wf85Q3xcZpkt~OZWfpY9C=kCtJdiI;FtFssAhclB9b<8V zkxlOxe9=kyaNTr>ilW%R^NnQx{?(pQ<1cAGp>o(X42cF}qrQ62^z#YAl9`Mbvb(kp zc}GvE0e_Xu?r__udxPITrUj0={c;#L_E(<^#=%3O2;96oiLvq)Wby?_^!LNC>V}KP zO$R-%LEpY!sPns_V4_Gauea&xMbgW#ldH?j|k19-d7hthejc@*7 z`F5@sf+QD}fLT|WA}SF=4T?yfu`H-0-tt$LOOIskMNkMC0iv>h3EsYGhu{zTJp#sf zk7g)}>IzE(Z}`)xH3Rfi288}3 zeErnPd_PH+;eyeP&~5jR}?xL4R{25R01FC&-!wm~mr_2t_`m7#3KJSECqa zUwk<%d}|q;b=sVN3P?V$!LJ{98dk;yIPTk5f@IkRIP;;q-5UmZ=TyWFXr)1+ptCQV5UC%uIvT^QZUqOrBTtmEPoJ*5= zOQLxl#XO#dYOgD@xvzhZZW2cRTMM`C&i7_Aj2lE$GoU#b3}8j3y9eSKN(l%*y>cGj zzHx^z*cX>`**x0u{>w0-8lkm+|08y}-HISeE=oWhjwb|4LC&Poc<-(~+6S+{*IQj3 z^CbHQEte!masxxw{a4?za{ICmcSjTvZ+!cm)rsAEI-;R)<+_D$edtD5l93n?0sF@t zH}8s2>&$ZmUqdBUVjhCRqG*apvILM!3X+LHGznnlpeP0tyOD-HSjQ44FnQ#LC>R)l zfe`3O09^nGwv2}7|MChndH|XlYYqv@zRvw{@fA12VEt4${a3#QZ*?tL4jsXqfNmN9 zng-K?9*B57uwys{*M6`9_6iboNeW1+3asa<*e@tI_ z(-nbJPMqw1>AY{|jpNS{CRIr0iH)tN-}R*vFL`k^;@|Y>2YQ%TC)TVTGzmrppcbNtpf|e>_;%|^(z9TfL0Nkz z6UJqu<%1(>Ht_8a-X0!3Vf^e&I_q`?E6$4V@97a_wZR{2oQ70?$jqk;)G|qCpt~oX zh!59JJ$bg~Zc^=H8ggn7sFX=^)|c41gehRqLOQW9-D11LLr{wr}QPbHUKTC=`I079fm3 zQB;r=83fU04G=3ekddZ}NPK%%Bzjuk{>g*4pLN+|LNHYL!5vo%LRGE){C<_ykbzPb z6iMs{3_#Qbolv3~xIP#VOhTYHm9&scrbrT5CptwNcD|20)#GjEhCxj!H0GA!J+9+P zLv9&f_U=+Ndh94qHj^`h(TZjYpzhw@o(ok}P8;m&6SA3{y7K*How;n*@ALax8(T+> zt*ot$>a2B9!0Dm>flR0}HmzmKF%#uLRAqN+vdkS+Ed!gd6SC~R2p6l9)z9A19*0S*fDCs$m32kfh9gJW;} zIc#|9ap+#Ygv(S31Yy$US3={-^Br((3fy8o&Y`M`)jli;2bdGPdTVFMUTugLWG_-I zjYN7jEXJv!7dp3WeT^0hLsHWy;kn&JhY?Pg07is0Wzd4fxj6gW0z!&FLBtev0vs6j z#a;$Pei`2DnnQ}G*VaBQAp}w?nMR!*`vkYw>-Pr&o?EWDxeowbV<(LDZQs1zoHPFf z)#LT3T3!q9-o9Jf*RhwJeC8?DCw=*>qjfE>tzEh@8;FFb0-%syD4| z>srTD_@dQbim>QzobJ}e;DJm7Lbh4s6-~?mVJ6IAg*vvKRh<|Ggb;l4rzc^@LwCa~ z&;PEJOfsKx%H?;!*z?YZt_6?s?Ek1qWBGU4Y#x61`)8rA?O2#~+Z}+4%O~KVq8>UZ zp2d7tfIw}!S0EO+(|s21*)>f1I#(Nsp})WR`)B^PZS|+=+g^DL5A5q9=68N!J?0mn zKYMt~GPsXfu(LpUQpjt3_AFsSxonJDGG)gcKSLBnQ64?6)idj)ISt97Wb%!_y*4oQ z*lB9x=;nwd%lp_zuERyQ>rXXu9eg(nuQxag`MT!I9_lZp>&s@Gpz$mgs;b<-F* zTpzVWuVhMo!J;BJ8Q@efp=k2~m&(e_oY}s_=HhI+27}JF2?##?%TuuFu>(OVj;pV~ z2PREug|D7{5=0}x1HNM#^_6d43zHvz5&R8}{Co^#f^5@h7o$e#EQ;+9E+Y+cazE9# zZ`5|a{Z99`B_D1b?jPK!=L&1niR4BA=w&}Y;v(Kdmy9}@95yhocWYb#)M0hY%J6Wh z4NTd*0X%N_0?zpy86U3PZ<}fsyUGYxCXj= zx&qP4$r7uZBolFOFjAXMCG)v-N~vraKUt_hHfkYm-R$C*!$8{|B*^YrfU?C~PMMl% zOtC_$V+*=HO&-oH4@pzZV z>x-Ou!MW3Pz2NKK-O*oJS2wY`x#f5y%CUSpotGpjqIkS9L(}5khL#Fet1`RRYD%bD zW^>ar3m|wa5h#9^Yk>s{SRimM791fJ>nFVIz}^c8-nsWy*zwj29Fz^4+u?=>o`cKI zKJH)MIMbBX>o&oAOV+@Lc^`b~S62WsD4(1b9wDFzD(mzCn~k+=gfjPWnnw~tzMv{0 zwC~}|Zum3n`}^6mzpW3%Vsj)hzN3)Mxl;p)?mZi}_I*xe<&Xot)m!A$&`6|2(124rA{RAD`tH@2Hdz#66Q)ic8wiCW@%?>WLxXW4R#!ibP#SUv!*#Oa@@CV+ zX@9t~PEuTMB)i>$H|Dpj0-^{b%1$mwh{}G%XnvaNrPLKghTwIs%?YQAYk(Yv`pw6G z2ZfD`;E9KCfk&Qr5f**08gBf_rEub$qd)hC2jj!A;MrH<*%#h`z_IgS>>1}k+Zksc zAhBX^fZh0kMn0Fxlx<_3E3%mbSE4f~nz=!l==-dA??OvAOeGYa*uQzpbKBRg-?DG( zuH;AWt;{hz`?JbeH*P-TTuGbLn*UdMK!Qi}~mY)0A> z0Xytz(YzH+F5BmYdvAj#=z$-7{~~yI@hYf}MGp&*N1lBfW?Xs&&t=p=z%i4E-+Or( zqZj}H(9&x;XV1SEoKW5&6+QYek@Zwwig)hVvhbBhv~*@u$ENM=tKM9a{_#V%qTgL} zyMEZF%rdN!JumXhOd!-r{)#O@MaaMr4|{jtqjz}%p>S zu31K*&=swU1#21_b(hQM^;9<2AlWU0uV4lHHMoZ_WL3l$!Dl@cTffa<)AtB zonkuWm^Ieo$}b;L@Fw>XYwy-nb~xUXj}L5p?Xf?9GT77K!Au*ga>VLuj;I}3)C#5z zgrhM`1_JL?K+vEq!5oxgbDeX!JGN{WWJ&T?)Krhj=k+R!(m=egZ!nWik!Y-XTrR)6 zE0;=U6N7`@zCgfTKc?-Ncz;*iFpWUCbw)KP9xU>l#BS9r6;PZ72#Ah!bz;6E!gln; zX=vKJb0Zu-Yw7`6{l6Ly-}h6_qup@%x8RsduY{v7yS!wtP#KSoP_YhP)=}zwS1OA* zae=Fl0MxgO41BUG^~klizMoDcH~B(=?sOu#rFBYM|8b|z)ux|3OK^EyaN}40D#50^*YEc>L@Vkt!--6H$F5!Bn)(Tn*XJ@zv(G-K;B;D|gIeEsy2leq z%6T!J)s=YOLV-s7kVvGCy{ z{7Phj^(z_t{l|C)`Ss6EW0zK7mvhP0-$fIqPOe}L4_FjEx~2)qp@b%@t^y%MF)U*RwUhOGs;jN~u`L^CoqH;Ywltrm4-LM* z_N~Rsf{|ch=|2_~VvV)%(lxj9lws}>T%e!d?{$jVSbs3y?bEY>yMN`V2Nc{<595w z*=OL_*M92&UsR-OhQ}WZC$p@-NXZm2p$BTr0TeH?gAi}u=KSE&xBsZR)%{F}imGHV z(B0|5_$LTxTvk;*9Zwj)x%zf;W6Gj;A4%r_iw8FWQZP`r07#L5GH_JPYz!a~b74Gs zMlGIq_GxOgy3(iXhNQYwDG&_@U2eA^H;$^KZmSwrK$s`eE z*-rs^EYl1G8=5AH9$yH{ipTdVO(M)SUU}2 zfdRJrnYsDF2=;H@0R4C00DpdRq;eUmodY){3y|&ahn4r-3A3dX+;r__C5C3H!Z)K!vDEUVk`J;|>LD^n#`%jMZE!rMW}lW}~3{O~dd98e5tL z)g>o(x9_8tCCUC^O}cNtB&e##-!#gFLtOPCuYj>% z`#Rr-%R=UovLFnKl?SDe0_bYjhu5#&-n(h@i;MpB@@wh%aLQ>E(ws<4FIMcY&05@L z-S0U9jrrNKJ^;r0GnxZqXITRoF}6+^`P8h+gBxjz{TryhwOLR-ZaEkY`=T{fAzw5U zi`3P$xct7bX_|U+f8QXX)U9Q5ieAu}_5=&Lyy1_AsXta35kx6U5%L-NyfE0=ZNyrd zYXU8!tFS0ZrlwIT5K^$mCsMOOk)rbQrBUA|S)vMg*$bWTFM>@sd>>Xi;WHasw|BsK zw>$w~e)X-gO9oha{g2_QDHWdyvDyB=fAU3me{T}nF1#4VU39SxMsb2VG{0;43;7K% z{&nky_gAb;^bM{A0LF{;oP6=Q$QSmbjZ4>M8`@gT#m_I~QP>ZX7A=O~j|2{1V?<#? z9KbCB^2k6KHO8KOBHFbM9<2$8o02OQ_faZf%Hw^6;K}1FN-<_Sq0gpvQ);cWwQOU#~pR~eNj&&QYCr=b%anAyWAn9xZI7D3KWYj zVwohpdq<}d2>HZFBuafjAhIl&s!x#mcWF}BMoUy&V()-1ZeH*NJn`_Y2ZYbNI=Ub_ zX-Y}^i|%8_Pj7-dFZ&i}n9I9o*n1XIGk{)ydl}rv@p>(_{t@}y3W0S_ul@h#yV|yAg;4>oObEgsQ%4ctWp1I$FK&=6U)`^Fo!6l zOrSZ|CTam?td%MNC>XHJS`#sVEZD>y>s4cmhD6M35mzqirL6AG%pVdE{jU?E)KO(~ z%j!=Ix5sVxLO}xwNRU+plu$6@@_8j+I4E0&nU@0r2}_E9crSlul#37;kbS-i@96R4 z%;9)C*Vi+s`us9A^rYUonMAy=4q((%IR=@ZhC>R7yY=bm)5z6!@$>c#DA)|+`4ydJPuqYxy zb^Aeag&7)an9@4gN5XN<$2*U0ye0R$)9_n;G5m71YTVbOBc#>?EyUs;#Mn*~cFB89<7D zV!cuga~UX5mX{QJgiDhb!K&MDf$HsR;CJ_2|Cu_?!Gm#aEcXe`JE1+_wdaSgKD=PX z+<=*SWmHoKpU904$QJi4$&G0(C1sM>Vv%&)iy1T^gem;0qA|^QTWT#cm30jO>i{l7tgoFg0?;DG#DL*7PPQ1&BJjt0_3(kY>&ZP(EYTqzybC}q6IiD$ z!Xt55(Hfv4#f+RptGG6j|FIf8(-`KX1P;k>&MrlB#Yj#l0}9tRH7HYN&WJWmXd5f5 zu0ST09PaDt)kKS83S=03T%y7~pDT-V(x@jm> z9W%zxneB>9pIM!#m?+`mY(>2SWhuulyA@{_#ne*BpRZ$4)7gp38wM z1_c`e%~oQ?o2RXQWAWlE_7?0_k7R@ax7cbpR!=f15X%C?G=Ufw8-{XHpmlN4*?4r4GvGO=>6V2hn=le2JDDkGjSg8R>i7PY;o zQF0(0@~AFVK^U`62o$Z31t&~DiZu=fkRV8^&m;Bi-M2ThaKe;bo@UwOogA5aUQ60lJ;F;mwF6o@zrB*%=ECgvjJRZ`d*7Os(6xFgbgo{; zLF`_;ydQeDoXUTbSi8uzh&jzVz?r@pCmS>+buX^h7GpDE?Z-@|Lc|!pgG0j|eM@K(P zTp0`D_IRRL5S3&+F6DFiR)0loR^!YwN2Nkj1%GB6&FtH#d#aj6qy{m`r)WAj2@{a) zDkKxC-8%)Q#fr5BaOneVrZdZf465>dz|4a|L>M+b5H;Gh;q|ZHyW^uZ4{!PCllZh> zyiYAH2Zcfgh*1E!(g&hf0ZMdG{4R)$Zv=ORAJl*so~;fXejY=SZL(MZfT`WLg^I-^ z2Pj(RbD&6)BWK|YvF&K-nOvsL3iB1smZMAtGn2NqP*g04+3Q2Eduf1zfGk3pB_{CO zuf>YmWUN@UxGP#2!&PlF^1VCT-z+v-?0)}!2#l=+ zPo*DZmk5MoFf!X zshh>&vx=}`$DGk(Yo*h)!2eO3?_#}T*wMn`gCU9upj}CHmV_Y8yR9C*q>5>g>JJ1x zmSrl6swfCy>$tfm3ZJZAl{PI?95-olu)3~3WLiY6ZWuj*Q0nj9w?~Ng@Ap>LHbf#d zt&Kyy9SK2pMFrVgkxKM?GlRfNWiGj-?Ml3)(z{o z0sv!2)6QBdxASN#R=Z~fu;JN%ddE@&ZV0tDfWImV0)KufE(LzY6%<8Ko<0IfM$8wA z6-)%h4oo}Pa3VA`Qr0ciNzh0%z)TcBj#Wyyy|&j36ju!JE<~0ip`s@%)-*<PbJ|2~Ky1OYwoY2+_o1jeWTY3kn9ng_Ok_Eck{xa{zh(pKJYmBkJfyU!-9<)u zbYt;{9I$M463U)1#UnylmIHNlwKHO|z|?3o9QKEz zBFBApOj?cJe5^w%PK0~faXf&741D0eE+$!JUfF{7h7)PWr>11}q zf0P>AoViR(HjBS0e{`_LHGw!053wU1ww;*HdQ00^+0O&8_aL2fZvbCqMY%B?9Xi z#zq3iD%_}VAcY3w$&{%Va@*T`Kh32EqLap@E3(76o#R?#+D98Yvl($ZVXKC)Ds%R4 zAUB@Q_~H4Gl_emuR6^~@NtPoU=$tFxa30E2e6UNYfyy>PP&8%Knb9MUQR1DOlsHSs zS=?^$M~Q&*bR}-0m?ltLhzuCMnx(YppKzg@3x_Q)v~s+yTR_^eOSL%%u?C({}p7);ZLo?Jp;M6;N`@Hys=QT9Vj zOWIf6$^}?^+B=l!2m%fD@a-i}0rI;4uZ4YN8Z+F_1#b8J(UGSdQOZL|TN{W&FIe0c z*iTPj4d^ES%s*O$KPES0QLfZwiKT2&jro3ik;lxUH5E1 z9%XZrW^ N002ovPDHLkV1kB@(0Kp= literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png.meta b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png.meta new file mode 100644 index 0000000000..c96290dd8c --- /dev/null +++ b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 2cf41b512bcd93648a1c34d3bdab6b2b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2f0f0feb38e63a048ab7749e823a0755 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HeroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_tongyong_shenhun_icon.png.meta b/Assets/ManagedResources/Atlas/HeroAtlas/r_tongyong_shenhun_icon.png.meta index 23e3049cdd..2de6844326 100644 --- a/Assets/ManagedResources/Atlas/HeroAtlas/r_tongyong_shenhun_icon.png.meta +++ b/Assets/ManagedResources/Atlas/HeroAtlas/r_tongyong_shenhun_icon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b4fbc1b043f0d3b459ef1743b24cb849 +guid: a2b5055e009b24343a5917735d90b92b TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,6 +58,17 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -80,24 +91,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: d54e37fc423e0fe45b2299f25b7a0851 + spriteID: bb7a89aa65946054b82a639cb36ea2a9 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab index 289fba9575..4f6f36b125 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab @@ -76,101 +76,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &885351063493527978 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4154239177533303857} - - component: {fileID: 6871622883756293186} - - component: {fileID: 8611141055276569167} - - component: {fileID: 5056131969430361751} - m_Layer: 5 - m_Name: line - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4154239177533303857 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885351063493527978} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7775848301174822185} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 4.58, y: -13.59} - m_SizeDelta: {x: 441.4, y: 2} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &6871622883756293186 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885351063493527978} - m_CullTransparentMesh: 0 ---- !u!114 &8611141055276569167 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885351063493527978} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 36e05fe912e1e9e47aef85f30fd11d93, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &5056131969430361751 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885351063493527978} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &1272730104103476269 GameObject: m_ObjectHideFlags: 0 @@ -1056,7 +961,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7776147267272310759} - - {fileID: 4154239177533303857} m_Father: {fileID: 4824128418226270383} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab index 3acf92a274..3768f0a36a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab @@ -43010,6 +43010,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224353307690090294} + - {fileID: 6637659864277122635} - {fileID: 224121395815468788} - {fileID: 224681068575272128} m_Father: {fileID: 224445502205186148} @@ -63100,7 +63101,7 @@ RectTransform: - {fileID: 224129801811890890} - {fileID: 8795387183264503407} m_Father: {fileID: 224558474284908024} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -87281,9 +87282,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8204720010108857596} - - {fileID: 4573250569383195525} m_Father: {fileID: 224558474284908024} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -96799,81 +96799,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8D64\u708E\u836F\u5E08" LanguageIndex: 10898 ---- !u!1 &156519083606563073 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4294846205027911603} - - component: {fileID: 3304244818298500556} - - component: {fileID: 4338796073857792544} - m_Layer: 5 - m_Name: TitleBg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4294846205027911603 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 156519083606563073} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6906339372280010588} - m_Father: {fileID: 468245187776722909} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 81.65005} - m_SizeDelta: {x: 387.2, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3304244818298500556 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 156519083606563073} - m_CullTransparentMesh: 0 ---- !u!114 &4338796073857792544 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 156519083606563073} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9528302, g: 0.774318, b: 0.63372195, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6855519ff9d6ad742bd124d6932043ac, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &423002597689776110 GameObject: m_ObjectHideFlags: 0 @@ -97177,6 +97102,82 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1044067860525199598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6811487750097457237} + - component: {fileID: 8958681429632674031} + - component: {fileID: 7595094421135736355} + m_Layer: 5 + m_Name: Pos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6811487750097457237 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1044067860525199598} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3787308882671181896} + - {fileID: 1228224766086152148} + m_Father: {fileID: 468245187776722909} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 269.8, y: -38.149994} + m_SizeDelta: {x: 287, y: 142.40002} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8958681429632674031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1044067860525199598} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &7595094421135736355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1044067860525199598} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &1165459557923164387 GameObject: m_ObjectHideFlags: 0 @@ -182549,6 +182550,52 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u786E \u5B9A" LanguageIndex: 10152 +--- !u!1 &1691056267236155436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7495242390579781977} + - component: {fileID: 3260145328625104902} + m_Layer: 5 + m_Name: TitleBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7495242390579781977 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691056267236155436} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4930794380363053426} + - {fileID: 1328168189959362842} + m_Father: {fileID: 468245187776722909} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -258, y: -38.149963} + m_SizeDelta: {x: 347.64, y: 142.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3260145328625104902 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691056267236155436} + m_CullTransparentMesh: 0 --- !u!1 &1790930152063138769 GameObject: m_ObjectHideFlags: 0 @@ -192033,7 +192080,7 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &1804913774911209981 +--- !u!1 &1884766110686385504 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -192041,79 +192088,58 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6906339372280010588} - - component: {fileID: 3188727142546430765} - - component: {fileID: 6579913159305037139} - - component: {fileID: 5455799123382695942} + - component: {fileID: 1228224766086152148} + - component: {fileID: 888004739153871973} + - component: {fileID: 3555795162194110844} m_Layer: 5 - m_Name: Title + m_Name: PosText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6906339372280010588 +--- !u!224 &1228224766086152148 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804913774911209981} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1884766110686385504} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4294846205027911603} - m_RootOrder: 0 + m_Father: {fileID: 6811487750097457237} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 193.6, y: 8.849976} - m_SizeDelta: {x: 404.7, y: 70} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &3188727142546430765 + m_AnchoredPosition: {x: 174.5, y: -71.20001} + m_SizeDelta: {x: 225, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &888004739153871973 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804913774911209981} + m_GameObject: {fileID: 1884766110686385504} m_CullTransparentMesh: 0 ---- !u!114 &6579913159305037139 +--- !u!114 &3555795162194110844 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804913774911209981} + m_GameObject: {fileID: 1884766110686385504} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 70 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &5455799123382695942 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804913774911209981} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 0.9019608, g: 0.7921569, b: 0.627451, a: 1} + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -192121,19 +192147,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_MinSize: 4 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5149\u73AF \u56DE\u6012 \u65E0\u654C" - LanguageIndex: 11490 + m_Text: "\u707C\u70E7\u961F\u8F85\u52A9" --- !u!1 &1927312550457178104 GameObject: m_ObjectHideFlags: 0 @@ -192249,6 +192274,86 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &2040858868293623553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1328168189959362842} + - component: {fileID: 2614135478898552151} + - component: {fileID: 8336839007626671309} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1328168189959362842 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040858868293623553} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7495242390579781977} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 234.52, y: -71.2} + m_SizeDelta: {x: 321.15, y: 85} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2614135478898552151 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040858868293623553} + m_CullTransparentMesh: 0 +--- !u!114 &8336839007626671309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040858868293623553} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9019608, g: 0.7921569, b: 0.627451, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 55 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5149\u73AF \u56DE\u6012 \u65E0\u654C" + LanguageIndex: 0 --- !u!1 &2205073105291886742 GameObject: m_ObjectHideFlags: 0 @@ -192397,6 +192502,80 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &3449381789191473778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4930794380363053426} + - component: {fileID: 3778598524646794727} + - component: {fileID: 1410323929195104986} + m_Layer: 5 + m_Name: po + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4930794380363053426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3449381789191473778} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7495242390579781977} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 31, y: -71.2} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3778598524646794727 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3449381789191473778} + m_CullTransparentMesh: 0 +--- !u!114 &1410323929195104986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3449381789191473778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 02b8bbbaafb89d84a99da3dc5017a5aa, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3699904631118917597 GameObject: m_ObjectHideFlags: 0 @@ -255322,7 +255501,7 @@ RectTransform: m_Children: - {fileID: 439766457450116605} m_Father: {fileID: 468245187776722909} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -255369,6 +255548,196 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5321688270316283741} m_CullTransparentMesh: 0 +--- !u!1 &5683555352183435737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3787308882671181896} + - component: {fileID: 1205094569297172439} + - component: {fileID: 8520049788795518155} + - component: {fileID: 1438423483563911247} + m_Layer: 5 + m_Name: PosImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3787308882671181896 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5683555352183435737} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6811487750097457237} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 31, y: -71.20001} + m_SizeDelta: {x: 62, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1205094569297172439 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5683555352183435737} + m_CullTransparentMesh: 0 +--- !u!114 &8520049788795518155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5683555352183435737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 99ac359296768a54990c6e2a8912efae, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &1438423483563911247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5683555352183435737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 62 + m_PreferredHeight: 62 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &5696048352838328926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6637659864277122635} + - component: {fileID: 2473743150135751695} + - component: {fileID: 5830598276207552205} + - component: {fileID: 1084146396283711813} + m_Layer: 5 + m_Name: posQuality + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6637659864277122635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5696048352838328926} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224558474284908024} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -366, y: 644} + m_SizeDelta: {x: 156, y: 422} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2473743150135751695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5696048352838328926} + m_CullTransparentMesh: 0 +--- !u!114 &5830598276207552205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5696048352838328926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 78763a042307189468192e0bc0b018b9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &1084146396283711813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5696048352838328926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 62 + m_PreferredHeight: 62 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &5779875340601305572 GameObject: m_ObjectHideFlags: 0 @@ -255724,236 +256093,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &7354958877339657946 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1222144166322523087} - - component: {fileID: 1701758990595977622} - - component: {fileID: 2677216368538382960} - m_Layer: 5 - m_Name: PosText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1222144166322523087 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7354958877339657946} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4573250569383195525} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -12.275} - m_SizeDelta: {x: 46.01, y: 217.55} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1701758990595977622 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7354958877339657946} - m_CullTransparentMesh: 0 ---- !u!114 &2677216368538382960 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7354958877339657946} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.90196085, g: 0.7803922, b: 0.49803925, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u707C\u70E7\u961F\u8F85\u52A9" - LanguageIndex: 10916 ---- !u!1 &7760986139338632641 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4115362798329252288} - - component: {fileID: 8917331983395831021} - - component: {fileID: 174781018756952109} - m_Layer: 5 - m_Name: PosImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4115362798329252288 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7760986139338632641} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4573250569383195525} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 127.5} - m_SizeDelta: {x: 62, y: 62} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8917331983395831021 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7760986139338632641} - m_CullTransparentMesh: 0 ---- !u!114 &174781018756952109 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7760986139338632641} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 83432f17b727aa740aa065d3a17c5484, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!1 &7902120421258653545 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4573250569383195525} - - component: {fileID: 774209003986926821} - - component: {fileID: 4352305618709847796} - m_Layer: 5 - m_Name: Pos - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4573250569383195525 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7902120421258653545} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4115362798329252288} - - {fileID: 1222144166322523087} - m_Father: {fileID: 224121395815468788} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -438.9, y: 1275} - m_SizeDelta: {x: 76, y: 317} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &774209003986926821 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7902120421258653545} - m_CullTransparentMesh: 0 ---- !u!114 &4352305618709847796 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7902120421258653545} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 160f9d20d35bf3c47937e17cd7060d09, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &8029049751717713216 GameObject: m_ObjectHideFlags: 0 @@ -255986,7 +256125,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 480935560315310008} - - {fileID: 4294846205027911603} + - {fileID: 7495242390579781977} + - {fileID: 6811487750097457237} - {fileID: 9144041776289725838} m_Father: {fileID: 8204720010108857596} m_RootOrder: 2 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab index 50ffc0cbee..0013935ef5 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab @@ -629,9 +629,9 @@ RectTransform: m_Father: {fileID: 5493559332277853408} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 31, y: -71.2} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1173538945110251614 @@ -2668,7 +2668,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 126.5, y: 31.695} + m_AnchoredPosition: {x: 94.5, y: 20.7} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2722006554956443899 @@ -3207,7 +3207,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b4fbc1b043f0d3b459ef1743b24cb849, type: 3} + m_Sprite: {fileID: 21300000, guid: a2b5055e009b24343a5917735d90b92b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3290,6 +3290,8 @@ GameObject: - component: {fileID: 871027738489403935} - component: {fileID: 5274284421785695141} - component: {fileID: 238968780715353373} + - component: {fileID: 1116243716763637883} + - component: {fileID: 3232807113400389329} m_Layer: 5 m_Name: posBtn m_TagString: Untagged @@ -3313,11 +3315,11 @@ RectTransform: m_Father: {fileID: 7662967509015272728} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 389.78998, y: -49.5} - m_SizeDelta: {x: -685.15, y: 142.4} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -33.58, y: -49.5} + m_SizeDelta: {x: 0, y: 142.4} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &650529087623267775 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3416,6 +3418,43 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1116243716763637883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3697084287494790549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 5 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &3232807113400389329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3697084287494790549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &3748087398088511068 GameObject: m_ObjectHideFlags: 0 @@ -3662,6 +3701,7 @@ GameObject: - component: {fileID: 3915846666900563107} - component: {fileID: 35534546367631598} - component: {fileID: 6308169570023901556} + - component: {fileID: 7459288734510652830} m_Layer: 5 m_Name: PosInfo m_TagString: Untagged @@ -3683,11 +3723,11 @@ RectTransform: m_Father: {fileID: 5493559332277853408} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 234.52, y: -71.2} - m_SizeDelta: {x: 321.15, y: 85} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 70, y: 0} + m_SizeDelta: {x: 0, y: 85} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &35534546367631598 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3723,7 +3763,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 55 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -3731,6 +3771,20 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5149\u73AF \u56DE\u6012 \u65E0\u654C" LanguageIndex: 0 +--- !u!114 &7459288734510652830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4065605281392485048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &4096148106584707376 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index b05919edd8..1f9f8f3924 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -54086,8 +54086,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -116.099976, y: -302.8} - m_SizeDelta: {x: 227, y: 210} + m_AnchoredPosition: {x: -116.8, y: -274} + m_SizeDelta: {x: 198.7, y: 183.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6900503861996968449 CanvasRenderer: @@ -54374,7 +54374,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -116.8, y: -162.5} - m_SizeDelta: {x: 198.69995, y: 183.8} + m_SizeDelta: {x: 121, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7345339821710159408 CanvasRenderer: @@ -54477,9 +54477,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6121298216406054189} - {fileID: 1243633643177871126} - {fileID: 4335717813882998829} - - {fileID: 6121298216406054189} - {fileID: 224438664217865725} m_Father: {fileID: 224750236772289674} m_RootOrder: 6 @@ -54487,7 +54487,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 203, y: -177} - m_SizeDelta: {x: 243, y: 84} + m_SizeDelta: {x: 405, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3901079369435443197 CanvasRenderer: @@ -55242,7 +55242,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6768597193923982555} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -55322,8 +55322,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -116.1, y: -469.7} - m_SizeDelta: {x: 152, y: 152} + m_AnchoredPosition: {x: -116.8, y: -417} + m_SizeDelta: {x: 124, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2420754012896772010 CanvasRenderer: @@ -56286,15 +56286,15 @@ RectTransform: m_GameObject: {fileID: 5189905295769671105} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6768597193923982555} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 85.81002, y: -10} - m_SizeDelta: {x: 127.42, y: 30} + m_AnchoredPosition: {x: 54.5, y: -14.8} + m_SizeDelta: {x: 190.6, y: 61.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4654559960055660368 CanvasRenderer: @@ -56350,7 +56350,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} m_Name: m_EditorClassIdentifier: - _textSpacing: -32.08 + _textSpacing: -30.48 --- !u!1 &5361733365052867487 GameObject: m_ObjectHideFlags: 0 @@ -57137,7 +57137,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6768597193923982555} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e448f20711..7f4bc067e0 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2654,7 +2654,8 @@ EquipTreasureTypeStr = { "r_hero_jineng_fahong", --法宝 4 "r_hero_jineng_tianjin", --天赋角标 9 "r_hero_jineng_tianhong", --天赋角标 10 - "r_hero_jineng_tianbaijin", --天赋角标(觉醒以后) 11 + "r_hero_jineng_tianbaijin", --天赋角标(觉醒) 11 + "r_hero_jineng_tian", --天赋角标(觉醒以后) 12 "r_hero_jineng_hun", --神魂角标 8 } diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua index 2784d7eac9..5eb3356c97 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua @@ -83,8 +83,6 @@ function this:OnOpen(...) this.skillTypeImage.sprite=this.spLoader:LoadSprite(SkillIconType[SkillType.Jue])--绝技 elseif curSkillData.skillConfig.Type == SkillType.Bei then this.skillTypeImage.sprite=this.spLoader:LoadSprite(SkillIconType[SkillType.Bei])--被动技 - this.skillTypeImage.enabled = false - this.skillTypeText.gameObject:SetActive(true) end -- this.cureffect.transform:DOAnchorPosY(0,0,true) -- this.cureffect.text = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua index a982831827..9d7a37d382 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua @@ -61,14 +61,16 @@ function SingleRecruitPanel:InitComponent() this.UI_Effect_choukaR = Util.GetGameObject(self.transform, "bg/UI_Effect_chouka_R") this.jumpBtn = Util.GetGameObject(this.jumpPanel.transform, "btnContinue/jumpBtn") this.jumpBtnGo = Util.GetGameObject(this.jumpPanel.transform, "btnContinue") - self.posImage=Util.GetGameObject(self.transform,"Pos/PosImage"):GetComponent("Image") - self.posText=Util.GetGameObject(self.transform,"Pos/PosText"):GetComponent("Text") + self.posImage=Util.GetGameObject(self.gameObject,"rolePanel/rolePanel1/Panel/Info/Pos/PosImage"):GetComponent("Image") + self.posText=Util.GetGameObject(self.gameObject,"rolePanel/rolePanel1/Panel/Info/Pos/PosText"):GetComponent("Text") this.info=Util.GetGameObject(self.gameObject,"rolePanel/rolePanel1/Panel/Info") this.infoTitleBg=Util.GetGameObject(this.info,"TitleBg") this.infoTitle=Util.GetGameObject(this.infoTitleBg,"Title"):GetComponent("Text") this.infoBody=Util.GetGameObject(this.info,"BodyBg/Viewport/Body"):GetComponent("Text") this.infoBodyGo=Util.GetGameObject(this.info,"BodyBg") + + this.posQuality=Util.GetGameObject(self.transform,"rolePanel/posQuality"):GetComponent("Image") end --绑定事件(用于子类重写) @@ -366,6 +368,7 @@ function SingleRecruitPanel:UpdataPanelData(_heroData) this.info:SetActive(heroStaticData.Star == 5 or heroStaticData.Star == 4) this.infoBodyGo:SetActive(heroStaticData.Star == 5) this.infoTitle.text=GetLanguageStrById(heroStaticData.HeroLocationDesc1) + this.posQuality.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(heroStaticData.Natural)) if heroStaticData.Star == 5 then local t={} local upStarSkillDataList={} --数据容器 @@ -427,7 +430,6 @@ function SingleRecruitPanel:UpdataPanelData(_heroData) -- self.profession.sprite = this.spLoader:LoadSprite(GetJobSpriteStrByJobNum(heroStaticData.Profession)) self.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(heroStaticData.PropertyName)) self.heroName.text =GetLanguageStrById(heroStaticData.ReadingName) --string.format("lv.%s", heroData.lv) - Util.GetGameObject(self.transform,"Pos"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroPosBgStr(heroStaticData.Profession)) self.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(heroStaticData.Profession)) self.posText.text=GetLanguageStrById(heroStaticData.HeroLocation) SetTextVerTial(self.posText.gameObject,Vector3.New(63.76,1.5,0),"MiddleLeft") diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 8ee99aedbc..8d55d55600 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -434,15 +434,15 @@ function this.GetSkillsData() heroSkill.state = 1 if curHeroData.star == 12 then heroSkill.Icon = "r_tongyong_feisheng_icon1" --飞升一 - heroSkill.Type = 7 + heroSkill.Type = 8 heroSkill.quality = 1 elseif curHeroData.star == 13 then heroSkill.Icon = "r_tongyong_feisheng_icon2" --飞升二 - heroSkill.Type = 7 + heroSkill.Type = 8 heroSkill.quality = 1 elseif curHeroData.star > 13 then heroSkill.Icon = "r_tongyong_feisheng_icon3" --飞升三 - heroSkill.Type = 7 + heroSkill.Type = 8 heroSkill.quality = 1 elseif curHeroData.star == 11 then heroSkill.Icon = "r_tongyong_tianfu_icon" --觉醒 @@ -466,7 +466,7 @@ function this.GetSkillsData() local heroSkill = {} heroSkill.skillId = 0 heroSkill.skillConfig = nil - heroSkill.Type = 8 + heroSkill.Type = 9 heroSkill.Skilltips = nil heroSkill.Name = nil heroSkill.Icon = "r_tongyong_shenhun_icon" @@ -616,9 +616,9 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills if this.skillPanel then UIManager.ClosePanel(UIName.SkillInfoPopup) end - if this.skillData[i].Type > 4 and this.skillData[i].Type < 8 then + if this.skillData[i].Type > 4 and this.skillData[i].Type < 9 then UIManager.OpenPanel(UIName.RoleTalentPopup,curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) - elseif this.skillData[i].Type == 8 then + elseif this.skillData[i].Type == 9 then if this.skillData[i].state == 0 then UIManager.OpenPanel(UIName.RoleGodSoulLayout,curHeroData.heroConfig,11) else @@ -629,7 +629,6 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills end) end end - LogGreen("#this.skillData:"..#this.skillData) if #this.skillData > 2 then this.line1.gameObject:SetActive(true) else @@ -926,7 +925,7 @@ function this.OnUpdate() --长按 if Time.realtimeSinceStartup - this.timePressStarted > 0.4 then if timer <= 0 then - timer = timer + 0.2 + timer = timer + 0.15 _isLongPress = true this:LvUpClick(false) end From d6521af9655b5ddfcd5da298149589e28fd995d1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 14 Jan 2022 15:52:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=B8=E6=84=BF=E7=A5=9E=E5=B0=86?= =?UTF-8?q?=E8=BE=B9=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GeneralPanel/View/GeneralBigPopup_WishDraw.lua | 2 +- .../Modules/Popup/View/GeneralPopup_ChooseUpHero.lua | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua index de823d8ff0..36c38abe44 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua @@ -140,7 +140,7 @@ end function this:ShowSingleHero(go,data,index) local heroData = heroConfig[data.Reward[1]] self.itemList[self.curSelect][index] = go - Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star)) + Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_topkaung") Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Icon)) Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) Util.GetGameObject(go, "name"):GetComponent("Text").text = heroData.ReadingName diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua index 2a49f4cdba..b49a8c6b79 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua @@ -122,20 +122,22 @@ function this.SingleHeroDataShow(go,_heroData,_index) local choosed = Util.GetGameObject(_go.transform, "choosed") local cardclickBtn = Util.GetGameObject(_go.transform, "icon") - if itemType ~= 5 then - frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star)) + if itemType ~= 5 then name.text = SubString2(GetLanguageStrById(heroData.ReadingName),8) icon.sprite = this.spLoader:LoadSprite(artResourcesConfig[heroData.Icon].Name) proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) SetHeroStars(this.spLoader, starGrid, heroData.Star,1,nil,-15) else - frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quantity1)) name.text = SubString2(GetLanguageStrById(heroData.Name),8) icon.sprite = this.spLoader:LoadSprite(artResourcesConfig[heroData.ResourceID].Name) proIcon.gameObject:SetActive(false) starGrid:SetActive(false) end - + if curPage == 5 then + frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star)) + else + frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung") + end this.choosedList[go] = choosed this.choosedList[go]:SetActive( heroData.Id==currHeroId) From 1c827a3a23693ec64d3cd33ef4781a83af90c0a8 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 14 Jan 2022 16:02:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E5=85=B3=E5=8D=A1=E3=80=91?= =?UTF-8?q?=E6=9C=89=E5=8F=AF=E6=8C=91=E6=88=98=E5=85=B3=E5=8D=A1=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=8F=E6=89=8B=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Materials/UI_Effect_TouXiang_FightBtn.mat | 2 +- .../UI/Fight/FightPointPassMainPanel.prefab | 130 +++++++++++++++++- .../Modules/Fight/FightPointPassMainPanel.lua | 5 + 3 files changed, 134 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat index c1be88bb51..34bfafd93e 100644 --- a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat @@ -34,4 +34,4 @@ Material: - _Stencil: 0 m_Colors: - _MainColor: {r: 1, g: 1, b: 1, a: 0} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.9811321, g: 0.9020048, b: 0.36561054, a: 0.45882353} diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 3b102256ab..c5f48f222c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -21058,7 +21058,7 @@ RectTransform: - {fileID: 2047898567573916233} - {fileID: 8635743836815067626} m_Father: {fileID: 3829532297210306968} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -42536,7 +42536,7 @@ RectTransform: m_Children: - {fileID: 5374976552370438436} m_Father: {fileID: 3829532297210306968} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -144543,6 +144543,7 @@ RectTransform: - {fileID: 7828900952075963866} - {fileID: 5204423984622933357} - {fileID: 6591256859250515825} + - {fileID: 7759392491232237277} - {fileID: 2039730614} - {fileID: 2835335463341580670} m_Father: {fileID: 7718967529276036518} @@ -146312,6 +146313,131 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &536767011877295405 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3829532297210306968} + m_Modifications: + - target: {fileID: 4044842431821162333, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_Name + value: GuideEffect + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} +--- !u!224 &7759392491232237277 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, + type: 3} + m_PrefabInstance: {fileID: 536767011877295405} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8971074634032498639 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 8efa5342dd..780b2a0b2e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -102,6 +102,7 @@ function FightPointPassMainPanel:InitComponent() this.btnFight = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFight") this.fightText = Util.GetGameObject(this.btnFight, "Text"):GetComponent("Text") this.fightSaoGuang = Util.GetGameObject(this.btnFight, "saoguang") + this.fightGuideEffect = Util.GetGameObject(this.btnFight, "GuideEffect") LanguageFontSizeFilter(this.fightText, 50) -- 你要变强 this.btnGetForce = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnIWantMilk") @@ -677,11 +678,14 @@ end function this.SetFightBtnText() this.fightLock:SetActive(false) this.fightSaoGuang:SetActive(true) + -- 没在主线引导种就显示小手 + this.fightGuideEffect:SetActive(not GuideManager.IsInMainGuide()) local isPass = FightPointPassManager.IsCanFight(FightPointPassManager.curOpenFight) if not isCounting then if not isPass then this.fightLock:SetActive(true) this.fightSaoGuang:SetActive(false) + this.fightGuideEffect:SetActive(false) this.lockText.text = FightPointPassManager.GetBtnText() else this.fightText.text = FightPointPassManager.GetBtnText() @@ -743,6 +747,7 @@ function FightPointPassMainPanel:OnSortingOrderChange() Util.AddParticleSortLayer(this.pgEffect, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.UI_Effect_MuBiaoJiangLi, self.sortingOrder - orginLayer) Util.SetParticleSortLayer(this.fightSaoGuang, self.sortingOrder + 1) + Util.SetParticleSortLayer(this.fightGuideEffect, self.sortingOrder + 2) fightMap:OnSortingOrderChange(self.sortingOrder) orginLayer = self.sortingOrder