diff --git a/Assets/Resources/Mobile.meta b/Assets/Resources/Mobile.meta deleted file mode 100644 index a76c7270..00000000 --- a/Assets/Resources/Mobile.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f134d222725933a4a8aa79fee0ebc10c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 46b5e54a..51554556 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -11,7 +11,7 @@ using Assets.Scripts.Devices; public static class App { - public static string Host = "http://192.168.0.101:5085/"; + public static string Host = "http://192.168.0.102:5082/"; public static string AppVersion = Application.version; @@ -85,13 +85,13 @@ public static class App public readonly static bool isFullScreen = width/height>1.8; static App() { -#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 = "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); -#endif +//#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 = "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); +//#endif } } diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index 5f248bdb..90d7691f 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -259,8 +259,8 @@ public class UIManager : MonoBehaviour { false,Resources.Load("Images/p-4灰")}, { true,Resources.Load("Images/p-4")}, }; - var a = Resources.Load("UI/simpleCountry"); - var clist = JsonConvert.DeserializeObject>(a.text); + //var a = Resources.Load("UI/simpleCountry"); + //var clist = JsonConvert.DeserializeObject>(a.text); if (_now == null) { diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4706883c..9b996cb4 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ 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}