From dac88a6dbf008b76aff1a6e638efe3d6c10c18be Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 29 Dec 2021 10:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExploreAtlas/y_yuxulundao_disidui.png | Bin 0 -> 7484 bytes .../y_yuxulundao_disidui.png.meta | 110 ++++++ .../ExploreAtlas/y_yuxulundao_diwudui.png | Bin 0 -> 7637 bytes .../y_yuxulundao_diwudui.png.meta | 110 ++++++ .../ExploreAtlas/y_yuxulundao_tansuozhong.png | Bin 0 -> 7745 bytes .../y_yuxulundao_tansuozhong.png.meta | 110 ++++++ .../UI/Formation/FormationPanelV2.prefab | 343 +++++++++++------- .../~Lua/Modules/Explore/ExploreManager.lua | 4 +- .../Modules/Formation/FormationManager.lua | 4 + .../Modules/Formation/FormationPanelV2.lua | 4 +- .../Formation/View/ExploreFormation.lua | 12 +- ...SizeFitterPopup_ExploreSelectFormation.lua | 21 +- .../GeneralSizeFitterPopup_OneKeyExplore.lua | 16 +- 13 files changed, 579 insertions(+), 155 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_disidui.png create mode 100644 Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_disidui.png.meta create mode 100644 Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png create mode 100644 Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png.meta create mode 100644 Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png create mode 100644 Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png.meta diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_disidui.png b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_disidui.png new file mode 100644 index 0000000000000000000000000000000000000000..7fb2d141824af3dc9511921fcd4f06728349ad6a GIT binary patch literal 7484 zcmV-C9mC>@P)uK;P+62j^TBtpO#0-_iU#w5aEhXja&FemnD==^w@PZ9Fa) zzZJvZvf;RB_$?Jb`gy_hEfudff9uyurjJ}aZ+wny>W8s!gS`u4@!LvNqT<}3D1u=) zisBf606`R0RTOz37*G_!DGDd;4jiXxOpzp2;#gVccv+F9|5fA^MF)mHIGDwG^Kauo zqR2qe&cXUXF&sy691g(%p{gvynlS>h;{B%Q$R^;bhRHTxYy54zr_%c)767>rK`R0V zCn=0_ISI<`rBED4C61N&bXt^HMphN2^iUWto7YFW>Khz$XV3QTInlJji4K-ZKv1nTPZ1O-O5iyBR%BUGWf@TwMZ!oDr(7DqnzKk=kAf?r%m@oMTtOQz(i3|4Vs3q*$L06(XJbBzPaJ~@Bic2rU{pLyYnoX z&Sphbl2n`|F~VktRfr!@?i)X$c}9KG?)2EJs%$t(A*v*a zvLK48ESpV(Vgin0VcukmYpmL-WNyqLwE|EjKn)5aOAUh&1ZwjKX#a#u{NKE7#fW;p z58HO+D)Eu0p6Ma%_5_zm@FJ5J!Sul3y6Wm3vs+t(aPRV#%Wap9A3O3J|I7#{NeV+T z6a}yd*{qn4^s!tr$;+akSn(WqE>6=p0j5n>5LpmpMG%w=Fl{K9Ny_Ec004jynY<)q zvjX(ls3A+&lN4t22Pk+K%Ht(fMOMUIP5_A8tAg~hMGI=DjT`5D=Iu3o>9c2J>CTQg zEC5G!jeF+I%ST<)I?JDA801Vi!vFZCR}UZjWE(H!a-1yih=n#YYnV!tIurGPIgB7M zcjGAUl~X3t`u%>F3!5{0b}&Uy_Q!9zDR9|@ChCEwo{OH?yEm3Nc_PKcW4z4s^1$ah z2uHBm=B%r;Ym=PIiTP-R1Xq{UTIH(Uq10;qaD28Jgu6=6&r9EEKRbTI1 zws2tp!7y~gr=O)V-JO|SD3llTd9et>(g0%=g*t0$9Z&!Ghm$6aALrSAb+G8jnY3Bz32Ez#$Y|7m*(tYo;tNq4vRbDS~ zNlRxlWA;GMK5ORXfuG!WxAqQmW`C*rUtfN$2P23`rmHI_ zG+y=l@! zZ*yZq>G-y`)5w!Mb|c@Mbt!2hNu;T+7Jur2`)mH;o%hAX&C^Kzy53|OSvjW#sd75V z2EVs-Kiu=9Z`>8^JAEp#p}Q+5WCwOedv>teZlfr4dCN@uqD!0YTaFwL{OnI}#rRZ; zQ)Ed2-hkpbcJ1Yt+Eh?B02+e8>jMG2*6YR)1w0fLK}eFgY+Mr!&jq>piZ9V)YN|)y z_x&e$K9do^M3wO=717A;!S0Z{ytQyBnPZT)NIx2MIT0N&AoV^k`n6?O*L?TD{;(=Z z%BgS!++Lf0{)_gGoXm5g%=1zO*Bvow60>(?#W#lQ;asdIG^msTrodhNl(%uT``+c( zROy2aGJoQD?PC;B(JN+MMz)L{r5$aL#*h(yucn&yzja|aPX6M+!E`tr;=uK`>J&^E zPTL63QqTrGfB9w2#PZ9U>xOy}P85+)GL5LJq9Tf-6p3z`w2W^e9>3?Vy1)B}wgfz@ z;D8h!4cZRKycS0)N?W8Kd1221SR`f7Io#PTzPk3ku$a#aq|-$rN;#94SeBDmR*;2( zX4e87MnEYQuCcn`%7m$gHY=GWbGyR@p(Z83zyQO`yGJ%U$4#3WSU7bO1Q#?D^V?5% zArCE_t4$z);Hgh`B4?ug0<6#%Zoi3wL44!0UBaLC9~5t$-Qv7!PK(y&zV2S+#g9MD zrO&n}@_pev8;`NMzAz(koNSz!Qm-I}p(rY>Y$NDSg!`0eA|*xyfqLxfMJV*?_1y=M zjqRPqJKB6{dxA8lJ?1|#ea+&yBXBQW8Tzz^ZU914O%S>I zl5xl{+uE4FU9x}9^j=$JaGD0oD!`^i=b&AXZ6{8te^|5jbo9`{-b`0#3MRC` zgVeHnHC~0|dgL21t$Nfnq58eL#xO=}5yQDk9#W<6KZ{wyiXWG|p}`TjWTOA?@3^gQ zTH^=|!1Cn!E#i&?2UA=!&aB#dkcVR+jR7A5JYw6?oDubfcVQUh*>xX85~tcC>CTQcyo&-M z77W#pVY~+?DH^9J5+f-+7>61FffT`D1d36NZ5d4rVgU@a0yp}z2~qs`oplY)2Upxu zbMxHUHUP#GZ@tUPOpaeNaRQDI1Wq_z$ht$vkjooKAbY!dkZ&$t;C51^7K^+7OOoUu zaHX-PhD323*H4CtN)(EhoYpzL1-w47WHTFjt1jDR)v1Fi6Fl;QG^3*spjQsP89VBGiLd}H9AJA}^TwaRh@+A=E@{9yT6gUzPiGd@c8i&P-91f6A z&UEnigwF7x_S@OAI&pSSp+v8rzoO%bfe99UvtwK5AF3jDVK}p)2Y14 z8?plFU}nagPpWj!`EZ=`l>wwz^w?2-hQ&8`bYihg zR^n1ARuKh>@_21aTW0xnLJ2(MsgHL^z+oO*vXC@(=D|O#61MH#&nS|3VI4*b?lxhw zk&S_KVWA^EAsPBJv9{W+A3GiH6BSujQ54fmrj{8UD3v&iC7`)fGW+iCeac-6uC%}Q zt#4NUz~`0UWf)Et1QEqB6+BCD8I1Q#tgD6mlAHGW=zL!v25AJtY0MD%M@%LMF&s0R zBh18UtomAML0+thD!ZR3Cbtsb`_WIjAUrM$ydvgvqCHq+3#Zbq`OQ;p^Jh%QR_!~e zZrrn1;00c?Y8595Op)aQor@*nyvQ&TsPXePM@WHlqNKw?Q64X?n>sL=?|i;9qlnr> zlmLU$6omF&5Y~6qHMlU^MwPXt>BRvY!E#^GVbjBRqD?jdiEG zy7T+fDTYs{SPht1IWVE0qZ&sB;>Z0?oTdnckwlC3u?nEE(hSOweYKYV4nBjLH4FeC zosaZ!NWrxQ=8w?601Y6p(=-OA=do)Rql+dqdHdrD0l{&+IuIzeID6b^~T65i3u38-IWq1O!nE+ErCuqsYip0CTH$c{5T$GK6j`DZSyMhJ}?Hku$+xXbA zqkS+|7_PZPB@Ls;ke1JyS$AUZUJvE=&?3XI7LCglG>h>VYH@5Z6FOW@Gu-P32vJ0@ zV9f1+nkDUaoc8+c#t3JX+l>dD4hmMioi2H+g@|Y^*T(ITh_!VWMF`Q^^Ex z4+iaCcC>^MM4n9~_)=cT+2uGYn4KsK$W5 zG@*J7Y3BGQmm^s1gCs5+i-B3P(jexXlJWdd{K}ktA52S`<$QoLz$BITLJQzI30t7b zHg`s|M?Vf`;5%=x6SKWNDc}=VwaoGvIn2{rKjCws-jv8NVB589G3j(tlShrR|L$M@ zdF*TJH>5w>v>DveRIV?~O6E8b5WEgdIVaR%f^kN4?qqI*EF4_X*CT7Y7YdQC_!MCH;r}bhry*MY&M#7 zIB77K&_`X?A3uq#tO+7hN7SRE$Bd~>oIdHv_H-wOT$a~ctq{aB7h6@D)WL#pR{U%@ zU>mkr0S1BOqqDlkF|T=gX^>7wV^9R5g3X2rG~b8eIEEHJXsyRf%$hRMLAcy@Se2lq z{_XyItEP-=vj5`Q=Q~7}m5TA0vNjYAFrvcnd>IICm^5CSq;N8&{NTk`LaFvMX)Y1x zA&>Ol_D_@d-*8=78Urz;3UuJI@9qt2=b=A0eff&UQ%8@U&UAG}B$j0j+uM^bMrsi@5r>#d8uC*(MQhpvTCjP& zRAAB+4q3clj75uP&7%FS)zqA;&MOJ}H`%y{DDHY7kP@ou&497GL z@RG_zl@*oGWW*0PZj9p&2mSb+D}pEcqUsMfek>ETjr`%#1&A3itRNy!ZQ9D@LcM87 z>60!OxVN@zedRH~uRs5C_Ta`1F+P(P%{e2jXAnOj2(7%uc>Lw{A0?7!P9;-k+p{9n z(iF4ZVAkNnB@?`HkQ~8k8j^xQx-IyP)qty7EjLMF^#T7m)u}29)8C)j6AHzTE|}Xi zqPmLw>FcW^8@6rl!7v<|F?n+Jv|{Q2`+K(bq>J(b|rIzSZJ2PKww3bhkN}%z`)J`Siz}|_RQMVtCcOEf01_9 z*Sp*eBYgjO^Ilx3j}D=K+lV&qrUCEmscrby}HeBX80mTU7U*DRhuzzcDN^8=7mTsD}8bN1b5#}H`FY@@`?fN zzPn>5lsTlC{s?PTo{1Fa698lMIzVWj&+Z;M$^~&3t!9QKF^nWJ-GrDb?ogNs?~^BjNA^#>{w}? z3r@ofB?G-3lEf&Nn}BU2{&C~IOP4IJ`_5Oc^BPMqf4SvT#7$9UfRRN}>JEpvmA`&A z`s~9GH5knnWUt@ZurZpC^fBO0R~!MY%AXkUvd)@1w|`t-a0G*PKuB}b7^-PR1EmpE zZT}pGjHnKhwE;hlY8$0646)g0;9N$TF}jgJaZD>rHw68Gb z&ehQ1ZoOj8$a@!lxrFL%$J?aUAAWQy-FY@9GI!Ls`r`STD+=1^ z`8DswQ|;|3HXi5YLG~#XwM5yhfmZwQ;g#UtJ1gC%Jx37KP%K{9!vh)w$8o=_TvJ6; zX{g09Zgn{~*aZ&?HJ2)AMdu`iLFs5<;w1mn*>lEx|CX=T>SMCI{jBoc=YD%M-gZ2c z?+fR^bUs50RurdK9%J8bc%m#?b@D}rZJ;fQAGZ+4(GHdtz=#5eF-|magV(lw#!Kl`4icYGk(A12rH>CClFBZs;&ooCZRKBsM8g|x+)wzl4_$J)j%n=!2{Jpll^^UB$t zrPC%aS^1Nn$G-@N``JW1TLg@1N=^tls9+)EK_FA^gnRht@X=i zw`!}oJrY%3-?}}wcFWdyx~nq{E-h5c!R9r6`-!nLvLGs4Dk&WL^ppM@PqgJQZ9h^* z(DoyxlEPrxMO)!G0UO6~y*v|Se`mL{cGKoarmHgzfGY&|Bt;PgMUmt}ia}Khbu+TI z!A^z1qoybn8Qe6D#D-I8b@OLC;#@MpDS~KD=4qrC!*IOOf6lW5a8hoM%|Bsc^^z;+ zR)6QK*VpJ^`EdUs{)rb~Y3o0FxI5j^p5QZSUf;CFCKGI?tF!-=4>z2eJ)vo;@qKjR z1VL^H`1Sk>HiT9AwK^2pzc&IJO5%8>ph+}sV!hWJNV3-_LV80jB>i0BWJ+E6tEa=M_A@B}u2OL6 z%LYy3Dv*gcq#EAavp+|<-L^Zfxyp0j@~izel0@61{mKg;Y=~{xvb8ID`eZoM)13mZ zvbd#0n|O(3lx%NLvhBeBGcRn|QvKKse^H}92l(9Tox8*DY~Hdf-gdkl7F1EYn8_+; z(ip=D=v@ri9hPgYn-rm|yPN&lf4tbeX6J4WqNr>#!LhLz2Qdy<*>bTC7qztYswy#s zy+#ltfjo`KR=L zB7N-JTeqi996prJ^mJ*P*bE>mfd=m35^*MxNHB<^&~I%2EY}z6&Hn11JA<<(O>{wj zKH9TC``ns$do!J9W0~&G1QYAeLGG*=?^A?yjC(I21G07Z2!{1&{^{@|k5Y&VrnWmMJqyKom1Cyz*+4u-PCp zt3q&0$mgJ(ae!uk)u3^J0uRu%%(~Ba<=8}=)xz}`D5@6o$cRVx>`6?%?kk5t<8X-t zmksq4Huay!c3Ci2Ost=K^Nlw`t7%&VN<3lrBy3(&%5#n-n-1lpnV#<4if?`UFzIxX z-~`;VWRa`Czn}Thr=Q2y?D#y*#A3O8UpSSIMsh+n%PXQF7Iy|9X2L3Steg$?<`4`$ z`}1d#sV9H;ds-F*CLf8!v%TFhi2TYN%d4ttl>{{t-AYMCGmxyr*w$cP*kER=OvC8) zFxtviHCkY;>JiQKND53K!t)SarFOTS5?*=pt#H9*<}Mg8@H}u|v!PxF%pdd->Tkgf zue6V;l7M-HZMF~_Dhz|F@g7U>sQ9BLsOSiDd-X zRw87xP;CdB;ACVVzrgiL0rCyzIn&uGv9VYdr)fnI1OaMeM3&)-TFL6Y^#9mk#Yu*W z{2~?38$GTI;Vxww27VX|qX!kZj)_Lu|9tb!o;TiGNA5XxjLr7;=q7?X! zpa3Vhn07RP$P$8_+do}))@oIO22-FgkYOYMi1v>GND|z9;7qbC3bHCmdJ(&M@Xf0i z)3>0AOkUQ!!*l=qM;>I-^meSwkkvOfNFwo~=Ax2R{)a*p1Uw8j5#u(#|9(G&=)v|w zR9J@1Y3G?#{2vl4wXRyI^m8t)s-hYn6Gi>H0dBa33BU|hbh6<(WRTyu=~}Bchcl*w zf$P6xPR@}&{a==yr(lL0NTo{n|CjTWckjFV|Mrj}2=ZTKea%5D0tx*90000bf3_qOPl}$O0mQ z=&ndYgh03wNJv10+y^0<9CJ_iOi$lk-PLvP^R4OXRM%9`OpN~a_s4#pXP)k^dh4yK z_x-$|@A(dP<&)1KknQ*X{Tt{)1j7)9VVI_A8q%~2>goc;eDiV-q883!rr(Arg>%NA zYWXxDR|=o1>9=A!E}6c|g+JrGX!(>2?X90iTiNob6waIPqgbB9{A{DW3$pocCmLCH zZZHhtIDugV4j@2C)ihOAMuGvu5JA%f@}kG%B%HnXJ6lTi}?)W@lxK#39irIzOix2>^T(?NhT2tm?Wv1iD^jIL3$@l zbYFA*_4QAD>l>4sr%vrr?aY>r5sLJWSXkT z3PCf3yT0D>4|m=2SpJ@wg!6vJ$8s z7+iO4opaH`g+aJ>{ep|xPfVHI`1x<=#8VWFV>qU-b}^HYvV#MBK9LXR-Mw;i2FDcl6AOk5kFBXOp>TgqQPqJK$izsH{Ig!@JO4AEl{^Dsh|$ z5O-7tnJZQ&KN8JXH~Ul-n@$^tXnwWpUCCV+3=w7{a^p) z*pYX43nItm6;VJoY-VMca+5k12+Zw}&2ePu&+hnni7mrWE*I&WG}&|6>eUS!mM(U} zu}Rfc#6{DmdvFamhUVku}Aaatd$$U;$L;+}h#DfD9fQkdECujx-+Xz-VfPiv3NdPD9a_gUz%T3W9 z55@X?G+W`P8Tj-E7*9ikvvS6)%I|;q{>jVd&T)KZ`I3sTiaGjIDOu)uSrPKGNlg|9 zm~=XEZ)20^(TBe`{firKoz&FQ5;!ABjJvkZGj(oT?RPfb+PI``wtMv@pR73=jiYpi z%L8G$Yid1fmM@(!rLLB8P!y^U_{l34Ev$a_)i=BO=ulebdC|fangs-QhN@!29%g1T ze_EMlJVvdZj0L3Oak3r-{m*!Pw5Pt&bH^2z`_1PneLiy9f`#=zxcNHjzFTir9{BaM zv2ZjdUb%c(Rb7QoZv(6BA76SMMN?VVils}v>pwYP*Ui8G=LhP(`K#ZMFJ{uBn9a(= zs?D_0!FXmE98@722rvb;Kp+f2gku=kB{;4d;h-vp-$2taox(6Urvr|u@H6w~T^wB5 zHj9QfEJdLoes+U*S};)mgP;5dFQk%!#Pf22;fjL^w*demhGCoQYAN`;YVjgZg3D-FuEK|X_KM4^zkc{o zSd(S-ba)V0gf-58*wM);LS9k?K`!IEBMSpqy(2q&W4s>Dg?d7xN(o?wZ5Kc7Ynte} zWBs~H^Pn$loudDlrM|+4Hq8G7wP5lD{b)xdiW>YrT7r1(a6xW)%```ctYW28HZI4zxQ?ap!R42X`&z^Ns^GNsv3rLTlH)t zs&axb92ODDIs7AQ2xigvP^Pq|pQLr)#vH^z~P->YrcGugf9?jI}SgPoJY?@-5B4B{d;pIJz zO|F*NvjQt-O^4uuu3~=m-d=S7ip4rh00^W@Ff(J+XA_|snT`9nvf z8y78b-FC?Wz0ZTa{phK8-s4hT9r5fyILpVPJU0-|$@%<>0lR2jeC{l4_uEn7}Tjvg7v zClh%`Wzb<|4^7pE`_nYD3tf(B%;)jKZ);n-NgwU^`GREJjAQ@?RyN^jXmkdqP78eJ zmJK?)01$rs>UQx!XOB?had`j;&DBA4`Lq`F)AshTrl4d%oS zx0}4}k_8NO`sucr=oc@%n2oicjHkLg(^598fM=x}oz_LJX-EFlDFT&vqz1YtzJk!96m zmI*bk)ohGl^D~z7kjj1jP1F)uK(*UbU+)Y|YxRHSmYZs4H#Oh@mY=<`Q+ogKktD2^ z%?FOqH_X3?0U$L6DiB5x`0nE;#I5@e8y@2ahL-M8U}>gyLTVgW4Qec@$Z$#KH!)~N&{ zNrH5_(YB)>ql=pw(1D&lbl0lo9v4mNs^qFq%CeIr)TZic3L^-@Sdm~T{^*t){kI=G z8UeRhj}nixAI`mLK`p3~G~ygdvEXLopJ3d$-KyAWC+@kEDLTqHr$V_ zf+`zk0b2$ccNFpM)$xvB7%gJA4r`Skwkr{yT+wf+@|!>IL(hzdv@wp7O^jdZ?eG3GkfE zSM=$@z<3^19qDkA5M*P0J_=M)J`orAcnl0sRB+*~dVWl{dG~CmaA$TQvub85zPYy6 zldP@t=7u8KTtt!JnFyLD+a@-ZfVi!Bl9%!MT(sNG2&rV&CiY@CS>@D=HJ?=On)9)7 z&R0ely^@z@)bIZ16Fpnr*~8_N2?63CkH7FoHIn0rw>!J>XgUKcnO7xIroBFP?SlFK z2i7jvF9vVok$2vg!G^hi^@-Ev*OWrwkR-xS<8tfZKppx-6P4GVRjRzXu-hU|j^p-yk#!s~;GNJw)1Plvl39Au` z%KX+PpG;(4-gi*FZTV%6XTNY))psg<%FDT2UJ*r5n;LkQ;4+x6X|1h+{E~<9RWR9s z0UXi@rqj47=!PsR2bqqU)e&y7Y3!c0+=9GN6;*OQSx9chzxlm~dx&A3t4di;as;c{ za5Cjy);5b>Hg^ub`QQ<4$NmGNAPTZwuLMQns!jAZ8jlH5E+^}`oKe&fGGZ|fC+Q3Z z8D~|EgLb=VoFs9$j$~QFH*u1`rLMLJNKl=$$HTbm8$7hv3t@fF*KWF@diLZ=`0UA( z7+=8e_{n2W!28HqAurpc1V#^NX)3T(=9#y4@oO%c(*$9J2XDBh_H<8g_E0LB6H-YY zY&nFN+AyG!Cp0w%Vki7Af}u$@CrdW{<7Gf&_l)Y8&uTA!4SNQ&G7JD9l^q<&>rbM) zqAFr40t|q_!7wh!d6ag_6^12A|eQ)DiA34xTs|!npShI0}O}yKuK^I{q*L) zbF6&x4LynrldnfV%isps1ZbDFSr^Qjv$A#OLUdlj>>GM~8 zs_DUxj}O3D;e_rE6&VJMV`#H}{=C|g2M%~?kC%~hIo_sor3|x}k6|{)MpL2VwQ0uN zeuR((^oroR8Yh8fDTjk#d=(CJgtOA)Ap$NZ4NTx*nBs9gA{q)SNEE~aCr_!TBSZQG z!+<6ealsJ`I(+;@87IjsACH4aWuH0LbXx_*GaOpKWO31U%8QcLAB(AAznG)Pp+pLu z425LG=ko_UyJRX5^gXz4WpQwUfj;i;5rKI_3|3V@ev6MrK`q%ah#3f0J7p~U3bSFIax68@ z_Z_?Kh}6Jv0MA9Tfl7Aq+%~Uq90vbOf7~Wz`umb3%Tj9=%&#!pFu&OKuE2%*lTt3H zyTp1?mCHrXm@vWd+kgG`7*-N#ap5`PMkvbR0q+l zhB|EGq)9dLGpD?nzTSk$Wdx(wGC@3Ru~oU}8!h-|7gHJ!*v2h(fI%?$uBvM1(zZFp zK{^wOLJ^1tI-6h^o1`TKO7uUh#_J>J&un#)ZjS?2C9u?w@4lmQW=k{J6rGZuH5L?W zZ43ZN%w`oX9L{Ziep47?IC_RrRWwgSliLvtx|*wl#o0L<3W>>%v&q=0_Jq5x&beyI zWkGX)$wVU0$78&Z$w;cImF{$(T#QWJ~IpN>ksSa z0aVv5xwPr@@#AOGJw1am&+{hZx7=jgsm!sAb2CWnfMCZ&cGr(fYyd-m;Yob#T07cJKeu{?GaZRk{d-qOn#TzNp^-Ty zi0tMQaaBkqMWhY04o*@S*fvxBrS?%OkrZ;VC@&-vqN}>v;c+@jY?$u;5HDuZ5(E`Z zc9Z?;!!VuFHB@TAK7Ztxy!N8mCCSHQz5R;J^8)E`&`U3xQ)wIr`z0xex~c>gTsdnx z`=3n{nz&HkU_P11iRqMF#_l((lCi=MRu&nrePh1YUtGmzQ$VF5O_8Z-;i)Jg%0U1Pn}^#PgDz7ZeO9^sY zfdLB5nV|#hinf`=pO!71{aPlSl=D2#_4kW1Fy6>4^;j-;Idy|+B7?8)XYqM~_N8oAS2qQ_iZF-h;k@qoVF*D* z-f%J#M^cs(g-jZ}Le0!{kXFD*lBllmo>Oa@rU~g3pYG{NTzBt%ae`q9MaYX7L88Fa zX*K__Zgo)|0n6^*yRVy%MdN#p9AoZTv!YlFa_`!eH67uBHdT^%q#>Cb2q$DdXXHPO zXT~gch&gCyr+&~F>ZzQZufaPy!+=VFAe+c>vXD-Tu4-AS4OTHfyzyGr@J{rakiIZ7 z>R`}t4T${ViIe#|ue-W>{biSq==bIKKY%iaRBmXHH@ooT5dZ__aFDIFHN^qxO(YBD zo}vouLDEdgc~pog(JnUy5#U>{y{0Ca&8cthc{h>l>P%+`!#SDfB?B}VffIlksNggA z0gRa)9LP#pP5{r3sqmA*=`*W0T)w8sym+47xjUBX>KueXUzgkC{HQ-X#W)X){FB>m zn)*)&sV7JhBUu(@`uh|yt9x&#%tVhhv7;p~FDMN&nvC>zC<>?D9ul^V_*jb!GWA!k8(aT zyzdFhFKEB}ockI{rqp3i#X&%6CFApz*f+h2Bvkve6)jULCQq5_d*F_Z)o^@rYis4x z&u{999w%a4IK)8)T`S}!jWmQ=08jwTd@3nAgH?>XzTUI&(n}ieSh1w|FuPB*%UfQ5 z^K`1aD=Ou(c~^Cf^WfP|ZgxYR+h|h&P3yxxAG^=%bFhB@nN)YzARmpUWg%}wg005r zctB$nCoW((He7 z>njXK5K#9kC_@pkVC3V4U5w^Q9ZMY{ljx3S5+ zaN)wruit!Qu(`HcUveFhA?**l_GGra_QoJL5Xw3Nm8>c(^qBzzy8wh_LVzOc7q)Kg zThKgd0xwDE`L}kawrzVgobK)B?CN1~n#LWKm5isM(ZyEyS%PI@!x+-Dj)lT*MAMvmK<8wbBF$*SB@DPT7<4)+gY3*ji<*9Z_Z^J}d+zJ#Qoi`}$4*8*I@*)& z?n;SSPT#(oi$u7y?d|=$K5lQhV(#pcWGMjX*2@-o*Up}?`kse>6#Fn79^&J%OaU;O zB{@0TB#xF=7%jMGcYG`vQQqJMu*{q{&wuYtH`c9Rv``P&bqq$-=XUMkw(i^&OZ9Z8 zGW~s7sFs7xYp_?z`Y=#pnNKFfqwl>tbj`_j4%hc1rA2)|QZgZ0*#+qy5UsP?o6kHo zUBhwGSmDiewdJ?*B7_R=`mn1jN?Ir$R{_|_h@%Ye@m3S*w05MUOVjiOA%-E?SSAWW zI+e;ptxR$BaS(!N@}KkUAcsYJysUp}Yt`z@7FT`g+N-J!u)KcgsPNsVo@pOCeylgu z*%24gDZ$vZ#wX%@x~F^Snb)_UUNp6NmKn%~II z`_23At-a-%s~cd%_qCrEHtpJ-*|m3Hk_(5jTsWMCdRWN%(jKqAld#(7EeVq8C6S7( zXSy@}61byzeSSnyg$(#;Nk@=qGAYlQHkA#<;!00sNIucsD?)uO$Mfo`-hQ#5GVrd! zhG=dXwN)7Pge= z6EE{QHPhdhXg_@D?33GfRy}z2r>l+k1bc4F2m8V=zP)pAto=j>ET{szSdCTO!WiQT z=v|1hJ1*DSSjA#bZ!iDDUq03Q(g*wWVkABh&-2k}9*U4al_-TeT+CM2Ynq%J-fILw zGF6skDVH7BQ$l1Hz0$}tAb3B%d$KyGqs>~nu{D~U~^=JO$_FIGVr?E-@(cULss+a1qEhd9WcS@KjEygwh0sfjbE2RFa6?O?svd-1I+msbC7 z&-;mAZ-47Vs=KQr-P_a0g+maN5^Xm1S=nN|K|ZUDX0xF4V3`t?1mz9sC!hIE1ZqxT z@TF{47QrCQ=SMIDOaN5jBU#Uj=q$7C&wDw@*#OYS`2a-$qZN!{aLWmX;ebgBK+yqX zfI$a{@f*&K7A-zE80FentMS1TQqq0B+=efF@fhWDQDBVUuzIC?XlN++z4!hcd+Gf@ zr*hFKmmLTvvynkg%wz;r5~ae<0Aw{-A&Hs^^>YZvx_F#csk47^D!>Fn#iclLP z@wt3~mFx!D_>T>CHpy6#UsUG2+2i_4Y?l&-fiHRhY&=&&yIdr~|M#X%eSdgm8@2!A zkNHf0AD4?pg>jW({=boOu?J+6m(jl$fU81vAOHkvf(UT&2?F*wDf$LDSvHE;t%Gk} zy|}RjMapHB!eTJ~`HwQnq#6C#sUf>h{QPTtE=)%CMC?QrC6$jy^E+OBbqE4#p!*>z ztmN~fCl&wq#E#ZA8%jUt(rOx}+f9;Ww6ij&oehDTs^}C`J2c97!qV2R&+&}uXyE#5 z%*nYFit#VY&Qowx4y0Tq{Qt>$%FB0d{QrB%5JLY0)_Zv2K&+zE00000NkvXXu0mjf Dxzznr literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png.meta new file mode 100644 index 0000000000..33c8310470 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: f97be1fdc1d373646a260705672575df +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: 1165bde3c7ff2d24caf6ac5708ff5e27 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ExploreAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png new file mode 100644 index 0000000000000000000000000000000000000000..75039f462eadb9480b80342ca73d3c3c9b878068 GIT binary patch literal 7745 zcmV-H9=_p;P)D?03i)oX-FUt$mTfl8rza3Th=z3eRG*z*K2D1zZZmX&oz^ns_q4AG3*LS=RWGVLls+a$+heE25|(y`VcL zSV{rGKGDeXd)&|vPA5hODk)cW4MR{Ari!A(kH%Rck;p0nuj{I+68p(;b3Tjbh$}g zQFNKhDsq;yukO5nM!-k{2LM7pHTf9$PO#I4I9x8m+t}#-;JK$yVi<Ml`C!BF z*1v2R(p5F1>pFlM>6!s%O;c42>3X?=vjWAu4!2C8wH!HIZqnP(Sn>G756$b04eOh} z+Mnt=)E-H6bq-|)2T~H7QFKkSYX@ulb}(v1zS}j9{a6Yp#kLmv_j2b-N?E{=jEnHp zH@JTL@IzCg85Vo{;~i}0!GnopPgfdNH0=*iKmXwmCO!Seo1;fMI#_NvCP4X^_Q5a= zClIJ^oFH(5q6vq~MUpf_sFI-aqoX1pkBbV=secP-2&a=^DytYokd9EmkA+TMKrNd$ zr{U*;3hn9Vo|8$2Asrr%@q9AN%0eX7H@69rW^hli&NHpGwfdsd zmyqAN^0LtS-Fxcq{l)5C5}V;=F3ah8yo}Rkb`4WXD_A*)T~q0{>+JouKj-oI$%Ldl zU?_@k2kTt3rcd*&s0$J|TzH=U-M{Yi|KyjCbjw**_SQFg7oKuTb<5PLf$u!>+Xy=p zVO3F7F@nG`0!J8TfCj@I4&3SSI+@B!=2xq3t=`ww%|H6$OOerz_CzKe<^VJ&(rExB zK~YAX(1=;y85_YqICKPg8yY<%MH4^zZ{H4e^bg2uKiV{!>gi5p2K%#OIxT97QVba7 zv=44u?XXP~4v&XHIG!KFix)2Nb+7zd^Uu0Fhphc7(w6m{6$r)1XtDkj>+kWnSh;6B z-nsnw@*IXFF{jJzKsZ6bZ`$ENSD$;9XXl90abs-<&q{uVp&2e9I!LkY{KXu;Rir@X|mHxdS zOR6f#vczVJt#HgbXgQ8%v;|vBZfnc)31cmgjsgO`wWAZgxMh0+wm{haaDqexO_L6W zK>#dO6hws=L{$=H+XUIcg_W3eJJCHJAda^++2y#}rz~I$(ufzXlr_7*)OQUGVcv!Y z@10j(7J#yV+l8(@^K=)|R0?T1o`4}eo=R(d!*LZ61cscHV?k3xzMfmoJBQi+*>3;F zqkS1ZF$$}`K+C{n0a#o$wX`SH;HLe4if~c{&=6R>O_Q74OBOAxV4RNpJu`we=$=b2 z_8~=aEog1dpIE+d0kxo|sd?GW9T_p16ab_}wx$9NKu|PJ`Ftc*QQ8eAw}VNMIYl-dJ(QtjBiZT z!ufkGp|VmIFu*OqGKyz8)S4^n9!+Adni|gyXD)HiX$To*;Y14k`^K$EX0u9kWSCba z3Cv3kBXAriN!;P`IP2Z<~q-+OluG>5euz(O(%!Bp4MvrjoS@Xqfa zn?X69c5`@~1UxP@GZe&-s^O#QjPhmAQKaJ-j({U6ioAGXTjjP)MwEG81zw{W3S+EE z`ye~rZqnO0$@{bWelYE&OO*J z4GkWu!tZhi>neYC>rFEos;jB{UVOQ|WA9f7M-J}SG6Mq&fY4@P4g{mX)Y)`x1|YPyKp|W`Op#POWQx;zp-#W zK4Vg&qazway{Qb**3^i2Sw@==b)v3tSV~5tnUSM?DKVXqHAOAxG;9M@h2JrA&K&QV zr=RA3^4$;8QyS}?vC)JwI1-n2P1Q4sN*+>>=h3THkgc`V#(g`x`p|DSZsxO*NJv6xclAZ*hb~)oPH6Li z4&@IY{w3De*EcG&tU&pEw5z7J%071Py1L-<1#>-^uFJ?tyFzurnloq5GPK?E-@SeQ z|9<_??zaVjmsvKe@Eos$Pa@Z*g)7+|ip3`VcpTxhTPL`LgxxhY zKi{wgZQ8pp6YpprPWASrvauL1jK)PUudSUToD}Y^t!2(#dT#Z<-F#!+6~BIhRof4X za+Vb}aE$4??(}$ZPea2vr`VVYt!Sz&tGKR%h9efunC`yr^hE^ia5$Snb**=;{xuHu zr22X@a+Z~H)=VLXAxWI_`e;Fx$DV8c9CGRG8TH}OL=e+-71W826OQ^oMZWDz=FWl- zptri%U_(7Wy5_2>?d|P{lRe%2SS*U^iek0UG@G~9I-%vv=29m2KV0&F0l$X3F2n$t zr2PT9AsBSD&7S2U{eDli=a}YQI&-RV47gkdpZT(XP#xq2^7eC1&tJpIGNvn%dgrq* zB%i(GU#d+F06?pClGG!g?GiJC1KDgWD(H%;Y1%Oj1KQ2$@i;u82G69H7C-HDV5^p% z?KyJvD6auX0lW?edCH9GE+FHu4VkiJ%49U-#%o-+pXFEM3yt??xFsE0bv-9C<@xg0SF+U^&CZ;_8(;R zY$pDBXHO=>xU25Ia9Id|WXfokL&1RGaZIs{*KS3CQq1f}7RR8i@Bch80Yi|Ci~Pww zch}!`-8GZSwYF~{f=1XZVl!#+^=%(#k~-%2-ldo1msup4Lf>7xPD=C*7)18RYu?U2 zyXt1QIjGm2vDo?eOD|J7cfMwwtTFE5B0QlG<8N;DUvb(Z2Fh11oR6V}^8pzydw-z4 zZgvFqCz2@3^D0u+v5&6nUxhzc>g$5cH&1ITxTkGO3vuhE%PUtOJ~WKsgpQD6od9E! zbOXm~!DRgL(>>_@ZQJ`(eLXP;<8lP1Os#+7)*EYK@qoa%tpD`0fziVqy}GU|fvM9$ zON6X--23|5(F0%Y9g;E`!Ll6{nCvBv#XvD3Q}{%AN)gFxUlTAYOx{nQdSYCxlFAC>U%@`Vf5pRmN|Dd z)%(}(*vUp>QDO6;PPchK0Oy?f^IWg(`5cH67$EuXffv|ST}}C0r~2<&c~yQQKG@fe zR=@pjLgqNhQ&(ScP1^$61OZrRk8S=?*}3mP8bGpW>J)l+-%%OB>TtQ7|2}`-xW^Y{ zSx=`@VlM7eY`}EjNtz-T07esdA=TSGJbYk(g!cQLPOq0n2-RBdQZwOjY^43bAV!cn zQ&m-pVPlCl|X}{byV~;1H68D@4$2n0MM|w4x=M*j$C3KfjZC$ z%1OXVM+kYX4cvNKoAb;m%{4ba^*sBpmtMpG2!PY9-mpdUGBozh)7r2_t&?4=E?nli z|E1SbFK*tNSvqs7*VHnH`v;_A9X8@awL#adU%N86a?vS-S^m}0enm{D1t8%InwzL= z7tYV$14KHAW8hhp&Nz9V@2A(Vball>&`;ichp!+ArLCpO*h>EN@h9S&J9ee{(KyG) zN3!YuzO;}?0D;DesC*12({3T^ng;#gx#1Y6tBNXfoKW}#ny$&Rq6mUUG7LB^@hbN* zr3l(k=6F_OGsaeEX|t4*Pq&a^E2k-@b&8dtf4~-1aQ`vDWV5O&NjyI~BEW+pUDF|s z1gaN}u|k6jtU7ZM@E79wP20r(Sb2rJwYCP^-`B4^@W)q1qp6g-;;b_(5keHoX_JOZ zKfdjYJ&9K~ZNr1XAk!U-snHCplQd02v{~o1d}x4hkcM@#e9^-EvIMQQx4VZ2XWZ%Y z=6HW}$$1#m3+3zf9z@T7@~ObbVDl-g?a>}@wOuWZ?#eeaW9?C;-v zC*IrJ!}24;9C&)i;$EyQXF18T?G&t1AjP_(sw0_9enL-fZlYiJ`WU9N%0>D8q{HQ+ z3a5-9=|I3&F}b;dplN~*1pL<1yd;C==_H&^5_dRAO_qy+rkG~1TXGWx!9Rk}V8t|y z;d251f+~t*u6L)?u$(Ag1qB7>b+Apm@bONiy|<4)d*(FP!!N!Zf9K;JX+AN^Q$8Ps zbiLBNwmUY0-r09hfqI|YxG8yt5h&9{GQuxu5N3YYz!)Z<+a^kqG%?I&YnJvMrazna{e4-Zehsq4JCD5 z5Ttv5_rxF@4g*+tA(fOt16X)d$#MMy1BtI<-GHPrA`P9JaGL=-;A0n^wURToRm(>swikVz-rlOg!{Mu_|Kk?mYy3(@&eW# zjcMPz`fF7tSWr%L*@>(vCYWB@ye*aN?iv+SDS?lVK!jaUB}qob1J>g$6}Zm$94iDq za>A(OiC^vAoUUH#t z)5ecnANF)-%-~Kh7*skCpk8|4g)Upt<}&*Md}%O|GF1HB#t<^g zfg?P&dAs7lki2x-6!HsQ^MX$XLkLR`;29w?s#@}7$_<)ktOFd!bjzdyA8Ko90-_84 z89kgxVT@&L5-f*0!b1wKNLh~Kgd^byrxT;v;O1P}{AeVw$AX z1eOhL9H*Xfp6!VWnY-CZ`vXo-sGjk+PVp~3dG*%Di`pSoQIB+XrNe^*JXmM>x;0IgIS%41s*%y=aN>|I z(bL(1XUow6JSj@(8}m*=m(DvW4;HYb9^1T)mw8@(`0H1A7ENt|73|qR z5UzRg{SQaity>pPbRHfBVy}pTVjHk=1B?-b5qyO_4f6!F@yI*x#WLZ+7^GMDnkI)H z|Hd_bbDTP&!|0c9uNz4A_VkL$L|WH0Bjpk!2+*Li!t*>o8c%V&NDj=!^JtpP?=mb6@QQ>lT(F&xqjacoB2F{>FVvXtoV3@5w0 zhQT9F(u@H@CRg}|o58Zr2V0d6Ky&*iv3dw{}Bpgt{ z0YKX+f*=DEhjEG|lKPXcujw7$zi%kn)0Oblg&1FBQ>LIHT~p;O3!I7PhKE^OQn)p_ zyBN7GmH(@i*lvyoiiyZXwx)4b5)?Ql*Edjhu>9-GYq(KCgo}@PpLAV^XfHQ1B7hY| zS5{IdO>UyTb^3S`3T|}}h-yD``>Lv+ulX~v3zDmV8^jR!IUx5{)k^>#Gz^%Z%NL!> z6gv+Y24~#w&ug-ditN=7zz)^LJ0hdX99anaWC+6);8%7^H79gr_d#s+u;l z>i!$937A_LBoUo6V`{#EHDB&GVn{HtkFL7Kzv+zAe9x`>V5IBd!6X|QWC3_$Dj`bQ ztZEGv=&G^8)iob&PThFLWx>`^9chwXNR-+;7}g?L9>43XB}U!QJ`mtX*Kd^i`+Bp4 z!%3{!v)6g~$+MlHeY&GDZRb~ejf}t&DWL^}FLRs<@viUOci%q3;l!kDR^q^qlS&!+ zFuCNaQYjZ!jX>H!f!h+n%{nj}53xG!ifuorh}M~iW;s#9J5Iwu=SP#hJ?Yg?JlUHb z9^6IJ3oDxq~Ix+R^knCNHO$RHB!TmAk9Z1p#;W=t()0%!TjbE=Zx zy2<~CS6?6a*)M+CCuLa$sYo|Xe27|;G(!T#*|6`R2z|Nj^u^R=3+H>zzTV9FnlQ9C9OMUTfB=*z2}UF0!1rZ(S1s4Q2x+vH|fQZdQY6hV>wdK-v_hs)qJW zYVri8O|Lq0(V}YWDk5BN+TYv~xNrG|uC}SI#)^OAuRFzGyzs|Cuy_JfrdH+w<8mP} zndCk{ayWaxuK6Fl@!AUe0Pom;PsZ@*?`2+}~I7_{4cS6%9I>ssiyk#H8? zR!}8TDx&^NNddnw1h^1E5QXiJX-34hsGUUwHG9ZDYJ&))tUpMI{;l>rwWDAaynj*ID(m>n9*KJms{ELdC93<+K4`Ag4O;(O|)KT*W^ zbkB*b3>FuG=t_`)c-b&D#-dF+;&l`NO*SGll4Ip=&%O`^Fr@qYSP15kE|+6L%VessK1CA} zqXHKn5#HiCdDD)aqqkpmdF6qwZsCKEHjO~mTQ)kxtAdaxqsEp*(ZsCQX4>Ar7e3yp zxd~i-YSk?jaA5(501J-eWFV^$4Sssp~Jt}NJXKXdNgCxOm zchS5#1!nv(B$x|=sLGPP4s$Y14M5~HiB+?d(+VeQ{vMCR{M}npUcfIRWzzB&2li(+ z9cZszK7U?*6>V-mtm^_VeD{}c4R>`MN@v1@EEkIk5}T31jStQ?gyRLBHMTj9Q+ROs z3%r^gif|9^-#enok|w5761+uef2|cj1`*{yZ`q!nbIWAIZU(SE^42=`oy}Y0uqmuO zV@YGEFc^#=aSEJ@(0`d@sN&1@`H^uqU5#DI8_@I^Yk{0k7 zi00!2K^Wdei|p9De?&+octsFPIR(wJQFEYCEr76-RotdACgRZhd&usDOzZK0fp?Tg zN5y1!S8C0=_an<@&uR#dCiMSY`&R1n&-aY7k#Lq9fn3~CQB0>LGjNCzBnIZDt{iiD z!z3H8bqGA9PG~|hDU0c}Y?!0KSRm&_Q^z^(08Csg%D?pLs{_eoQVjV0&Ubcvl1UE? zu%NBzKqdXaA76I=`hTpdvTDFD4jjyYi4NvCBv8RKy!q;@$_IbhI0S8gSf|d| zPqE(<)iR~GBoNph*zjO>(|hlQPyK9n0^Hmql>MCc2 zmD{HB<=ACU{lWOM;jVuv_EXj$~53 zJ(;oi6sK5Tyf5WJEjDSY?fbax2#)wz`lZud7jiRIRkWrkGCwlHvXL;ngwMfm+yAu4 zmau?o`JWfbQYIDoKbTVg7i0Z@nExC93xmpP7?evjfRDw@D=VNmV2j$jYgh8%-n}ej zvMC&=0vAzBfUJClIx;kvI{qQX@@Ap}aHA)CdoxCSE1Ok-OToDk|I%Ow3o4_si-9YD z4QLqPU#cW2Y$TinZKjF>uZ$6Q%|ejv_u|Ky6wKnoDW*N_N4xW}UfQzFIJPbn8lGVgJ8NM3YsDcGAfK0 znUk&B?k)A5uw854R*na-a&?#T1ph7aPnpO6FaOmAA@qL$-Bh4iY*5=m00000NkvXX Hu0mjfqI4Na literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png.meta new file mode 100644 index 0000000000..fe369c0091 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6e6036354af272748bbb5af95ab920f3 +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: e5827377d58b73049913c1da57a2651c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ExploreAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 9e16a71809..ae7887e831 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -12341,6 +12341,80 @@ RectTransform: m_AnchoredPosition: {x: 29.799988, y: -78.5} m_SizeDelta: {x: 642.71, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1368536612236462623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7585235434928099993} + - component: {fileID: 8548672819578578971} + - component: {fileID: 3482131063915512777} + m_Layer: 5 + m_Name: Image6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7585235434928099993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368536612236462623} + 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: 4761079688238677584} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 140, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8548672819578578971 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368536612236462623} + m_CullTransparentMesh: 0 +--- !u!114 &3482131063915512777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368536612236462623} + 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: 6e6036354af272748bbb5af95ab920f3, 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 &1388174875177810144 GameObject: m_ObjectHideFlags: 0 @@ -28946,6 +29020,7 @@ RectTransform: - {fileID: 6823656507059928199} - {fileID: 8863559515178324334} - {fileID: 7182411058494587866} + - {fileID: 7585235434928099993} m_Father: {fileID: 491038039515440220} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -40355,7 +40430,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: e33370dca61c0ec46ba9858cfd7a2cc8, type: 3} + m_Sprite: {fileID: 21300000, guid: f97be1fdc1d373646a260705672575df, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -40895,7 +40970,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: efa15a6fa087ddd4087e8be91945380a, type: 3} + m_Sprite: {fileID: 21300000, guid: 2827c7115910f564e99d1f7ca5e4d518, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -68420,27 +68495,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68450,7 +68505,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68590,27 +68665,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68620,7 +68675,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68760,27 +68835,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68790,7 +68845,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68930,27 +69005,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68960,7 +69015,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -69100,27 +69175,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -69130,7 +69185,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -69270,27 +69345,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -69300,7 +69355,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua index ace7cd3f58..bb30e85aef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua @@ -46,8 +46,8 @@ function this.OnLevelChange() if v.state < 0 then if PlayerManager.level >= v.openLv then v.state = 0 - if PlayerManager.level == 20 then - this.CopyStoryFormationToCurFormation(k) + if k == 3101 then + FormationManager.CopyStoryFormationToCurFormation(k) end isCheckRed = true end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 1b3c36a4fa..3127e5e026 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -247,6 +247,10 @@ function this.GetWuJinFormationHeroIds(index) end function this.CopyStoryFormationToCurFormation(teamId) + + if not this.formationList[teamId] then + this.formationList[teamId] = this.MakeAEmptyTeam(teamId) + end if #this.formationList[teamId].teamHeroInfos<=0 then for n = 1, #this.formationList[1].teamHeroInfos do table.insert(this.formationList[teamId].teamHeroInfos, this.formationList[1].teamHeroInfos[n]) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 31036169c7..9ed858c900 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -862,7 +862,9 @@ function this.SingleHeroDataShow(_go, _heroData) exploreTeam.gameObject:SetActive(true) if this.opView.GetHeroTeam then local index = this.opView.GetHeroTeam(heroData.dynamicId) - if index and index ~= 0 and index ~= 100 then + if index and index ~= 0 and index ~= 100 and this.opView.CheckIsExploring(index) then + exploreTeamList[#exploreTeamList].gameObject:SetActive(true) + elseif index and index ~= 0 and index ~= 100 then exploreTeamList[index].gameObject:SetActive(true) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua index e093c1d6dd..9f28be4db6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua @@ -69,6 +69,12 @@ function this.On_Btn2_Click() this.root:ClosePanel() end +function this.CheckIsExploring(index) + if ExploreManager.FormationData[index + 3100].state > 0 then + return true + end + return false +end function this.SortHeroDatas(_roleDatas) local datas1 = {} for i = 1,#_roleDatas do @@ -106,7 +112,9 @@ end function this.HeroUpDownCheck(params, CheckFail, CheckSuccess) if params.action == FORMATION_ACTION.UP then local team = this.GetHeroTeam(params.heroData.dynamicId) - if team ~= 0 and team ~= 100 then + if team ~= 0 and team ~= 100 and this.CheckIsExploring(team) then + CheckFail("神将正在探索中,无法编入队伍!") + elseif team ~= 0 and team ~= 100 and not this.CheckIsExploring(team) then MsgPanel.ShowTwo("该神将正处于其他队伍,是否要编入当前队伍内",nil, function() --改变英雄队伍id改变 this.RemoveHero(params.heroData.dynamicId) @@ -114,7 +122,7 @@ function this.HeroUpDownCheck(params, CheckFail, CheckSuccess) if CheckSuccess then CheckSuccess(params) end - end) + end) else if CheckSuccess then if params.position and params.position ~= 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua index e27400dee8..f333cac996 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua @@ -45,6 +45,9 @@ function this:OnOpen(_parent,...) end function this.RefreshData() + if not this.mapData then + return + end if this.typeIndex == 0 then this.data = ExploreManager.GetFormationData(1) else @@ -130,8 +133,9 @@ function this:Refresh(_data,_item) local formation = FormationManager.GetFormationByID(_data.formationId) for j, hero in ipairs(formation.teamHeroInfos) do local heroData = HeroManager.GetSingleHeroData(hero.heroId) - _item.heroList[j].hero:SetActive(true) - _item.heroList[j].levelText.text = heroData.lv + local pos = hero.position + _item.heroList[pos].hero:SetActive(true) + _item.heroList[pos].levelText.text = heroData.lv local star,starType = heroData.GetStar(1) local starSize = Vector2.New(25,25) local starScale = -12.3 @@ -141,14 +145,14 @@ function this:Refresh(_data,_item) elseif starType == 2 then starSize = Vector2.New(36.868,39.76) end - SetHeroStars(this.spLoader, _item.heroList[j].starGrid, star,starType,starSize,starScale) - Util.SetParticleSortLayer( _item.heroList[j].starGrid,sortingOrder + 1) + SetHeroStars(this.spLoader, _item.heroList[pos].starGrid, star,starType,starSize,starScale) + Util.SetParticleSortLayer( _item.heroList[pos].starGrid,sortingOrder + 1) local demonId = heroData.id local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) - _item.heroList[j].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) - _item.heroList[j].icon.sprite = this.spLoader:LoadSprite(heroData.icon) - _item.heroList[j].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) - _item.heroList[j].heroData = heroData + _item.heroList[pos].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) + _item.heroList[pos].icon.sprite = this.spLoader:LoadSprite(heroData.icon) + _item.heroList[pos].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) + _item.heroList[pos].heroData = heroData end _item.exploring.gameObject:SetActive(false) _item.updateFormationBtn.gameObject:SetActive(false) @@ -235,6 +239,7 @@ end function this:OnDestroy() this.spLoader:Destroy() this.itemList = {} + this.mapData = {} end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua index 6293a2ad1a..1ff5554e21 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua @@ -256,7 +256,6 @@ function this.SetExploreCost(forId) end function this.SetPos(gobj,pos,formationId) - LogGreen("formationId:"..formationId.." this.formationId:"..this.formationId) if this.formationId ~= formationId then gobj.transform:SetParent(pos.transform) gobj.gameObject:SetActive(true) @@ -299,8 +298,9 @@ function this:Refresh(_data,_item,index) local formation = FormationManager.GetFormationByID(_data.formationId) for j, hero in ipairs(formation.teamHeroInfos) do local heroData = HeroManager.GetSingleHeroData(hero.heroId) - _item.heroList[j].hero:SetActive(true) - _item.heroList[j].levelText.text = heroData.lv + local pos = hero.position + _item.heroList[pos].hero:SetActive(true) + _item.heroList[pos].levelText.text = heroData.lv local star,starType = heroData.GetStar(1) local star,starType = heroData.GetStar(1) local starSize = Vector2.New(25,25) @@ -311,13 +311,13 @@ function this:Refresh(_data,_item,index) elseif starType == 2 then starSize = Vector2.New(36.868,39.76) end - SetHeroStars(this.spLoader, _item.heroList[j].starGrid, star,starType,starSize,starScale) + SetHeroStars(this.spLoader, _item.heroList[pos].starGrid, star,starType,starSize,starScale) local demonId = heroData.id local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) - _item.heroList[j].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) - _item.heroList[j].icon.sprite = this.spLoader:LoadSprite(heroData.icon) - _item.heroList[j].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) - _item.heroList[j].heroData = heroData + _item.heroList[pos].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) + _item.heroList[pos].icon.sprite = this.spLoader:LoadSprite(heroData.icon) + _item.heroList[pos].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) + _item.heroList[pos].heroData = heroData end this.formationList[_data.formationId] = {} --formationId 为索引 ,预设index,mapId,exploreTime,formationId