diff --git a/Assets/Resources/UI/Prefab/MapList/MapItem.prefab b/Assets/Resources/UI/Prefab/MapList/MapItem.prefab index 186bc4ee..343cfbaa 100644 --- a/Assets/Resources/UI/Prefab/MapList/MapItem.prefab +++ b/Assets/Resources/UI/Prefab/MapList/MapItem.prefab @@ -2801,7 +2801,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2816,7 +2816,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2826,17 +2826,17 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x - value: 103 + value: 123 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.y - value: 30 + value: 38 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2876,12 +2876,12 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.x - value: 127 + value: 145 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: -220 + value: 14 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2997,7 +2997,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -3012,7 +3012,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -3022,17 +3022,17 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x - value: 103 + value: 123 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.y - value: 30 + value: 38 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -3077,7 +3077,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: -220 + value: 14 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab b/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab index 3f66df60..a214a17a 100644 --- a/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab @@ -564,7 +564,7 @@ RectTransform: 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_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 211, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &1670686349435088156 @@ -1526,8 +1526,8 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 - m_Bottom: 0 + m_Top: 6 + m_Bottom: 6 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 @@ -1705,8 +1705,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 20, y: -20} - m_SizeDelta: {x: -40, y: -40} + m_AnchoredPosition: {x: 20, y: -14} + m_SizeDelta: {x: -40, y: -28} m_Pivot: {x: 0, y: 1} --- !u!222 &5526612272606031881 CanvasRenderer: @@ -2526,7 +2526,7 @@ RectTransform: 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_AnchoredPosition: {x: 28, y: 0} m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5526612273925040420 @@ -3478,7 +3478,7 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -3658,7 +3658,7 @@ PrefabInstance: - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -3683,7 +3683,7 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -3703,7 +3703,7 @@ PrefabInstance: - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -3723,7 +3723,7 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 2c5ae963..88057ff7 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -19,7 +19,7 @@ public delegate void ChangeLanguageDelegate(); public static class App { - public static string Host = "http://192.168.0.101:5085/"; + public static string Host = "http://192.168.0.101:5083/"; public static string AppVersion = Application.version; @@ -153,7 +153,7 @@ public static class App language = "en"; } #if UNITY_EDITOR - language = "en"; + //language = "en"; #endif var a = Resources.Load("UI/language"); dic = JsonConvert.DeserializeObject>>(a.text); @@ -180,18 +180,23 @@ public static class App } } } + public static Dictionary websiteDict = new Dictionary() + { + {"https://wx.powerfun.com.cn/","http://www.powerfun.com/" }, + {"http://pf.juze.pro/","http://pfweb.juze.pro/" } + }; static App() { InitLanguage(); #if !UNITY_EDITOR - //Host = "http://pf.juze.pro/"; - //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 = "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/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index 0dad770f..291319ce 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs @@ -117,7 +117,14 @@ public class MapListController : PFUIPanel SetRounded(btnMapMode.transform, 64); UIManager.AddEvent(btnMapMode.transform.Find("GoList").gameObject, EventTriggerType.PointerClick, (e) => { - Application.OpenURL("http://192.168.0.101:3081/Mine/Upload?token="+ App.CurrentUser.cookie); + if (App.websiteDict.ContainsKey(App.Host)) + { + Application.OpenURL($"{App.websiteDict[App.Host]}Mine/Upload?token={App.CurrentUser.cookie}"); + } + else + { + Application.OpenURL("http://www.powerfun.com/Mine/Upload?token=" + App.CurrentUser.cookie); + } }); transform.Find("MainNav").GetComponent().ShowBack(); #endif diff --git a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs index d6fa5547..f71f7c9c 100644 --- a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs @@ -156,33 +156,33 @@ public class NewRouteDetailController : PFUIPanel Utils.DisplayImageTempDict(left.Find("Icon").GetComponent(), area.CoverImage, caches , b => { - if (b != null) - { - cacheByte.Add(area.CoverImage, b); - } - else if(cacheByte.ContainsKey(area.CoverImage)) - { - b = cacheByte[area.CoverImage]; - } +// if (b != null) +// { +// cacheByte.Add(area.CoverImage, b); +// } +// else if(cacheByte.ContainsKey(area.CoverImage)) +// { +// b = cacheByte[area.CoverImage]; +// } -#if UNITY_EDITOR - var _t = new Texture2D(4, 4, TextureFormat.DXT5, false); -#else -#if UNITY_IOS - var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false); - Debug.Log("使用了壓縮"); -#elif UNITY_ANDROID - var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false); - Debug.Log("使用了壓縮"); -#else //pc - var _t = new Texture2D(4, 4, TextureFormat.DXT5,false); -#endif -#endif - _t.LoadImage(b); - //Graphics.CopyTexture(t, _t); - //Debug.Log($"{t.width},{t.height}"); - left.Find("Thumbnail").GetComponent().texture = - ScaleTextureCutOut(_t, 0, _t.height / 2, _t.width / 3, _t.height / 3); +//#if UNITY_EDITOR +// var _t = new Texture2D(4, 4, TextureFormat.DXT5, false); +//#else +//#if UNITY_IOS +// var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false); +// Debug.Log("使用了壓縮"); +//#elif UNITY_ANDROID +// var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false); +// Debug.Log("使用了壓縮"); +//#else //pc +// var _t = new Texture2D(4, 4, TextureFormat.DXT5,false); +//#endif +//#endif +// _t.LoadImage(b); +// //Graphics.CopyTexture(t, _t); +// //Debug.Log($"{t.width},{t.height}"); +// left.Find("Thumbnail").GetComponent().texture = +// ScaleTextureCutOut(_t, 0, _t.height / 2, _t.width / 3, _t.height / 3); }); //Utils.DisplayImageTempDict(left.Find("Thumbnail").GetComponent(), area.CoverImage, caches); } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 999e430b..c5b8a1b5 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Login-Mobile.unity - guid: 4be878da00cf764499988cf403faf94d + path: Assets/Scenes/Login.unity + guid: 6dce3e17997730b4492f91dd8fede429 - enabled: 1 path: Assets/Scenes/MainScene.unity guid: ab586a3c1bacd4a48a55178eb06fe0cc