Merge pull request EllanJiang#17 from EllanJiang/v3.1.8

Ellan Jiang · web-flow · commit 320e6fcda84e · 2019-01-03T12:01:51.000+08:00
V3.1.8
diff --git a/Libraries/GameFramework.dll b/Libraries/GameFramework.dll
diff --git a/Libraries/GameFramework.xml b/Libraries/GameFramework.xml
@@ -14669,6 +14669,11 @@
             获取当前是否正在播放。
             </summary>
         </member>
+        <member name="P:GameFramework.Sound.ISoundAgent.Length">
+            <summary>
+            获取声音长度。
+            </summary>
+        </member>
         <member name="P:GameFramework.Sound.ISoundAgent.Time">
             <summary>
             获取或设置播放位置。
@@ -14793,6 +14798,11 @@
             获取当前是否正在播放。
             </summary>
         </member>
+        <member name="P:GameFramework.Sound.ISoundAgentHelper.Length">
+            <summary>
+            获取声音长度。
+            </summary>
+        </member>
         <member name="P:GameFramework.Sound.ISoundAgentHelper.Time">
             <summary>
             获取或设置播放位置。
@@ -15784,6 +15794,11 @@
             获取当前是否正在播放。
             </summary>
         </member>
+        <member name="P:GameFramework.Sound.SoundManager.SoundAgent.Length">
+            <summary>
+            获取声音长度。
+            </summary>
+        </member>
         <member name="P:GameFramework.Sound.SoundManager.SoundAgent.Time">
             <summary>
             获取或设置播放位置。
diff --git a/Scripts/Editor/AssetBundleBuilder/AssetBundleBuilderController.cs b/Scripts/Editor/AssetBundleBuilder/AssetBundleBuilderController.cs
@@ -1439,7 +1439,7 @@ private byte[] GetXorBytes(byte[] bytes, byte[] code, int length)
             }
 
             byte[] result = new byte[bytesLength];
-            System.Buffer.BlockCopy(bytes, 0, result, 0, bytesLength);
+            Buffer.BlockCopy(bytes, 0, result, 0, bytesLength);
 
             for (int i = 0; i < length; i++)
             {
diff --git a/Scripts/Editor/AssetBundleEditor/AssetBundleEditor.cs b/Scripts/Editor/AssetBundleEditor/AssetBundleEditor.cs
@@ -758,15 +758,15 @@ private void RefreshAssetBundleTree()
             AssetBundle[] assetBundles = m_Controller.GetAssetBundles();
             foreach (AssetBundle assetBundle in assetBundles)
             {
-                string[] splitedPath = assetBundle.Name.Split('/');
+                string[] splitPath = assetBundle.Name.Split('/');
                 AssetBundleFolder folder = m_AssetBundleRoot;
-                for (int i = 0; i < splitedPath.Length - 1; i++)
+                for (int i = 0; i < splitPath.Length - 1; i++)
                 {
-                    AssetBundleFolder subFolder = folder.GetFolder(splitedPath[i]);
-                    folder = subFolder == null ? folder.AddFolder(splitedPath[i]) : subFolder;
+                    AssetBundleFolder subFolder = folder.GetFolder(splitPath[i]);
+                    folder = subFolder == null ? folder.AddFolder(splitPath[i]) : subFolder;
                 }
 
-                string assetBundleFullName = assetBundle.Variant != null ? Utility.Text.Format("{0}.{1}", splitedPath[splitedPath.Length - 1], assetBundle.Variant) : splitedPath[splitedPath.Length - 1];
+                string assetBundleFullName = assetBundle.Variant != null ? Utility.Text.Format("{0}.{1}", splitPath[splitPath.Length - 1], assetBundle.Variant) : splitPath[splitPath.Length - 1];
                 folder.AddItem(assetBundleFullName, assetBundle);
             }
         }
diff --git a/Scripts/Editor/AssetBundleEditor/AssetBundleEditorController.cs b/Scripts/Editor/AssetBundleEditor/AssetBundleEditorController.cs
@@ -556,15 +556,15 @@ public void ScanSourceAssets()
                 }
 
                 string assetPath = fullPath.Substring(SourceAssetRootPath.Length + 1);
-                string[] splitedPath = assetPath.Split('/');
+                string[] splitPath = assetPath.Split('/');
                 SourceFolder folder = m_SourceAssetRoot;
-                for (int i = 0; i < splitedPath.Length - 1; i++)
+                for (int i = 0; i < splitPath.Length - 1; i++)
                 {
-                    SourceFolder subFolder = folder.GetFolder(splitedPath[i]);
-                    folder = subFolder == null ? folder.AddFolder(splitedPath[i]) : subFolder;
+                    SourceFolder subFolder = folder.GetFolder(splitPath[i]);
+                    folder = subFolder == null ? folder.AddFolder(splitPath[i]) : subFolder;
                 }
 
-                SourceAsset asset = folder.AddAsset(assetGuid, fullPath, splitedPath[splitedPath.Length - 1]);
+                SourceAsset asset = folder.AddAsset(assetGuid, fullPath, splitPath[splitPath.Length - 1]);
                 m_SourceAssets.Add(asset.Guid, asset);
             }
         }
diff --git a/Scripts/Runtime/Config/DefaultConfigHelper.cs b/Scripts/Runtime/Config/DefaultConfigHelper.cs
@@ -18,8 +18,8 @@ namespace UnityGameFramework.Runtime
     /// </summary>
     public class DefaultConfigHelper : ConfigHelperBase
     {
-        private static readonly string[] RowSplit = new string[] { "\r\n", "\r", "\n" };
-        private static readonly string[] ColumnSplit = new string[] { "\t" };
+        private static readonly string[] RowSplitSeparator = new string[] { "\r\n", "\r", "\n" };
+        private static readonly string[] ColumnSplitSeparator = new string[] { "\t" };
         private const int ColumnCount = 4;
 
         private ResourceComponent m_ResourceComponent = null;
@@ -35,15 +35,15 @@ public override bool ParseConfig(string text, object userData)
         {
             try
             {
-                string[] rowTexts = text.Split(RowSplit, StringSplitOptions.None);
+                string[] rowTexts = text.Split(RowSplitSeparator, StringSplitOptions.None);
                 for (int i = 0; i < rowTexts.Length; i++)
                 {
                     if (rowTexts[i].Length <= 0 || rowTexts[i][0] == '#')
                     {
                         continue;
                     }
 
-                    string[] splitLine = rowTexts[i].Split(ColumnSplit, StringSplitOptions.None);
+                    string[] splitLine = rowTexts[i].Split(ColumnSplitSeparator, StringSplitOptions.None);
                     if (splitLine.Length != ColumnCount)
                     {
                         Log.Warning("Can not parse config '{0}'.", text);
diff --git a/Scripts/Runtime/Download/UnityWebRequestDownloadAgentHelper.cs b/Scripts/Runtime/Download/UnityWebRequestDownloadAgentHelper.cs
@@ -13,6 +13,7 @@
 #else
 using UnityEngine.Experimental.Networking;
 #endif
+using Utility = GameFramework.Utility;
 
 namespace UnityGameFramework.Runtime
 {
@@ -111,7 +112,7 @@ public override void Download(string downloadUri, int fromPosition, object userD
 
             Dictionary<string, string> header = new Dictionary<string, string>
             {
-                { "Range", GameFramework.Utility.Text.Format("bytes={0}-", fromPosition.ToString()) }
+                { "Range", Utility.Text.Format("bytes={0}-", fromPosition.ToString()) }
             };
 
             m_UnityWebRequest = UnityWebRequest.Post(downloadUri, header);
@@ -139,7 +140,7 @@ public override void Download(string downloadUri, int fromPosition, int toPositi
 
             Dictionary<string, string> header = new Dictionary<string, string>
             {
-                { "Range", GameFramework.Utility.Text.Format("bytes={0}-{1}", fromPosition.ToString(), toPosition.ToString()) }
+                { "Range", Utility.Text.Format("bytes={0}-{1}", fromPosition.ToString(), toPosition.ToString()) }
             };
 
             m_UnityWebRequest = UnityWebRequest.Post(downloadUri, header);
diff --git a/Scripts/Runtime/Entity/EntityLogic.cs b/Scripts/Runtime/Entity/EntityLogic.cs
@@ -70,7 +70,8 @@ public bool Visible
             {
                 if (!m_Available)
                 {
-                    throw new GameFrameworkException(Utility.Text.Format("Entity '{0}' is not available.", Name));
+                    Log.Warning("Entity '{0}' is not available.", Name);
+                    return;
                 }
 
                 if (m_Visible == value)
diff --git a/Scripts/Runtime/Localization/DefaultLocalizationHelper.cs b/Scripts/Runtime/Localization/DefaultLocalizationHelper.cs
@@ -18,8 +18,8 @@ namespace UnityGameFramework.Runtime
     /// </summary>
     public class DefaultLocalizationHelper : LocalizationHelperBase
     {
-        private static readonly string[] RowSplit = new string[] { "\r\n", "\r", "\n" };
-        private static readonly string[] ColumnSplit = new string[] { "\t" };
+        private static readonly string[] RowSplitSeparator = new string[] { "\r\n", "\r", "\n" };
+        private static readonly string[] ColumnSplitSeparator = new string[] { "\t" };
         private const int ColumnCount = 4;
 
         private ResourceComponent m_ResourceComponent = null;
@@ -92,15 +92,15 @@ public override bool ParseDictionary(string text, object userData)
         {
             try
             {
-                string[] rowTexts = text.Split(RowSplit, StringSplitOptions.None);
+                string[] rowTexts = text.Split(RowSplitSeparator, StringSplitOptions.None);
                 for (int i = 0; i < rowTexts.Length; i++)
                 {
                     if (rowTexts[i].Length <= 0 || rowTexts[i][0] == '#')
                     {
                         continue;
                     }
 
-                    string[] splitLine = rowTexts[i].Split(ColumnSplit, StringSplitOptions.None);
+                    string[] splitLine = rowTexts[i].Split(ColumnSplitSeparator, StringSplitOptions.None);
                     if (splitLine.Length != ColumnCount)
                     {
                         Log.Warning("Can not parse dictionary '{0}'.", text);
diff --git a/Scripts/Runtime/Resource/DefaultLoadResourceAgentHelper.cs b/Scripts/Runtime/Resource/DefaultLoadResourceAgentHelper.cs
@@ -12,6 +12,7 @@
 using UnityEngine.Networking;
 #endif
 using UnityEngine.SceneManagement;
+using Utility = GameFramework.Utility;
 
 namespace UnityGameFramework.Runtime
 {
@@ -164,7 +165,7 @@ public override void ReadBytes(string fullPath, int loadType)
             m_BytesFullPath = fullPath;
             m_LoadType = loadType;
 #if UNITY_5_4_OR_NEWER
-            m_UnityWebRequest = UnityWebRequest.Get(GameFramework.Utility.Path.GetRemotePath(fullPath));
+            m_UnityWebRequest = UnityWebRequest.Get(Utility.Path.GetRemotePath(fullPath));
 #if UNITY_2017_2_OR_NEWER
             m_UnityWebRequest.SendWebRequest();
 #else
@@ -344,7 +345,7 @@ private void UpdateUnityWebRequest()
 #else
                         isError = m_UnityWebRequest.isError;
 #endif
-                        m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.NotExist, GameFramework.Utility.Text.Format("Can not load asset bundle '{0}' with error message '{1}'.", m_BytesFullPath, isError ? m_UnityWebRequest.error : null)));
+                        m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.NotExist, Utility.Text.Format("Can not load asset bundle '{0}' with error message '{1}'.", m_BytesFullPath, isError ? m_UnityWebRequest.error : null)));
                     }
                 }
                 else
@@ -399,7 +400,7 @@ private void UpdateFileAssetBundleCreateRequest()
                     }
                     else
                     {
-                        m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.NotExist, GameFramework.Utility.Text.Format("Can not load asset bundle from file '{0}' which is not a valid asset bundle.", m_FileFullPath)));
+                        m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.NotExist, Utility.Text.Format("Can not load asset bundle from file '{0}' which is not a valid asset bundle.", m_FileFullPath)));
                     }
                 }
                 else
@@ -451,7 +452,7 @@ private void UpdateAssetBundleRequest()
                     }
                     else
                     {
-                        m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.ChildAssetError, GameFramework.Utility.Text.Format("Can not load asset '{0}' from asset bundle which is not exist.", m_ResourceChildName)));
+                        m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.ChildAssetError, Utility.Text.Format("Can not load asset '{0}' from asset bundle which is not exist.", m_ResourceChildName)));
                     }
                 }
                 else
@@ -475,7 +476,7 @@ private void UpdateAsyncOperation()
                     }
                     else
                     {
-                        m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.SceneAssetError, GameFramework.Utility.Text.Format("Can not load scene asset '{0}' from asset bundle.", m_ResourceChildName)));
+                        m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.SceneAssetError, Utility.Text.Format("Can not load scene asset '{0}' from asset bundle.", m_ResourceChildName)));
                     }
                 }
                 else
diff --git a/Scripts/Runtime/Resource/EditorResourceComponent.cs b/Scripts/Runtime/Resource/EditorResourceComponent.cs
@@ -1032,11 +1032,11 @@ private bool ExistsFile(string assetName)
                 return false;
             }
 
-            string[] splitedAssetFullName = assetFullName.Split('/');
+            string[] splitAssetFullName = assetFullName.Split('/');
             string currentPath = Path.GetPathRoot(assetFullName);
-            for (int i = 1; i < splitedAssetFullName.Length - 1; i++)
+            for (int i = 1; i < splitAssetFullName.Length - 1; i++)
             {
-                string[] directoryNames = Directory.GetDirectories(currentPath, splitedAssetFullName[i]);
+                string[] directoryNames = Directory.GetDirectories(currentPath, splitAssetFullName[i]);
                 if (directoryNames.Length != 1)
                 {
                     return false;
@@ -1045,7 +1045,7 @@ private bool ExistsFile(string assetName)
                 currentPath = directoryNames[0];
             }
 
-            string[] fileNames = Directory.GetFiles(currentPath, splitedAssetFullName[splitedAssetFullName.Length - 1]);
+            string[] fileNames = Directory.GetFiles(currentPath, splitAssetFullName[splitAssetFullName.Length - 1]);
             if (fileNames.Length != 1)
             {
                 return false;
diff --git a/Scripts/Runtime/Sound/DefaultSoundAgentHelper.cs b/Scripts/Runtime/Sound/DefaultSoundAgentHelper.cs
@@ -35,6 +35,17 @@ public override bool IsPlaying
             }
         }
 
+        /// <summary>
+        /// 获取声音长度。
+        /// </summary>
+        public override float Length
+        {
+            get
+            {
+                return m_AudioSource.clip != null ? m_AudioSource.clip.length : 0f;
+            }
+        }
+
         /// <summary>
         /// 获取或设置播放位置。
         /// </summary>
diff --git a/Scripts/Runtime/Sound/SoundAgentHelperBase.cs b/Scripts/Runtime/Sound/SoundAgentHelperBase.cs
@@ -25,6 +25,14 @@ public abstract bool IsPlaying
             get;
         }
 
+        /// <summary>
+        /// 获取声音长度。
+        /// </summary>
+        public abstract float Length
+        {
+            get;
+        }
+
         /// <summary>
         /// 获取或设置播放位置。
         /// </summary>
diff --git a/Scripts/Runtime/UI/UIFormLogic.cs b/Scripts/Runtime/UI/UIFormLogic.cs
@@ -69,7 +69,8 @@ public bool Visible
             {
                 if (!m_Available)
                 {
-                    throw new GameFrameworkException(Utility.Text.Format("UI form '{0}' is not available.", Name));
+                    Log.Warning("UI form '{0}' is not available.", Name);
+                    return;
                 }
 
                 if (m_Visible == value)
diff --git a/Scripts/Runtime/Variable/VarColor32.cs b/Scripts/Runtime/Variable/VarColor32.cs
@@ -0,0 +1,54 @@
+﻿//------------------------------------------------------------
+// Game Framework
+// Copyright © 2013-2019 Jiang Yin. All rights reserved.
+// Homepage: http://gameframework.cn/
+// Feedback: mailto:jiangyin@gameframework.cn
+//------------------------------------------------------------
+
+using GameFramework;
+using UnityEngine;
+
+namespace UnityGameFramework.Runtime
+{
+    /// <summary>
+    /// UnityEngine.Color32 变量类。
+    /// </summary>
+    public sealed class VarColor32 : Variable<Color32>
+    {
+        /// <summary>
+        /// 初始化 UnityEngine.Color32 变量类的新实例。
+        /// </summary>
+        public VarColor32()
+        {
+
+        }
+
+        /// <summary>
+        /// 初始化 UnityEngine.Color32 变量类的新实例。
+        /// </summary>
+        /// <param name="value">值。</param>
+        public VarColor32(Color32 value)
+            : base(value)
+        {
+
+        }
+
+        /// <summary>
+        /// 从 UnityEngine.Color32 到 UnityEngine.Color32 变量类的隐式转换。
+        /// </summary>
+        /// <param name="value">值。</param>
+        public static implicit operator VarColor32(Color32 value)
+        {
+            return new VarColor32(value);
+        }
+
+        /// <summary>
+        /// 从 UnityEngine.Color32 变量类到 UnityEngine.Color32 的隐式转换。
+        /// </summary>
+        /// <param name="value">值。</param>
+        public static implicit operator Color32(VarColor32 value)
+        {
+            return value.Value;
+        }
+    }
+}
diff --git a/Scripts/Runtime/Variable/VarColor32.cs.meta b/Scripts/Runtime/Variable/VarColor32.cs.meta

Original file line number	Diff line number	Diff line change
`@@ -1439,7 +1439,7 @@ private byte[] GetXorBytes(byte[] bytes, byte[] code, int length)`
`1439`	`1439`	`}`
`1440`	`1440`
`1441`	`1441`	`byte[] result = new byte[bytesLength];`
`1442`		`- System.Buffer.BlockCopy(bytes, 0, result, 0, bytesLength);`
	`1442`	`+ Buffer.BlockCopy(bytes, 0, result, 0, bytesLength);`
`1443`	`1443`
`1444`	`1444`	`for (int i = 0; i < length; i++)`
`1445`	`1445`	`{`
Original file line number	Diff line number	Diff line change
`@@ -758,15 +758,15 @@ private void RefreshAssetBundleTree()`
`758`	`758`	`AssetBundle[] assetBundles = m_Controller.GetAssetBundles();`
`759`	`759`	`foreach (AssetBundle assetBundle in assetBundles)`
`760`	`760`	`{`
`761`		`- string[] splitedPath = assetBundle.Name.Split('/');`
	`761`	`+ string[] splitPath = assetBundle.Name.Split('/');`
`762`	`762`	`AssetBundleFolder folder = m_AssetBundleRoot;`
`763`		`- for (int i = 0; i < splitedPath.Length - 1; i++)`
	`763`	`+ for (int i = 0; i < splitPath.Length - 1; i++)`
`764`	`764`	`{`
`765`		`- AssetBundleFolder subFolder = folder.GetFolder(splitedPath[i]);`
`766`		`- folder = subFolder == null ? folder.AddFolder(splitedPath[i]) : subFolder;`
	`765`	`+ AssetBundleFolder subFolder = folder.GetFolder(splitPath[i]);`
	`766`	`+ folder = subFolder == null ? folder.AddFolder(splitPath[i]) : subFolder;`
`767`	`767`	`}`
`768`	`768`
`769`		`- string assetBundleFullName = assetBundle.Variant != null ? Utility.Text.Format("{0}.{1}", splitedPath[splitedPath.Length - 1], assetBundle.Variant) : splitedPath[splitedPath.Length - 1];`
	`769`	`+ string assetBundleFullName = assetBundle.Variant != null ? Utility.Text.Format("{0}.{1}", splitPath[splitPath.Length - 1], assetBundle.Variant) : splitPath[splitPath.Length - 1];`
`770`	`770`	`folder.AddItem(assetBundleFullName, assetBundle);`
`771`	`771`	`}`
`772`	`772`	`}`
Original file line number	Diff line number	Diff line change
`@@ -556,15 +556,15 @@ public void ScanSourceAssets()`
`556`	`556`	`}`
`557`	`557`
`558`	`558`	`string assetPath = fullPath.Substring(SourceAssetRootPath.Length + 1);`
`559`		`- string[] splitedPath = assetPath.Split('/');`
	`559`	`+ string[] splitPath = assetPath.Split('/');`
`560`	`560`	`SourceFolder folder = m_SourceAssetRoot;`
`561`		`- for (int i = 0; i < splitedPath.Length - 1; i++)`
	`561`	`+ for (int i = 0; i < splitPath.Length - 1; i++)`
`562`	`562`	`{`
`563`		`- SourceFolder subFolder = folder.GetFolder(splitedPath[i]);`
`564`		`- folder = subFolder == null ? folder.AddFolder(splitedPath[i]) : subFolder;`
	`563`	`+ SourceFolder subFolder = folder.GetFolder(splitPath[i]);`
	`564`	`+ folder = subFolder == null ? folder.AddFolder(splitPath[i]) : subFolder;`
`565`	`565`	`}`
`566`	`566`
`567`		`- SourceAsset asset = folder.AddAsset(assetGuid, fullPath, splitedPath[splitedPath.Length - 1]);`
	`567`	`+ SourceAsset asset = folder.AddAsset(assetGuid, fullPath, splitPath[splitPath.Length - 1]);`
`568`	`568`	`m_SourceAssets.Add(asset.Guid, asset);`
`569`	`569`	`}`
`570`	`570`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ namespace UnityGameFramework.Runtime`
`18`	`18`	`/// </summary>`
`19`	`19`	`public class DefaultConfigHelper : ConfigHelperBase`
`20`	`20`	`{`
`21`		`- private static readonly string[] RowSplit = new string[] { "\r\n", "\r", "\n" };`
`22`		`- private static readonly string[] ColumnSplit = new string[] { "\t" };`
	`21`	`+ private static readonly string[] RowSplitSeparator = new string[] { "\r\n", "\r", "\n" };`
	`22`	`+ private static readonly string[] ColumnSplitSeparator = new string[] { "\t" };`
`23`	`23`	`private const int ColumnCount = 4;`
`24`	`24`
`25`	`25`	`private ResourceComponent m_ResourceComponent = null;`
`@@ -35,15 +35,15 @@ public override bool ParseConfig(string text, object userData)`
`35`	`35`	`{`
`36`	`36`	`try`
`37`	`37`	`{`
`38`		`- string[] rowTexts = text.Split(RowSplit, StringSplitOptions.None);`
	`38`	`+ string[] rowTexts = text.Split(RowSplitSeparator, StringSplitOptions.None);`
`39`	`39`	`for (int i = 0; i < rowTexts.Length; i++)`
`40`	`40`	`{`
`41`	`41`	`if (rowTexts[i].Length <= 0 \|\| rowTexts[i][0] == '#')`
`42`	`42`	`{`
`43`	`43`	`continue;`
`44`	`44`	`}`
`45`	`45`
`46`		`- string[] splitLine = rowTexts[i].Split(ColumnSplit, StringSplitOptions.None);`
	`46`	`+ string[] splitLine = rowTexts[i].Split(ColumnSplitSeparator, StringSplitOptions.None);`
`47`	`47`	`if (splitLine.Length != ColumnCount)`
`48`	`48`	`{`
`49`	`49`	`Log.Warning("Can not parse config '{0}'.", text);`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`#else`
`14`	`14`	`using UnityEngine.Experimental.Networking;`
`15`	`15`	`#endif`
	`16`	`+using Utility = GameFramework.Utility;`
`16`	`17`
`17`	`18`	`namespace UnityGameFramework.Runtime`
`18`	`19`	`{`
`@@ -111,7 +112,7 @@ public override void Download(string downloadUri, int fromPosition, object userD`
`111`	`112`
`112`	`113`	`Dictionary<string, string> header = new Dictionary<string, string>`
`113`	`114`	`{`
`114`		`- { "Range", GameFramework.Utility.Text.Format("bytes={0}-", fromPosition.ToString()) }`
	`115`	`+ { "Range", Utility.Text.Format("bytes={0}-", fromPosition.ToString()) }`
`115`	`116`	`};`
`116`	`117`
`117`	`118`	`m_UnityWebRequest = UnityWebRequest.Post(downloadUri, header);`
`@@ -139,7 +140,7 @@ public override void Download(string downloadUri, int fromPosition, int toPositi`
`139`	`140`
`140`	`141`	`Dictionary<string, string> header = new Dictionary<string, string>`
`141`	`142`	`{`
`142`		`- { "Range", GameFramework.Utility.Text.Format("bytes={0}-{1}", fromPosition.ToString(), toPosition.ToString()) }`
	`143`	`+ { "Range", Utility.Text.Format("bytes={0}-{1}", fromPosition.ToString(), toPosition.ToString()) }`
`143`	`144`	`};`
`144`	`145`
`145`	`146`	`m_UnityWebRequest = UnityWebRequest.Post(downloadUri, header);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ public bool Visible`
`70`	`70`	`{`
`71`	`71`	`if (!m_Available)`
`72`	`72`	`{`
`73`		`- throw new GameFrameworkException(Utility.Text.Format("Entity '{0}' is not available.", Name));`
	`73`	`+ Log.Warning("Entity '{0}' is not available.", Name);`
	`74`	`+ return;`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`if (m_Visible == value)`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using UnityEngine.Networking;`
`13`	`13`	`#endif`
`14`	`14`	`using UnityEngine.SceneManagement;`
	`15`	`+using Utility = GameFramework.Utility;`
`15`	`16`
`16`	`17`	`namespace UnityGameFramework.Runtime`
`17`	`18`	`{`
`@@ -164,7 +165,7 @@ public override void ReadBytes(string fullPath, int loadType)`
`164`	`165`	`m_BytesFullPath = fullPath;`
`165`	`166`	`m_LoadType = loadType;`
`166`	`167`	`#if UNITY_5_4_OR_NEWER`
`167`		`- m_UnityWebRequest = UnityWebRequest.Get(GameFramework.Utility.Path.GetRemotePath(fullPath));`
	`168`	`+ m_UnityWebRequest = UnityWebRequest.Get(Utility.Path.GetRemotePath(fullPath));`
`168`	`169`	`#if UNITY_2017_2_OR_NEWER`
`169`	`170`	`m_UnityWebRequest.SendWebRequest();`
`170`	`171`	`#else`
`@@ -344,7 +345,7 @@ private void UpdateUnityWebRequest()`
`344`	`345`	`#else`
`345`	`346`	`isError = m_UnityWebRequest.isError;`
`346`	`347`	`#endif`
`347`		`- m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.NotExist, GameFramework.Utility.Text.Format("Can not load asset bundle '{0}' with error message '{1}'.", m_BytesFullPath, isError ? m_UnityWebRequest.error : null)));`
	`348`	`+ m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.NotExist, Utility.Text.Format("Can not load asset bundle '{0}' with error message '{1}'.", m_BytesFullPath, isError ? m_UnityWebRequest.error : null)));`
`348`	`349`	`}`
`349`	`350`	`}`
`350`	`351`	`else`
`@@ -399,7 +400,7 @@ private void UpdateFileAssetBundleCreateRequest()`
`399`	`400`	`}`
`400`	`401`	`else`
`401`	`402`	`{`
`402`		`- m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.NotExist, GameFramework.Utility.Text.Format("Can not load asset bundle from file '{0}' which is not a valid asset bundle.", m_FileFullPath)));`
	`403`	`+ m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.NotExist, Utility.Text.Format("Can not load asset bundle from file '{0}' which is not a valid asset bundle.", m_FileFullPath)));`
`403`	`404`	`}`
`404`	`405`	`}`
`405`	`406`	`else`
`@@ -451,7 +452,7 @@ private void UpdateAssetBundleRequest()`
`451`	`452`	`}`
`452`	`453`	`else`
`453`	`454`	`{`
`454`		`- m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.ChildAssetError, GameFramework.Utility.Text.Format("Can not load asset '{0}' from asset bundle which is not exist.", m_ResourceChildName)));`
	`455`	`+ m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.ChildAssetError, Utility.Text.Format("Can not load asset '{0}' from asset bundle which is not exist.", m_ResourceChildName)));`
`455`	`456`	`}`
`456`	`457`	`}`
`457`	`458`	`else`
`@@ -475,7 +476,7 @@ private void UpdateAsyncOperation()`
`475`	`476`	`}`
`476`	`477`	`else`
`477`	`478`	`{`
`478`		`- m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.SceneAssetError, GameFramework.Utility.Text.Format("Can not load scene asset '{0}' from asset bundle.", m_ResourceChildName)));`
	`479`	`+ m_LoadResourceAgentHelperErrorEventHandler(this, new LoadResourceAgentHelperErrorEventArgs(LoadResourceStatus.SceneAssetError, Utility.Text.Format("Can not load scene asset '{0}' from asset bundle.", m_ResourceChildName)));`
`479`	`480`	`}`
`480`	`481`	`}`
`481`	`482`	`else`