From be4e7417084ea7e9d1058a5b04eef92a7d3ad274 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Mon, 18 Jul 2022 17:07:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=94=80=E7=94=A8=E6=88=B7=E4=B8=A4?= =?UTF-8?q?=E6=AD=A5+=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/Delete.png | Bin 0 -> 1000 bytes Assets/Resources/Images/Delete.png.meta | 128 +++++++ Assets/Resources/Images/Done.png | Bin 0 -> 887 bytes Assets/Resources/Images/Done.png.meta | 128 +++++++ Assets/Resources/Images/routedelete.meta | 8 + .../Images/routedelete/ICON_delete_44.png | Bin 0 -> 2720 bytes .../routedelete/ICON_delete_44.png.meta | 128 +++++++ .../Images/routedelete/ICON_done_44.png | Bin 0 -> 8648 bytes .../Images/routedelete/ICON_done_44.png.meta | 128 +++++++ .../UI/Prefab/Panel/MapListPanel.prefab | 312 ++++++++++++++++- .../Prefab/Panel/Mobile/MapListPanel.prefab | 320 ++++++++++++++---- Assets/Resources/UI/language.json | 14 +- Assets/Scripts/Apis/MapApi.cs | 8 +- Assets/Scripts/Apis/UserApi.cs | 11 +- Assets/Scripts/App.cs | 3 + .../Scripts/UI/Prefab/Login/DeleteAccount.cs | 22 +- Assets/Scripts/UI/Prefab/MapList/MapItem.cs | 55 ++- .../UI/Prefab/Panel/MapListController.cs | 51 ++- 18 files changed, 1239 insertions(+), 77 deletions(-) create mode 100644 Assets/Resources/Images/Delete.png create mode 100644 Assets/Resources/Images/Delete.png.meta create mode 100644 Assets/Resources/Images/Done.png create mode 100644 Assets/Resources/Images/Done.png.meta create mode 100644 Assets/Resources/Images/routedelete.meta create mode 100644 Assets/Resources/Images/routedelete/ICON_delete_44.png create mode 100644 Assets/Resources/Images/routedelete/ICON_delete_44.png.meta create mode 100644 Assets/Resources/Images/routedelete/ICON_done_44.png create mode 100644 Assets/Resources/Images/routedelete/ICON_done_44.png.meta diff --git a/Assets/Resources/Images/Delete.png b/Assets/Resources/Images/Delete.png new file mode 100644 index 0000000000000000000000000000000000000000..428486fc99d375d1d4a6fe57f9c1e4bcf529bd2e GIT binary patch literal 1000 zcmV>P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91B%lKT1ONa40RR91C;$Ke0Pp?|{Qv+1Qb|NXR9Fe^SWQS3Q4~IB-pqUb zNJKv(6a+yaxRBSw+!VNQ6+zTCFmlt+!mKQ`O|JY2p%%4}ASkG9w5o**K_tw?77B(D z1Ok}4OvBye?2oEa0k;J$@u@Xul zK0<_iq)ZqjvC=0hUgCJE#LPgCylAb8vH!0jZM=czL&q9|r$rQ-ci-oWAu9JJCt%1QUzn zUs=4dQRI5g^F!za-!6x&vGyliMqbwBM-Z3k(TQB|6>{i-s}nS{zLVvLo;}H95SPDa zIO|g?sjjQGwaR*IRrf1|K-<;zk-APy*}g-0%vYPcG9x&6ZBDnVIyKzeou6N*H_4pB z@wU&ZEr`pnkm|6SoIl!oR)Cmx9Ot!|`}=|Fx(~00lXKE0F)o&Uq;Dy#J|8(DhYB5B zTFWH_sMTnIMWK$<(Yo{n%*!3EEY@d6%LS%d?X2)9jrK5Om?b>2YtSyS9aQmB@ zdzJwPUGRXi8AAa>{Hpz!-$K56^J_X18~{Ph+`PGso)>G0+f|oegL3_rD9ny9IO_p7 z;>fp#aVxc_9>*>U$>%SboFLO|Vt~A4H)KdImvbo@N$MvgmCU=F6PUtA{ucL9>gzg~ zLvl$@mB(K)b&_)ZJMzx#4I((h?+{0LjVn}pxiXXe=1+aod>4OVZp-xHo9ln{SpNW? W%{DSQNo;5U0000DV literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/Delete.png.meta b/Assets/Resources/Images/Delete.png.meta new file mode 100644 index 00000000..c0b98f6e --- /dev/null +++ b/Assets/Resources/Images/Delete.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: c2bac3c2896c8f74d902ab6c3a72f29a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Done.png b/Assets/Resources/Images/Done.png new file mode 100644 index 0000000000000000000000000000000000000000..fc1d2fd8f7f7ac7023f0ce20fa2376fe4e98a484 GIT binary patch literal 887 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 DeleteRoute(int id) + { + var result = await PostAsync>($"Map/DeleteRoute", new { id }); + return result; + } public async Task>> GetRecommendAreaList() { var result = await GetAsync>>($"MapRouteArea/GetRecommendAreaList"); @@ -248,6 +252,8 @@ namespace Assets.Scripts.Apis var result = await GetAsync>>($"Recommand/GetList?pageIndex={pageIndex}&pageSize={pageSize}"); return result; } + + public async Task>> GetMemberMapRouteAreaList(int pageIndex, int pageSize) { var result = await GetAsync>>($"MapRouteArea/GetMemberMapRouteAreaList?pageIndex={pageIndex}&pageSize={pageSize}"); diff --git a/Assets/Scripts/Apis/UserApi.cs b/Assets/Scripts/Apis/UserApi.cs index 2913f6f3..0dd5d7dd 100644 --- a/Assets/Scripts/Apis/UserApi.cs +++ b/Assets/Scripts/Apis/UserApi.cs @@ -84,10 +84,15 @@ namespace Assets.Scripts.Apis return new JsonResult() { result = false, data = null, errMsg = ret.errMsg }; } } - - public async Task> DeleteAccount(string pwd) + /// + /// + /// + /// + /// false直接删除 true仅判断 + /// + public async Task> DeleteAccount(string pwd,bool isFirst) { - return await PostAsync>("User/DeleteAccount", new { pwd }); + return await PostAsync>("User/DeleteAccount", new { pwd,isFirst }); } public async Task> AppleCompleteInfo(string phone, string Captcha, string pwd) diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 1c5f3fa5..fce6a771 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -200,6 +200,9 @@ public static class App } } } + + public static bool isUploadDeleteMode { get; set; } = false; + public static bool CanOpenAd = false; public static Dictionary websiteDict = new Dictionary() diff --git a/Assets/Scripts/UI/Prefab/Login/DeleteAccount.cs b/Assets/Scripts/UI/Prefab/Login/DeleteAccount.cs index 6a183729..e4a3e8fa 100644 --- a/Assets/Scripts/UI/Prefab/Login/DeleteAccount.cs +++ b/Assets/Scripts/UI/Prefab/Login/DeleteAccount.cs @@ -7,9 +7,10 @@ using UnityEngine.SceneManagement; public class DeleteAccount : PFUIPanel { + PFUIInputField password; protected override void Awake() { - PFUIInputField password = transform.Find("Content/Password").GetComponent(); + password = transform.Find("Content/Password").GetComponent(); UIManager.AddEvent(transform.Find("Content/Delete").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => { Delete(password.Text); @@ -21,15 +22,28 @@ public class DeleteAccount : PFUIPanel } async void Delete(string pwd) { - var res = await ConfigHelper.userApi.DeleteAccount(pwd); + var res = await ConfigHelper.userApi.DeleteAccount(pwd,true); if (res.result) { + UIManager.ShowConfirm(App.GetLocalString("Delete Your Account"), App.GetLocalString("Are you sure you want to delete the account?"), async () => + { + var res1 = await ConfigHelper.userApi.DeleteAccount(pwd, false); + if (res1.result) + { #if !(UNITY_ANDROID || UNITY_IOS) SceneManager.LoadScene("Login"); #else - SceneManager.LoadScene("Login-Mobile"); + SceneManager.LoadScene("Login-Mobile"); #endif - Close(); + Close(); + UIManager.CloseConfirm(); + } + else + { + Utils.showToast(null, res1.errMsg); + } + + }); } else { diff --git a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs index adedd983..dcd60523 100644 --- a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs +++ b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs @@ -46,13 +46,15 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, MapRoute map; Dictionary caches; private MapRouteAreaItem area = null; - public void Initial(MapRoute myMap, Dictionary caches, MapRouteAreaItem area = null) + private Action refresh = null; + public void Initial(MapRoute myMap, Dictionary caches, MapRouteAreaItem area = null,Action refresh = null) { if (caches != null) { this.caches = caches; } this.area = area; + this.refresh = refresh; map = myMap; //localY = transform.GetComponent().rect.height; //Debug.Log(localY); @@ -129,6 +131,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, { transform.Find("CollectImg").Find("Image").GetComponent().sizeDelta = new Vector2(25, 20f); } + ChangeUploadImageMode(); #if !(UNITY_ANDROID || UNITY_IOS) transform.Find("CollectImg").gameObject.SetActive(false); #endif @@ -176,6 +179,56 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, transform.Find("BtnReride").GetComponent