From b86cb01ea297ef9abde22ca01ab54a305693f241 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Tue, 7 Sep 2021 16:12:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Images/Mobile/记录 - 删除.png | Bin 2476 -> 1477 bytes .../Resources/Images/Mobile/记录 - 操作.png | Bin 0 -> 773 bytes .../Images/Mobile/记录 - 操作.png.meta | 128 ++++++++++++++++++ .../Resources/Images/Mobile/记录 - 详情.png | Bin 0 -> 2102 bytes .../Images/Mobile/记录 - 详情.png.meta | 128 ++++++++++++++++++ .../Prefab/Panel/Mobile/MapListPanel.prefab | 39 +++--- .../Prefab/Panel/Mobile/RaceListPanel.prefab | 45 +++--- .../Panel/Mobile/ResultListPanel.prefab | 9 +- .../Prefab/ResultList/RouteItem-Mobile.prefab | 15 +- .../UI/Prefab/Panel/MapListController.cs | 3 + .../Scripts/UI/Prefab/Race/RaceListScript.cs | 4 + .../UI/Prefab/ResultList/BigLeftController.cs | 1 - .../Scripts/UI/Prefab/ResultList/RouteItem.cs | 8 ++ 13 files changed, 332 insertions(+), 48 deletions(-) create mode 100644 Assets/Resources/Images/Mobile/记录 - 操作.png create mode 100644 Assets/Resources/Images/Mobile/记录 - 操作.png.meta create mode 100644 Assets/Resources/Images/Mobile/记录 - 详情.png create mode 100644 Assets/Resources/Images/Mobile/记录 - 详情.png.meta diff --git a/Assets/Resources/Images/Mobile/记录 - 删除.png b/Assets/Resources/Images/Mobile/记录 - 删除.png index c0563443700f813354e757bb1b64f6d059c4a7fa..c9c6c2168df0f31640ec9c0a2df56c00be88dd39 100644 GIT binary patch delta 1375 zcmV-l1)%z@6U7UVcYg&qNklC>5!SAzB4XBo7wBCoPB% zf-hpgyUTfqmLiw55ABl>@TnDBF9rWVjppuNA{6vZDE@g-tfEFxRH#AQDy%Xqb) z)05SZ%4R2@@r&u;>Mz4-M&SR2K--D6Qy6l&$@?$|e}9ene3QQ{O~P2_jQRPUrehh4 zSIu6$8(vsnncNPe{)DlAt>-siNB4sF8z!l`$`eA?tJUcTRJtp1CleTC&qS^J!i+Zd zE&$q3!H_0$i0@a8*t2J9i=x8}(aAGrEV{*3{H~=+ZQI(aDzDd@f`3iq+g@H2y;fnApfCS(>;?v0*Lnh# z(r$JRabQ40i2o@JCO>A;w#7Td0RLBtyB5$-PtqDyw?f^eWIKHuYNue#SV9fQEY}k% zL}#=6Mpo#FB|L$#c4&3NH)iZ=rA=drcAP6Wukhq1A?#aL^Akm;jZI`sRADwY3Zc09 zjDKug}YSSv^Jr4BJaB5uFA{>*E6xkD~ zcbiV#@QmklqDgD$*3YF&7k+?);eU>Jdc|k8TA6P6_B`|zu<$7qq;#8S4LEZc z!xiT_9fb1vefPNTmFB^UZ96+Fl_Ov3luJ{lYrx_Z>NI*{zg&ws3(r=nwsZ~Hpx!|T zQaBNN5P8NMx_Z#H4Zh27;SwATsy|I$QrBUcwryzL#vI6|P?(yU8dzAkSi*_!FMpUT zKk(|!=S$<@XE67^<>h0Vc?_=Bk-@>?^3kIuxLtc6`mV>GI(1<;t}DFix{deMhie2A zeHDX)_jmEt+?(nP8RC-+=I#$Mr5s#bT!{C@94Rs!`VLsb?dzF31~w(=8CV83B?MAZ z%RQEXO$mXN)b?GE9Ui{vb+i@t6MqLDnVC8Chidoi?DR*D<2+42q7|QHNEW_@-9tlz zZzw*l2K01S+0zXI)}GCO;{XO*uofjOBsK^xz-c;S6i6zbojvlNqP=mYa`+RZ>9-c3 zPhHeA_>UiJ>LZDsKGi~@ba$g+%>&@guvB7K^)YVXo{qFSM1UMU&_|!xQ&^wH2Z{D* zwffqRAw^Qj>M5|QMTNrN9gT+j57y)w#{0l}Wf%?KZ#lipp002ovPDHLkV1k6Mr!@co delta 2382 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 A{Qv*} diff --git a/Assets/Resources/Images/Mobile/记录 - 操作.png b/Assets/Resources/Images/Mobile/记录 - 操作.png new file mode 100644 index 0000000000000000000000000000000000000000..3b59fbb53113c9e2d021e4aca9a37bb2748f1401 GIT binary patch literal 773 zcmeAS@N?(olHy`uVBq!ia0vp^VL)ud!N$PA*lkxE3*@k*JNh~@Fl_AS{*%ZGANZ0~qINJs!`SPB#Ay7$$r;B4q1>@V< zwtmcp0)2Ua%n^QE_g!Du zJn~gLA*B5==*YLvpDVt2&hEW_Pet>7y7Jokps;IEk2imo+NvG*W@=gAsV!me^Ojgo z%ie3XkD0|OXQ!Jp+Z^Yd_N@naCj6Um;K8kjm49NCJd5VXK9^g2?C}CVrvLK}_;fVv z4z|_PT|eXc^yljL*Izwh|KsY@=DTML&X(<7emU!&z0j4AGp+BxEDifyH${Pg34{dx zY}VX(fvNc#Z;W~8$xUk_A4lcL_xpaGxO<^Vfc4t9bsl%s%%(==%#`3rHGxIc!Z>lKAr3yNPda35VyVuRXTQaM}Ko<}xPR`rX4- zXD|CYEk+@2ZJMi^%gVPs#N^ms;h%xAG#(7dhA5?DrR9tJv4QJny*WrR)A{ tZ?EpOnJMJem7Usuyx3J1yN|j!YM9xJlQ=G0EUE{kMNd~hmvv4FO#of(IE?@R literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/Mobile/记录 - 操作.png.meta b/Assets/Resources/Images/Mobile/记录 - 操作.png.meta new file mode 100644 index 00000000..1f399788 --- /dev/null +++ b/Assets/Resources/Images/Mobile/记录 - 操作.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 36e3fdf68d78a6646a46fb3fe7cbc09e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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: -1 + 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 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Mobile/记录 - 详情.png b/Assets/Resources/Images/Mobile/记录 - 详情.png new file mode 100644 index 0000000000000000000000000000000000000000..9ca33f58bdc1ae68a64afe67f17377ab829c2295 GIT binary patch literal 2102 zcmV-62+8+}P)E1&z000N6Nkli50()iAWdPiqk?ucbaRjI3UD4|z$jdFdw0itxtDLpM~k;_P*uNfP3 z^a0G{m684jun(>E3^o~Ife==zF4XLZ9V^5Ap?+c+EytrSq^d(9mS(DBK{isES6=LJ z_mdmNGEg-}PrUwDK$$6pq7qe}8}}9KV3#&OL`u)~s^tB;+I{;8`KQ+2PU)UVF2vuj zU3#jfRvlC}b^JwSK`irsN{y|`j*79Ls0c?<{&szoPQT5Cn{^X7K9HrpRCLhA3y7*- z)ZqVkUeDl;CSg0p2Ah27wnjy4<-TRLM&oP9tuR##$i`uE*ijzddVtILXc=P^IBfFD zq^U#b&hkkAu1Nn)q8w+wNZ&1=>Lc{p#22!`e*K$xPrMhZ;{}&zGy-P{?;99@P#x4`@;X}Mhn?@o9MYn{%28_4>oTmO$O!r*3?t4 ze#S(A_bF|G_0l^1dWrYzlt#_5Dp_~x@vLgn*Kwe6jd6`h=NFi?%-0dz7*CTLURaephsdQN}%N3fe5qMvlG!?Ki03Fk|EW7y54R6n@WrH^5 zte8%=Fu1-#DnD+r84qEprbxmw))Wg+Qm!8!53o-DRl&pW0jGuH~V0@ z&dHv^k73?j!^=fTE8W-4qd#w)KrA7!BDl%wz#hWL8)Dsb4S$;uNAXtxPuN{ zdp%n*{mizbFs`v;Hj&Q)w4}et|A$%r`{~}fybVYFSTXNso2J67?ls)q_J}RMki3=8 za!pBnm&==`sW5A5%(h=D%*r5CKAeXCX2Pt>htu%iOqk8WhvCiPN+!(8Zjn-X$covd zPa*`5n^tiycoq8!cGk&g93kwBpJd*OpvDsUs*#ehQXsy7x#GER&tj$U0~Ak^Pt za$3huVu95u&8i;v#89_?gJIAsD?_$=G2p>B?}FI?17Nm_)0d~m@LUDg8w5Fc1?&$0 z2_cZhyqs5x=QP|?TRs!*w}Hh*cF$Wkc~`yf0rVYW=V{5qL8z|b{_QGTO0cSqScikC zP1H9~#-7Y&AUa?f)&oJKjMC35-R?nE7*=PxBe56;Yc?D26v2&kgP6{GAZ*NWO0UYd zlZ-)0EL(M;yEZZTA^2#ab{Ayu`IqUjN_W?be8)q?6Fd=kCB_zO6aQYFBb74}m9jO+ z6_3Y?Jp+$zZF-!UyX8fC%=0)!z+!7TU&Hvsww|nKfz(tFiu|l|_Fa{<-(n=g2LQp<^PKpyp1B8?#Y|uq|x`;^i-1NwlpK zC`d6AbsjklGkCDwZS8iap)XR0yjPY*v?dCG7~7DsM9C#-Lr!5;!0gWwCb2%NWmvD9 z*8@xRpxMSTa@w|zoo$26YdlslSsT!K&apPQO=agi)|9E3{c`hI8K-KuOztC>O+P=9 z<)))t7>}**`Gz1-rWf`_nWA2W@mTx(GDN+2_&9XIk=bdxBwKA*QU-#Y z(j?!3Cc%-`x1&jH%QA5fYs>PT%6Pcj-$9tH4(^8Y?AtmCShqv4yR_kc;;dRq$Zd#9eSgb74_cH;=8I}=0R0@d2F-)ByXnrF8 zm7*Cowp`%ihg6Q^JR_bp2oZ~@;I@H360`T{-1fKWZv3MKSOov>@ g{W9uP-zc;H0U*(+#T48~tpET307*qoM6N<$f~1rHfB*mh literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/Mobile/记录 - 详情.png.meta b/Assets/Resources/Images/Mobile/记录 - 详情.png.meta new file mode 100644 index 00000000..fe030212 --- /dev/null +++ b/Assets/Resources/Images/Mobile/记录 - 详情.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 84e7c752a3296664a8e326a886488af8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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: -1 + 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 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab index 3d3ad57a..7f5e4096 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab @@ -120,10 +120,10 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 844, y: 390} + m_SizeDelta: {x: 844, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &465239219729653175 CanvasRenderer: @@ -897,9 +897,9 @@ RectTransform: m_Father: {fileID: 465239219729653177} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40, y: 20} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 40, y: -175} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0} --- !u!222 &5942024322520947810 @@ -2972,9 +2972,9 @@ RectTransform: m_Father: {fileID: 465239219729653177} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -328} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 30, y: -133} m_SizeDelta: {x: 52, y: 52} m_Pivot: {x: 0, y: 1} --- !u!222 &8456421790132693988 @@ -4492,7 +4492,7 @@ GameObject: - component: {fileID: 6653062728990783300} - component: {fileID: 6653062728990783302} - component: {fileID: 6653062728990783303} - - component: {fileID: 1215686165907123932} + - component: {fileID: 4066843332072514142} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -4557,7 +4557,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1215686165907123932 +--- !u!114 &4066843332072514142 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4566,10 +4566,11 @@ MonoBehaviour: m_GameObject: {fileID: 6653062728990783301} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3} m_Name: m_EditorClassIdentifier: - radius: 20 + r: {x: 20, y: 20, z: 0, w: 0} + rect2props: {x: 0.000030517578, y: -10, z: 241.12343, w: 241.12343} --- !u!1 &6653062729120167375 GameObject: m_ObjectHideFlags: 0 @@ -4742,9 +4743,9 @@ RectTransform: m_Father: {fileID: 465239219729653177} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -139} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 30, y: 56} m_SizeDelta: {x: 52, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &2704666254422893685 @@ -5437,7 +5438,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -5447,7 +5448,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -5502,7 +5503,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -5 + value: 190 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab index f0fba077..ef963d6e 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab @@ -318,9 +318,9 @@ RectTransform: m_Father: {fileID: 1673965681348374004} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -139} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 30, y: 56} m_SizeDelta: {x: 52, y: 52} m_Pivot: {x: 0, y: 1} --- !u!222 &3267393459555052240 @@ -912,10 +912,10 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 844, y: 390} + m_SizeDelta: {x: 844, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1673965681348374010 CanvasRenderer: @@ -1502,7 +1502,7 @@ GameObject: - component: {fileID: 4408462524766711656} - component: {fileID: 4408462524766711654} - component: {fileID: 3403777905788897306} - - component: {fileID: 3645075438866488861} + - component: {fileID: 2590029437549992851} m_Layer: 5 m_Name: ListContainer m_TagString: Untagged @@ -1568,7 +1568,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3645075438866488861 +--- !u!114 &2590029437549992851 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1577,10 +1577,11 @@ MonoBehaviour: m_GameObject: {fileID: 4408462524766711659} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3} m_Name: m_EditorClassIdentifier: - radius: 20 + r: {x: 20, y: 20, z: 0, w: 0} + rect2props: {x: 0.000030517578, y: -10, z: 241.12343, w: 241.12343} --- !u!1 &4605362255460975186 GameObject: m_ObjectHideFlags: 0 @@ -2006,9 +2007,9 @@ RectTransform: m_Father: {fileID: 1673965681348374004} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40, y: 20} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 40, y: -175} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0} --- !u!222 &7538218140977774808 @@ -2090,9 +2091,9 @@ RectTransform: m_Father: {fileID: 1673965681348374004} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 30, y: 10} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 30, y: -185} m_SizeDelta: {x: 52, y: 52} m_Pivot: {x: 0, y: 0} --- !u!222 &5052066067678859807 @@ -3156,9 +3157,9 @@ RectTransform: m_Father: {fileID: 1673965681348374004} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -149} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 40, y: 46} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 1} --- !u!114 &7196181606344597827 @@ -3517,7 +3518,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -3527,7 +3528,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -3582,7 +3583,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -5 + value: 190 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab index e4141067..cc8c2740 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab @@ -1972,7 +1972,7 @@ GameObject: - component: {fileID: 5897250536070262098} - component: {fileID: 5897250536070262096} - component: {fileID: 5897250536070262097} - - component: {fileID: 5897250536070262095} + - component: {fileID: 6768840054818298971} m_Layer: 5 m_Name: ListPanel m_TagString: Untagged @@ -2041,7 +2041,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5897250536070262095 +--- !u!114 &6768840054818298971 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2050,10 +2050,11 @@ MonoBehaviour: m_GameObject: {fileID: 5897250536070262099} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3} m_Name: m_EditorClassIdentifier: - radius: 20 + r: {x: 20, y: 20, z: 0, w: 0} + rect2props: {x: 0.000030517578, y: -10, z: 229.45616, w: 229.45616} --- !u!1 &5897250536639853677 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab b/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab index 98afd4b6..cd6161cd 100644 --- a/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab +++ b/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab @@ -1923,7 +1923,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ad507f0048fa74641a8c0ecc2771813f, + objectReference: {fileID: 21300000, guid: 36e3fdf68d78a6646a46fb3fe7cbc09e, type: 3} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2667,7 +2667,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ad507f0048fa74641a8c0ecc2771813f, + objectReference: {fileID: 21300000, guid: 84e7c752a3296664a8e326a886488af8, type: 3} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2844,6 +2844,17 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 40 objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 84e7c752a3296664a8e326a886488af8, + type: 3} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Pivot.x diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index 34c8fe4f..a0dfa116 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs @@ -47,6 +47,9 @@ public class MapListController : PFUIPanel { #if (UNITY_ANDROID || UNITY_IOS) topContainer = transform.Find("Top"); + var rect = transform.GetComponent(); + rect.offsetMax = new Vector2(rect.offsetMax.x, 0); + rect.offsetMin = new Vector2(rect.offsetMin.x, 0); //var rectTransform = transform.GetComponent(); //var offsetMax = rectTransform.offsetMax; //rectTransform.offsetMax = new Vector2(0, offsetMax.y); diff --git a/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs index cdf09e5e..81be0c3c 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs @@ -201,6 +201,10 @@ public class RaceListScript : RaceScript //rectTransform.offsetMax = new Vector2(0, offsetMax.y); //var offsetMin = rectTransform.offsetMin; //rectTransform.offsetMin = new Vector2(0, offsetMin.y); + var rect = transform.GetComponent(); + rect.offsetMax = new Vector2(rect.offsetMax.x, 0); + rect.offsetMin = new Vector2(rect.offsetMin.x, 0); +#else #endif } private async Task Login() diff --git a/Assets/Scripts/UI/Prefab/ResultList/BigLeftController.cs b/Assets/Scripts/UI/Prefab/ResultList/BigLeftController.cs index c7ed6d17..6b0cd80e 100644 --- a/Assets/Scripts/UI/Prefab/ResultList/BigLeftController.cs +++ b/Assets/Scripts/UI/Prefab/ResultList/BigLeftController.cs @@ -8,7 +8,6 @@ public class BigLeftController : MonoBehaviour { public void OnPointerClick() { - Debug.Log(11); RouteItem route = transform.parent.GetComponent(); if (route.enter) { diff --git a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs index e935421f..2592a4df 100644 --- a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs +++ b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs @@ -283,6 +283,10 @@ public class RouteItem : MonoBehaviour row1.Find("Times").GetComponent().color = Utils.HexToColorHtml("#9E9EAD"); row1.Find("Rank").GetComponent().color = Utils.HexToColorHtml("#9E9EAD"); } + if (row2 != null) + { + row2.Find("Device").GetComponent().color = Utils.HexToColorHtml("#9E9EAD"); + } titleColor = "#414251"; SetButtonColor(false); Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto); @@ -311,6 +315,10 @@ public class RouteItem : MonoBehaviour row1.Find("Times").GetComponent().color = Utils.HexToColorHtml("#ffffff"); row1.Find("Rank").GetComponent().color = Utils.HexToColorHtml("#ffffff"); } + if (row2 != null) + { + row2.Find("Device").GetComponent().color = Utils.HexToColorHtml("#ffffff"); + } titleColor = "#5c5c6e"; SetButtonColor(true); Cursor.SetCursor(Resources.Load("Images/PointerButtonHover"), Vector2.zero, CursorMode.Auto);