From 25bb439c34f811feceb5dd05b56c1c7e3e8ea00a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 06 五月 2019 20:07:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Utility/DeviceUtility.cs | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/Utility/DeviceUtility.cs b/Utility/DeviceUtility.cs
index 939d569..d620f9e 100644
--- a/Utility/DeviceUtility.cs
+++ b/Utility/DeviceUtility.cs
@@ -77,10 +77,8 @@
{
#if UNITY_IOS
return UnityEngine.iOS.Device.advertisingIdentifier;
-# elif UNITY_ANDROID
- return SystemInfo.deviceUniqueIdentifier;
#else
- return "";
+ return SystemInfo.deviceUniqueIdentifier;
#endif
}
@@ -88,10 +86,8 @@
{
#if UNITY_IOS
return UnityEngine.iOS.Device.systemVersion;
-# elif UNITY_ANDROID
- return SystemInfo.operatingSystem;
#else
- return "";
+ return SystemInfo.operatingSystem;
#endif
}
@@ -99,10 +95,8 @@
{
#if UNITY_IOS
return UnityEngine.iOS.Device.generation.ToString();
-#elif UNITY_ANDROID
- return SystemInfo.deviceName;
#else
- return "";
+ return SystemInfo.deviceName;
#endif
}
@@ -110,10 +104,8 @@
{
#if UNITY_IOS
return UnityEngine.iOS.Device.generation.ToString();
-#elif UNITY_ANDROID
- return SystemInfo.deviceModel;
#else
- return "";
+ return SystemInfo.deviceModel;
#endif
}
--
Gitblit v1.8.0