From 5162b3247cfccfdd8ccc768564cda8679286aa4d Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 13 Jul 2021 11:28:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B7=A8=E6=9C=8D=E5=A4=A9=E6=A2=AF?= =?UTF-8?q?=E3=80=91=E5=9B=BD=E5=86=85=E6=8F=90=E4=BA=A4+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont_vi/r_shangcheng_luofu_02_zh.png | Bin 0 -> 32058 bytes .../r_shangcheng_luofu_02_zh.png.meta | 99 + .../TagAtlas/ArtFont/s_shop_luofu_zh.png | Bin 0 -> 19323 bytes .../TagAtlas/ArtFont/s_shop_luofu_zh.png.meta | 99 + .../JumpServerHightLadderPanel.prefab | 13128 ++++++++-------- .../JumpServerHightLadderRecordPopup.prefab | 2 +- .../~Lua/Common/GlobalDefine.lua | 2 +- .../~Lua/Message/gtwprotos/WorldProto_pb.lua | 13 +- .../View/JumpServerHightLadderFormation.lua | 2 +- .../JumpServer/JumpServerHightLadderPanel.lua | 56 +- .../JumpServerHightLadderRewardSortPanel.lua | 2 +- .../Modules/JumpServer/JumpServerManager.lua | 14 + .../Modules/JumpServer/JumpServerPanel.lua | 11 +- .../~Lua/Modules/Popup/PlayerInfoPopup.lua | 7 +- 14 files changed, 6844 insertions(+), 6591 deletions(-) create mode 100644 Assets/ManagedResources/ArtFont_vi/r_shangcheng_luofu_02_zh.png create mode 100644 Assets/ManagedResources/ArtFont_vi/r_shangcheng_luofu_02_zh.png.meta create mode 100644 Assets/ManagedResources/Atlas/TagAtlas/ArtFont/s_shop_luofu_zh.png create mode 100644 Assets/ManagedResources/Atlas/TagAtlas/ArtFont/s_shop_luofu_zh.png.meta diff --git a/Assets/ManagedResources/ArtFont_vi/r_shangcheng_luofu_02_zh.png b/Assets/ManagedResources/ArtFont_vi/r_shangcheng_luofu_02_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..9eef300b0900e4126d15535fa402dc3008102ec7 GIT binary patch literal 32058 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 FV1kSdTvPx6 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/ArtFont_vi/r_shangcheng_luofu_02_zh.png.meta b/Assets/ManagedResources/ArtFont_vi/r_shangcheng_luofu_02_zh.png.meta new file mode 100644 index 0000000000..404a4ad093 --- /dev/null +++ b/Assets/ManagedResources/ArtFont_vi/r_shangcheng_luofu_02_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 4abb9366bb4707c45a51db9f261b25f4 +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: 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: 82a9db1446e223d429ed045bef3e0ded + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TagAtlas/ArtFont/s_shop_luofu_zh.png b/Assets/ManagedResources/Atlas/TagAtlas/ArtFont/s_shop_luofu_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..4d554e31d2cf7731a8fb97fa2b1d47341fd71db9 GIT binary patch literal 19323 zcmV)oK%BpcP)b!St^d~$rDMSYe_{BK z&mW}}0JbszQn@0a{y%^Zz+m8h;P{Mp^MOZzfBc8q{C7hXf1-Y`hxFrtmG~3+(f=!? z(r`O)T@PuMz<1M64L)u+d_jHx$+_@l!NQ+2m-diejlU>-1U&ekLP9-y(aGZzyTv&iVN&g!Q-9z-uK%L>Az)k!crGRfeu?Yb6=L?2>QQlvq8}AG$;P=2| z7v1)w4NBXf6bj+->uwte49Li9(XrLGLH~?A+4RgnZScgm?z#8tI#i6PFnD#K4Cn&D zLWv7FU_8Va9~T`)bQa2_5EJ8(?_S!|%GF4R-tyu%et+u*%gRQnC@2MZh`5M2hzLqW zK!L*L(eGb#B5(n4QD=lBxp_=E>#NjkuV(#%cf0Gq^De&Yx6ca-5EOz^7J?w60fkag zl(x}!7UH!aUJUU3F4a+#$^knE@I?!Si@1%5_;mvO`Krs0u(Vp*)^OR7F+_55!MHRX z*iX~GT|M>rhZo;<`%x$dD_Y6Jmw)40;LaZM-utb4?)<*C3qeJFbaVtnAsBF*fF#N) zg>W7i7n9hDNhJ^+#tvnnbS@YNwotz77xOuPx;cKdf?ncGSP{^n_mL4@E7FymtfR!b6ERMx6QtC*`Mw? z6$E2qXuAMq6(Q*fgiGO+jy`tC#E(#sxw zaRWNk-gnArLQEW#h0+CJhXKJPwqu+m+R8!MIY7u~82125g;6>Or6d00<<$FSOcSB9 zbJTt33_eCH^-f#Em4}U{d~gMx(@b-HEj3%4Y1+51r|}*8_1k~2;jcfw3;a3WrcZ6> zUoZk)@wCrGw&xwvurMR@MDCxIvf9 zRi_`m(hY!5{(BtlRgtzdH**~ zyXMNrU%3x7;31|J@mxS-R1M0t5R(Mspmi9~;3Y6ppI$sPcBl*`Nnfgv1OlXDTgdMB zT?LSIq%mxDG#qbfVZ`Lo7}Z2HcOaqc(X=$RvgjWVvU%Z$oyYgy?5gjc_@}c6-$GEz znuTu!N&zacub@!Qr-b+^uz-d>XL2I+alGhj0xbMK1ssCSs z-or+6`VX!p91S5(6U_~^y!r6o*uQC0AfFMLd(HFP-g5RoAv)3YTcgAs#LptNSqqNTk1NXL#Ou1A!YT^BGS3RIzj@q#F&)KmqtGxMDNKR>5;RUaQu@em9;RKj0xyn%-5P2E-7 z4yRrBQ*!dNc;|_~vw!2-?y}tb{m1_PeJ{Bm<0a5`0b*Rlw4kh96n0v41%*K*h3nL# zbPkqXgjN>!Ui!^|o4_-&@Y)x)ZNOhL)!k4yT`*e13t zThCkf2ki<*WUf}~jYAR%ui%UR-C8TJer_uOw%chZ`r(V)+E=j7X@X(!VFMU4ZaAA( zZRL}fKcr!AO_$0G`;=4IyEmZII)$Nf_&^Xhy;5rOiVMjrDxht(!Z?%<8~{>}oA6u9 z&dcJID=y;2KRwRAO&!)s5oQ4MLcK2{x#v-_?0U2nMU1bzfQ!;m!sXvm0KYwTz(8B8 zb_Ob}=)>_Bok%zJ0i6qBcB50f+##?L*25tByKXV7q84|AJP zTA|WAVF%rY(bL8=@1a1yPEU7&0Ypr~pCNWOpnP#oXQ%bB2x#H1Z(Q_6R;l(8>;8Wq zmc8>1Cw}8hFwFocr4bb(udFu*cWmsj)&WOMq;hB_p!nK#KjPhg{F4=Lz1}(7_wKy# z+zmf^Y1@6NeNT($)Bz6Kj-s`Vkrc+K7^PBR94sprZ5N?bh(BC>;qAcH1lw_ zpGIWik6+&Y=ag$6)JpxZt-(DTcd+);4NN$`j8JPFW0H7IjNub!Q9Zkw6>q(o*&Dw! z-SkN(IE4;t>hnEivR${MqU&GX-p)XPa$Hd=BeO``P#A_BHh^K{4`ct1{q*V^#(2%3 z!YHc{t+Ug*h@f=HSDQ^*Ptg%jHcDG4G=c{vg-DtKBrSG`0WsL21k=BI4F9;bV`UV7 zVk>}1#kWZAen^Z-`gVKKC@UMS><+qK-oE{}Ul~wMdM7%#a}OWAx`^55&IL5#XqXX` zrZZ~lNzDJ-(=31el`raCD#lFauw!O3aLg$3@e3cG+3VJNSaMDd$E6B}woEv=e>%JJ(Qx^>iPYXl1)Yth zi$I4^u7h}uC=3RJ)={*MqI8HmF1(;8b9@-zh;zYhUm0+fLpiC1YV2qPC1lSzdyN@-C7qemUXVg{irefqsvU2m-vgFgw z)lU1xiB&(p`K_HlYo|$t{d!Pn4MsV>sA@cJyYR9T`8O~SKy!T~pMSKNDJRTAt1zN9 z>z1xy=jv5m@@5qj(r4&UhD{hxesOP58j%E`(K^h?Nz*9p(~Bp6c{}mO#8NpKiYK((Yf>H`CVZZ+*hBgkaC*S!J=#K_Qi$La%aS}1~j)@>`piH?2 zTX*b5g1=%3AmTCa>33Q7*0T2W3vW1$iUGYr90Xz2M=RN~v_oE=aP%m|B+zyqN<}eV zB0!iiNniXyLzY2T^!h5$JQ0Asol9ffb+5Eo{_OZFxn=&& zp8=xnEMIg}79tvD;y?^tJV)JfLRG-nGi37N?W5xxF|@ynV~FNtQQqHQ^o;Q*lD2Gm z_v=F>I}0%$0FDE8ZZWBZOIhE3{N#y0A!5=Vd4=zxNRPh`BjRFA6G{wPXQK!KhLS$z zOg?2c?>zo&$CwI7;rkRNRQ5IH9(-Q>{Mx5Yhp_B?JTDFyZaL?wBP^xb^_tbh>;gm*IH^4>efxuMnJ6nSo5N=vhL>m|+0u-qZBD&- z8q0?k^X}h24&)W#=$q#6d<)=~6RO%Pvz=hYD&x^9S9}9ddxv<4R%m5oj7#nQCNj%= zp6eHt6p+9*ZXg|#L?nghHiMOo=cR(>jc>_O$~Se2B-p zXs(~iCvUG|&7yV0n*w7TfCc|tKv~srMo#Qc{r*jS{N`e6cGU**WET`rF|;3t&lpHF z8piYDc&;W~T!aecGj{4oib|q9eRp7NXQXM7pUvCZKKI&9+`m~+ohklkK)ar3ol%45 zwqjC^VCSKfrm(D-OcS}FP$X5}>)Rk^R-%C@ISZY?Sse;<9nY z`u29m%si54P96*X@dB;&!GS34-;XPP^#hJQV-8E-U&8y(zD2B|kEW zMw%L0X*}2nh;L{yaS)Hu6RXJ1R%~6no0W^-CeiA!e&K>HxB^T){bWwQ;3PoNcR(+8 ztY5>MkN&gUyk7vjKik#vF`0{<3Zs>8arC7Qg)Ta-oj%7kDpUILycRrfJCav`-O{>^!Qs?8LZDjF~!yMU)>k=I}Uo)fPGD|UCDK$euKM^6bUp{zs8E0N{0>-ogHfxq{;+?;Bh`mNU zjy?T2jyv-!eD?n5JbPz{>tO%3ovdE6iAl2#XU5#47&Cbkf4}?h>{zwFJx^KxevF=Y zm`^u0$~VH%cVJ&G_~}(V@S|UK^slt9bV@~sV_FuA%AFe2?L4z6lrhQHE?mqF3%|$* z3UvpMu5SUDbnFz27_@Rh8K%#fN+dUj=kNN<7q*iLDNi1L zZ);Wo^X@ z<jq#F*mn6S95=a+J zdWNL+DibVkjEC_YG|KlIcB;Pv3ET`M(ny=MPT+!3Tr;g=u%*@gz-%PbvKWM=^A^(D z)WX1#eQ2m{;^UVW1=2ry?oDRSJ(B$5e2$o2K{)(vp8R#Y^Pe@Ju4K~DQ&4ym6lL?( zOTWVJzuUn?$DMlu#%sY3h)Uy$K_pH?O?7}iPh=+<6Ha$9P&@qLqdoI~IKA&9O7ZP( z$mtOlKK~AL&i^`*uqL8XeC>*h$jZs)qi0_ZK0Lm(vi?n_&VqCNcDt}Tyg_ys&anVV`irVX1w`dt$cOH&+ z5J}bJIjtxxK7MBn;GHlWiM1-sy8%z>( zq&+Td{EQJCed-jyIjzVqE<{^Vloj#)OX6X=u9h~wIM>0+q)q5b`=X-uP;kF7GP`r( z?qKbr&sn?Z^DghFojR38FE3{Q?%m`UhEPf~X5uiWef4-gdTt&7rp(q|*^Ff)JS43Q%inVrI^e!a#*?q6S4aN{7*wphWTN zL$7iuD6gudw5XLahxa0U$y|19Zerc?4J>-`!$X$q35>|ccYVC~=VUB$ZE1E7RzIJK zjOc(}0E6*-CehmBut|fc8h8etmjVMNy|WP~;VX_xGi~-^Og~{9kZcbM_1m^USsXTT z6iR0S22@)Bs{tMM&EU$T8~nO35P&f)D5X#;k897kZK$Qymtvrv;E3Z!aQs&%@Zn2~ z*;jp#5#z_8tbD{vFmBoy-hVdDL}J=JVn7sBgh*~4p1`S>d>tL>4Nen+$Gm6XW!_(3 z?5W9AZOmOvkYPGguK=~9A!!c8-0MrS?T^|L296uaxao&8|L?EUTHio-&~H#FCgDdA zfI}p!EYQEBXHKPWRTS6R?;HEH=7qn!%#t_W3Dk4il^1c$DQ7U_-sB%m&1E`+iN`!RH01F6=Q?&d`RT&D>) zmL$8l08ubxR0YGw4rk}4J?vQBIWYZ@(3)_~;}0&`_dj%6%;;e!3J~NO(Sda1U`!IN z!zi6cQL#;a0eGnv#JIlrB?hHjcJHe9CpCUJ$&M|x>8(tG3bT35Zcu*c2f&(zE4cd3 z@6&%!Z$GR>DRyq%7g+sLo-C&u1_H?He^dMK?@sPBGqc>Rubs^7)8~+1m<>v?ee*{4 z@AcTcY9pV%5?qPf;P7dK*txA1V}!zzVzBZ+7ok+bcMzuQZ)vPUykL28-o%T$8q@UA0B4)2Mc=|D5ojuUH^~O2e)*ltDA9AfL2IRCXHG7Ma(++SZ1Ac z44;3xf`8ug1TA$zW{TIYAr!VjTm;y*Wk;ZYk3aL+w8J|=qBYK&&oAPW*WM1)F>1!) zOg~{9Mp~#GoWrFzUcejA^yB@f0}lOAMPB#<{J6AC@dp6o)~5q#15BjTFRadUQilfk zNu~wFVc)*G?j)1|q*@N5N=wn1MXA3`D-fl_Kj9)!=xtd~;p=$uw@6 zdU!i@)`j8^t#GiT|qgXtjM(R?AWjq?0i%xA2BTq7&4fFqbis( zdp5Jrn#)~3xPg}14o`dUL6r;}JDhnhtiqVIY$Z0}2ZpX)v8x@gEz38t;`#j!z>aXp29{Ba&xZ4aB40;0h`S z_V%5+;;~~(H3Ns0Gye8V{9V>0KxukclwzC~T(=n^K}hFu+Icgm8W832TmRPHRz&Ns z<9qnK(BoSSV|daGK_=7qZkM%|Qlr}P@7cDBK9%Jl9!`8Go)Zqtidcx z+uj{K(8}O3hhYRf&%x3bkKOuI=l;xUJJ_95kj2>P1Niv$b%6|)QZt4WW!>7!Fpw;=TJ0d#6gG=|V_|Am#7Sh3qo0qQS*Oy++ z5AOUi<$a1#b^#)OSWxeZK78%!i+K2d?rtxC$~Vs?6zR`~6|Z58@ZJjxDDPKBc|~tF ztlrN1&%YC(`;nU;qI~c`0QPO!#^4Euv#)v&Pv8F!N-N4a^WwQcn8LC$9{uI-X{qfn zm1o=f{EFPrMj%u4=`7B5es8&+2}lXXco;Vh%Eq#D$g;zndD*!f_tm4R+q;qegZudL zcZ5+Y1USt7+DRxC!MJr8Ng!@29VrrG=*a$vB=DR%l%&vh7Rt)Ocm^>Z9ty3q(sgYAry3>? zEQs85WM$q3A6GZ;>pVub*Y%Et_6(kg%1k!`k`~FH`|Eq`+1e3FFlEkoqB*%hwtt>S zJPa1S$_pv!S4v}D_tufz;zE9O$M>nLYvM1rJ;tWx>$}ZY8+RX{x3%G8ItHY>9%;ut zWz3%~rLJj9XgpZQL%)2G>+bv^SvfJ3osCjq#I!PWWHD`Y=9QK*e(D(Fu>_lzts}3b zgzSPMUVPlwfs_g}VC)#$b$@|j00S|PTL~DwjTlV;F0`V{=Nvx@vZL2#R-eYEr;F4=k0m2B`cwPeV zsHtgX^XJ<$@oar*W8KQ`#!_20o)blf`g9&Q3$Q&AmEmv23Ke0*0}}_8#E6hdyC+6_ zMy$+tVg%zELeUbm6~=fT-OP0W1|8OqiAN5k_25p53iG+->RG(?`Z_**B?EoMl#!)b zcYa*md|~JEhq_}y)yCYVId(_L!pbFku)_H)U$mGlpKl9fo;Y(P5b6lqF~a&an|c5B zWi^ulrV`+76Tf***+t{#bC*vlMhGZi`0^>H2j3?T~gE{A)gz;Kg`}sy+loQRj zuD^YA7aJ(%Q_e3$M;@A*iN!; z*-BO|+}1u8bIw1Sp`-h=dq+L3O|`80sG9{%MbUO1Vp51#i;%je;-Pew@7^$8ckU7Z z&bf3dZnBY(EjY;*vWts3?YtvUb`}es`=mXeMxAy{|ALbDb~FY~`}HKw0kC9G%hJBN z;h6G|Z?kFnE;cRidX%_)a36+`84i-dKO5q(Z%;jUU;jjxyyK1Wp-AYPKs7k`E^LSs!0AIX{Nt`?7&LYy z(~g~jZMUG(hLYr!)7Y@Cg-;f&W5t3M02r~b>@vXdo!csxy}OrmX{ROWb&cRngF#T* zANOv?%~CKjv%azt4=ZeA5h7$4VN5kaRm!Ol001BWNkl2qEIl>#@T9F-{Ywo;!tDtHa{g+fUY0o)elz z@K}Vh55YrHpKudRN$;O|Ve1<`<^s;X^q35}L!nfNtZ0}Y-FY6_dHM9|+b3;_^H&Fv zB%&-Vo$DVolQ`nmAtHorIQ#1}X>D$0(Q6%cgkCwJ!+?(oGEpW3Jp1VZ(L0)wj}I=4 zwlmSPw-@rxm0i@4fIkdp7Mn zR5t`*`l&N0?^EIjdFl{|AMLTX`T$$jZDH+apOe}5St0AnGl!RKeQrbTvve=AX8x}{ zL1mWrgE_On_6-9Xg<#Wpe82jQQ$R%#9F!gA*pn+5Ghq@pUU(gQckJP;Z%=0U@H{MA zlbxH*;Zw?)Fk=?$Pv60vSKo%16yPArM%x8w<)60AY$xuTCtlcCmwBF~JvFiW2}!hU zCX!W&c&(YJwU3(!d6{VE^%{X?7vaRWlT1`|V9)l>?bV7e!L@_76t;9?<~Zm&^ix=ix@-5ZowE~_r@LEef=8@ zpuM=`9YBKR>~I-MJ2 z<8S5;Dx7L5Rn=4HOqe~D!lE3EX=T;YP2H|IT{=o&;n@~nm&$)Z}~F--?;7) z3X1YcBvL$d`x7jCC*X`EzqE*39=w6KURubTe+~Mnlu|!Ae`Hzy-_{-I?uxLs!PA~W z2X-Q3d14<&AOEb(9vP2)P6jt9=s4(rNPxYh-*8FK79hpMJYujItCk1w&yVQ zHaPLrBS0MdtDkbvDwpjWws6a3cXyk=F77TN$V6X;krbdClCHbGA^F>?yvPli$HX(? zSK^!eCyBJSWAT7Sw zY&^t3epw;kz3Ci6;bw$fG)eaCY2mN;zR8A9*K|wUUDy7aJ6;?~dEa7`xERm3w)*!Z z#4#q0uNMj8H3s@iOwax>(IcM^-@zS%pU;=6`>GqhsXN4fXMEFTd=3jc{ji&I7!; z0}9X24e2v8^B!@`Fs2KYYBmc^Mr{2B#vToH7)o883Md&xzqCYx#W1 zCoFk;d6)bL;_e^c+|lqD9n6!-K;899=d||UF~=l#HK$hQgskbAZJc<Q`D0nLd>xxNZsOAq-{XPk( zJ4h&!i-p%E&yVi@KG)oPC%I+CUD8}b{i=hpAHBGx?$>YaXgFlFYj-B@_Fd@Y0Y&Fz z+xl0TdGbqhx$-9`5RPW~(YOfzc>F!49yN+V!z##*C?-xXX3XKkc;V^Ay!O{%*w49F z&Y`Sw0>;E}leKG*E6nj{AImfMc9^|I zC6I?Rl=a;roPj12c{p$IN37 zWBZl^Y+SRAtekAB1`WbUD@7$a6y`R9E+)HpJfjNWgE!ye$v-?sV@!iBWR+v>$5Vp_Er1`9G9toxuF)56=Y+ALM zJ088kSIoTxf;9Yzu;ZTY)~mjIOwc&z+%4Vk#5Jn1Q7RT&YLnO7ivr+|leg6Hn#Zx6l1r*C#l zjLUy;DxTMh#sVwM;1NR@G-@oG5F#nItlx~b3elmy5G@BUi5K6>^rJ`e>4Fh_`sT-o zm%vSI!8ncRtO}IQB`2?M0B?oLqX)x+h(g;rSXK_61oTBUvM8&}QfgXeU1h}{l5$9x z-GuBswrs3J1Zoc)q_CibQDgfsa_s4BJiR{;-}yGXH>CZTqEMFYpRx&+;U;PscVq=t zG>`s+3Yl@j1R~MFq+*-s*MBJ2-f}hzrVZu6pLN97g|wP7syMr9ZC$MA`@_hv&Ydx+ zM4sPTs{lE^U*S+&t3MbC-fsHCJHE;2!}_6g7W?GtXZ|0F=K}S z*@y=sE`vr_v2%Sj{YDJnJ3l@bBmOBwr7TG8XU)nTJad0=71R@!~ni}?rcN^yd)^YE!RH4x=#+-_g@69uWYYhMpyrr zZwBtsg#*5K+KxLpEOQ{hVIJbkd|DTddR-?p4s3n{?h0J^d z@}gf8A-k=r;S>5&Tvmh=ZzU2b!gwiGFWZa}uOA6U+B9=HPIHh~S< z`N!bJH{itU2}jFGC7QVW+8Gp-Pr`^tC^Qf!zM5F$O0x4OAf|=mPCb`hJL0_hNQW=A zcUEY^TK`Jn9#sfi(ro|2wz_tLvn_q0hy)nux;rmn!sG!69v>}O&y)AQO2hu3<*9l{ zJ%^3Y0+U2(8znYn<$2_n=5qDTXArWQa1(WqR4Ap`TfL8afAKPsvGgQ7vwh*drsqjd z{EVl|E(G|yfW$M=$Yi8;CK^+m-7m-17i6||=GPBLJVA#G(3Zu@&zB)0JoK9qlEyxMb^{;{_@-P`ej=|PYQLQR7>+jXK95FG(YsJ4^G#?=x zz`>AAA3;c8dFCa$;%J(2V;ev~X$#L}arIfZwkPXQA$GJspi!YRwA+jol0ZG_|GS8C z#%n|?8_UW8%fiY(CR5~7Ae1Gk4&fthi{iv&L;4goAlTYWZ?pg@gwqYB{ zR16-T*Memguzlk`Zu-Ml=~a@zxXQn>*7JzRT^{=VTQt-J15-EDC!WN=3)x9OnM{;P zh>xqzK}mZIR(JZ43s{vo;WINu(|#i>m^5{mA4wsAox`f7yAXkfnkE`*0(XFa0r=Om zXr1Nnj2IA$|0NH#Iz}FQZD;+@2%ZWJG-zvGnOT2nSq|b0$Z3(&Kf4&fL2N|)a3HO- z(!YZh4;eWCWtX8t#V8$RZ}rYV9Sv1zR@SW3sno;GUeL^Rk zGzM)I;U$}hH7}xOXAQr&;a!?CtjhwiWd~bV(^UcrP}qfuPN*y#C_>-1-<8A4IAY=e z-k-mer|y4`#+shbs?UG=ZKfYLiczEcfU$Z0nGd<(iZkh5n#4;r;9nPPh_|+I$Istn z?We&onmw`9vs;@J>+qSV?P+7AF8-m!uDe8O8^j{9^InNoeXniRZku=>ppWiTa8yL= zOEYOb@AA{J!lnM5-4dtnK#Vnuf@ev-EC|XMa|nZYD1^~R3}o?}9pPg!*KAQ>T3l}< z;3$-<6`oc&3guV|r^PjkH#Wu>)+gOYf`<>gp2?BmWc5<}!EHg?C3sF9{vFuyK%Uy# z1_}$pK7$#_RN7fOzv~;6*!{1Qk;H!pu76oHvU6;tDJsC1qPkP6e+$o@pdA7@EQ4AYLO` zde@g;vQWk>*y%Y|Rf_t8fiYu-=pNh)fm{biqln>Y>6AA9P zWgcrj35LzMf-OjY}&B3NAWA^$yyNO7^z7aIVhk@BKBEr>Hd9h_@W#(f|dS)Lq~m0DR)9&5%MA)*Zlk{u08*UH0(Qw@scPMt`|c9rNU(8<^|eONEb_w z|K1~&T8E{w$Q^!DJAEhjE4))7hi7*Gsb`-=(}5l2_Zo+toy${y{4m&t4xz2y#GBS4 zsaCwC>2drz!;mq3aAG^q+D1g7#3tF&6e#Z)Svr4r!|imn@MbcQ03D`YG6u*K{;m~2 zIus(!j`xvPDlac=jq8HC2v`01XiCcj<23rWZ=z|ek8#(nFR^Cvwm|k4$6K>-fAil6 zPO!{fsIyK4q^(h=6(oJkTz54v%I3z!MRZd7Bo0HK%N6%^OaBsBE@xO2)An6;8GJA!fud53^bZO)IgZ`4~5e zQAOm0v#1zUME$;lxXA;=4!(tW4tBH(E7Y6v@=%~1t<Arochh_oPEJeLb@3@aR5u=C~dQK<8FTQlNY*(gUyb&cER4J`|-WOnNN43TmX5c z!U!=?q<56S`4mp9ESzMkj{CO(jyr1#gNBykI`#O+bVG=7dHb2*m9hI`&f2#2hUQ1F z3~ANlXC%iQG1QM_CWLY75I2EIb^7#-e^-{%>hKnF0zpptK^e+DD=u+6wz$3{;@) z^d?20T)xMo#u$U46}1}f;4%MWfk ziP2-L0P*ALoH(xWm_Khbf4TGBE)6w1-ns>Qn;sx2)+EwT+iuj|E+ol44~c(**8hBq zLNH#?7!cCx=b66?dlzu=6>|_3!?Lr{mVf2*>XpII&m=svVRtOG8<4^I(IFw-{mR-7 z+D5z-;x+k~mUxYb7d#HHd^!?zED$~Ix}6z{^xt6QaEBQgfU1E5(BXcFEqHDNLIhO6 z#YbgT30lQ4se{;7m__feT0KaokHlSj^BgR@mh7UzcwQ^NyYY`S)^rU|63_pdgb*c^U4fIT?|ihPM=)NB zWGq1>Czn+1K9oRVI7MDjgy#B=$ez5A_0z*ka^6{9+q#+_^dabeCu;kv-mGr;_4tyU zk!4Z)ys*}Db3@&qD?0AX@mze_3?f;+9-wgjPb_Y)=gGe;W!;iJUCK11++`o`Ykr&# zT_E#mn`}K!EUlv$rvc+N`=4Lb7MPAJe2?#2FhtRDc|E{2zc`ERTpQ1IQC1$>E<*6w zur3&79dph4bh~b^XecmQ&-?xy44 zpskH*+7^k<*2tb1sYg&&HiAY>BN#UwjuYG=@`@*b#1J`1eQk{QUjDd;+B#s&jM4o1 z{#!ujgO|cf?jx1hOei`4f6I&F&?itvpxX;IOsbB&p|_~Hm4!oWtsbG%ml&`6-I?^R zC?cFQ3b9h$cHOP)T;J{YwNO?BrHdi7k5Hs9ZnDO|CF%=c)Rch?9@!rq$-zk_A(Bmq zB!^Ax$E{Om@zZbrA(N3p#SwcFu!^7<7Z{UFCh9DYGpDlfe?nS)2ZB)xZP0IcDc`;R zcm@rr1Qqtp#Te@Ay>Uz}~v~{QR^<>I#dk(2Dd8r1J>4UPv zIEk%zZUXUwjO;r5v9kxT|3E2!y7jj-?EB(C+tnYf;nR<|FzLvVxXHaJF<4d!h+s@3 zT8G%VE$CEsjkJHwF7ti%&|4IMt<`;WVxW`G8^;mjDiF7sU7MEhz;B;m{qioS4mv;# zZnB%N8;Bh(AuNThmDC#vDwc|6+yL>ti-PR#Bg|(W3|CRUlu{fowNB~~h>GxlE;v6%2=M5|f z+Yf5Rk=>;i_AcOxpPa!Flgm+F%>S5@a%pO`{-5@)H8zgxI)8U&XP3Kth?E&gmQ1RN zoY--lM6u<UklIeb0%?IXXx$`@+xkZfq-oO_K@+rT9!*jNu#*ODY&4El+o}=6 za-`a|RXzM5C0e#fNqoqZM2VDSicfLLea+76_Q&qwp1FHxxuRq@KXQP{{sYQF|=%RfT6|a*+$#SV6A^>?%0OU4kUSaUfy|I7NZM10$g_PiKn9Q8EnN%ks>lZeTeo z@lZulW??2aK*B{VVIy#=Uq{)o{QzLTf#;swQ?$_@5OKh2f-p=Nq5(ni6waMI94gB#fr!%*-=FMgy%ox~mtCK~9ru3m z4!HSgoEy*MdtZAR3o~K zKJzEH;;PlnfS-exK8cZ$@T?2l3x-fpW_QN+`rg%GxnSP-(I4)^@u4*S=IeJs7^%`u z6uwl@?MZ$o3w5bY<0yS{@p+0N83J!WK#!>cq?GG1EK&CTZ5fX zoeq_k^Ze@7QOZCvga~<{t}onj%^SB63;!Zd-RIQop-!LSSC|i1)@8yZrLP&JNdQF>(}Ft?!O1O+`6gs zmZRZfZe|k4`p5ChCtt<*&{!lFS=S#O&pO?wGxjhlmRRirEe9Y80L8a{CLw)D-$4*8 zKp+9><>5PTp`qhTp%?L{3+|x}jqzClv=cA;o*6)2_ZaT~>Zh>f<~9T|2fLqF6(ATw zMd97iMf>Esr1hQEiP+zR0jc+eK0JPP3ZK9K_aTfJq=*61Kp|hm)BmwQRA$}_22cSI zKNE=fTtEIfDpLnji0k;pj%zm~um>Q$ETqig(Vskn^knr5fhx_~UeCel%uezKkayKZf(8)%?yEy}jL2nH}$GPTat+`)(FNU?2zrSPdx%BZ;H0pRfA=kTXxOiDiEb&MkuY_^|>v$_r8zAFjE*kF^-YplX&fwF$^9&t^PGcwjZ3IEVyqB zT+H{P(s?c-?1kzDkj#&LUk2_>IRjH(Lcs_iApy-sW&Lxx*;R4#fhNoRfdHI+yID_7P000XrNklr`R{vhcDUxQ=qUPfa;o6;9KD!-6=ARn0Agr9-;*#!aziS9 zH~pvgU>cimjsZa$eh|YGkG_g$AKnovH|zP&zm<1pQEdR|J*aLW&_x&j>93=w=gbwo zXAVqdb^=HM!sEZi60Hz1Kq3!eti{W_U&r~8>P@&;LV=VsIWKssJoEyMEFr1_k?qT# z##p7zj`W_!)I=JG_MB30)l%LI-ki1FV@FHiA!Tq;@j?aY6A3lPg@i0X`ZfZmw9O-o zCK%;?Y-Hea7M48HOBWVj+}M;je%-3%Hxs7#1i$IriR!d$#`SlfT(HS&@QfJ_&*pj> zW5#Dbwyx!;mLWb!|LNH`jNkmgMhp*5;lY2{j`UP`ldlEGf6?}XEc9t@k`t%~4p5`< zyg(kd46&8IfA;22>23o60+q!{EC3Avk^mY3H2wCP=6kPdi2ap_=m!@4 z;P~E&#jp5MW)aR1k_EH?ByVU<{??|JhPqzXFL=T0dnOjXhEn1rgNos>QAsMODQsOz zTcE^uyewDa?_AyTr6$Y#GM1r&7o0wNF~5DrcBfHk51v+64HoG^3_#+Jt6ToE*)nfh z?m1o{C(q`J4-L&1UIDO(O0tLyBpD0y?rU1VY#HLax^fm>|B2V8vya=QWk;;C%$6xc z!zVjhf6njixPAl9y;<#X11T4Krm|m8J01suKzW7La=Ek{Tu|nZjC+>xP6tnP`E_OI zd?_C>MR=f6B?%M?UeKL&{o|(=?KkF%UQS_-EGrM?)VX3jm8}I(S7)32!>#(cdl95g z+7tkAa60pBXH(*MXJh>Cmbkgq6k>H*4m(}+c6U!@9%1~bAr}GEA5Iqr)~DjHBxAQm|g$R!Y@vLKrsF8?vmF70`YjXdE#YgVCrgckPN#!ry0Qj@EyRUaT zy943ARwz`}@WBm{H=Zp%cVkknco z#5QbcZ~RumG(w$SqN#%Wi$gQnr%7Kcy)4}}MOHiiSh>*{Rd%DbFws&Sx$F(=0TrN1RyN5JX9rz3 z7$02W=|9#-*EZkR5;yNKg;?!LIiL4}kwwQp(La~li|F^zNItIPK*bZ$ta{P~9+iX! z{p$+nz_LO8bGfqsE|dl3VH$UdKB@tvf`~U9A4shlp}$lBDa1$lDV!v4NXkW4Q6k)5 z(}k8)A6#Y^rL5gHloX8=ml{M@mUbrk3P^qJy}WqeQd`n~wmcHhfrtWOsiu{4m4Fo<;NcMsJda!@@d zu-2>#AZ(Dx^H6!}^d{nm!n&oQGE6Lj{j6iNl}6 z4MeT_sT)L6Ik+)ocR&*K0tLw>M}^R)+&I=dh=`CLhC{Rpwf`^<|$Zt zRF6CxsZOF*t^P{n;&rRG2YErB*iq|WRWRKck%8)V;$ff)BHo{<<#{>S>Ayr2UaLg> zP*_J{CJ#+j5OG=g=cv#!%J{2w0L}ja0I{ylHpx<`YFI`VSO*|3G_M$yA(fes_W`ab zfH;p)o|6=iyK~iY>D)gxni@+}s6o$;@@#ckwPobe88CiL?J!5Rg&J-Vk7gzHP#uP^oa@q6ohOO{5?xbw?^eB5 zEoR;>?}M^2;Bs(F$E_6SUsriL3kvohHFQwZ`cZwsP`N9Vo%5@^#+9*FdqnkDc-!mB z=Y23J*VQnnD%w!W1H!ta%1Qi?{!u*>nAE6ZIhmsXt&6${3!U3e-uRGpW z@I;W>P!ukZ1y}jk@vMSK4L`^Wam7_bF4eoO$O|z8p|*_*AT>IOYLh7C;Pt{YW+X3p z1R~Yj>B2-^2u1(pgUG6$(KYTJd8nxxFe-C7UDSCZ{#gg|ntIDYq!vzRYJ3t}?fmfv z>&_v@-%bE2-UtdWss~kLblm~yE1i^>SpXBA& zGN3yC>9f$>!|&6jqq)p#GC~E*az-Pv9WJGfL|11UfTdA!Vq6t~UsoB3RKj->JSs7H zh(yHadMj4cIMn|~dbP``lNxQruW>%q^Rn$yeuhp5bY7g7tNqTOrD>DpC`wLU-AC~t zahdfVMN89uG$101Y8)b+JN$nIPA#gZ0i$@2P+opkNgEbiiMm 0 and "s_sanjiechumo_ren_1" or "s_sanjiechumo_ren_2" + local str = "s_sanjiechumo_ren_1"--i % 2 > 0 and "s_sanjiechumo_ren_1" or "s_sanjiechumo_ren_2" Util.GetGameObject(go, "liveDef"):GetComponent("Image").sprite = this.spLoader:LoadSprite(str) Util.AddOnceClick(sdBtn,function() @@ -222,7 +222,7 @@ function this.ShowSingleData(go,data,i) Util.GetGameObject(go, "playerInfo/warPower/powerBtn/value"):GetComponent("Text").text = data.personInfo.totalForce Util.GetGameObject(go, "playerInfo/warPower/Text"):GetComponent("Text").text = "第".. data.personInfo.rank .."名" local live = Util.GetGameObject(go, "playerInfo/live") - this.LocadPersonInfoLive(go,0,live.transform)--NameManager.roleSex + this.LocadPersonInfoLive(go,data.personInfo,live.transform)--NameManager.roleSex sdBtnRedPoint:SetActive(JumpServerManager.GetCanBattleCount() > 0 and enterable) Util.AddOnceClick(sdBtn,function() if not enterable then @@ -250,7 +250,7 @@ function this.ShowSingleData(go,data,i) Util.GetGameObject(go, "playerInfo/warPower/powerBtn/value"):GetComponent("Text").text = data.personInfo.totalForce Util.GetGameObject(go, "playerInfo/warPower/Text"):GetComponent("Text").text = "第".. data.personInfo.rank .."名" local live = Util.GetGameObject(go, "playerInfo/live") - this.LocadPersonInfoLive(go,data.personInfo.gender,live.transform) + this.LocadPersonInfoLive(go,data.personInfo,live.transform) sdBtnRedPoint:SetActive(not data.hadProud) Util.GetGameObject(go, "sdBtn/Text"):GetComponent("Text").text = "膜 拜" Util.GetGameObject(go, "sdBtn/Text"):SetActive(not data.hadProud) @@ -270,19 +270,38 @@ function this.ShowSingleData(go,data,i) end) end end -function this.LocadPersonInfoLive(go,roleSex,live) +function this.LocadPersonInfoLive(go,data,live) + -- if liveNodeList[go] then + -- poolManager:UnLoadLive(liveNodeList[go].name, liveNodeList[go].go, PoolManager.AssetType.GameObject) + -- end + -- local npc = roleSex == ROLE_SEX.BOY and "live2d_npc_map_boy" or "live2d_npc_map_nv" + -- local scale = roleSex == ROLE_SEX.BOY and Vector3.one * 0.26 or Vector3.one * 0.16 + -- local live2d = poolManager:LoadLive(npc, live,scale, Vector3.zero) + -- local SkeletonGraphic = live2d:GetComponent("SkeletonGraphic") + -- if SkeletonGraphic then + -- SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) + -- SkeletonGraphic.transform.localEulerAngles = Vector3.New(0, 0, 0) + -- end + -- liveNodeList[go] = {name=npc, go=live2d} + if liveNodeList[go] then - poolManager:UnLoadLive(liveNodeList[go].name, liveNodeList[go].go, PoolManager.AssetType.GameObject) + liveNodeList[go]:OnClose() + liveNodeList[go] = nil end - local npc = roleSex == ROLE_SEX.BOY and "live2d_npc_map_boy" or "live2d_npc_map_nv" - local scale = roleSex == ROLE_SEX.BOY and Vector3.one * 0.26 or Vector3.one * 0.16 - local live2d = poolManager:LoadLive(npc, live,scale, Vector3.zero) - local SkeletonGraphic = live2d:GetComponent("SkeletonGraphic") - if SkeletonGraphic then - SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) - SkeletonGraphic.transform.localEulerAngles = Vector3.New(0, 0, 0) - end - liveNodeList[go] = {name=npc, go=live2d} + local curPlayerLiveViewData = { + skin = data.userSkin, + sex = data.gender, + ride = data.userMount, + designation = 0--data.userTitle, + } + LogYellow("data.userSkin "..data.userSkin) + LogYellow("data.gender "..data.gender) + LogYellow("data.userMount "..data.userMount) + LogYellow("data.userTitle "..data.userTitle) + liveNodeList[go] = PlayerLiveView:New(live.transform,2, curPlayerLiveViewData,this.sortingOrder) + liveNodeList[go]:SetNameHeight(-2.5) + liveNodeList[go]:OnOpen(GetPlayerRoleSingleConFig().Scale6,Vector3.New(0,-118.65,0),WALK_DIR.IDLE_LEFT) + -- liveNodeList[go] = {name=npc, go=live2d} end --刷新倒计时显示 function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown,str) @@ -365,7 +384,9 @@ function this.BuyVipFun(type,warOrSd,fun) ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,JumpServerManager.shopGoodId,1,function() PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_BUYNUM, 1)--更新特权 local tipStr2 = warOrSd == 1 and "挑战成功!" or "扫荡成功!" - PopupTipPanel.ShowTip(tipStr2) + if warOrSd == 2 then + PopupTipPanel.ShowTip(tipStr2) + end if fun then fun () end @@ -420,8 +441,9 @@ end --界面销毁时调用(用于子类重写) function JumpServerHightLadderPanel:OnDestroy() for key, value in pairs(liveNodeList) do - poolManager:UnLoadLive(value.name, value.go, PoolManager.AssetType.GameObject) - liveNodeList = {} + -- poolManager:UnLoadLive(value.name, value.go, PoolManager.AssetType.GameObject) + -- liveNodeList = {} + value:OnClose() end this.spLoader:Destroy() end diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderRewardSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderRewardSortPanel.lua index 3c10b215a5..62b560d45e 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderRewardSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderRewardSortPanel.lua @@ -63,7 +63,7 @@ function JumpServerHightLadderRewardSortPanel:OnShow() self.content2:SetActive(false) self.content3:SetActive(true) self:ActivitySortRewardShow() - self.titleTextExpert.text = Language[10531] + self.titleTextExpert.text = Language[10576] end --排名奖励1 diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua index 275dfa0734..bbdb1aac4f 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua @@ -10,6 +10,7 @@ local myRank = -1 local oldMyRank = -1 local enterable = -1-- -1不可参加 是否可以参加 竞技场100名以内参加 local isGroup = 0--是否被分组 是1 否0 +local isStart = 0 this.shopGoodId = 10035--挑战价格 function this.Initialize() @@ -54,12 +55,14 @@ function this.InithightLadderData(_msg) LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score) LogPink("_msg.enterable ".._msg.enterable) LogPink("_msg.isGroup ".._msg.isGroup) + LogPink("_msg.isStart ".._msg.isStart) arenaInfo = _msg.arenaInfo stage = _msg.stage endTime = _msg.endTime myRank = _msg.arenaInfo.score enterable = _msg.enterable--是否可以参加 竞技场100名以内参加 isGroup = _msg.isGroup--是否被分组 是1 否0 + isStart = _msg.isStart--是否在3周内,在为0 不在为1 end --推送更新 function this.IndicationHightLadderData(_msg) @@ -103,6 +106,9 @@ end function this.GetHightLadderDataIsGroup() return isGroup ~= 0 end +function this.GetHightLadderDataIsStart() + return isStart == 1 +end -- 获取剩余挑战次数 特权 function this.GetCanBattleCount() return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM) @@ -230,6 +236,10 @@ function this.JumpServerHightLadderMianFeiNumRedPoint() -- LogPink("跨服天梯剩余免费挑战次数红点false") return false end + if not this.GetHightLadderDataIsStart() then + -- LogPink("跨服天梯剩余免费挑战次数红点false") + return false + end if stage == 2 then if this.GetCanBattleCount() > 0 then -- LogPink("跨服天梯剩余免费挑战次数红点true") @@ -253,6 +263,10 @@ function this.JumpServerHightLadderWorshipRedPoint() -- LogPink("跨服天梯剩余免费挑战次数红点false") return false end + if not this.GetHightLadderDataIsStart() then + -- LogPink("跨服天梯剩余免费挑战次数红点false") + return false + end if stage == 3 then local datas = this.GetHightLadderDataArenaInfo() diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index b545023f56..ef75c5c22a 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -87,7 +87,7 @@ end --跨服 function JumpServerPanel:OnOpen() - this.UpView:OnOpen({showType = UpViewOpenType.ShowRight, panelType = PanelType.Main}) + this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main}) JumpServerManager.CheckJumpServerhightLadderMainCityRedPoint() end @@ -164,11 +164,14 @@ function this.BtnClick(id) end JumpServerManager.GetWorldArenaInfoRequest(function() - if JumpServerManager.GetHightLadderDataIsGroup() then - UIManager.OpenPanel(UIName.JumpServerHightLadderPanel) - else + if not JumpServerManager.GetHightLadderDataIsGroup() then PopupTipPanel.ShowTip("未划分跨服分组,无法参与!") return + elseif not JumpServerManager.GetHightLadderDataIsStart() then + PopupTipPanel.ShowTip(string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek))--)--MServerArenaSetting + return + else + UIManager.OpenPanel(UIName.JumpServerHightLadderPanel) end end) else diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index bf90c6d1e2..5efa4b9239 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -410,15 +410,20 @@ function this.RefreshBtnShow() return end -- 判断该界面类型是否有按钮显示 + LogYellow("this._ViewType "..this._ViewType.." "..tostring(not JumpServerManager.GetCurPersonInfo())) if not this._Config or not this._Config.btnType or (this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER and not JumpServerManager.GetCurPersonInfo()) then this.boxLine:SetActive(false) this.btnBox:SetActive(false) this.addFriendBtn:SetActive(false) return end + if this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER then + this.addFriendBtn:SetActive(false) + else + this.addFriendBtn:SetActive(true) + end -- 有按钮显示 local btnType = this._Config.btnType - this.addFriendBtn:SetActive(true) this.btnBox:SetActive(true) for index, btn in ipairs(this.btnList) do btn:SetActive(btnType[index] ~= nil)