From cd858da64f56c9dd1947583ea567b50459fddae8 Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Wed, 17 Jan 2024 15:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E8=AF=95=E7=82=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BG/UI/BtnIcons/UI_hz_zhonghe01_82.png | Bin 0 -> 2309 bytes .../UI/BtnIcons/UI_hz_zhonghe01_82.png.meta | 110 ++++++++++++++++++ .../BG/UI/BtnIcons/UI_hz_zhonghe01_83.png | Bin 0 -> 2310 bytes .../UI/BtnIcons/UI_hz_zhonghe01_83.png.meta | 110 ++++++++++++++++++ .../BG/UI/XingMo/UI_hz_zhonghe01_24.png | Bin 0 -> 7453 bytes .../BG/UI/XingMo/UI_hz_zhonghe01_24.png.meta | 110 ++++++++++++++++++ .../CarDelay/GuildCarDelayMainPanel.prefab | 26 ++--- .../Guild/CarDelay/GuildCarDelayMainPanel.lua | 6 +- 8 files changed, 346 insertions(+), 16 deletions(-) create mode 100644 Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_82.png create mode 100644 Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_82.png.meta create mode 100644 Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_83.png create mode 100644 Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_83.png.meta create mode 100644 Assets/ManagedResources/BG/UI/XingMo/UI_hz_zhonghe01_24.png create mode 100644 Assets/ManagedResources/BG/UI/XingMo/UI_hz_zhonghe01_24.png.meta diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_82.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_82.png new file mode 100644 index 0000000000000000000000000000000000000000..db2a6c05d17bbf4b3802fb4c9168c7f2a220653d GIT binary patch literal 2309 zcmaJ@X;c&E8XiDa4Jt~hl-oN5i&!9gghUbql1MB;4T~{=5R!q6A&bcb0;q@xF1R38 z1e8rJ92KMmf(y1_Jrx(gg=!T=LG+430Jm5~>77u}d(OSyIcMhm-tRom^FH7Ey+3CA ziqNGPJ7+rp05IHO79Wl6=qtCeLciwaPqw0A9>NwNVafy~MWlv+0Esdl0=aTgBE*M8 zlGJsVAwK}HaD&4Ih=3PD7c1pBkqLv-$yF#D0Q~%QDv?+QAz(a|2rC%a;ihIR2um2) zRa72nj9y%Vo2itF9;Ajuh*BM{R3=SzafMWgC^b^03M3J6 zM9^autdJ;EGz%vPJRY5^&>$j(7~--RSX2TB!xFj=H7J0;MXd#17)nrnoGnSSyDV$P`!diA(w{*E9=q68UMrd`!!abBiV)Cm&LvMI<_d&82~JGTvkB1u4}MM z84{s&X?-!=`>SQ(ykJl7%QF_7C3r1p^Z!!cxR#R0q{v{+Rcn!~X2FO01$Voi2b^xx zH#Q10Tsplpp0dEag}wecP5BPxt85%H`SZt-vGE=kzwV*z?-({ism+bG&0~x2U(I?r z)H*!+!M;BC~#>s{4a(!cJJG3~A? zabF7~JfeL3-A}cbUf$t0^xow?drj(7i_ya`RXSBcE0SKBdH48*cfGl`wl81q8+f9x zD$8qo4OinH<&P@-*ALrqdEA2I;y0m$Izs|~wn4*OOgMq)9-fh!hn-bmPS`E?h;CTI z&;P(*8TB;!+s2?yQlvDQc5wXGZ&xMv3U*b`_j5Y5q%#$k+S3p0Xn3&W^@C}cHkY6F z>~FXF>()(7HRuONJ>$G}UA6ncNyG2OV|zl6RHR0?TDM6I8$2c5S#N(#8#($6KBhKC zpE$HOX`OMDn=o*sFSA+eJTLX8f3*ZUe+j0tQybd)91nOk_4zq`UHn7G;||MLe-2xf zHv0OsGTIwj^}^Ai>pPiS&bWGJMPyZV7w&&nT6ubn|8sj@9hn=tEdEvxEXpwC_oT_~ zrzIS85@pPs6Mt({zny-wZMDU$`g0>ji?}4(7OTQSO1(j}+#+P>o=}UBSrukBm?hFp z-0Uo1Q>eu(=S|mvK^UN8fIw5iz$~dk0ci4Lm03TfW&RN5^}H$E7Auef*kDG6U#RAk zcLH0idW9z|w+;%h!L*d-Ov)3EDXyKSS@cr?Ycrt4q*`It zQff7!HIYm>nC0A)(W-I&RJ{iTrqF1)7hUki6!!z^V}jW_;a@G~>F*L7LOUy|-636g zD>bqQDB6z4;o>~Bk0rj{k4lr-(|LOG-PjF>(4B0koGg?wHSX!2 zyO#~r9vHMR+wn3|A2XQ$v$bsLh1qu5Lbn`FM%=rVyXtMzL}R$|rpyJ5SmUwx>kMGa z{o*$q-MzeP?`5lRFQ+FFYQHMJ_xSAG=DE1y)^C3$Utx|fOD@P57$W&|Y}y@b)MX6# zMo(dszN!7_b3vA*vg&fo^rv;j+tP;(G!OjGF^bKPqV1$5xg)nbh5MO*WZPjnKF|{m z&dkspU1QF3dc1q|RB(=!%{CvN6a8_K5A%CN*?NP0+cz6xzIx(T>1gTo))B+|#kTae z!_#8_g)1YS@O$$Q|CV32cxggRnJafYGtwojqopTLVQhLL3Cdl+S{ul$^>rR6bWXeI zQuc;5>KN6qIr3ja~(y+U=u)uym zxA9!Pd5!U>z|IP))cT@}!|SeBtTFNzvRw-=z4yKwF*eqn^l(SXUXKi1UtQEdOMl57 zU**Oa&#n5Lt<<%hx(@9Mu+Pwct*fHweAoHh%o|-570;4mUGS9d)J&1 zQs!8@7u+MCimu@a{a&#A$W@ZzwF2k+PTi*xiCZ}t+h6srCaGOYst0#4*F<3 z$|GvE!Oc(Qdmp?m3!Kw?U{rj%-NOBd>xVUOTVHZgq~i{8fb*-H<&VtT3r#;JTy`ky JWMJIpe*=L1x+nku literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_82.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_82.png.meta new file mode 100644 index 0000000000..ac3e7b3cec --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_82.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e1443944b35bf714c9f3a8758f1a4673 +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: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 02e319c8b33cbd34a966ee30bc538f82 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_83.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_83.png new file mode 100644 index 0000000000000000000000000000000000000000..85a7702e4e7407cc4d448e52c241976d78ee3b5e GIT binary patch literal 2310 zcmaKuX;>528pj7vTx#m_=oNzE7;r6Q2TVv%lE5WO&;pf3t%l5y3?!MD3?xud6fJUH zt_#F~vRS}eH6j9aw-)qLWeFMqK~WKxr$kMWA_ypVf@1rj-g%yxbI$wx|G)P==e!># zV^zpM2@{DE0RSKfg9M@YSdYJo@s9Y{zTjy(J~(3mkyscSi)qDb81RSC7#I{P#8NmE z7DGuJZ@?S?aBxGyBe6(PFk6Bu$YPs@tW&6PHvn*!>QrJ$JdA-cuoO{pN!E)$lRyOG zk|MlBRFR4g%aEXCH5`^45-v%Om#`qxQa_NRW8(k?jEO;=Lax-XbzIU2myOSDVG0Qx zkzny$(ublVMXNwQs)j)?vbU#%##{pWu*fuTCY9ms0n({77KOTmLSuMRX>6)D+sg<1 z_>k~yYABW+DhT|T3tw?bG7M9(DHN?%OV%>Ts9H*)u~;~RPNCC1afPQQNr{Pdo=T0| zC_w;gBx*#3A*d3x5ydfR0>&lbm44WQLiGu&)Ol>#fpi*~ z1}=<1ln|=bEE+M0L~Nl_gNcWQpc++xBYS2epRdK|v%HU9 z=<~HK`K*_M7ele#>|btrG=#U0ZThKi@x`akhn0A{tMR_R&(2*50ArJc0{?Jb+l%|6 z;92mjn(pCO9_X6F(1nFnp$mz|@F4esd3Te|%s66c*Dw6ZuDfS;)?X{1|825tH}d$# zuF{MQ*E>a`eL4D)vS|xFJ*^bd(|5(B7Xw@L&UCp}Uz`PLpAQP(=cbe}xSZ_u!zPa0 zW#4rBt*I~5vA|E z>w~q1jZcnTe|u3~*>g;nI&GU--~2k*p=ZDAgZo3XGM{x)R#-AxiVCQ8FGvfrr5E31 z1WwrT8dAU5dzp7|XL~SN*Dh_{$|_8!9630jN-*U?t2@4!ksdb>+5yE>JY@AAot;w% zwTye&xu7AVy4N(tsefeAC(n0w*jzli!*~$Tz({;H&XW=^7X3hOnKF>d{?J6`9~;l!FG zHyYEkq2SWdoT#+YtO)sF(&isiHmy5xV|LDR=_)63Z1bb|fR1T>ryG0UdTM18k8Fi^ z7`*zUtIn?5cFGjXFJO1Or{2k9{On$#cQV`Sd`o%>xsE~W-=*Y!@8?idvGS{>*SaR% zow4hw^XV1a9YH2gXg8j)Oa{#9aIph&M+1*q_M|!u0)GkQ?*Xn%1sV~6=P-qs+6ZiS z#GS6QhON%OQw!%Zt}1;AWp=t_A7C~Ot{9=y!>d|k{T=g{9kY9L#@r|c*tT>ZDIoJ| zTIYJD{p1-$y2ELX!+63zVJ%~|bTsjqx4GY+C8mbpJg{6ZJ=rkgP7RLED`Pt(4u$x;jySYi@no&E4R33 z9x|Q0diLn8Jqmtl2%}@t>WF`2d-b_9_#7&CWTpOiB=vhUEr3+UDL7idQ9gHo+SI5C~(S>;+n;m zgV446g4(}+e{-u9OBe!s7-6r9TaE6AQed7NG3Riy?%t+v4TtsnvKBm@F*SDTm0Nw! z=bdlTw6?>i49^a#TF*4M=($d}9~p|b|>DGp9SRSq8RRWxCB~zKeO%oZp(R{!!BZ&d%6ZKd!dZz9$e1ukQJe zYt-Snhw9@Z>jvadx}_oRUDje|>_bKSm%CftBg<;$4(0)xJ@U1Mh_TJoS8#bc>Rm96G#2y-qPd$$g5udF7#OO$;{)&7obXh7yhlApr2}q z27dp}r~@fEPKMcsq(pjnv6|9nufMpqK3Ed4!R58B9~n3vSs}I?#k(=#M?c?6Q}@>*B>-S S8-L&SXCe#;5uD;}*!Dk1Ys$9( literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_83.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_83.png.meta new file mode 100644 index 0000000000..8cbe2d09e5 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe01_83.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: a0197572fad951f42aea1fe738f49ab6 +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: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8882f9304fc87ef4586c76cec4a4f308 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/XingMo/UI_hz_zhonghe01_24.png b/Assets/ManagedResources/BG/UI/XingMo/UI_hz_zhonghe01_24.png new file mode 100644 index 0000000000000000000000000000000000000000..751a46ed58e02511594bd089c23971af21d3fb66 GIT binary patch literal 7453 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/BG/UI/XingMo/UI_hz_zhonghe01_24.png.meta b/Assets/ManagedResources/BG/UI/XingMo/UI_hz_zhonghe01_24.png.meta new file mode 100644 index 0000000000..93c71c1b61 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/XingMo/UI_hz_zhonghe01_24.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e414061b145944946b2bb2a54b6cfa22 +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: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 42441d817d9e78f45962b695536659b7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab index 7666d681bc..071e0f2ebf 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &239949504 RectTransform: m_ObjectHideFlags: 0 @@ -849,7 +849,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.9607843, b: 0.827451, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -857,7 +857,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -1677,7 +1677,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2030770693468687629 RectTransform: m_ObjectHideFlags: 0 @@ -1695,7 +1695,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: -18, y: 69} + m_AnchoredPosition: {x: -42, y: 69} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4188976732141891790 @@ -1719,7 +1719,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.9607843, b: 0.827451, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1727,7 +1727,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -3049,7 +3049,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6120031733158163214 RectTransform: m_ObjectHideFlags: 0 @@ -3090,7 +3090,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.9607843, b: 0.827451, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3098,7 +3098,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -4347,7 +4347,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 6.4, y: 3.24} - m_SizeDelta: {x: 186, y: 173} + m_SizeDelta: {x: 205, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7083837331954130465 CanvasRenderer: @@ -4377,7 +4377,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: a758002a909c6bf478516e8eb95c858e, type: 3} + m_Sprite: {fileID: 21300000, guid: a0197572fad951f42aea1fe738f49ab6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4581,7 +4581,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -12.700005, y: -100.3} + m_AnchoredPosition: {x: 4, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7083837333117824725 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua index e67338cbc5..c29795a5f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua @@ -10,10 +10,10 @@ local curMonsterId = 1 local curProgress = -1 local curMonsterIdConFig = {} local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "UI_hz_kuang_bg_01", select = "UI_hz_kuang_bg_01", name = Language[11006] }, - [2] = { default = "UI_hz_kuang_bg_01", select = "UI_hz_kuang_bg_01", name = Language[11007] }, } +local _TabData={ [1] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = Language[11006] }, + [2] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = Language[11007] }, } local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), - select = Color.New(255 / 255, 255 / 255, 255 / 255, 1)} + select = Color.New(0 / 255, 0 / 255, 0 / 255, 1)} this.timer = Timer.New() local challengeNum = 0 local lootNum = 0