From b075279a14cd6f4a47de5790017c0bebcc6d5d51 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Mon, 18 Oct 2021 14:03:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=EF=BC=8Cios=E5=9B=BE=E7=89=87=E5=90=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/XCodePostProcessBuild.cs | 8 ++- Assets/Plugins/iOS/IOSCameraController.m | 4 +- .../Prefab/Panel/Mobile/MapListPanel.prefab | 54 +++++++++++++------ .../Prefab/Panel/Mobile/RaceListPanel.prefab | 50 +++++++++++------ Assets/Scripts/App.cs | 2 +- ProjectSettings/GraphicsSettings.asset | 1 - ProjectSettings/ProjectSettings.asset | 6 +-- 7 files changed, 82 insertions(+), 43 deletions(-) diff --git a/Assets/Editor/XCodePostProcessBuild.cs b/Assets/Editor/XCodePostProcessBuild.cs index 8cd53518..e5a90aea 100644 --- a/Assets/Editor/XCodePostProcessBuild.cs +++ b/Assets/Editor/XCodePostProcessBuild.cs @@ -79,11 +79,9 @@ public static class XCodePostProcessBuild PlistElementDict qxLoc = plist.root.CreateDict("NSLocationWhenInUseUsageDescription"); qxLoc.SetBoolean("NSLocationWhenInUseUsageDescription", true); - plist.root.SetString("NSCameraUsageDescription","cameraDesciption"); - plist.root.SetString("NSContactsUsageDescription", "contactsDesciption"); - plist.root.SetString("NSMicrophoneUsageDescription", "microphoneDesciption"); - plist.root.SetString("NSPhotoLibraryUsageDescription", "photoLibraryDesciption"); - plist.root.SetString("NSLocationWhenInUseUsageDescription", "locationWhenInUseUsageDescription"); + plist.root.SetString("NSCameraUsageDescription","Use the camera to scan the QR code or take a photo or take a video to upload."); + plist.root.SetString("NSPhotoLibraryUsageDescription", "Need to access your image file to upload."); + plist.root.SetString("NSLocationWhenInUseUsageDescription", "Need to get your geographic location in order to push the route for you."); plist.root.SetBoolean("ITSAppUsesNonExemptEncryption", false); File.WriteAllText(listPath, plist.WriteToString()); } diff --git a/Assets/Plugins/iOS/IOSCameraController.m b/Assets/Plugins/iOS/IOSCameraController.m index cba045fa..873ca95c 100644 --- a/Assets/Plugins/iOS/IOSCameraController.m +++ b/Assets/Plugins/iOS/IOSCameraController.m @@ -54,8 +54,10 @@ //图片旋转 image = [self fixOrientation:image]; } + NSUUID *UUID = [NSUUID UUID]; + NSString *result =[[UUID UUIDString] stringByAppendingString:@".jpg"]; //获取保存图片的地址 - NSString *imagePath = [self GetSavePath:@"Temp.jpg"]; + NSString *imagePath = [self GetSavePath:result]; //保存图片到沙盒路径 对应unity中的Application.persistentDataPath 之后我们取图片就需要在这个路径下取 这是一个可读可写的路径 [self SaveFileToDoc:image path:imagePath]; } diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab index 01059311..e4cd33ce 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab @@ -1240,7 +1240,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -195, y: -281} + m_AnchoredPosition: {x: -195, y: -301} m_SizeDelta: {x: 78, y: 20} m_Pivot: {x: 0, y: 1} --- !u!222 &3729561503460600226 @@ -1331,7 +1331,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -284, y: -281} + m_AnchoredPosition: {x: -284, y: -301} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0, y: 1} --- !u!222 &3729561503895154083 @@ -1691,7 +1691,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -166, y: -213} + m_AnchoredPosition: {x: -166, y: -247} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &4077563585998376545 @@ -1912,11 +1912,11 @@ RectTransform: m_Father: {fileID: 7944455583227005010} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 206, y: -10} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -10, y: -10} m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 1, y: 1} --- !u!222 &4167844827205442557 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3885,7 +3885,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -284, y: -103} + m_AnchoredPosition: {x: -284, y: -153} m_SizeDelta: {x: 264, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062727310468537 @@ -4088,7 +4088,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -284, y: -31} + m_AnchoredPosition: {x: -284, y: -80.5} m_SizeDelta: {x: 60, y: 19} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062728066858167 @@ -4125,7 +4125,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -4421,7 +4421,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -284, y: -73} + m_AnchoredPosition: {x: -284, y: -123} m_SizeDelta: {x: 60, y: 19} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062728799582122 @@ -5856,7 +5856,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: -70 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -6064,7 +6064,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_AnchoredPosition.y - value: -213 + value: -247 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -6182,7 +6182,7 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_SizeDelta.x - value: 236 + value: 264 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} @@ -6227,12 +6227,12 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_AnchoredPosition.x - value: 920 + value: -284 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: -15 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} @@ -6257,13 +6257,33 @@ PrefabInstance: - target: {fileID: 4589186191166513557, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_Text value: Route Name objectReference: {fileID: 0} + - target: {fileID: 8098460543711191387, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 8098460543711191387, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} --- !u!224 &7944455583227005010 stripped diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab index a64348dc..9dc74503 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab @@ -546,7 +546,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -264, y: -20} + m_AnchoredPosition: {x: -264, y: -70} m_SizeDelta: {x: 60, y: 19} m_Pivot: {x: 0, y: 1} --- !u!222 &6312843494427679176 @@ -583,7 +583,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -1552,7 +1552,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -264, y: -140} + m_AnchoredPosition: {x: -264, y: -194} m_SizeDelta: {x: 82, y: 20} m_Pivot: {x: 0, y: 1} --- !u!222 &4393121095389363787 @@ -2051,7 +2051,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 304, y: 200} + m_SizeDelta: {x: 304, y: 229} m_Pivot: {x: 1, y: 0.5} --- !u!222 &8398349872535909533 CanvasRenderer: @@ -2103,7 +2103,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: r: {x: 0, y: 30, z: 30, w: 0} - rect2props: {x: -14.999985, y: -0.000015258789, z: 167.58432, w: 167.58432} + rect2props: {x: -14.999985, y: -0.000030517578, z: 177.83737, w: 177.83737} --- !u!1 &4876623757515401105 GameObject: m_ObjectHideFlags: 0 @@ -2696,11 +2696,11 @@ RectTransform: m_Father: {fileID: 1786430169159750715} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 206, y: -10} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -10, y: -10} m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 1, y: 1} --- !u!222 &3398068556692691702 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3300,7 +3300,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -264, y: -45} + m_AnchoredPosition: {x: -264, y: -104} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &172587720231943750 @@ -3513,7 +3513,7 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_Pivot.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} @@ -3548,7 +3548,7 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_SizeDelta.x - value: 236 + value: 244 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} @@ -3593,12 +3593,12 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_AnchoredPosition.x - value: -9 + value: -264 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_AnchoredPosition.y - value: -19.5 + value: -15 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} @@ -3623,13 +3623,33 @@ PrefabInstance: - target: {fileID: 4589186191166513557, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_Text value: Race Name objectReference: {fileID: 0} + - target: {fileID: 8098460543711191387, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 8098460543711191387, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} --- !u!224 &1786430169159750715 stripped diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 62c22586..3c8321ae 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -100,7 +100,7 @@ public static class App { #if !UNITY_EDITOR //Host = "http://pf.juze.pro/"; - //Host = "http://192.168.0.101:5083/"; + //Host = "http://192.168.0.101:5087/"; //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/"; diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 9b996cb4..4706883c 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,7 +38,6 @@ 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 6874c069..a88005cb 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2.0.2 + bundleVersion: 2.0.3 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -179,8 +179,8 @@ PlayerSettings: applicationIdentifier: Android: com.ZhiXingPai.PowerFunUnity buildNumber: - iPhone: 2.0.2.2 - AndroidBundleVersionCode: 2 + iPhone: 2.0.3.0 + AndroidBundleVersionCode: 3 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 30 AndroidPreferredInstallLocation: 1