From 26e4e81402f1ef411e28c6bbf6f886f78ac2bb53 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Mon, 18 Oct 2021 14:55:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Images/Mobile/登录 - 快捷.png | Bin 5693 -> 6911 bytes .../UI/Prefab/Panel/Mobile/HomePanel.prefab | 2 +- .../Panel/Mobile/ResultListPanel.prefab | 4 +- .../UI/Prefab/Panel/Mobile/RowerPanel.prefab | 2877 ++++++++++------- Assets/Scenes/Login-Mobile.unity | 2158 ++++++------- Assets/Scripts/Scenes/MainController.cs | 24 +- .../UI/Prefab/Panel/RowerHomeScript.cs | 2 +- .../Scripts/UI/Prefab/ResultList/RouteItem.cs | 2 +- Assets/Scripts/UI/Prefab/Rower/RowerResult.cs | 1 + Assets/Scripts/Utils/Utils.cs | 4 +- ProjectSettings/GraphicsSettings.asset | 1 + ProjectSettings/ProjectSettings.asset | 4 +- 12 files changed, 2723 insertions(+), 2356 deletions(-) diff --git a/Assets/Resources/Images/Mobile/登录 - 快捷.png b/Assets/Resources/Images/Mobile/登录 - 快捷.png index 15b7784ef44b48fbabb02a4f814d03a030295fce..8adaaaea8710b04618a724269e335fe1bef76efc 100644 GIT binary patch delta 6852 zcmV;#8aw5^EdMo-cYhjkNkluC3xn@#6TP_$@<#HQ;-*rm6ET3ff>vyUlkigjx$q^1ZuIT-1t8YFMuhM$v zA%%Q<>ZI@qduDCDZMh!TDtHpKfJnWIp?n zDRS?cpGqD5uT8y=$%V~2%e4z9F~Kr~@K4{x*Kxrt==~J)sMxaHbUFbfdgZbkj=5-J zEqhmt$uo1-Q8UJx(5!tjl2NE5=02~hNT(n3oQ@&0RfkrM!s;`5Ns@d)7u0>(dZV9= z_{*L7tbe0{r$B{c1V>=#we;HZqr$~kJ{>c$B7tdSVt`oQHEmd!JT{P7V2*k1K4T~Z z8^4XaqBM_H!F(|D2ExTcpD%*f5fGo0s7mP#7&MX4f1R7~* z=d<%huh$tq!@=n2fzv(BNd7Uw{E_irnmO!@8bFcby zVt=^c9Y9+jYXk-?9?$RfWSkENEs+4`b+NJ6(I$xO6%-jbxXva@lh@B=2SckTe57bc zMocw0dnsTL>#6qXm}k3*m(3Zu$w5oVOrzOyfvvO4N&gm?$+H*#Ozu4MMwWy?s`u2j zYxY%DZMx66dMH540Dv^HGq!mtlMrbN*EC{S+wmt^d7r-)!9L^mn2;c)-O6sD1zB)>%L>+?A7xCP`FEJyP_giqCynlGVCoXCx1tj_n*^3^nGQ?vEvi!ju&ln~fpzu{nhi z7dv#RUTa9tuzT*ZClVSU{ZN8*9KaA0X$HMbXlh>o2weRhNy^$bE%(TD4lD@bHG@n+ zeL_8OGHUH4^o=%iK?)&V4R1=*v#&wj83cl}$><+s$N+k6bx*xc*gmbvz<;^jpI8dt zL(ulB%Y+1>^Wgf&NLI(<^#EzUgR$^$@WWcNGgCBh?OzLmR?Fz0$^+rWr+4;Jjwm%>y@b!-yPeWQd{ZQ`Z9{1-Y{Es9@s4t z&br=BMDNC}5GwKbP{!hfei?-N9n(|EEHQG>gi6MYD3V3nSAWXFcUH*U9*@JVU}KPs zWYSqTWkw<+&bX>zi~-58qou*D;lB_w)n{%%2E8!$E^)Md-q@>LWmP#0Z(EGZD z6oDY4NnQq@-hWrlY21NF?(%If>f?qg`EHjl%cXjqL%SmXhzXp42mAt()aXvHZddD3 zcNPr;2@;?nkaM7;>B$*aB_RR&Thf-0W4RuNE=&70k^~mEzDurKp_z0=-!I;3Bun7h z$fz?a#*dRpWm!^YqhQzqS@<56q*>d(PsNzGlxSOb=6|FD2$eKp1olK&!SFpzSqL2a z@Kk?nQ5F(nVvwu;xJeQzv%7rGXgz7>zNgoIotzYbL&eg*5&>Im#UulvV!inqap;oK zYd@zgYXK<%wTT%<8H2c9+fV@y3o#hf0GjZ2awAi(a}8y_s_>6{ge zRRaX7ivK(i%LFkhhEiwxG^YS==1V)XA&uY{^jlA^-~7yJUGJ-;?if3r5fIeskdj*m zf<#OMLF!wu;Lu5%&XO?8unzfzOCo^@X;4;QHt*jizu&e<=51SQ zaKSMq09VL7T!9_|bW_=m_4$L^%Px1(8-Fp}Ev9S5&wT*%egs$Hc_*DMcYpHp#H?-i z*87`f{GYxNPhWoF4EyXU&Cbtub_twS&vzFymkxSnkmD!AUK@|xtYT{EgwXnj#yb8+ z`#a^LCg-~EFS_bZ>c-F8ww0 z8`n8mR_$IJ3Ss7sk3taMV+J(nFPT0BH~M4CxE4?Y{bQ3M#G_jmGE~R2{dn!qWzF6< z<&n?aTcbIi!49byCm-OkDM6JW*P;dI9`S9c82OuZH#VFnZLtzrjocC0V1M(LgIacY zdeQiVlWQdiw>l+dGP}<&<>Kb&$C)xXTZ=}{xTKZVmlsqU7jtwHMF-O#cfI188r$D) znj<%Td_>fZT5?D1qcd{xggCzE!mskq5~Nsw5Z_7&Gb5@>x#a1Ay-Re>{UoxEPTEPZ zR^V+8-(9N@IcnKf?08A;>3{sysKwiaveMExMyGB`or3ZAyL?^o_57S6gm6w;uQ}Pz zB{Ha_w0Zq+&|59sz)6E5E+YKk(I@J%wQ_qwFbr^%cRcyyQC_MC){~b`j$?El@9~p@ zap$J`Is~LJW4d`v%D{y)sq(6-?j_UO+*e5hGfnrFmYwI|M2*NRdw>4I9`2!iYu~V~ zZ290FA0AgbbK`u}khWeNu%<+J=o#^(RX7DDWb7+9>(Ff&y2g2tVs|B@Sd zqwhdKZc(?HJaK7ZwG5%={eypbOclPQLR^@#AY^Hd`CL=ZBt`?CAFKRa8SYO4Q_Cn# z0QPL$DO2Y~`Y>xpVvJ?#jo5zQbq7q7-R$b79YcE zB&T(Kbaz=vX@5sIj%@}2vM3LrfX>RS4?9#0x|;NbGQGSCwuSiBrkhr}8@_UElYIvc z?!uTALmSAEKsG4B0UUxxJ9=mQi}it2h8#c~$CIv=B;c|2S#<3l&9G6y6*f?GbJCnD zub2ijb!ZtB{ghDbLx#U#LrnUcEr6h_HrszD zfU(_K!heTo$S*vfB=wXE3~0k3X(p7b44F9za|M%P{~#!qtD)V`r#?(C+F5Mi7sSz# z#WX|9A=6j2GI(7-izJsUYH&j1isOB1mooqGJ^paOi{QnvB05R5nvx1l&-5&!sQimxY!4f!PbK}qXIQ|7jR z01rq$@{K=k069MkA_9*`6FO@A*^Hoo}-0b9feCaa4g>MDq}LiFD7K5mb9710%ZN26DKu;>qLoH;1BPVf2ec7 zPUZ0^N#tGSH@2epQ_q;^huhmPSu8SRhC0T;OvH(SFbe3!bUFP|bX#2*;^}ax6^4d) zRDXC|d9wB{wSt*NoQ!~LaiB{#=SW*{hJV^8I+zlhGCKw6jIXRCCk~j`_tD)c(((0J zNCeB0$r1$&Nzot_#IcnS$bif7`J1h|)0th1XNMw?s>ct9J!7E?P9`9Q0;M>x!N)c) zDn=1IRYzIWiEP&I`QD5BOq zlw@?Y3yMe-Au~4MfHD3{SBgG3P0FN4vx{V4%ihxV#9H6X6|xK1ukU?Bp4+xW7H|Kf zVyAbVmT)${MnvokpK5(ij2tbT+c;kv!!SL~sP5f5NlE950n;{BBMD3X*ncl*2!KLh z9LPZChprVT1vfKi780Vrft2X&-Gp}6NuL&%h6w+913pvVo+XcMn5H)@C>mJ=(t(4D ztQhE6%s9^Kvi*SLcxbJ#PwZbqG5K4C3W|d&2XR_>MYFv9+B)Q> zhE`HFNaPF42R~czFOQO8ui6Vmu&Iemws^%hVBtiZRB2Kw_<1VckrZ!x55Fg4UYHcc z7c@FYzH{~$;yBy6<;Ab*>)x#(C3vGXtH%_<1Nh?YZ~HdN_!s!}7qzlDubb`k(ANuS==Bc$E`s(wg$IMy{B2MMw`C1+5%-NWv!6D5QPSr*SLTa!Jq;1xwb$L+AOY2hpQS6p(e}RYZyIQ#R4cf|8t$WF* zo185z>YY*}JSJeh{swyG_LpSlrUmlup}q0;7jppBvf_rw+d!{@$yT<+WX_ZFS+! zEZl=zVVG3ZS$~n#Re7M#{LqIR#n#dBNn8GY@E#T2l?-|Hw%+>7@A*1V!(foP1@u7F z1sk6=m~#s)Y+BW8E)Sh|56^2s`%g7n_rD{zzVLPF(zLUDyVKEsf$~oQt1(Ukw=e&i zuGmfCHrI%I9^fAfrS>L=4UV>OcNL7i9#GXSm*()3A%8F5`e(K4gg!PJ(IGv_MtPW{ z2&8d1Z=sm5YgfOG{HXJP=qjrAyCbM;-71e9kdc45L$3H(ce$g(4b|*+9o!=$m)d*s zrYAI(sXZU8W^?tT+ho^)Js>61dp#^o${SU)`Swdcl%-pr4~0^7C=LvfMw)-B@&Z$5 zD=E6^6@Sb`7IN6jw++xo-!s$V_%aPZ=WqW7;4jHjvykTdHSiIWQ!gHd^ZDRpKeG;kQ^~Ch^e})UpUpVV% zkCQK#HO>!K+;qmgh=%HS9Kdk@sheiYRm*RZuYdmeza09gExw6C2zNpM&g~zSd}BtU z$O;+Yd939Y`0KzQb}%1LN^Q+Y_weB-Ig=|Aq*ag%dhr&$hLAIW2m{;DriZwL7oI2K z0H5HZjr*5sX`bpjSx&0cP<9;HDZkNGH~*dG(z0GN{==Ns^*^S%2GX#sfo!YXAwPff zDSx^7%#kv>UHtJ}3i=WB@U4EG{;vo&zrQsU&bT81@b`i^e`_s&KfIj=bofub4!Iw7 z6W^Rzchj!Q4XV=Lgr(O}RKf{?)WeGjc^Z%-nr7v#%3H{`1OL#sT>8HaPypT$WxmW( ze-KKy(QOCG&Fx2~f{&oLvvRlGvgFJBH-A75m&S*LMWM=mBAJS47bv<9Jx~CfM5c%s?L2TgQ|6y76kwbR*n)w@NaYY3gN9`%O8+*!_)m^bDQ^Pfod0QYW61>O{(c3HRuAp^P%u~b}ZBS01vC>BcPsD~Fi%2nnBf#-71-*qlGo7B#IJR!Gpe+7g|#EpFv$u!=v zQO2G{<2XH4r2gjZaq0YFcULYPd-`EHFj<$yK%c5Kk#xpULNB1l%75C03NxXs+!7&m zy19;$kRS?Wa!V=NWC~Iolm57-WdJKO`6-dq-@M{jhp~@I2>2gKA)O#v{0i*d{qKy| z7b;)W!>tvF;cg-=AZD=o%z}s?p5zt?0@KNw$W}l`ZQrO0;McpfH#4{w`oqx+=W7wS z!g{D5%U^-;7yL6kRDbx97m~~~J54I-vtUej{UPD?+P_*=C#8i^GR8;6PArfG23ez1 zc%D-W$}F+aFY;%tqJJo6h=ut6&WU}5LKxi{H#5w*o16mUVy9T+idg^lLV{my+knNR zo9*9!t!HX^n@ltETUb-u y=_Fn4@K0^XE$goWD<(TWWl_fP!6vwo$NvM>ABVGQtUdn#0000-vv&Z^0A{_1v|1aalAd+%Akv)o&CtLoP8&c1!$?|=1r3q`M2*dOX%v9PdE zbUK~GM~=MwcSS0luYdh}Jupqwg;@7oNy_iO`$h*kT`=(nWR%UDM~Y?3jO;WLAA0B; z-sqayS(paO=;+qsuDk9k=H_k{+qdtmTmlcJJ2bRxD}-smX~m8mJH4@M*Y1k`)vx|m zulvRu|8kK*^?!vW12jd*x!>ZXgFIC0!+2288gGvgj5 zB=+w8*1=o1ZoLeqvcPuqJ#`tS6gYA8=qvZSnexzi^2zTSFEpD-@4WMRGr!ElmM!;q zs-*Dn!;xEO3=Itx%a`9}gRsoVzv*f>1bh>JumK*s;q)xPJXwh3t;*+4C)vzUf4a+$KmKjTWT7EkggP)VSloU0h%22weX`iLZAS%=8^@1-=<=cg zyvl=}9Vse+^H0K<0z7F+0srHVKlDz>(y0m*+K+JmMN&_T@!{ zN`FI00eP%L9*Vu*{9yw=S%MS}2t_59APjfas@1koY%4Ii6>jFk0F5kcw^imKK>hNL zhF#)IP_#R~;((3+!*w`tNyyh~`T!MfF1Vy2Gr|fs%dh4aNWWX8+ z2Yq;f%UJWeDCJxSa1S>gEC7qpivlZ?Q;Y#nE=h)(tpq$c~3;~Yr|T^eZs3Ut+~okIYD zCju8Jaw(dC=`oGhE?-Kil+jlkN(c)j0HZA$LnmEn2%XMkx7#^z^ysU{9OzRXI{Ws0 zuf%7Rh@|eUn=r>%XIwev913^<5r0hRNES7&KkD0pyVFhwUN3H02)P5cuwGEjC9hVma(vr)FgDfH|7(5c%2owCxg z`hkZZ{vBJazVSY_;%K+p-|?_BxI>iLVC5o}*2u^fznQ8CEsYBo&K1+s(|?uIz+ZYA zWRPBAcY5U+VB^ztlFoA2q()lL7evu6UAk1nRnBn1H8T!$WUYxuU_MFSFc{NOwQZV9Qs-SApm?0bM^&oUw>}w0=vhNT$s+% zK~OyoaO^(nhCL%Lc}atU7X%{*LBO3(b`Uf;mhs_G)4?oJJn_W0pSRWNua$l%Ik3as%WI{J9G#yo%T;}n|5AHPm6QK;UqJwBS=bT35pi!PJ z%;SN9Ast_54PolT0 zAA9WSkIkuFkPGK>J2KM72Q6+a`eijzO?)`IWG11oSTU!cvVZ%)zp%%#FDrXARCgdd z99WcrJo)Ium7r4=SvDu}-V#h2C|TYK#o!5K>0!0up0H=3al5n~v-e)F|MBeE)DOdyLH3w2IY?N^qlb3%IZDy5^MB8ty*aaI&%yThpoZ1*8Uz3| zDrezPE;QCDuY2HRKH79DPX%EL$K&)4N6v1bPc7!Cy$OLNfe8?80_S0)1mtt3AeWtB zKQhUnfD1Y43M=s8Xxq@+TWAT_Yh{Z8kVhKZxa%GsUhDUac)2_`H|Ot%^p2>G7Cnv* zoz=7nu792O<5M%%56`XRb5f2n160WXiXNQ7!9jo4!Nb^!6)XIK46?Yv#k(fFDZ_RM zN)E~iPGd_`fwp7xkQ94qSUc-|PBJuLKulkw3n1j#(){Y(b`pW|Ix16V3GHEjsg}(fNljJlkOF%W=KrB_RU7PgB zR>?G9jgO6;6w4mQwwS{*tGZ%)Lw0S*pMNwbJAYeevxlf9ho4cDg-(A5_ zFHVXQvErjKGBR4>=RC=#?AzV{)7|y!dw&ikFeLybwNZ0Y7X|i6=I3ugyjJk`47-mi zFtBxN{eGc&qG1OEMRuC)aD3s>E^a)tARTml2cUy7BpP<}y(;=fp(1>W2BwD`sejw2 zI?R55 zTdHjt9vHaG-)CZ3oSmJsx4@U|?r5~QcI}$Axj6|vIf5*r2rGPOI0>QH-lq~3{fL7X z0MS4ms^Fp3=78v`!$GIu;F*KNbQU>m*}WPVSYE#6%noFS+0H{nK+yFU^M8s4VcuHC zR)(7T;t{Jp)oQ~{C}i`{{k`7YFQg!P?yHSD8_Z6z-Q>ej23nW(FsdMeXZmuWS?}9- zXv6gMtlu0Gl&N>9WQ6^!%`;R+IHYnaJDA(x6Q9tOS1^k@DYN#a$Ym3@lc}yKzMKI+ zGMb%&6~-3%T7MXk8at)vG^v-#>ZdGQ{X00}xJf^iY(EECX83NPj(h(#!LhG~)F; zT57nhup=Fp?{zxepV{liBi-(@BO5n%-}V7f>{N`b|gwJWq*CmUL_}R^S}WUHi3}ofeo9^H5p>Lu#w0REs{%|Hvi3s6Q=mb z_D#$i!2BXg-wSgF!(`C_gHfRU4u>1J<0*;IP=M44jA$uAAxmDF(b^g+E%DUX0L9=i zjywpRD<=J{eTn=^Xx(|M{E{UMMIxIC1bEC;nbPcxgy?QsiGS$V;Vfb>p+|hqU?l*x z5~(D`OmhvNs=yMTo+)7&ze&?zmKvyjvU25$r`~+?rAwrJ`lHWC8ldwGq~EDFy38~k z%%>q_+Jeb}OTLK%T?Pw(n5;-FxGMCwO&=1X!=`LWGxI42O6Sz_<((&w9)10nS#GIz zddKSkb_ioIN`J@eBQ9rP7=H+oHRXXp9P;xl&!;z3rRUa7F!zb!oDwe*OHA2^40uib zpa&LdJjy@D2Tc03uzhZB{ulOpf)8-ppEVY1``xbR!X=m#G)YrJ)MrhD;Hj{UBrrhH zS<^Z4Bop`=Bn1T>+AX!cuLM({2?K_LcP+OMJQm1?o`0yS!IM7QlC30q#RJ!`Pfgf2 zX)lPjSnWRtq2mx?P%uCm9aeHOJ#?&9Is`40>=4@2@A_8C>eZ|L$2XMxbVs~@pPIT} zeLpNM*_FLKBW0I9D`C(?a5+w)MJ+s1JQ)^4*A}JDZ@%~58z)0DTGe-SAjv3=QK;#x zoCt_$^?y6iu@BML*#}vxLg))Oob(;hiEzefO#8~3=uk)eHq%jYXaJdXz zyV*bR-g`gnyKU;*z0vG*SW|2>Mni;`)2gM1554fyug{Z2{AA32ilsQJ8lOU8Q!wu+ zW&04M-%Jep;j?C#Xi8qlGNDR1FBQVKm*TJ6+kgA#ftd@wN6ZKn4~FGT^OV7?6t7aS z28`J$;9Cm%`abjVefIeHn3JH7m*tx_ZO$T9`^=efOX6H5yLIah!)8#GkTqs!XNt3D z$DO2P(KksUytqUuA)p~)(xEhEqs?Tu#cIAhXP?Oa17!`(5{Vbq{)$h@1Cs`6Ou|f* zMt@3F)pTm(#*MZ)T5YO|S=C4;-tI12#xGMVMoWWVtQLkhSp7%~`bZvX{J|&et7G@A zUYZF6SBXN+5{VRzgT+{v&V$9U$G+k|1|&=5cYbQ(zk$wTiCT;f9hA(+>D)GRD0$~c zd`pV&n(^T(_WJRaE@m=5R#>bc(fBP7c7I-=2mkU6%riD-TidKPEfb(Vt>svaJGpJ! z>MeLVg0C*#F<#!zs*+yj>r%chSF%Oq2uZKASnin@5=wnsxRm1uVfM?j_t;D>QD|FN+Tmkg2RXMZCbeIVG9pGv(rz*vdXPn z^Y)W6-p1h?yKP(lClzC3pZE{Np?`-jv$4n7EZC{TY*%5Dw19$&GYt!8oYuKbJ)Mo{ zbq~9h`|kVoF;o0L1#sj{j6P{`N|1wDT(-)Zdh<5L@pS{_@8mScH4Ud9KP0HYWyBX8 zoUZu8$6Re?czB)hH~3%kSHzOX_g3%^1wLZHPptGaMEKvFZOw$iX2eIon0V*dp<};HD2oZ&3jWN8HbT2aL!CiM_aU_AVhM&+ zUIFp(#VDQ#?4mz!d&XD%SAQM+Va}khzL+^U1@W06e(<`~jH3^q?|Az32|xXn9HFV- zOf2}!18Pbuk<{tTR*3|A|Ng^+v$JQ88x!AzmD8PyJjUz;5K0MzmiKvxYYP&FRTFY> zf({UevY|(t1jebWRW|{Dt|k|~ZsWNVmOa);G^FbT10V3{xn|88 zUu4==V%cb`vC`)!pMPw#U%t5>XfkmUXrNWgS7oUm&nSEMK6B8<^JN4QNnnrwP!gk# z1Ore>(QIoP3Cuo@6R591!fyCer!gqm1w_wprSQl)F~JX$mP%qfuRf?b*6j6?iG(0N zLbp@>s5$kZ5`#eCWD_(etm%|^O?q}lZOBAXvOvi;*_SUNZ+}uX{mdaxz63}1A}-j{ zfMNEjEjnu=cplii{c->PgWGQ2T=9XU-;VkgzNZnw4#>VL(`>t5( zXIcbE9bwB3Wg~yYajp^j6DMrx)BpMa&<1GXr|f2Y=0X|B$V;}7(5b2UH_f>Ra>8WL zU2Ab(PRc3ON`H7$Uo!wnfDCQPwFn4wVv!bY(`xa92-0tt$$E7^OYPDodXl~4L=sA; z{M=vJ$3TZc%K_A90G)=xwo<1@fJh!nGf|=otFA9<1gJnI$3Eopb)S0eJoyy6G_uN;>W;tv;BfOVynCg9guVNJkmHM`{{Hk^nZwx6R6};zmA0gZPH6hIVjBp z27W&-z=$tD^MoNTk6%b4Ga&9m&!3-p&fY)#nK?09pPfitzUJha+`I)U9W)Q2qr!Fs zC^~9lHxsouUAkGXKT*K*|E$kyw<5KwcKxdNf7CD|9h { - if (Rower != null) + if (Rower != null && !isPause) { Rower.Reset(); } diff --git a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs index 2a7f63d0..e19569c7 100644 --- a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs +++ b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs @@ -95,7 +95,7 @@ public class RouteItem : MonoBehaviour row1.Find("Distance").GetComponent().text = $"Distance:{result.TotalDistance}M"; row2.Find("Device").GetComponent().text = $"Rowing equipment:{result.ManufacturerName}"; left.Find("Progress").gameObject.SetActive(false); - left.Find("Main/Name").GetComponent().text = $"{result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} Free rowing"; + left.Find("Main/Name").GetComponent().text = $"{result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} Free Rowing"; left.Find("Main/Time").GetComponent().text = $"{result.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} ~ {result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")}"; var rect = left.Find("Main").GetComponent(); rect.sizeDelta = new Vector2(399,rect.sizeDelta.y); diff --git a/Assets/Scripts/UI/Prefab/Rower/RowerResult.cs b/Assets/Scripts/UI/Prefab/Rower/RowerResult.cs index aee7fe3c..ad1b074f 100644 --- a/Assets/Scripts/UI/Prefab/Rower/RowerResult.cs +++ b/Assets/Scripts/UI/Prefab/Rower/RowerResult.cs @@ -47,6 +47,7 @@ public class RowerResult : PFUIPanel if (res.result) { _model = res.data; + dataContent.Find("Title").GetComponent().text = $"{_model.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} Free Rowing"; dataContent.Find("Time").GetComponent().text = $"{_model.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} ~ {_model.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")}"; dataContent.Find("TitleContent/Duration").GetComponent().text = $"Rowing time : {TimeSpan.FromSeconds(_model.TotalTime).ToString()}"; diff --git a/Assets/Scripts/Utils/Utils.cs b/Assets/Scripts/Utils/Utils.cs index 44058f63..f8ec5eac 100644 --- a/Assets/Scripts/Utils/Utils.cs +++ b/Assets/Scripts/Utils/Utils.cs @@ -209,9 +209,11 @@ namespace Assets.Scripts } public static void CallAndroidMethod(string methodName,params object[] args) { +#if UNITY_ANDROID && !UNITY_EDITOR AndroidJavaClass jc = new AndroidJavaClass("com.unity3d.player.UnityPlayer"); var activity = jc.GetStatic("currentActivity"); activity.Call(methodName, args); +#endif } public static void showLoadingExtension(this GameObject game) @@ -224,7 +226,7 @@ namespace Assets.Scripts var newLoading = MonoBehaviour.Instantiate(Resources.Load("UI/Prefab/Common/Mobile/Loading")); #else var newLoading = MonoBehaviour.Instantiate(Resources.Load("UI/Prefab/Common/Loading")); -#endif +#endif newLoading.name = "Loading"; newLoading.GetComponent().position = new Vector3(Screen.width / 2, Screen.height / 2, 0); newLoading.transform.SetParent(game.transform); diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4706883c..9b996cb4 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a88005cb..d285c6c4 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2.0.3 + bundleVersion: 2.0.4 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -180,7 +180,7 @@ PlayerSettings: Android: com.ZhiXingPai.PowerFunUnity buildNumber: iPhone: 2.0.3.0 - AndroidBundleVersionCode: 3 + AndroidBundleVersionCode: 5 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 30 AndroidPreferredInstallLocation: 1