From 609e4dc367f59a702822dfa0bdaf7b60a897c879 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Tue, 9 Nov 2021 11:37:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E9=97=AE=E9=A2=98=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GUIMainNetWorkInfo.cs | 21 +- Assets/Plugins/Android/AndroidManifest.xml | 2 + Assets/Resources/Images/delay/Mobile_1.png | Bin 2336 -> 3638 bytes Assets/Resources/Images/delay/Mobile_2.png | Bin 2393 -> 3722 bytes Assets/Resources/Images/delay/Mobile_3.png | Bin 2396 -> 3711 bytes Assets/Resources/Images/delay/Mobile_4.png | Bin 2375 -> 3698 bytes Assets/Resources/Images/delay/Mobile_5.png | Bin 2315 -> 3699 bytes .../UI/Prefab/MapList/MapItem-Mobile.prefab | 217 ++++- .../UI/Prefab/MapList/MapItem.prefab | 203 ++++- .../Match/Mobile/CompetitonPanel.prefab | 16 +- .../UI/Prefab/Ride/Mobile/LoadingPanel.prefab | 14 +- .../UI/Prefab/Ride/Mobile/Panel.prefab | 752 +++++++++--------- Assets/Scripts/Apis/Models/MapRoute.cs | 2 + Assets/Scripts/App.cs | 26 +- Assets/Scripts/Scenes/BaseScene.cs | 30 + Assets/Scripts/Scenes/LoginController.cs | 4 +- Assets/Scripts/Scenes/MainController.cs | 3 +- .../Scenes/Ride/Scripts/CyclingController.cs | 3 +- Assets/Scripts/UI/Prefab/MapList/MapItem.cs | 2 + Assets/Scripts/UIManager.cs | 2 +- ProjectSettings/EditorBuildSettings.asset | 4 +- ProjectSettings/GraphicsSettings.asset | 1 + ProjectSettings/ProjectSettings.asset | 2 +- 23 files changed, 858 insertions(+), 446 deletions(-) diff --git a/Assets/GUIMainNetWorkInfo.cs b/Assets/GUIMainNetWorkInfo.cs index 8c660a58..bdc1799a 100644 --- a/Assets/GUIMainNetWorkInfo.cs +++ b/Assets/GUIMainNetWorkInfo.cs @@ -62,6 +62,11 @@ public class GUIMainNetWorkInfo : MonoBehaviour {3 , Resources.Load("Images/delay/Mobile_3") }, {4 , Resources.Load("Images/delay/Mobile_4") }, {5 , Resources.Load("Images/delay/Mobile_5") }, + {6 , Resources.Load("Images/delay/wifi-1") }, + {7 , Resources.Load("Images/delay/wifi-2") }, + {8 , Resources.Load("Images/delay/wifi-3") }, + {9 , Resources.Load("Images/delay/wifi-4") }, + {10 , Resources.Load("Images/delay/wifi-5") }, }; #else dict = new Dictionary() @@ -84,7 +89,21 @@ public class GUIMainNetWorkInfo : MonoBehaviour _delayTime = App.delayTime; if (NetImage) { - NetImage.sprite = dict[getType(_delayTime)]; + if (_delayTime != -1) + { + if (Application.internetReachability == NetworkReachability.ReachableViaLocalAreaNetwork) + { + NetImage.sprite = dict[getType(_delayTime) + 5]; + } + else if (Application.internetReachability == NetworkReachability.ReachableViaCarrierDataNetwork) + { + NetImage.sprite = dict[getType(_delayTime)]; + } + } + else + { + NetImage.sprite = dict[1]; + } } if (labelBattery) { diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index ffd7a525..23cb19df 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -33,5 +33,7 @@ + + \ No newline at end of file diff --git a/Assets/Resources/Images/delay/Mobile_1.png b/Assets/Resources/Images/delay/Mobile_1.png index c4a4d92a12439da90dab1bfc2faab8ce5bec092d..2f740855416a049cc1b6150b772728774f4c8d2b 100644 GIT binary patch delta 3611 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 delta 2299 zcmV9A)(rtRd3)IAfi%}r)rg$+i5iwp!Oe|dF(sWDefoR)pqM|0m6N1qLjiM+N zQs}k`lQN;C%ld$myf8d)f-yEDnc&>NSO1|Z648vK!~MOk0;zG& zo_%Z3$K<=eMCVX(o)?vnf6aEiCoKCdA*^DG^TWf#{rxIk!X5=e2u2f&Es46)=s_ma z^$A&gML67W>R?)fuF)FQq^0?haponzY?OCn z6GWL!qZp7pD^{$qf7aAD%;f6Yy5Xd%B7uTB%7jf+zglP*00K#po8BZg;!YGZ8* z#O95UdlFQGfDw&o*EO!UrlzM{p1Rfb4qPl6<9e{A^~t(4RzF(=u4ArJ6VSNUlOmef z%JITF$g%X6Q_L7dyP@e}Geb-YR-|Ga8AO{(rQ?VM@^T~{eXSV`TZWgBFNOl&CJ*bWFM%8{!pE^C0>o~Kqc*M@`PEUCAI^Vwzu91wmP;0dPS9C zX-2$KQwJzX{UOkSB->k8M|8-Rr=uL}yp9N5vh7`N1-mki47QxKco-fveNNgXdBo}T z0qoO~HV~#y9^p9-6o&IhOai*I(uLq)NB!#Mf35@V?cI--?Abp|jwFTmpBcJI>7`2- zZ?$aNdf5`fvw2L)u+&3G0jng8(lZateGFoQDnpVmKDhYxxlN!F+SU3xw0Aq4};@+ufEC(cWragB=*y4Tp9;2L~Z^^BvPoKOQBx9@rzfjvN-OsSn zf9wg$<(~G_ly};xTgOI61`a8>Krpfcfm(b-IBS(=_mc7sa`-7CS87MlTJ;NUt%s~s z`cyS$?MfYUL&m0Ra%%Ez>LxhxU99cJ1g##Q)vc=gG^~rcjv9c9DqwDamQE$Tn>6?s z0nN^)cxtaad5j?7vc#$YOpi>66XUK0jwucMMEn9=S4Sel=5^Y zxI3!SrNDPPTn*y`4m_INiT>dC#s5{ziwi(p{)Rnaa)wmQCF|}R|At{N#cz~o6r=dzxKoQiAhe2M-eGB*|E?K;#uwLHOx@C&a%6|mG=>f>x z;(UnlYP|p65UZ1|lIzZ3a&qh%$FY#HU5V?6ndG){eESR8U{s<%wv0NSRXDbyhysWi zv2%R*j41QJV?*q8ZAEPV-$fQNe;~x3rX-=6X8(vH@!1x8Y{&5svC}FbLO-d;QR?Sa z$FmCi`D*hniZle+SZ$2g-l}ua12;Wt?@DbvKJ!cKf~83~uv@!X`}G2Om> zTkBV?_{yDOXXysti%ZR3S_91X%hRR#Lz-DQ;yV-x~BQtoH9J z{PvQ3H{DcJZMbuQid11-e|5xnRVY*OOBsf*@L6|F)9<%&2>2Q0`~1+z)6iH_C&tv( zuTfXenYz04-(SYA0I2|zWws-?PuT1unlLN;9f{OdY01VJ7w?V?Fr+4MbHJ__XSyXu)Ut$%YQBw{au0`IxYrjO5 zvXy$xX1cNa1YJZ~N5RmoRp#7Wr5;oydeLI+I)3s@t@#_#FDzTezm0nx-{gl0{~tQQ V4Sm>TmZ1Ou002ovPDHLkV1k#gTao|( diff --git a/Assets/Resources/Images/delay/Mobile_2.png b/Assets/Resources/Images/delay/Mobile_2.png index f95e8c5f14d2e3b3cc00e36684711b9099b0fb36..ef820364fb63115b954b0443c87735ac22ffd9b2 100644 GIT binary patch delta 3696 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 O00003-BsUJk!ZWFa?AjS^_qaQSi zqEJYo+a{%S?|9B_&t>l2nY;IHfA4lH`!i?G`^=rkna47w{I+gwuT3OVHx(4)RB1}I zN`k2z%=B=ZK}RGefoiFuE5*&J++RdkU4I{ePAM`2>ASE7rGr!fp;mIaX|-y@1*33D zG$m7K5{cAjD$+MhyB(SmsVj_0SEv}x-MKoIgETU4vISTx`1Tm{6dWGNF zx1m)5gsFX1yui<=B6P5>n-QPjlKoB^NHc-XIT|7Do~mHV3&f>e*=lLvqEsb-_L>{ zEi=%wK@1F}4-(VJ$W;QJl4e*3;Q^enKpn$FH&$s(I0}$6s1g!J8CN6D5{z>J7yMmS z7!|lYK!onMZCl6k@rltN3-wx67C(;KzA8a;X3GR(Z> zl?_rieu5ygX%GX%f3sxC61JkUY9ZubCkv1y`hO7#WN<7K?`wfAQrNm~@ypHg0^3eewBG z6FCyRFl9Wb{e$=4Vzsq3kr>h{iN~L?=W_4lpk(1FI2x<$WFS zGB+h#4>HLxe}Oj2!8ZP^jKy~i!uR#c>*_{DI%dQ*H@CG}mP|<|H^DMn4=t3Hj1LRO zzg)an965EWYs4h0!v}I8nN01or2I&yK!<}?IKOOZ)lDs_6NfXI?!BsUgzbDlMb@oa zJGZr2Rpx@_(~S-5D~E@F{Ypie*~P_=w;;{$d;1CF;WB;#r$_oRmx4AmW$mFpPzwD8by`fm5ZZxa zzPHH}&SXPq2a5gPdMEhu&<^Mo6^Dfx@lshGfF$*MUk7kkguA0s{os%-4M#cbtjPfG zig0&Ssvqvk1ZJ?MG7vaCZv4m3Bn-=DLl|1dcc72bPh=p>~VE}Xy7ux9;5CZ%ih7?okt14jYN2*%Pi z56oN!@m`f7N*FI(y!xC^pc0yz+d7zKeX8Q-0zV)!6vh>(EW`#CN{7 z7o)Ixd{VKj;^RVH%yHBJ6x9GT12lIcf9l<&!N&k-J`@wN9dz;-K)_)M)c`m>aw(5M zCRx%01joCO08Y0sX7=EE5>&Kc1K@elwQIRFoC$6Vs&pan;gN84bu2|M4NN}yHbB%1 zqREMp;%A?mm~3bp0LQo`b7!Edm;BbiZCE~=7K3TH`VH6)-#t=ajo4*krX^CRpB5;@WdZuRC%540NzDFmw!(s zE<~8_!pS$EJ8@!hmy$iVrg7akoR$B81iJ@d<`(86#;x)HSHoECY!zI$_eXY)UFJCE zGPa9x9b*Q$4Fd1}3T!Zn(H~kye;v;%99mI80gM@A7kKd*Q09(f!`R{3irjR^MHVn1 zj6DuXLOsm>0Y$>I&G*<2;~~ZltAH$cr5;A9mscInD(vMePhDnV2=L+Z7%#t7`=JNE z^eDe8QDm(xoeos!Lf=c^zM54WLtwID8g) z>z4H_G|GDDHEZF;?nCepr3Qk5SF7B9xr$qIpl2E9SMe{;@HKw}`ng4m#5ZA|LO_5z*i<1EO=NGj5hfKB zBKT1dCOi`07uYGzM!}AEcY4k~f9&z@&g{(W%DsJC2}rJt#)x!y4;#0VQU!{KnVV~i8 zblyC5w6!%hdg#y#-{ZQWoE&s*cI?>EHa@PdgC24GZUC9fLEI8I^n%fRe+#1-McMD- zmuzpBM+OE4&bv{US7ipy06=)t__%blBxOOk9LL?d7GOoa0<5H-G+K)HV01}IQeY6$ z+c1cWC24$p85jfT>bmX5OeWKZyRa9eFZLs+h#?rmW5bwNbg}Q)=f4XPcvXz&hH9%wFO>5vu3((Wkd-?SA^xpv5O)db}h((@gX=&;8 zVr<~L0d#fk*qqH~U&P~Gdm}RCmQHwF99I-&cOo(HrdxHeT-Uk)H2I1wcRY!{{x7Jf z)lDTDwCq-3cl*+%D_i&M*_lL_pt_-_D=h#QY{tg2FG1kjf7}o{gk>J==uqx*W1-1$ z1K6_V?pP`{@pq8a6+)uiR5=lgE%?>p!_RZif@9861L*1LTQWWU!#^>aUE`R9q96?d z^2wGKdDD?21K()^Yw|i~0P*;)DThV^9A{ae-JqqnZLoNhVz)$UTn<`hv7LT<>Bl^QLL0kDhb2^4<2 zl?p^!PZ9X(S6_YC{N*wgs{6RIh!T-pR2(hKuN*g@X5&^+`wSTnKNVO@o4z( zYK2#A0l0M=I)HGs*<$!A~yZN|ljSUm*T z?CUwBIK4dP!_~Gtcg8vNr9(cxv4g*D#zlx&A0x1>z@e^)h6cdbwRCfeh(I7vjYC}n z$iJu=j(7C}!K6(gv9WX=xzx+9YXF#8+NYOEga-=&BQ7f%0N>At<@5wgO(Crw0_2jM ze^!dGXaGE%p;BTI7F-1MI4v^(9?OCzgC}zc*FXr6Q*v9XQkend&*TwPzNJ7lz_nc9 zc8)4#27pPQyXK@27Y&4f+E=Q~90TA{Y-lRPzW!2_8sr+>UPF$x>dY|!p2Me&6#m9T zpp@eo1K{>zEKv0}p32rW;xg@`MT@0Ne=q$>?nl2%OSjgAt1$;T)@~)AF#sOFiswaN zp1@h7&X%&*Vg25ce6=Pf$N8gn^Cis~K>qCAT8j^Ue(v1C!3<@JFpP1H;dst+-f1+I zX9A0nVf;5*qc@5R7FM%d=L`USLK~U}p1K`+XS7Cd6c;4m$Tc~q%sB%noVRaje>-uI z6c)0UArLKao;LtQi{`%!qlOR2ah_`dpenw!Aza81$Z=jU0F~d?5iV2+NH`H7_k0Ri7*6$t*5sZBe^B#LV*<*+A`s*BZ{Xki>*!c4?cLiatzNw<$Ha#p z{#SbT*#pwp*xA4`ZkxBoCuJ6 zrL{FC3?Q8ROXOZTbm)cee=!dDHl!GYR&8=l?hCJj$!G;s&$fn(^?N_q9XXez;`@N_ z!oSW7vBdhl7bu&mgPhO28<;ee#eqa({oVl(ohc&6d2TtlytaPS27o@{A{GbwixJ|# zF%clgOw1WOOCZj%rSs`ge+PC zEkX_DFXy(*0GgVje=kF4wW0JD$`Apy!0j9~$_(J>(f-qDD&ClrN?ZgU0dh)iOBE?I z04BgEZ67a9D6WHzfF7q64Pbcq_4o0-I23G^h4e)P$R#-~UTgm=8UPcZ$#_hgQ22w3 zfDxCv25{`y;0P>-tAxS@7y)ufF7;Hl+?B^@L#i6Ukt45sgF%F2T>%ep(sM>}cJkOMZ)$2%uPVtXPA`*D z9-}zD^2~;le=~AdEqzr3U;*pbuX+Z}$w$=+GZW9#yUv{}e<7J+jI-*TF7MpLgp{q& z3NVauR-M!3nW>*#kuy_i%_L%)czox2Rm~iSSLSss&gpI8PM60ohw%eZ#cu@hP9>3< zY{r(_PM23j2vwFNw#UeEVTeEwWp`|@^pIo1MDnmH(iTJ=sE%z^o>WO^R62j z>i^nGWtLh17R(Cp5yjo`iX~$!NV}U>B_~$Nr$`Yya((f|$ETJqUD=AfH`&QA@;Hrv z{73ZrfBWr}YPkg{RxRI=0vEOfusjCP*21q)kBw#DL|B(LT=+dh zAkopGY}W4bwOVsc2EfX;Y`Hs@N}c-`h6HP@RxZ-lf`EK77MuTz!-tauo6C&Y}oMgUFZ&; zf5xSlF|35VxiDZSKTRxadDJti%CSM9UL{>!J2qo2{Y9~MpodW9aL(;>dN+|6;5>_K z&XpEGD=ih^A_c<4Dxww`WB&P3x3skU#?0$rT`s25}XF7vdMguMMq6I}BvPFY_8s zO(9JRcQg0bkx>5gTS}iJZWIH!Pxyf)eq#sW4dwn1^-6CEPlePf00000NkvXXu0mjf D4*vep delta 2360 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 eciG{>{||(2E>(ti4sm|~0000}Mm diff --git a/Assets/Resources/Images/delay/Mobile_4.png b/Assets/Resources/Images/delay/Mobile_4.png index 49dbd2b868bac6d21a155eff0d1d2307dd79b62a..b059f5875bb28e470c9306351068c3a4653d5619 100644 GIT binary patch delta 3672 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 IM6N<$g7>pshyVZp diff --git a/Assets/Resources/Images/delay/Mobile_5.png b/Assets/Resources/Images/delay/Mobile_5.png index bddfd16a197db7f9a45d8dc5f89e5cb038b4bb5f..11bb5eb6acce430b3013cf483faa7fc0e672cf93 100644 GIT binary patch delta 3673 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 delta 2278 zcmV6hP{~fAS2BJDs|e z%!l7tXksD6^Z+C0uMYI}boq&r#EGbaj!PO!SS<7%J|JbxsqrqtsZ1D?H`lHH%vl0Zo&L? zy1To(2)s91)~?O1jw%eH%U8z7QR3$*7%z$+C#vCp)h3o*pJ%ddr^3a;shqO>Xc&uX zRp%ow+_E!9>A;=d9~D zhJP;CYgJh^j+$SUrovVSFv6n_QdOY|rZwmib+Ls;nvRS!FX^&T>UtCSZHUk$O%WRqGfgw9fn7R!v?v- zzMVdu?>l<5e|yL#Yr;ozAe+tYaD~`yQeeVS7EaHcG4Gk)-Y!gXp}$ZEGOcY}Xqo5= z)euT#LxujHg_Nn1OBX3-bs)(hnNG1a$ByNXOQUL8;y|s2A#?cNLZN57Y8-G%M=X4B zS#@i(uF$WGXO}K%o-;Uj<~tunKp+E@_R?z=l{*1ge{T+dPl!pU@ty;?T%hq>^^7N#qQoj{+dE{k?H47l=K$SooR^6Dl%fe6Vc3#QFt0v_?^?l0 z%X7e+-|ylpf^6*_rc565_~hae##@#a*4|;lxLigP_&qX=xfZmsF?XBn1GUg!R;TNT z7h*e5e@T1WJYkMl65D}F+uQ5}n-$vuv!cqdG$a1gPzPv}`ctR_Nw&8sM|8=Sr>h+2 zq=^Vzvh7`J1*bBO9c(G7ei$Bg`<%2(@`}^z130H8ZJ?Y!d4=aWQ0U9=vI&^(N~^)a zj{4QhUk6%SI~Et+@jq;iB!$=S4E;^%`SYi*e=T{q`7cL^z~M0|!%`1j1tOHWG<@t^$S#kUT?d2YqI73M%b!YED|KS}5 zf0_{$*#V=p1qo-J;`k;~zLp$*jMyr*BWSJqjgHpGoK*TyEoSXX9rHuSp=#v%$m`Ti zaN}FA1u znGpMECmDQ~;j3#bfa#XT%r>kiQ9UV}e*oMUUAa=s)1Bb@s7j{-AFhPw&rjv#O9Puv zp$SNOL9{thQ~cy}6PpcV0x-s1Q9MCiz2;vHY>p*~#|DtI)YGOpq9g&;UkoSddZ{j) z6LD0-58LvWUfx>DWWnf9!N3;Sj85!&s<{=nSWXZvgNI5Lj$#5g{)kcK^%H<^e-RaK z`BZ&V9!89aRXXY=06VuhA7Z5N|FuM{-foow@Xklx9=pNOR5P|KaUC&}+;Wa@e`O9B zmFSNxqmE}4j;$!70Afb$93MU-%G`5oh@GCTh*kGoWDx^G>}lF0ETRohM3MMx^&Z=C zJVflY3W&0w)Z-}CdDZc(!a84Lf9hhCh5#FEjPb@>^&WcQrAOmkX^aPmJ&k8Bw{E+; z$c2(~L6}=pd2EOItk#Xx2^m;f}CmX|)v3lnG1mJ}kF7jzAi1qBPPEIFeh7BP`fAuw;|8)!& z&Yu1C*5LWmyFdTpn^vkW4zqgZ>^Wz}ie~5L&7019@9%LgT=>_>-YC9OXV`Ii!T0FK zjcvD7nsw&K|1lI@r!ZA-fYl(vVB8d^xRZ(eYEV~J>;J3J?Il^ay;M|f_;Y}YRAD@I z#CKIFQ}I(7hOhA1^h{Itf7?0)bVga992)tlc4Lg2U+U^PTUVF<>t*Z&NClJtmR+0M zEL`>x9jF5TO)Pn8U$P;_#hd-d@&_pa6&-0SPJkX99%0_Nadj)5u{-H>9s0kLx@^=s zHZb(Xr)$QHx%<_nEULVTFR=uelmmxnk$3L6&rwpEsn;x{7rT$pJVTTP6b!vuW!}qG z9Lb43>M(X0|ME<&`8&~1O`FDli2EGh=7$acAD@s;M_Ra%xBvhE07*qoM6N<$f>9P% A^#A|> diff --git a/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab b/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab index 6ff56478..a5c6bac3 100644 --- a/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab +++ b/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab @@ -78,6 +78,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: HOT +--- !u!1 &710578789119385012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5037267593953567808} + - component: {fileID: 4817509892402794667} + - component: {fileID: 8378119382235899804} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5037267593953567808 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 710578789119385012} + 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: 4124294474962224008} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4817509892402794667 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 710578789119385012} + m_CullTransparentMesh: 0 +--- !u!114 &8378119382235899804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 710578789119385012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 8 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 5000 Times --- !u!1 &819910058413193561 GameObject: m_ObjectHideFlags: 0 @@ -110,10 +188,10 @@ RectTransform: m_Father: {fileID: 4025778309107900326} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 12, y: 0} - m_SizeDelta: {x: 42, y: 14} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4710878962531887153 CanvasRenderer: @@ -136,7 +214,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -246,6 +324,7 @@ GameObject: - component: {fileID: 2770232035517795500} - component: {fileID: 2479352852572287436} - component: {fileID: 4401605354796093568} + - component: {fileID: 741169813329077373} m_Layer: 5 m_Name: IdContainer m_TagString: Untagged @@ -269,10 +348,10 @@ RectTransform: m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -96} - m_SizeDelta: {x: 0, y: 14} - m_Pivot: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -10} + m_SizeDelta: {x: 42, y: 16} + m_Pivot: {x: 0, y: 1} --- !u!222 &2770232035517795500 CanvasRenderer: m_ObjectHideFlags: 0 @@ -294,7 +373,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.6509804} + m_Color: {r: 0.25490198, g: 0.25882354, b: 0.31764707, a: 0.6509804} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -322,6 +401,19 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!114 &741169813329077373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1921570118184608949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 8 --- !u!1 &3665847147416900931 GameObject: m_ObjectHideFlags: 0 @@ -526,6 +618,7 @@ RectTransform: - {fileID: 5298406130298708889} - {fileID: 7800446602652995690} - {fileID: 4025778309107900326} + - {fileID: 4124294474962224008} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1835,7 +1928,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6307032429101699376 RectTransform: m_ObjectHideFlags: 0 @@ -1893,6 +1986,108 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6814733190828891432 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4124294474962224008} + - component: {fileID: 8195733315417098693} + - component: {fileID: 5862750977804010451} + - component: {fileID: 2842133267511715692} + - component: {fileID: 3662596792497286770} + m_Layer: 5 + m_Name: TimesContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4124294474962224008 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6814733190828891432} + 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: + - {fileID: 5037267593953567808} + m_Father: {fileID: 5262667172184159172} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -10, y: -86} + m_SizeDelta: {x: 52, y: 16} + m_Pivot: {x: 1, y: 1} +--- !u!222 &8195733315417098693 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6814733190828891432} + m_CullTransparentMesh: 0 +--- !u!114 &5862750977804010451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6814733190828891432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.25490198, g: 0.25882354, b: 0.31764707, a: 0.6509804} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2842133267511715692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6814733190828891432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 8 +--- !u!225 &3662596792497286770 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6814733190828891432} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &7312186405814551362 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/MapList/MapItem.prefab b/Assets/Resources/UI/Prefab/MapList/MapItem.prefab index 58a6440f..40672969 100644 --- a/Assets/Resources/UI/Prefab/MapList/MapItem.prefab +++ b/Assets/Resources/UI/Prefab/MapList/MapItem.prefab @@ -110,10 +110,10 @@ RectTransform: m_Father: {fileID: 6731783213148011198} 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, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 42, y: 28} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &40935759426676191 CanvasRenderer: @@ -144,7 +144,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 12 + m_FontSize: 8 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -269,11 +269,11 @@ RectTransform: m_Father: {fileID: 5262667172184159172} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -8, y: -111} - m_SizeDelta: {x: 62, y: 28} - m_Pivot: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 12, y: -12} + m_SizeDelta: {x: 38, y: 16} + m_Pivot: {x: 0, y: 1} --- !u!222 &824398186415707549 CanvasRenderer: m_ObjectHideFlags: 0 @@ -323,7 +323,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} m_Name: m_EditorClassIdentifier: - radius: 14 + radius: 8 --- !u!225 &2305233025022563976 CanvasGroup: m_ObjectHideFlags: 0 @@ -570,6 +570,84 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5201358532413552253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1472987012728650082} + - component: {fileID: 8891547307338389797} + - component: {fileID: 4134016806216411969} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1472987012728650082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5201358532413552253} + 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: 7439532681881893281} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8891547307338389797 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5201358532413552253} + m_CullTransparentMesh: 0 +--- !u!114 &4134016806216411969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5201358532413552253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 10 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 5 Times --- !u!1 &5262667172184159175 GameObject: m_ObjectHideFlags: 0 @@ -615,6 +693,7 @@ RectTransform: - {fileID: 6649687043736982202} - {fileID: 6649687042165429259} - {fileID: 6731783213148011198} + - {fileID: 7439532681881893281} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1998,7 +2077,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6307032429101699376 RectTransform: m_ObjectHideFlags: 0 @@ -2056,6 +2135,108 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7191439550260148234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7439532681881893281} + - component: {fileID: 4916827147955079064} + - component: {fileID: 346179151325165203} + - component: {fileID: 4276313799055615114} + - component: {fileID: 2875918043730214713} + m_Layer: 5 + m_Name: TimesContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7439532681881893281 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7191439550260148234} + 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: + - {fileID: 1472987012728650082} + m_Father: {fileID: 5262667172184159172} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -8, y: -111} + m_SizeDelta: {x: 70, y: 28} + m_Pivot: {x: 1, y: 1} +--- !u!222 &4916827147955079064 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7191439550260148234} + m_CullTransparentMesh: 0 +--- !u!114 &346179151325165203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7191439550260148234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4276313799055615114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7191439550260148234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 14 +--- !u!225 &2875918043730214713 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7191439550260148234} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &7312186405814551362 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab index b77ba92f..6e081ae4 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab @@ -158,9 +158,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 333.1, y: -91} - m_SizeDelta: {x: 83.693054, y: 17} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 91.847, y: -5} + m_SizeDelta: {x: 83.693054, y: 11} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &8367125415035570718 CanvasRenderer: m_ObjectHideFlags: 0 @@ -182,7 +182,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -190,7 +190,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 12 + m_FontSize: 8 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -424,7 +424,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 292, y: -53} + m_AnchoredPosition: {x: 292, y: -58} m_SizeDelta: {x: 484, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6055002719563706353 @@ -2642,7 +2642,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 292, y: -25} + m_AnchoredPosition: {x: 292, y: -30} m_SizeDelta: {x: 484, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6558498177387274039 @@ -6122,7 +6122,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &169318638442674245 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab index 305e6569..0262d5cf 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab @@ -1089,9 +1089,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 143, y: -251.00002} + m_AnchoredPosition: {x: 68.75, y: -5} m_SizeDelta: {x: 36, y: 14} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &5327673503896133289 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1113,7 +1113,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -1121,12 +1121,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 10 + m_FontSize: 8 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 6 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -3553,7 +3553,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -37, y: 27} - m_SizeDelta: {x: 34, y: 14} + m_SizeDelta: {x: 34, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624750161478546 CanvasRenderer: @@ -4056,7 +4056,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5324006962730904505 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab index 7f8f5f3f..97c1bad6 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab @@ -15408,7 +15408,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &765892906285101840 RectTransform: m_ObjectHideFlags: 0 @@ -15426,7 +15426,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -37, y: 27} - m_SizeDelta: {x: 34, y: 14} + m_SizeDelta: {x: 34, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &765892906285101842 CanvasRenderer: @@ -15462,7 +15462,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 8 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -24928,84 +24928,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: BPM ---- !u!1 &2783195509524191030 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 624412492994636013} - - component: {fileID: 9162611760189166957} - - component: {fileID: 8559864736886170644} - - component: {fileID: 8754708267688494519} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &624412492994636013 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2783195509524191030} - 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: 7957384752596773323} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &9162611760189166957 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2783195509524191030} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &8559864736886170644 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2783195509524191030} - m_CullTransparentMesh: 0 ---- !u!114 &8754708267688494519 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2783195509524191030} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - Thickness: 2 --- !u!1 &2844054572527012973 GameObject: m_ObjectHideFlags: 0 @@ -25110,7 +25032,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2911565238154287815} + - {fileID: 4878508384030102641} - {fileID: 5572785103298013575} m_Father: {fileID: 765892906030958096} m_RootOrder: 3 @@ -26804,6 +26726,69 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &3885314884952357934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 811924184280589878} + - component: {fileID: 168968448232896897} + - component: {fileID: 2307480879748888002} + m_Layer: 5 + m_Name: textController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &811924184280589878 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3885314884952357934} + 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: 4878508384030102641} + m_RootOrder: 1 + 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: -250, y: -25} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &168968448232896897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3885314884952357934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2307480879748888002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3885314884952357934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} + m_Name: + m_EditorClassIdentifier: + Camera: {fileID: 0} + PlaneDistance: 20 --- !u!1 &3939974592896431733 GameObject: m_ObjectHideFlags: 0 @@ -27668,6 +27653,84 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &4418929756686786047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7460554930423924697} + - component: {fileID: 6002025779928421078} + - component: {fileID: 4593873469960385658} + - component: {fileID: 7494733664248202043} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7460554930423924697 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4418929756686786047} + 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: 8295479162517379294} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6002025779928421078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4418929756686786047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &4593873469960385658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4418929756686786047} + m_CullTransparentMesh: 0 +--- !u!114 &7494733664248202043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4418929756686786047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + Thickness: 2 --- !u!1 &4430178248804784782 GameObject: m_ObjectHideFlags: 0 @@ -28631,6 +28694,56 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &5546447281832934985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4878508384030102641} + - component: {fileID: 1482190358270992362} + m_Layer: 0 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4878508384030102641 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5546447281832934985} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.96, y: 0.96, z: 1} + m_Children: + - {fileID: 8295479162517379294} + - {fileID: 811924184280589878} + m_Father: {fileID: 2877296740073624297} + 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_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1482190358270992362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5546447281832934985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5572785103222812767 GameObject: m_ObjectHideFlags: 0 @@ -28966,84 +29079,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5934947170891642554 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8315982216426010307} - - component: {fileID: 3150148025331675226} - - component: {fileID: 7421247234112425144} - - component: {fileID: 3181855987885688022} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8315982216426010307 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5934947170891642554} - 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: 7957384752596773323} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3150148025331675226 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5934947170891642554} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &7421247234112425144 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5934947170891642554} - m_CullTransparentMesh: 0 ---- !u!114 &3181855987885688022 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5934947170891642554} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - Thickness: 4 --- !u!1 &5957440960113615594 GameObject: m_ObjectHideFlags: 0 @@ -29118,69 +29153,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6064962625731806026 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7851427139125280118} - - component: {fileID: 7769038315603651724} - - component: {fileID: 6140869057789558723} - m_Layer: 5 - m_Name: textController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7851427139125280118 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6064962625731806026} - 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: 2911565238154287815} - m_RootOrder: 1 - 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: -250, y: -25} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7769038315603651724 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6064962625731806026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &6140869057789558723 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6064962625731806026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} - m_Name: - m_EditorClassIdentifier: - Camera: {fileID: 0} - PlaneDistance: 20 --- !u!1 &6236749187527932663 GameObject: m_ObjectHideFlags: 0 @@ -29394,6 +29366,84 @@ MonoBehaviour: m_EditorClassIdentifier: mType: 3 Tooltips: VIEW +--- !u!1 &6563861227399982718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7214539175388471861} + - component: {fileID: 4103855988499143545} + - component: {fileID: 6796578543190718233} + - component: {fileID: 8945044862909820934} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7214539175388471861 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6563861227399982718} + 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: 8295479162517379294} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4103855988499143545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6563861227399982718} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &6796578543190718233 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6563861227399982718} + m_CullTransparentMesh: 0 +--- !u!114 &8945044862909820934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6563861227399982718} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + Thickness: 4 --- !u!1 &6634841873967977020 GameObject: m_ObjectHideFlags: 0 @@ -29546,56 +29596,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 ---- !u!1 &6824796631642133877 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2911565238154287815} - - component: {fileID: 1923192322907375460} - m_Layer: 0 - m_Name: New Game Object - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2911565238154287815 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6824796631642133877} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.96, y: 0.96, z: 1} - m_Children: - - {fileID: 7957384752596773323} - - {fileID: 7851427139125280118} - m_Father: {fileID: 2877296740073624297} - 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_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1923192322907375460 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6824796631642133877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &6885174058740936923 GameObject: m_ObjectHideFlags: 0 @@ -32948,6 +32948,109 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &9089299703857052869 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8295479162517379294} + - component: {fileID: 3508096917997719819} + - component: {fileID: 7079807845949236487} + - component: {fileID: 9055185555242995774} + - component: {fileID: 6744955972345252049} + m_Layer: 5 + m_Name: RectMask(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8295479162517379294 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9089299703857052869} + 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: + - {fileID: 7214539175388471861} + - {fileID: 7460554930423924697} + m_Father: {fileID: 4878508384030102641} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!114 &3508096917997719819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9089299703857052869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!222 &7079807845949236487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9089299703857052869} + m_CullTransparentMesh: 0 +--- !u!114 &9055185555242995774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9089299703857052869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6744955972345252049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9089299703857052869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &9118781381026562979 GameObject: m_ObjectHideFlags: 0 @@ -33132,109 +33235,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &9150876622183322935 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7957384752596773323} - - component: {fileID: 3665534182506949866} - - component: {fileID: 1218397714914856995} - - component: {fileID: 8539519868554104213} - - component: {fileID: 2972488860811566877} - m_Layer: 5 - m_Name: RectMask(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7957384752596773323 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9150876622183322935} - 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: - - {fileID: 8315982216426010307} - - {fileID: 624412492994636013} - m_Father: {fileID: 2911565238154287815} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!114 &3665534182506949866 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9150876622183322935} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &1218397714914856995 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9150876622183322935} - m_CullTransparentMesh: 0 ---- !u!114 &8539519868554104213 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9150876622183322935} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2972488860811566877 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9150876622183322935} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &9155223439828020673 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Apis/Models/MapRoute.cs b/Assets/Scripts/Apis/Models/MapRoute.cs index 6a12344b..0038475a 100644 --- a/Assets/Scripts/Apis/Models/MapRoute.cs +++ b/Assets/Scripts/Apis/Models/MapRoute.cs @@ -107,5 +107,7 @@ namespace Assets.Scripts.Apis.Models public string AltitudeGraph { get; set; } //0,0,0 public string Camera { get; set; } + public string MineCountString { get; set; } + public int MineCount { get; set; } } } diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index bf64f4c2..4f27a0d3 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -15,7 +15,7 @@ using System.Timers; public static class App { - public static string Host = "http://192.168.0.101:5084/"; + public static string Host = "http://192.168.0.101:5085/"; public static string AppVersion = Application.version; @@ -119,30 +119,6 @@ public static class App App._IsRowerMode = bool.Parse(isRower); } Screen.sleepTimeout = SleepTimeout.NeverSleep; - Task.Run(() => - { - System.Net.NetworkInformation.Ping ping = new System.Net.NetworkInformation.Ping(); - System.Timers.Timer timer = new System.Timers.Timer(); - timer.Interval = 1000; - timer.AutoReset = true; - timer.Elapsed += new ElapsedEventHandler((o, e) => - { - var reply = ping.Send("47.97.84.8"); - if (reply.Status == System.Net.NetworkInformation.IPStatus.Success) - { -#if UNITY_EDITOR - App.delayTime = new System.Random().Next(300); -#else - App.delayTime = reply.RoundtripTime; -#endif - } - else - { - App.delayTime = -1; - } - }); - timer.Start(); - }); Debug.Log(SystemInfo.deviceUniqueIdentifier); } } diff --git a/Assets/Scripts/Scenes/BaseScene.cs b/Assets/Scripts/Scenes/BaseScene.cs index e82c29f4..38421e97 100644 --- a/Assets/Scripts/Scenes/BaseScene.cs +++ b/Assets/Scripts/Scenes/BaseScene.cs @@ -1,5 +1,6 @@ using Assets.Scenes.Ride.Scripts; using System; +using System.Collections; using System.Collections.Generic; using System.Linq; using System.Text; @@ -10,10 +11,23 @@ namespace Assets.Scripts.Scenes { public abstract class BaseScene: MonoBehaviour { + UnityEngine.Ping ping; + bool isNetWorkLose = false; protected virtual void Awake() { Debug.Log("base scene awake"); Application.logMessageReceived += Application_logMessageReceived; + StopCoroutine("Ping"); + StartCoroutine(Ping()); + } + + private IEnumerator Ping() + { + while (true) + { + ping = new Ping("47.97.84.8"); + yield return new WaitForSeconds(1); + } } private void Application_logMessageReceived(string condition, string stackTrace, LogType type) @@ -48,5 +62,21 @@ namespace Assets.Scripts.Scenes UIManager.InitNow();//重置当前时间 } } + protected virtual void Update() + { + if (Application.internetReachability == NetworkReachability.NotReachable) + { + isNetWorkLose = true; + App.delayTime = -1; + } + else if (null != ping && ping.isDone) + { + isNetWorkLose = false; + App.delayTime = ping.time; + Debug.Log(App.delayTime); + ping.DestroyPing(); + ping = null; + } + } } } diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index 24606c23..d562cfcd 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -1308,9 +1308,11 @@ public class LoginController : BaseScene Utils.showToast(gameObject, res.errMsg); } } + // Update is called once per frame - void Update() + protected override void Update() { + base.Update(); //Debug.Log($"{phone.isFocused}, ${pwd != null}, ${Input.GetKeyDown(KeyCode.Tab)}"); if (Input.GetKeyDown(KeyCode.Tab)) { diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 76d6aa93..bc89d37e 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -117,8 +117,9 @@ public class MainController : BaseScene float t = 1f; float scanTicks = 0; // Update is called once per frame - void Update() + protected override void Update() { + base.Update(); if (App.canvasWidth != transform.GetComponent().sizeDelta.x) { App.canvasWidth = transform.GetComponent().sizeDelta.x; diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index 10e362ce..1886c085 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -220,8 +220,9 @@ public class CyclingController : DeviceServiceMonoBase } float timer = 1f; bool clearLock = false; - private void Update() + protected override void Update() { + base.Update(); //CamControl(); #if UNITY_IOS || UNITY_ANDROID if (competitionId == 0 && singleUIManager != null) diff --git a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs index 5426b87a..d8753f28 100644 --- a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs +++ b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs @@ -99,6 +99,8 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, transform.Find("Name").GetComponent().text = myMap.Name; transform.Find("IdContainer/Text").GetComponent().text = $"#{myMap.Id}"; + transform.Find("TimesContainer").gameObject.SetActive(myMap.MineCount > 0); + transform.Find("TimesContainer/Text").GetComponent().text = myMap.MineCountString; transform.Find("Hot").gameObject.SetActive(myMap.IsFire); var props = transform.Find("Props"); props.Find("DistanceText").GetComponent().text = $"{myMap.Distance.ToString(myMap.Distance>1000? "#0" : "#0.00")}KM"; diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index 1ec44941..3befee7b 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -1035,7 +1035,7 @@ public class UIManager : MonoBehaviour } Confirm3 confirm3 = null; - + public static async void InitNow() { var now = await ConfigHelper.userApi.GetNow(); diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c5b8a1b5..999e430b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Login.unity - guid: 6dce3e17997730b4492f91dd8fede429 + path: Assets/Scenes/Login-Mobile.unity + guid: 4be878da00cf764499988cf403faf94d - enabled: 1 path: Assets/Scenes/MainScene.unity guid: ab586a3c1bacd4a48a55178eb06fe0cc 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 b90ba7dc..0bf5e4d3 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -180,7 +180,7 @@ PlayerSettings: Android: com.ZhiXingPai.PowerFunUnity buildNumber: iPhone: 2.0.3.0 - AndroidBundleVersionCode: 6 + AndroidBundleVersionCode: 7 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 30 AndroidPreferredInstallLocation: 1