From 0346b650aad211e7a0aa2e8a7c54201b22b2dd96 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Fri, 16 Apr 2021 17:49:11 +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 --- Assets/Cyp/ImageMask.shader | 102 + Assets/Cyp/ImageMask.shader.meta | 9 + Assets/Cyp/New Material.mat | 88 + Assets/Cyp/New Material.mat.meta | 8 + Assets/Cyp/load.png.meta | 18 +- Assets/LoadingAnimation.cs | 39 + Assets/LoadingAnimation.cs.meta | 11 + Assets/NuGet.config | 15 - Assets/NuGet.config.meta | 32 - Assets/Resources/Images/link-apple.png | Bin 0 -> 3829 bytes Assets/Resources/Images/link-apple.png.meta | 116 + Assets/Resources/Images/link-facebook.png | Bin 0 -> 2923 bytes .../Resources/Images/link-facebook.png.meta | 116 + Assets/Resources/Images/link-google.png | Bin 0 -> 4186 bytes Assets/Resources/Images/link-google.png.meta | 116 + Assets/Resources/Images/link-wechat.png | Bin 0 -> 4484 bytes Assets/Resources/Images/link-wechat.png.meta | 116 + Assets/Resources/Images/loading-left.png | Bin 0 -> 1210 bytes Assets/Resources/Images/loading-left.png.meta | 116 + Assets/Resources/Images/loading-right.png | Bin 0 -> 1178 bytes .../Resources/Images/loading-right.png.meta | 116 + Assets/Resources/Images/loading.png | Bin 0 -> 7760 bytes Assets/Resources/Images/loading.png.meta | 116 + Assets/Resources/Images/loading1.png | Bin 0 -> 5349 bytes Assets/Resources/Images/loading1.png.meta | 116 + Assets/{NuGet.meta => Resources/Loading.meta} | 2 +- .../Resources/Loading/LoadingAnimation.prefab | 340 + .../Loading/LoadingAnimation.prefab.meta} | 5 +- .../Loading/LoadingToLeft.mat} | 4 +- .../Loading/LoadingToLeft.mat.meta} | 0 .../Loading/LoadingToLeft.shader} | 4 +- .../Loading/LoadingToLeft.shader.meta} | 0 .../Resources/UI/Control/PFUIDropdown.prefab | 4 +- .../UI/Control/PFUIInputField.prefab | 6 +- Assets/Resources/UI/Control/PfUIButton.prefab | 3 +- .../UI/Prefab/Login/QuickUserInfo.prefab | 4 +- .../UI/Prefab/MapList/MapItem.prefab | 644 +- .../UI/Prefab/Panel/EditUserPanel.prefab | 5515 +++++++------- .../UI/Prefab/Panel/MapListPanel.prefab | 2846 ++++---- .../UI/Prefab/Panel/NewsModal.prefab | 544 ++ .../UI/Prefab/Panel/NewsModal.prefab.meta | 7 + .../UI/Prefab/Panel/SettingModal.prefab | 89 +- .../UI/Prefab/Panel/UserInfoPanel.prefab | 3652 +++++++--- .../UI/Prefab/ResultList/RouteItem.prefab | 24 +- Assets/Scenes/1-Login.unity | 3426 +++++---- Assets/Scenes/3-MapList.unity | 6363 +---------------- Assets/Scenes/MainScene.unity | 11 +- Assets/Scripts/Apis/MapApi.cs | 17 +- Assets/Scripts/Apis/Models/MapRoute.cs | 1 + Assets/Scripts/Apis/Models/UserResultModel.cs | 4 +- Assets/Scripts/Apis/UserApi.cs | 13 +- Assets/Scripts/App.cs | 3 + Assets/Scripts/Scenes/LoginController.cs | 173 +- Assets/Scripts/UI/Control/PFUIInputField.cs | 23 +- .../UI/Prefab/Login/LoginRegOptions.cs | 23 +- .../Scripts/UI/Prefab/Login/QuickLoginUser.cs | 11 +- Assets/Scripts/UI/Prefab/MapList/MapItem.cs | 130 +- Assets/Scripts/UI/Prefab/NewsController.cs | 38 + .../Scripts/UI/Prefab/NewsController.cs.meta | 11 + .../UI/Prefab/Panel/EditUserController.cs | 216 +- .../UI/Prefab/Panel/MapListController.cs | 16 +- .../UI/Prefab/Panel/UserInfoController.cs | 53 +- Assets/Scripts/UIManager.cs | 36 +- Assets/Scripts/Utils/Utils.cs | 58 + 64 files changed, 12634 insertions(+), 12935 deletions(-) create mode 100644 Assets/Cyp/ImageMask.shader create mode 100644 Assets/Cyp/ImageMask.shader.meta create mode 100644 Assets/Cyp/New Material.mat create mode 100644 Assets/Cyp/New Material.mat.meta create mode 100644 Assets/LoadingAnimation.cs create mode 100644 Assets/LoadingAnimation.cs.meta delete mode 100644 Assets/NuGet.config delete mode 100644 Assets/NuGet.config.meta create mode 100644 Assets/Resources/Images/link-apple.png create mode 100644 Assets/Resources/Images/link-apple.png.meta create mode 100644 Assets/Resources/Images/link-facebook.png create mode 100644 Assets/Resources/Images/link-facebook.png.meta create mode 100644 Assets/Resources/Images/link-google.png create mode 100644 Assets/Resources/Images/link-google.png.meta create mode 100644 Assets/Resources/Images/link-wechat.png create mode 100644 Assets/Resources/Images/link-wechat.png.meta create mode 100644 Assets/Resources/Images/loading-left.png create mode 100644 Assets/Resources/Images/loading-left.png.meta create mode 100644 Assets/Resources/Images/loading-right.png create mode 100644 Assets/Resources/Images/loading-right.png.meta create mode 100644 Assets/Resources/Images/loading.png create mode 100644 Assets/Resources/Images/loading.png.meta create mode 100644 Assets/Resources/Images/loading1.png create mode 100644 Assets/Resources/Images/loading1.png.meta rename Assets/{NuGet.meta => Resources/Loading.meta} (77%) create mode 100644 Assets/Resources/Loading/LoadingAnimation.prefab rename Assets/{NuGet/Apis.meta => Resources/Loading/LoadingAnimation.prefab.meta} (57%) rename Assets/{Cyp/UV.mat => Resources/Loading/LoadingToLeft.mat} (98%) rename Assets/{Cyp/UV.mat.meta => Resources/Loading/LoadingToLeft.mat.meta} (100%) rename Assets/{Cyp/UVSlider.shader => Resources/Loading/LoadingToLeft.shader} (96%) rename Assets/{Cyp/UVSlider.shader.meta => Resources/Loading/LoadingToLeft.shader.meta} (100%) create mode 100644 Assets/Resources/UI/Prefab/Panel/NewsModal.prefab create mode 100644 Assets/Resources/UI/Prefab/Panel/NewsModal.prefab.meta create mode 100644 Assets/Scripts/UI/Prefab/NewsController.cs create mode 100644 Assets/Scripts/UI/Prefab/NewsController.cs.meta diff --git a/Assets/Cyp/ImageMask.shader b/Assets/Cyp/ImageMask.shader new file mode 100644 index 00000000..e3e6a6d4 --- /dev/null +++ b/Assets/Cyp/ImageMask.shader @@ -0,0 +1,102 @@ +Shader "Custom/ImageMask" +{ + Properties + { + [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} + _Mask ("Base (RGB)", 2D) = "white" {} + _Color ("Tint", Color) = (1,1,1,1) + _StencilComp ("Stencil Comparison", Float) = 8 + _Stencil ("Stencil ID", Float) = 0 + _StencilOp ("Stencil Operation", Float) = 0 + _StencilWriteMask ("Stencil Write Mask", Float) = 255 + _StencilReadMask ("Stencil Read Mask", Float) = 255 + _ColorMask ("Color Mask", Float) = 15 + [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0 + } + + + SubShader + { + Tags + { + "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" "PreviewType"="Plane" "CanUseSpriteAtlas"="True" + } + + Stencil + { + Ref [_Stencil] + Comp [_StencilComp] + Pass [_StencilOp] + ReadMask [_StencilReadMask] + WriteMask [_StencilWriteMask] + } + + + Cull Off + Lighting Off + ZWrite Off + ZTest [unity_GUIZTestMode] + Blend SrcAlpha OneMinusSrcAlpha + ColorMask [_ColorMask] + + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + + #include "UnityCG.cginc" + #include "UnityUI.cginc" + + + #pragma multi_compile __ UNITY_UI_ALPHACLIP + + + struct a2v + { + fixed2 uv : TEXCOORD0; + half4 vertex : POSITION; + float4 color : COLOR; + }; + + + fixed4 _Color; + + + struct v2f + { + fixed2 uv : TEXCOORD0; + half4 vertex : SV_POSITION; + float4 color : COLOR; + }; + + + sampler2D _MainTex; + sampler2D _Mask; + + + v2f vert (a2v i) + { + v2f o; + o.vertex = UnityObjectToClipPos(i.vertex); + o.uv = i.uv; + + + o.color = i.color * _Color; + return o; + } + + + fixed4 frag (v2f i) : COLOR + { + half4 color = tex2D(_MainTex, i.uv) * i.color; + half4 mask = tex2D(_Mask, i.uv); + color.a *= mask.a; + return color; + } + ENDCG + } + } +} \ No newline at end of file diff --git a/Assets/Cyp/ImageMask.shader.meta b/Assets/Cyp/ImageMask.shader.meta new file mode 100644 index 00000000..c929a81f --- /dev/null +++ b/Assets/Cyp/ImageMask.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 36c797600830d844eaec2cfe2b90bfb0 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cyp/New Material.mat b/Assets/Cyp/New Material.mat new file mode 100644 index 00000000..395fc982 --- /dev/null +++ b/Assets/Cyp/New Material.mat @@ -0,0 +1,88 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Material + m_Shader: {fileID: 4800000, guid: 36c797600830d844eaec2cfe2b90bfb0, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask: + m_Texture: {fileID: 2800000, guid: 426bc972b7c244d40b428c79111a0d76, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Cyp/New Material.mat.meta b/Assets/Cyp/New Material.mat.meta new file mode 100644 index 00000000..9588ac8c --- /dev/null +++ b/Assets/Cyp/New Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd6552bd9b1de2747aa636527513d0b8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Cyp/load.png.meta b/Assets/Cyp/load.png.meta index ecb2a399..57c3ef24 100644 --- a/Assets/Cyp/load.png.meta +++ b/Assets/Cyp/load.png.meta @@ -34,9 +34,9 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: -1 + wrapU: 2 + wrapV: 2 + wrapW: 2 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -83,6 +83,18 @@ TextureImporter: 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: [] diff --git a/Assets/LoadingAnimation.cs b/Assets/LoadingAnimation.cs new file mode 100644 index 00000000..b85ee72e --- /dev/null +++ b/Assets/LoadingAnimation.cs @@ -0,0 +1,39 @@ +using Assets.Scripts; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class LoadingAnimation : MonoBehaviour +{ + // Start is called before the first frame update + [SerializeField] Color c; + void Start() + { + Refresh(); + } + // Update is called once per frame + void Update() + { + + } + void OnRectTransformDimensionsChange() + { + Refresh(); + } + + private void OnValidate() + { + Refresh(); + } + + void Refresh() + { + Transform L = transform.Find("L"), R = transform.Find("R"); + if (L && R && c.a!=0) + { + transform.Find("L").GetComponent().color = c; + transform.Find("R").GetComponent().color = c; + } + } +} diff --git a/Assets/LoadingAnimation.cs.meta b/Assets/LoadingAnimation.cs.meta new file mode 100644 index 00000000..eb6152b3 --- /dev/null +++ b/Assets/LoadingAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f5f763f23abe4724987b307b9cf9fb0f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NuGet.config b/Assets/NuGet.config deleted file mode 100644 index ca703692..00000000 --- a/Assets/NuGet.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/NuGet.config.meta b/Assets/NuGet.config.meta deleted file mode 100644 index ba99f687..00000000 --- a/Assets/NuGet.config.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: 36beb3506906c8048ad370241fcd0b87 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Images/link-apple.png b/Assets/Resources/Images/link-apple.png new file mode 100644 index 0000000000000000000000000000000000000000..11411d4a6773fbf383e058abb1249fff7036c481 GIT binary patch literal 3829 zcmVcI@25PHybG{m$Myb9ZNV_I0lbUFmve&TGz|ojr5r%&ZxcuJ-mP z545*;ylw?+ywTRyVeq=O?CRQ}nM5+d-FL5K@4mZL(CVUw3L)v&*Vk{B9H)~G)Tpei z6L9uN z9_d&-KCW$_J9p~j&d$y>hntex+t=Q080mL7ke6ggs+&5=1Y|3^xRG^UAs`{O%tK%+ zSFRwCNht1)bKiB>w@l>Lt^YPl`Xh)0#HFGn;*w2C{0^*7oe=N6_kk%>3>9iwZ@|Rj z4;LUT&Jk3)F<9|1zyO|kjSa>dDx-5em3Q3H%C>FWVFlSW^3#Ag$sqFm=OpUSXqmCW zKF$F%OxCtrT^6d-0J9R_eDhpu)3q)OAtIedsg=5?=eV`$TDLxTPN36Jr>DRHRKEXy z=Gj|eUiI?ws)X(F2Qj)V&}SU2eVVcK?_?(4CJkPEu`~1TXMr}2I3X`FwtfSFKVnQv z;x+u$=FQJ<2wJsj?a$Kb^g5Z)+MYYNsu;E%v%+kG!r4e0?&?}EysLP%{e(=O zJeegD35ya&MO)jG!e^R-AVhdO3#F(oT-d}~TU%V5vJqdk>dECq$ThOvqL7fSOr1KF zUA*Y@?1WCI4b#7Am`uhE!{7o<*82K6VnRtKFSFgdKeo+4@+%ULm(0>-Aq@>VAtW`C zD76V8*qk}`Su2&ga@wYe8xg_e>%@tE86<4vK&SxnZE-q>MjW9k>DJw@(1OT5@p!RK z7G9qr67;qes#4ubvwZn7Ym;r+vVN)#H}D-BG(dv_68SQ34UX*vE5c8!zP=NJ+~JSh z2Bx4^RA8Hjaa*qvS{NIEB51Zp!Q%kO<3){J2q9hHF)vSm&dy<$oheIp6(ke!c3a!p zA8MMhS$?fJUQxasi&fqC^2?o96nGohQz3ZM`0?X|B*>G_Cef!s0|b`oP?5QIgn{rF ztne2VQz76OIB6OuvMifIS&Im7E)xf7FI%>Rm6Vj2qC+LnyEi4v`u^Vrk&Bn&YKy%h}A;Sfb6Ui#%z7pevR4!R^J1Z@nVg*I2dwDr%^G1w< zA1qcpg}Vido(wL?vu8hNpMHA81(O5e@!c28L}EFhTvN?oGM!g@*RDP6(j{Ajs3gar z*4)FCEK4etQZffc1XYIQ=@g@S2|jfyH)y@+ym0i$(T^92zy%uAx7;$1&6?$yc7%{H zm1D2V8C-&O}t<#L=zva1iXZ9+qP4A zXI^|(ocfj54)K}a@nEqK7=r(-unLmvvQM%;hUwF%v)gXFRj^QIXY1AvMO&^=9J6ub zA3o!7he8~YS)mwl-Y#@$jmoUDl?rhpTJ7+K3Wr56wL@6bHF@#-DkL+nUj6gBRO;%V z@L0buZKJB{C4x}JVz z)20o9<6*0kffai6(aw^wvB5XMe6Ll2R~=SL8-}*3tLyo{dC^&Mz6!w_vEJUnbFf0S zl`(7`PVXuBncw^Ic`Ag=@dhaJgrATQcmw{f1UIRiAe9OQ@kb#Pv5{(;e$SRI&%bK} zW*d$mo8YwC!&~Gzowx}L4l^EUZeDuk;K7gf$~+>b<_L0#A=h1;Rg@IU`UQ2gs-di_ zV9Hi(3SrD35gOe)mz9;7irjS5jdDM(ZAzT34MC*ADm(H?URHf>rhtE;O+=*rCXTaMqo z*3{H`{NTZzhqTOOc?ENj-=(oT?_AE{aUF!D$QNInXOw7Nw5XX)nl#BlbL7Y|cIM1k z2b=?FnxVCREHiU+uzOit9Ahh1+~JM{bpHIWD{&lg>#g&!S69xuyN_~^t>mr-x9c57 z5SN!SHmN=hl`@=-_F$a$=h$pHZ{E!kBwAA)Pv_*N)B3}{3eBEfm*a?7+r8T{LntH} z-}O~U!5Iqdwma)Cz?e1R3h^CZcLnTF1apZASIEr;*wx6j;Iqz5xI%KmKG(fl%{btz z(9jSq9`d`Io4*lA00Or+Df{8sV}Jk2K*GF;s;jHm;>8QRNK9NqL*>h4p=Z4)2L=Yc z(1CFk6&1cg8)Bn04o>(ljREUDe1n=Cr+Y22S*V`*{3JxCH zejuQ!P$E&~IX_TRbYx`IAtWq7H6CG*0lpVvDwNr?)(&}fuyf}wFSIXi|9-Xj#>T1{ zT!5(%HT<#?L?fTMAXt!#Vx_@B_m>0Kc>#l2Y?&i1oVzG_luC{F<{CnW zmhD)%Vl~-~Rb@8_ACid+*Va-PBE@d<#2B(7Va8YK@mXPos$xn*R+&#=(Ek#@N-Nx1*WQfBC;fQi#@~k8n+UCtvtw@vt^3BtQV+u0--8FT(*H)h z-!iFUhC3 zg7B+o@-|Q=&(B^glw(jS8Xm44LK0$)pOf*E8_7VcSO2u(+O_dl@=dq-DOV^wO%27x zMGsrIoPx>@WuQzHz`F8DiUw6|V(7FKjMYZ-bWr($3`B;3z`w)6x&{V8J1Y#Gh7%rD zY<;fFg|A{u@jGn|sadA7AfIPbp5x;7+%HUnit<`bBms`KnE zFZSl<`HXfbJA0 zRYylhSbzU1cJ}N!oZ~ax$O{UCkY`Nh+5J15hzv2oLg^y=l4=A!|UwS{>K+Z;id#yjwI z*4s3X*dU|KpZ_)6r($75(bP?Qv{+bT&nd3nN};5tAlHx}f>A~)4&QQX)#wK|qL`IDb<$X~Ry z+>RYs;nLjt{L)}_B)Gr-KY8^>1BPr9%N&c!N0x?>v+yfn9Ll)v-Mf#z=E>)V1TWbJ zo>Oa%`ks=cy1E&Tk5)tvUt)!F-*jG}u$R`1FP&IkyUf;{cwvt+Quu%JWT=gTV1h$ZQ5@FVx`Z_~&Bu)D z*kB7OEkjPW$wty0uj4+=4e2P7DD+>kqSgEqDGL8Y@X*4xyZZ=oMi(N9$C~U7e4=o_ zxu_{FE?JY!vPBX`8~6tfd=iOwqL^sOvtU6Jz8$+EbQfd`vI#MoV{zZUZAlzp#5TC` zKxk=M2KoYqw##d3oN0=vGV|r58TRnuD6x^=zG>6C?bN?`S?P2qjC2`Bx;Ls~bgV3u zy7rYY5`9>+YuCp(?Hc^(ZRWnsZQwt18wdjt07lxrU_omVj@Ml3bD}UM9R$2^VTjF~ zS6vWXfJo?zy@1m3FwBWpa z`Lg-daCv#TGSMc>qWlk?IHn0B%!S!%4-QQ&!~ME`;G#4T? z?AbHnpK8sOKc!MHT^eEM&z}#J0h}^r3QpG7njaifdWC%5@bIwt^)o+dA5JgYMAW{g z`pAaM@-+}AMAq>!)L(*sGD8Cn|9>m9;mqUMH2iB2-2)ql3(JnEe_%vix6MSZOSn=S zhH)P78!@uX&<5fHvOelL_^6)%7FiCLH$kNVAM;1}n5R`f#;@Ok+!#8i)GZSK>0iKL z*ELdvK?dOOevPBo8=#jsAnIob6}}(_l7(kJFdcdj|I1(%hV{26%5RZBf$V?bNb}}c ztnxL!mnG|yPkTZPq*4e^RPXB>TnIl;p9bFo1LCLEgT5R-EkPe`5O4OA;UuaT0q=tW rj$&lsmp)KmU$qZ%!p-F*G~)F?z6?asGAm#^00000NkvXXu0mjf1CLf4 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/link-apple.png.meta b/Assets/Resources/Images/link-apple.png.meta new file mode 100644 index 00000000..0dc36d4e --- /dev/null +++ b/Assets/Resources/Images/link-apple.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: e60e7b809e129404b9dce5d584c9ca57 +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: 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/link-facebook.png b/Assets/Resources/Images/link-facebook.png new file mode 100644 index 0000000000000000000000000000000000000000..60772c3679568804688654260f455ab6522af4c7 GIT binary patch literal 2923 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 V-N_00M??Ss002ovPDHLkV1id7f3E-l literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/link-facebook.png.meta b/Assets/Resources/Images/link-facebook.png.meta new file mode 100644 index 00000000..8089599f --- /dev/null +++ b/Assets/Resources/Images/link-facebook.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 7951c34819fbd124b9314983619c205c +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: 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/link-google.png b/Assets/Resources/Images/link-google.png new file mode 100644 index 0000000000000000000000000000000000000000..8ebd067e236bd52d1182fc7c795eae7392cc9b2b GIT binary patch literal 4186 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/link-google.png.meta b/Assets/Resources/Images/link-google.png.meta new file mode 100644 index 00000000..c4509fb1 --- /dev/null +++ b/Assets/Resources/Images/link-google.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: a52d3365198fe5046ad9d0aa48ce18a6 +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: 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/link-wechat.png b/Assets/Resources/Images/link-wechat.png new file mode 100644 index 0000000000000000000000000000000000000000..91d088305ad0fdbfa80c1209d6542f3a6d9a05bc GIT binary patch literal 4484 zcmV-~5qs{5P)Hz4{xPpwW;|kN)ieQOXQVY@* zUKaEG#o%xsY2bVL=3C@BjIx?isB(6oY@nqD&P##N~ZO7*SfcLOp1uLOZGYrXWfn4mU)9x z=ibVJJSQ$xmg$cX0l~Ql5-;$_CFCpHbD*-eii#{Tjf({I$h^+A&bs3jYQ_oNiW{Eq z^%&#Ch^Rz_BC#yV@ZP}{jL4@li9(|%{s63L{U5FZ#z{m_*{FerMv~6wCuO%3VJf2u z1+U&%2X$LSq?NKpBE1BQ5@!M_Kun@?L^zdkKs_U;6=n|Q2vRSpo0!bm`z{AV#*Wzx z&R>O!s4w8CTtXwjiS=-T^^5BbllnYckM?9Fi5UY?O2gM?)=<*}R#qMRFMM_STLxx~ z#ucO=Ks(V(Pbk*)%tdM9p+&s<)~JzQ=^`VuvgWPniPDNPrn=qAEIpjprSQo1d4uhz zd7W~NL?VL9D83!D@%VEhVNPyR_ChQhCND;*MHx?lTUlyIT@So7DZ!Q^rMN^I4WmGG zgbmB{l5^T{W-6mVnDEA^nCkqboEWOJd5~I|?pBe36cmUaUpTEFHSsJIg58Y^kAc~P z8Wss6I$m=MX6|~2ieAa3xM&TLBqmKgqX#;Tgx__%T|<1?<$z{kkqjmdLXjvcEV3mn zII5mFlkr88+XU241A^_pco@z)Dqv{q1gf(1=AK+QRDFzB zS*|rY8kDEfJEn(*2|=e`n+8+*rfR4)j9x5$O@o|J^r~7fyL^U~iz>?CBQeLmfJUL%gTu@2dFTiaKVOVas^sA&&q?CSAU!%;LVF49sg8Cq6LVT zQNd$Wh(Uo~`GM*q8jOOkdPCV}4UBs(uOoE21|wA7+LJHTv_)=@n2xaW298a#-2o*W zSL&-%2P1L7$M_EQrLHQzxQ2yE35yc4w{aQ`BM$Us3Gn4yM7_pxTAmv+;z)fyzF^v2 zE^x0wKc|@f8uGr<1g$`oG)=#lv&}B(_3;mB*%-S0Y zgzqi|-`z^HMxlU9Al2n1XL~)UMxgwH{O}?;9Pp@Ylz@`70W~&)^H2p!Ey$RJV`Cmi z809z~;Er}T!}YBOL&s+AfNXgwE(#k?Z-$*0_8B#?4CC{a36xrt{v5dBJ)_o-b-N#a z+x8|Slqu|uUGw2YO_?d)3_(J91Txr((V|1{C{N_P^94#=XUyQ#&TIwbJoUK@(lQAf z&BFnVuS=W6PPG{G+VZ1oVAGkcV3Tb?>sQP0I5=_nG#sfuZr(_TL0hdnrGv3*x$``< zj)*rxXAAak@E+^aNDp+YljLBe#fNvKR+qK<-jwZ!HWdJy)V zb9Ef+ooiof4z-|8KR*5$tS|c?V?bl1ePkOrhp+VyI17iiYH*mmdN2Xd!+0lYGMi=f zOGJa;;!Wuj5`kfdcTkH~(&q94_~+r(UZnUY&ftT$V*(KtXBy48;9P7S`%Y2qVL*$% zILlh#EGvU=&i()cu|EEqr_4;jKD0r7iH#}{=ZRsXQVf-J;`OG^rEqCr-r#JHD{3SV z7XX)%YSdeEUJrFH%W_(7Vpg7>ua}1O1Zjoo!`upN(!+zP;|hNaSNLwe+WHkp-+26v z%&snnn~cg`dYo8CYvI7(%-qDBhV@4zFewKt5a&bo3*Ge5I0}d0gy?~tU&JAK3SnQ! zAg|0#$_hBnL%b~uM5f_Xk@G|B{4p++-yCC!*u$Ul6La48OIuH1Ngyi$7ylhflk=0a z=li4cDG*w4+C5J9$HX!oHI}IKh)hjR^#pGX8k!1()BXfb`;G=}8V$06ZRo<}8D0Tg zVyxK(^PW-*GaOAN4D~^QOrA@{M^zvc4B#8V#Y;-!-Lm7CWXg zh1F^Hig2|;78$4XP!V}0%JmyjwJY_N`SXdWMc3vXF|2h5=A9ruJQhx0E{EdtJK@W+ zZ=l9S8{8n1ERD@i%w9&VnLz%+rcd`AZOI9n_tRq7Q@KAVskHktgKZG!8mNm(u_~)! zCf*0-VGwrrqU4$DWLhjmgjlvJjQG0RMz(^ifu^wpk-etuiK<`>)$LFW*O}M)Yqx5X zw%Nhqa>B&kW0^O|x&67=4oT6n zoQ)kYzDdCd(vtW}eKA8vf4cW(3tO~~^uJ>j8Pmy8m=wkyf^ws@N(qNVz>^u_g>2SLl+7PZED(X>W~=Ok0XM~=kHq#v-jrtZTfOa7S!Q!nnAiSx9dwa1ZS^|3b@nQ zh(V&;sNC3eQ|m;a7!j>yv}Dj&%jh=&?bBIUd}yT?`;JkOk@o&}HZD|wh|1Sk^5POI zfCNkMVES3kPGg7Ygr6g>M2_015rv^XH3HFf19By=gfP?xp8tCV#54jC5%X(7(%O1L zgfOAspKiO6xq_8yAMaY%%PqD&?xFDa*w881_Tcmo{h+p#>5*Bg`L>v%Xf zIp-5!Jp2kojbHr99_PH^+=u>3P=j8Q47v6=qCvgYr7Y#-c^I zzKo2&R%Dof(X(B8oUeMo0{LQQgqvJ!kH74$y;o9{yA(+o(dZaBUZ_E3Y(_WbODRHH zv1nkH_Tq<;5RHI^R6!V7v0+^F2^?yfsEFQ;kSmC$Qkg8nTw82J?t(t{${-jRHfgki z=vEW%%JV|CEE`H09B_v$!GzqT9M6eba6B4(k3iawE3vmz>YU3_DR&0a?&qS#b!rR9 z5o7Wa?1uxDA)pb&ZpKKi)&2}(ph8?Zdg&4_T`9TA*$tPm{B&+fL1_gU_bLFNU>FH^ zOuvFeH^5}LFFzrBy}zgNsUY%(z~v}F<+S$4=<38vC#CR+A^I!1;y$d!c77Lpd$thvR2{(U;chRQrUale z4t7Y2?CbUE3Uz8fWN&t|+<7>d{X}xBK`^H40}yTV+I}|rc}QW)j(iN4>R3pm(fs@| zpxq+IfJjN~?Wn8LsdLWH15pn87VMJQur@dN>$6e#A@SD%{pd{Mt-bj{-9ZdQ0NMf2 zEeUKhhT5?y#x{J4GTSPn?$MpuwRODLVc6t{itVuRwCB1PB-bE+^))>*wpJ8ZG2Wq^z-(;4`hERl{+gSOb&zJprVWtUAyhn zygd|F>@Y%y4kp3Sf_J}p8?U})PE-{40xO(pTD>#G4rXsxwcy-#%SVA4h5=M?hNRf=`obuyZD?u=Pu7tAGXE1YQ>F5JHiPu$$hMVLS2b;~b;_|tUn(Yy=$@#8R3 z8rilrrR&(pv?7NW4eAC*ko9c@oeYqXOpG7k#VZ&9O)0t{e7?34p6Qta*9UM^>#sjj z8Z8d=D|4KMxp-Upyfd&c5nVP6OMYS4WbDkc14G77LUNEe4j^f{awePgc?!G6p9f)gF;jqUM! zzx1IbAY-1hd!Z$kblM#LI?5FBTaVF{#GoOu@aF>HQQlu5{_=iSCcEtpXWI?;8fb zW9GAQf0f>EJZ@Tyw=HJ<1_~z^Vg`N%ea2Dlw<(>q;_yx*LUq63`4ZFhh2PdqKtP}H zyok5=0<~pUMcIm%T$UVKWtE&>*3-GkSxc#bsvxSMEqNLZ_7W=p94QR@>pSo{2|A*_>XZAOc$XM+UrcQ|ILO3~x6S`r`&U))wQlyDHrK z(f*G%vpg-vQDb&RiqmLwDFeTs$Pr;)3L+#s3{+etSTv3~h#Y>Q6~u|ze-d)JzrraU zSb&)`_~qs<3_LxWpOCf2mxz89#2cdlPeCPph{jJ1({kL^mg7UG24QS9F(NJp~JxqKN%R?vJnzoyF3UHB-x zMa1*LUWp0GgLw`cw@pMf*&B1F778Wd1J!^eFNm?lzcFX<6#O>0aVaDU(u=^(*eV>4 zON#U)+N|4}bc9J#0gjTTQO&}a&+Tt-_@6y`p@OV8iGs{zp%av{qFM~dC`ov)us3$z z8)rGiN-$EdG{Z!`-XM^3JF>t+w)u)n@&K68?X$ WPajq$dezzh0000z9|8 z>y;bpKhp88yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1!reas97jz_$DT2 z=79t?!Mc2XtvvIJOA_;vQ$1a5m4N2xWoD*Wxf)tJx;VPJS(=%<8XCGfIT{-~Ia)Yd zSU8zGySbVO8Q|0lN)WjPK$~4si!#enQ{0O3a}~fIx5~ur z78ji6LG`BKbc?GiPQCg-$LNEi7b&`7LclZxV!{(IkONQtsd>OOUj$6t%d-S?7#J8e zJY5_^DsJ_JUF2gj|74+Sm1QDU(-u?`2uG)Lm%)qT`#4GZ|BD01Hc>s6s(1M* zg_9N?V5wa(^Wd3@S{KfiRx5{J6>eH4Y^#xS{oI@=j-?gXC09wU7M^qHyXppEy)zRE z-7K!`IAp^hd!5M-RoAWiQvu=z9|8 z>y;bpKhp88yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1!reas97jz_$DT2 z=79t?!Mc2XtvvIJOA_;vQ$1a5m4N2xWoD*Wxf)tJx;VNSTbh}>8XCGfIT{-~Ia)Yd zSU8zGySbVo*&Gv@=dZYTN<;8}(vm|Q`?Y%NV*A<-&6YjuXLzO}uT zCvAJH?auyqp+w4+5D9*1pOU19S6F1_-Us#MD~ECms>r7tb4kj)divS99fyR^t??G? zm?qh;ES%dWcr|AFE6J&XC3ky7ZRc-0#AThh4IK literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/loading-right.png.meta b/Assets/Resources/Images/loading-right.png.meta new file mode 100644 index 00000000..292fe8d3 --- /dev/null +++ b/Assets/Resources/Images/loading-right.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 7d4c345adf6fdaa4e86fd5a7a2ffe74c +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: 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/loading.png b/Assets/Resources/Images/loading.png new file mode 100644 index 0000000000000000000000000000000000000000..ff0521fe581801f2fda08bb17d4ff090abdd507c GIT binary patch literal 7760 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 Ht~dS-wHXca literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/loading.png.meta b/Assets/Resources/Images/loading.png.meta new file mode 100644 index 00000000..62d29bbb --- /dev/null +++ b/Assets/Resources/Images/loading.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: c2bea8b3d3ce1ce458bbd288445e3a0b +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: 2 + wrapV: 2 + wrapW: 2 + 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: 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/loading1.png b/Assets/Resources/Images/loading1.png new file mode 100644 index 0000000000000000000000000000000000000000..51919cc6b0949ebab6395754c8c37fce8b67e37a GIT binary patch literal 5349 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%0A6TV!wT1Q^a0f6Q zXxmOHapEufUX_XEKhT07IrH;sW*?vNeF5+VWo@G?KQ>EDKJsHzYV6Saqp=gca+wwv zvU0Qg$0~1I=)VI_0>%UH1wIX21pL>^3C?y}nvW12dD)L{_w6`azkv5);N{h;AlCsi zfJs18UlkO4z&PL_U=N_wwHSI=*<|Ri20kgt)5_q^^Z2EXs@VC6XXlHd0*7em?&Rst z2+5_<(BA;~p|w#INB>fw)WlAU%hIuZg^h{69K1U6C=b8qd9jrG`U7^(@$8g-@`SA& zJzKMF{RBrw4*avMoZxKorOL$jZhT#*FW;`aI-oxn`Yyf>w9&v6;6Y!<`IVdO!7q2l zUuCk22>%<{-FKALM`tS_@vPh0RU8?)`fF+N_){ANj;5PU+VSmX#MAnYRLQ>?Vg>p{L%7hqn=M9I!xjw1pTkg~5kj+ME_>Vs-?czDAs7-9V&&%o3qBeYaY{vfy)x~v;$Uv9zs@XT7 zeZ#krr;nb@`RK#cHis-69T~itK=yqagyd1wHo(ciN^6|HoW9mQNWgz3@I9-iIP|-K zX@Hy}#~*PJKAS8ii9c%X7X;qHYRAdT0c(^mr+s(_c=DfDUY-_x$zzS$0KXxRo|Qr8 z)j<4(cJL)Y%}p(6a`Zn7z}^4}36fqkvbyf}KB1M{st!P))^WFDkKe$X2S#Ha7h zp5&A|4k0_Opb^8X078nN5?oW%5BmQw`f}eS^Orl159}mXiK-9VB6D&cTX|%#CG+V} z;9B4TK=xaCw0;lpOF%9^8-L7>5jn!eMU#Zse+C0``YSh3V*F2BQy=x51de>*R}74*Lc1ow?BdtJpRiMIfWXW0IP(LQp21IFb^0695RiEsM3 zfte_}&<_L>2ORp7^4N9y-_)3#-M1CcOsbDzys9l&0SdVna3&ykGp_)? z4#>0D($8Jd&03Z$k0)PUBvj;g^(ITMJGtn|8Bu&E82pwZezRo7ewIu-_{1S=6Q%-l zfXB2};BtES5b%3IzP^-eCu>K{^?VTL-kO87Y|-_7Jssg8_kB;Vr3<&R;;Hz73NT1= z=T@$V?x+A`cbASG__D01khxanrDbdUMqQTEir*a- zV6dZq(5n-Ge%(iI@a60!UT6efeQBsWhB8+ajMuq3)^2CtGEEU#e{Os$O}3)0{Z7Xxx$O4LUt=!k5zz)Aa~{0 z>SO>9UMfKMU$XjKkEL3LO9fjOQRk#6M0VcqSI$@+`OT1l4 ze;WW+yu$9D0bH)0PMvZ5ypE$A>+v=r_&0m}Z7sjT2Ve!56#kv*GoZYWuhXOpdedM*`r4L--(a!7J0#u2WuK*Ke0x$!R_ZTh#4g;!#Liv(*ohIXXp* + /// 添加收藏 + /// + /// + public async Task> AddFav(string routeId) + { + return await PostAsync>("/MemberFavoriteMap/Add",new { routeId }); + } + ///

+ /// 取消收藏 + /// + /// + public async Task> CancelFav(string routeId) + { + return await PostAsync>("/MemberFavoriteMap/Cancel", new { routeId }); + } } } diff --git a/Assets/Scripts/Apis/Models/MapRoute.cs b/Assets/Scripts/Apis/Models/MapRoute.cs index 0cec7d60..f5ad5090 100644 --- a/Assets/Scripts/Apis/Models/MapRoute.cs +++ b/Assets/Scripts/Apis/Models/MapRoute.cs @@ -104,5 +104,6 @@ namespace Assets.Scripts.Apis.Models public string Hard { get; set; } public string CountryCode { get; set; } public bool IsFire { get; set; } + public string AltitudeGraph { get; set; } } } diff --git a/Assets/Scripts/Apis/Models/UserResultModel.cs b/Assets/Scripts/Apis/Models/UserResultModel.cs index 6cf47bf7..15c4ca7c 100644 --- a/Assets/Scripts/Apis/Models/UserResultModel.cs +++ b/Assets/Scripts/Apis/Models/UserResultModel.cs @@ -61,7 +61,7 @@ namespace Assets.Scripts.Apis.Models //cookie public string cookie { get; set; } - - + public string Unionid { get; set; } + public int Height { get; set; } } } diff --git a/Assets/Scripts/Apis/UserApi.cs b/Assets/Scripts/Apis/UserApi.cs index f84448ef..0f356bac 100644 --- a/Assets/Scripts/Apis/UserApi.cs +++ b/Assets/Scripts/Apis/UserApi.cs @@ -129,7 +129,9 @@ namespace Assets.Scripts.Apis } public async Task> QuickLogin() { - return await PostAsync>("NoAuth/QuickLogin",null); + var r = await PostAsync>("NoAuth/QuickLogin", null); + r.data.cookie = cookies[0].Value; + return r; } public async Task> OnWebWxLoginCheckUnionId(string unionId, string openId) @@ -153,7 +155,7 @@ namespace Assets.Scripts.Apis } - public async Task> Update(UserResultModel currUser, string filePath = "") + public async Task> Update(UserResultModel currUser, string filePath = "") { //return await PostAsync>("User/UpdateUserSetting", new { // UID = currUser.Id, @@ -186,6 +188,7 @@ namespace Assets.Scripts.Apis UID = currUser.Id, Sex = currUser.Sex, currUser.Unit, + currUser.Height, currUser.Weight, currUser.FTP, currUser.WheelDiameter, @@ -205,7 +208,11 @@ namespace Assets.Scripts.Apis //imgData = imgData }, files); - return Newtonsoft.Json.JsonConvert.DeserializeObject>(res); + return Newtonsoft.Json.JsonConvert.DeserializeObject>(res); + } + public async Task> GetNotify() + { + return await GetAsync>("/Home/GetNotify"); } } } diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 7465af69..c3a34419 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -16,6 +16,9 @@ public static class App public static string WxAppSecret = "906abafb2a18bc7a66ccfa5550f859b6"; public static string MapBoxAccessToken => "pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA"; + + public static bool FromLogin = false; + /// /// 场景跳转传值 /// Name,MapListPanel diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index da22d9cf..eb6dd017 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -1,6 +1,7 @@ using Assets.Scripts; using Assets.Scripts.Apis; using Assets.Scripts.Apis.Models; +using Assets.Scripts.UI.Control; using Assets.Scripts.UI.Prefab.Login; using DG.Tweening; using Newtonsoft.Json; @@ -11,6 +12,7 @@ using System.Collections.Generic; using System.Reflection; using System.Text; using System.Text.RegularExpressions; +using System.Threading.Tasks; using System.Timers; using UnityEngine; using UnityEngine.Events; @@ -75,7 +77,7 @@ public class LoginController : MonoBehaviour private ScrollRect scrollPanel; private ScrollRect scrollSign; private ScrollRect scrollAvatar; - private Transform imagexf; + private Transform imagexf,imagedf; //注册主页面 private UserResultModel userResult; /*微信相关*/ @@ -99,14 +101,13 @@ public class LoginController : MonoBehaviour // Start is called before the first frame update void Start() { + App.FromLogin = true; UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent(); - var userInfosJson = PlayerPrefs.GetString("UserInfos"); - userInfos = JsonConvert.DeserializeObject>(userInfosJson); - if (userInfos == null) userInfos = new List(); + userInfos = UIManager.Instance.userInfos; //userInfos.RemoveAt(0); //PlayerPrefs.SetString("UserInfos", ""); //transform.Find("RawImage").DOMove(new Vector3(0.5f,0.5f,0),1); - + //if (loginForm.Length == 2 && loginForm[0] != null && loginForm[1] != null) //{ // foreach (var ipt in loginForm) @@ -120,17 +121,17 @@ public class LoginController : MonoBehaviour // } // //loginForm[0]. //} - + if (loading != null) { - loading.texture.wrapMode = TextureWrapMode.Repeat; + //loading.texture.wrapMode = TextureWrapMode.Mirror; } if (loginScrollView != null) { scrollPanel = loginScrollView.GetComponent(); mainContent = loginScrollView.transform.Find("Viewport").Find("Content"); - quickContainer = mainContent.Find("FormContainer-Quick"); - loginContainer = mainContent.Find("FormContainer-Login").Find("FormContainer"); + quickContainer = mainContent.Find("Empty").Find("FormContainer-Quick"); + loginContainer = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer"); signContainer = mainContent.Find("FormContainer-Sign"); } if (signScrollView != null) @@ -214,7 +215,7 @@ public class LoginController : MonoBehaviour foreach (var user in userInfos) { var info = Instantiate(Resources.Load("UI/Prefab/Login/QuickUserInfo")).transform; - info.GetComponent().Initial(user); + info.GetComponent().Initial(user,transform); info.parent = content; info.localScale = new Vector3(1, 1, 1); } @@ -255,9 +256,10 @@ public class LoginController : MonoBehaviour wxState = (DateTime.Now.ToUniversalTime().Ticks / 10000 * new System.Random().Next(1, 5)).ToString(); wxBrowser.Url = $"https://open.weixin.qq.com/connect/qrconnect?appid={App.WxAppId}&redirect_uri=https%3A%2F%2Fwx.powerfun.com.cn%2FNoAuth%2Fv1%2FWxWebLogin&response_type=code&scope=snsapi_login&state={wxState}#wechat_redirect"; //AdjustWxQrCode(); - var wx1 = mainContent.Find("FormContainer-Login").Find("FormContainer-wx1"); + var wx1 = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer-wx1"); wx1.gameObject.SetActive(true); Debug.Log(178 + "已经开启" + wx1.gameObject.activeSelf); + //wx1.GetComponent().DOFade(1, 0.8f).onComplete = () => { wxLock = false; }; wx1.DOLocalMoveY(0, 0.3f).onComplete = () => { wxLock = false; }; }); var login = loginContainer.Find("login").GetComponent