From c3514df331288b7ceca1c7b42ef457154fead1ca Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 3 Mar 2022 14:38:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=85=AC=E5=BC=80=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=EF=BC=9B=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=8A=A8=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/upload.meta | 8 + Assets/Resources/Images/upload/1.png | Bin 0 -> 3282 bytes Assets/Resources/Images/upload/1.png.meta | 128 + Assets/Resources/Images/upload/2.png | Bin 0 -> 3695 bytes Assets/Resources/Images/upload/2.png.meta | 128 + .../UI/Prefab/Mail/MailItem-mob.prefab | 412 +++ .../UI/Prefab/Mail/MailItem-mob.prefab.meta | 7 + .../Resources/UI/Prefab/MainNav-mobile.prefab | 328 ++- .../Panel/Mobile/MailDetailPanel.prefab | 979 +++++++ .../Panel/Mobile/MailDetailPanel.prefab.meta | 7 + .../Prefab/Panel/Mobile/MailListPanel.prefab | 1040 +++++++ .../Panel/Mobile/MailListPanel.prefab.meta | 7 + Assets/Resources/UI/language.json | 12 +- Assets/Scenes/Login-Mobile.unity | 2595 +++++++++-------- Assets/Scripts/Apis/MapApi.cs | 8 + Assets/Scripts/Apis/Models/MapRoute.cs | 2 + Assets/Scripts/App.cs | 14 +- .../UI/Prefab/Mail/MailListController.cs | 2 + Assets/Scripts/UI/Prefab/MainNav.cs | 5 +- Assets/Scripts/UI/Prefab/MapList/MapItem.cs | 39 +- Assets/Scripts/UI/Prefab/NewMainNav.cs | 19 +- Assets/Scripts/UIManager.cs | 6 + ProjectSettings/EditorBuildSettings.asset | 4 +- ProjectSettings/GraphicsSettings.asset | 1 - 24 files changed, 4429 insertions(+), 1322 deletions(-) create mode 100644 Assets/Resources/Images/upload.meta create mode 100644 Assets/Resources/Images/upload/1.png create mode 100644 Assets/Resources/Images/upload/1.png.meta create mode 100644 Assets/Resources/Images/upload/2.png create mode 100644 Assets/Resources/Images/upload/2.png.meta create mode 100644 Assets/Resources/UI/Prefab/Mail/MailItem-mob.prefab create mode 100644 Assets/Resources/UI/Prefab/Mail/MailItem-mob.prefab.meta create mode 100644 Assets/Resources/UI/Prefab/Panel/Mobile/MailDetailPanel.prefab create mode 100644 Assets/Resources/UI/Prefab/Panel/Mobile/MailDetailPanel.prefab.meta create mode 100644 Assets/Resources/UI/Prefab/Panel/Mobile/MailListPanel.prefab create mode 100644 Assets/Resources/UI/Prefab/Panel/Mobile/MailListPanel.prefab.meta diff --git a/Assets/Resources/Images/upload.meta b/Assets/Resources/Images/upload.meta new file mode 100644 index 00000000..bbae8390 --- /dev/null +++ b/Assets/Resources/Images/upload.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 16abb669b1430e7499bf9f4fd7c2ddc7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/upload/1.png b/Assets/Resources/Images/upload/1.png new file mode 100644 index 0000000000000000000000000000000000000000..85167252497016f813fe5f714dfc40724aab04af GIT binary patch literal 3282 zcmV;@3@!7CP))7j000a{Nkl(S(ejwiXw5!YT8-pQQWR|pqSQ)T zAEn@nM=dcxAb=YJ+1-2koh+M8?m2g#cOT<;X71d3{&UWM{_~yx{P#cqxtB;OPLxvO zbhcinD82;{mIZgrT8G8uLv(ztTo7ISn8W| zawa}uvCQd@l}j}35)NQpUGtX-@wour+-L-guP!-&rCnjQmc1PxpYW{{3ZUKIv=kcm zEUvNPMH#B0VDLS#i`|k$di-q(Y$Tn48W}^i!aP6|2Vh?x28h1}KN_Zb%*6=<&}M7= z6$bxcILX*R0n}@#*O8GS?=YE4-nUqYPu&i@$d)Z_`ChMQKH4lqn|Yv(R@dY6WZTrK zW0xoDjhzqx?e>PXiXuJ24<<-~R-6J5Pi1Fcw#j0-^=z;tvM2UJ>hA8Z0Uu^p^Fy~H z^=5Nfg=k_zw+mmYJAid{O#n_=tKBt$yFu2O&0{uNEJbeZdXbg*U83HVu(3}9$S-NP zB7XviEA<9ZR{(9chPyG4%^?QyZ<9&Bv$C@EKiYL-E3w(y;ecP*g4VZaae%gNwpzj>U4C*jH`aFCZ-}^TU*`&EqqnoH-I$^40u+n>Cxun0uY^jU(_LN z-!rLQx@xJ&CN;&Mr_tDA{o418dsPtW&rV$xIrWk zW_q`Xo@yE1>`At1XP! zk-l^gR098LDQ0sqI^<$;p!>#;H;qo!0Z+I|!WQoXO#C#Bdf3{LR|t_^H8myM#bEO- z!!BU}MG#qDe)#a|1B#+-gWX#$0?*HyypyirT^f2Q^OB3PSt#|jV!ZFLF|)Drkd35- z1kh${n+8Vv0NfwZ?3$5H`5b0|I2z7BIkpn6k}oZ(Jdgh+E?T4;|1t zG~~(x3;9>AL_5)SD96B@T1F|-dv<$BQo-a}Y2zYN6>vaCmtR+n&;x*waZ zxd3ls2k75Wm-+ML0FEYR2973%Y@njJajK;WUVBc?^x269kDVol1CI>?n)wshBz9mw zB)@pD(NnF~()Y~f+_{*fzldAYulDtI53PVf4P>8RK=4B%8^9Rl1Ee*V~%i8wU($2xlfBAv}kM9ybrWlX84DDJs5gFYPf@dgwEo-!I~ zWg@|22U2)(A@m*{cx+Gre%X;DryJQ|`9a1yarfPvs^FPeSffGx*cQgw!J2eu7yqnkEb63QH_4d zakxtemCXC7sdsfDe|iy_CUA z+6{gfAlZez^1RB*MFRU7E%%Z2(FgZ(0!}9gwoh;3ZSu{L)g{SjG@Glc7WAp<$;#K& zHGGV|u2%Ku256V5XbI0Um+R!o0S*gH+TWpp(h;!)eT8Cra;TVblANBx_tMkjnJcbE zyRZVJ{h~qyRF{e9$)aImX|no?pdSsdLEZ~D#;A2p@ZFY{mZUG2z+lov1MBN|C@Iw% zh+lB0N|LV`a&X&1V08@t<85F73<6kEQt}ym8jZh-=p_6d^s>Xz_?3hrredB-4P>j% z=kxp(B27?(D%n zRY&&VeAy8gali($|0n3EQHDEk7amc9>1ga@U%>Yzd(g?e0E5rNodJgp#X|NK29(8) zD_b-!tct@3<(B~?B~Z>etB9w~KuBm0Drjx`FSRBA1H*P)uOZyih4bN0b8?n^sMoJl zn5aY00@$GuDej#Jz>;0A)@dG(Z!&z~E0LcI{FVT;yb(R|nX@L7VUGGQD-J-`4j|s( z^-4`(8ttC=EcT)sU=HGTe-Z&8PVyecq}&hCIJbnyD@cKou!wXS{y%vuNcBGrE#ct> zh;;11fyzv%D%W6mJ;C$kI2?ME*%3imR3r>k*PRHn-|QE#7{Gf&lCla#;IRP-0b~X2 zKn2H{H$tPHMmE|XWfn0W>68FmR5C&9`k_Ei=Hy&kWVJ39xp;%aGlm-ErQ^)|@LK;J z0pN^(X$#z^up0~iVOc)7j000f*NklI2lC zmTGbd5d;ii5v+#^#|y$L=M|VsMNPDDh~z3C?G;!p89S@ zv@M7TC_zZ>?%th#v*CuD-PyellH5S=IbnDHf99WmzM1*wpMPedB*#C_IWX=_r;>9ss!;CgD*n zFYj);?sv`E$jG!zrvu1K?*D-i*B7E;BQjMk>->~{Oap;ywAz{PWi2Dkf}IMWSroa< zBIF59_>pPqBaAYN(Ct__w%SiZjubW$^gieWmVq3dD&%&xE_^>mCPZ}3uhRgG6;(!{ za(ODXp@0t5R-=haRZV-1^y~L2ec_6@vz%D1N$Gtj8fF}ejx`qLM!_WHJM&4>FKPut zuI{WAyHfy+g(~mCIJ!g9m^Knd#ST>dpi1dnT3^1ajgjVyy&!$PcM^a_C;2Z(SYV!K zr}V!@)-h>T=b5d;0W^xDcUZ)_$E!v(W-q|IS3Nxc5n6Ne_g?wZr3;tHXj*qI;WP?U zag0|vO6W7J|0&mYG>9DvpdN}$hKus3XCo;2fHCb#x_>FgOq$ zxl_u|kf>ysUz*+geB(@S@W`|5qVk)h1v`m|Y5I_&&^x8#IX}*bwRoBtX&E2l0gu3a zw&x4jo}jZH818qN(z^`%RKv;ZinLx7nGe0Lm(_)lGn6$}tdsFFp&jrD)Xn&05Ab44 zVK?LoJOKhL$eRiu^D7x37Nxhz=$XT*B;8oRen#2%@SO9@K8RB7*O7d;0AwXXbSbmkk*s$sJOhQ+5k z>6xYv2tY(uel4p|Al$Rzk>%x4@>|WSHg`D-kWieEi z_a`Skm+8RCC%p<=_#dYZu-!)*OREMt>6xUn2GHDYmcrLkot0rqze3kf{n|;-W!m1p zaWYS;gF!|}>1h(P1`uK3VX`_9IeJ@0&oxa61lGuOKxC)u0mRNjw|rVv$>IvG9J zG&RqvgI|gX(*B3l_#8b{S(>daOxuwbQIGhpcgI_VTn0UUE{ny%{>5>?lb@>tp7zkV zQ?a7RKVi2AxH$;j60#Hjti%GiFi<~hG1}q++oPO}yq|{Up6Vshs}SG28z*S}_jBBD za2Fb|jdCq4?wq-y=tY%J0+kz5)ei99$J!jxYRjKZ1*ESHyz!OSg zR4z`XTrT-aKzS*h`Y~t*iZ-L|Z}8Hp6a30}0%#7Zy4*0#I)GB_C!mc-$wsZ9V0K%& z8@|A)UWO6%RJy96?IR7{`iB{+y4b6X6hJ)`y)_<>zaX=7PC>1PnJ(2>&$Bxs!t9ja z(P>16CLvN&0h^bWt0jCzi(4}>Ec>M^y0`Q>@fa}f-YV{0D7?*wqymsTh0RP z6m(1c4<#PCSFEw)vuDfus~-DtxShLm_Egk8@>( ztkA(m6Z?5$Sg%WG*}leL%YdtN-akcAm&&-f0Wm~@cYVB*iTSOw{K4HauIJR%FD<+a z-H5M58-4F!E1W;+C&#|fZr@vMp9_QUI0aEJm;FPJ>^Rt`FCRMl7~RxYV!`OwzS+(c zeOc|_|6wOJIlT{yZ<1;DJH93mZj1{+&~~{pA4CLR_TUjlv$-7m+*AG37Cx?4*z3x4 zuDoFj`<+`BKSBWL@^j$(9PQ40a8SgS)M#p13Y&L^pT;m#8?fUTpRSLKnd-WGh=pmJ z0Pss^MPi9=J+^dmx_8>Xwfc>@NVa=O)*L&D4_IE_xOBsBJoH#k*&+lRxJAJ^z!%BF z6Yu7?d{E;3V0hXe?`+-k92$DAuf7QUGTLKICfD0czEgT~hqYo0+&$$(S%ut+UnQe= zM;b;PHJaX?2b(wES3hw#P-Q>Mba#bLkw&C(0JToB6e2$-;A8?nyXtUXg}Mn7fzi1D zaiX6(VqdQ@fVW}BCck`69^!<(vE{qcNf&8VwH7JC+VT&vXt+ip6go<8=6A{pb|;$n zoC3N|_R|UA?Iv6qo6X&9BNn>@e&i7@`ILMj!h3c!1{FN*$^Zh4Ycw>OCNQc6Yyg5-{@>Ah- zzDU~usy*l<2%5UKGw4~ySwifV_l1 z6$f88S(X*?%Z1g}gpr@XYG=OXmrusygJ++_O=}TGpC;jNR`Y^$1if_xuAQ|Thbp2s z-9OwZ);V9!2Uq$!rS5|5Ddz5XXTTVjB~zi?VZ@@#L>N7pp6cB`A@lj1LX?M}XK{sI zr`DG*NhQz87qd<`%^K*}$H^0EbjA9w3;_Nee;MtGMJ4FHIl;!T%l#4CEdA>}i!e3Dwr^7V6zod_V~35T z>!&m&IN}@wp?KINN#s0{2~VofKWg=1>7{a!4WsOKv}roP@}3Pz@{(RRQXaiyd`vjLd}8wSN|tHcZ=8Q5)6#i|kNgf(1DDa-nJzCyly9?vPGRCeg%$Q1j;-E9 z7+Hps@0;f2d>Oy>r0Xaw0^}_jKS2Y)!}XTfOFUG4N;&~i81Tic;H>Msz!P#2ewXT$ zsMGmGo0~z4;tS7_Uf_u`o&XA_2=%}iPh%Q66$0nuFD~e*eu$lI^2#GFU$TON3jpF; zuRN`EJ`Nu*e(1FtCdy)j)M)vI6H*0$F{(XvO2`sViO_s)mU>0|8KdntfA4I_6ed=U|j z+N>U~HHxpA{K|UqvIfvgV5W4@5k^aF6*|H1QJC`~kf0NgyyTSU2MXCoh-jZUdkILD)1cppC+7JC_4)MKk`! zYjv|W> ApplyOpenRoute(int id) + { + var result = await PostAsync>($"Map/ApplyOpenRoute", new { id }); + return result; + } + + public async Task>> GetRecommendAreaList() { var result = await GetAsync>>($"MapRouteArea/GetRecommendAreaList"); diff --git a/Assets/Scripts/Apis/Models/MapRoute.cs b/Assets/Scripts/Apis/Models/MapRoute.cs index aba738c3..ac916de4 100644 --- a/Assets/Scripts/Apis/Models/MapRoute.cs +++ b/Assets/Scripts/Apis/Models/MapRoute.cs @@ -118,5 +118,7 @@ namespace Assets.Scripts.Apis.Models public int[] RouteIds { get; set; } //最近骑行列表使用 public RouteResult RecentRecord { get; set; } + + public bool IsEnabled { get; set; } } } diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 292079ec..5ad91235 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -20,7 +20,7 @@ public delegate void ChangeLanguageDelegate(); public static class App { - public static string Host = "http://192.168.0.101:5087/"; + public static string Host = "http://192.168.0.101:5083/"; public static string AppVersion = Application.version; @@ -219,13 +219,13 @@ public static class App InitLanguage(); #if !UNITY_EDITOR //测试服务器 - //Host = "http://pf.juze.pro/"; - //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); - //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); + Host = "http://pf.juze.pro/"; + UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); + TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); //线上 - Host = "https://wx.powerfun.com.cn/"; - UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); - TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); + //Host = "https://wx.powerfun.com.cn/"; + //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); + //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); //本地 //Host = "http://192.168.0.101:5085/"; //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000); diff --git a/Assets/Scripts/UI/Prefab/Mail/MailListController.cs b/Assets/Scripts/UI/Prefab/Mail/MailListController.cs index 72db510a..23f73d41 100644 --- a/Assets/Scripts/UI/Prefab/Mail/MailListController.cs +++ b/Assets/Scripts/UI/Prefab/Mail/MailListController.cs @@ -19,6 +19,8 @@ public class MailListController : PFUIPanel scroll = transform.Find("Container/Content/Right/Scroll View").GetComponent(); #if UNITY_STANDALONE_WIN mail = Resources.Load("UI/Prefab/Mail/MailItem"); +#else + mail = Resources.Load("UI/Prefab/Mail/MailItem-mob"); #endif } public override void Show() diff --git a/Assets/Scripts/UI/Prefab/MainNav.cs b/Assets/Scripts/UI/Prefab/MainNav.cs index c6629684..e06cdcfd 100644 --- a/Assets/Scripts/UI/Prefab/MainNav.cs +++ b/Assets/Scripts/UI/Prefab/MainNav.cs @@ -92,7 +92,10 @@ public class MainNav : MonoBehaviour private void ShowMailDot(object sender, EventArgs e) { - transform.Find("Mail/Dot").gameObject.SetActive((bool)sender); + if (transform) + { + transform.Find("Mail/Dot").gameObject.SetActive((bool)sender); + } } public void ShowRowerTab() diff --git a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs index 74f8be03..c5d4ffc1 100644 --- a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs +++ b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs @@ -114,10 +114,21 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, if (!isModal) { transform.Find("CollectImg").GetComponent