lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

Browse Source 
# Conflicts:
#	Assets/Scripts/App.cs
This commit is contained in:
CaiYanPeng 2021-09-15 10:45:53 +08:00
commit 15015f83a8
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Resources/Mobile.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f134d222725933a4a8aa79fee0ebc10c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scripts/App.cs
View File

@ -11,7 +11,7 @@ using Assets.Scripts.Devices;
public static class App 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; public static string AppVersion = Application.version;

4
Assets/Scripts/UIManager.cs
View File

@ -259,8 +259,8 @@ public class UIManager : MonoBehaviour
{ false,Resources.Load<Sprite>("Images/p-4灰")}, { false,Resources.Load<Sprite>("Images/p-4灰")},
{ true,Resources.Load<Sprite>("Images/p-4")}, { true,Resources.Load<Sprite>("Images/p-4")},
}; };
var a = Resources.Load<TextAsset>("UI/simpleCountry"); //var a = Resources.Load<TextAsset>("UI/simpleCountry");
var clist = JsonConvert.DeserializeObject<List<CountryInfo>>(a.text); //var clist = JsonConvert.DeserializeObject<List<CountryInfo>>(a.text);
if (_now == null) if (_now == null)
{ {