去掉一些报错

Author: kisence-mian

Assets/Resources/LuaLib/LuaDataHelper.txt

@@ -30,8 +30,16 @@ luaformattools	lualib/luaformattools
 luajson	lualib/luajson
 luaprinttable	lualib/luaprinttable
 luastringhelper	lualib/luastringhelper
+gameobject 1	prefab/gameobject 1
+gameobject 2	prefab/gameobject 2
 gameobject	prefab/gameobject
 gogo	prefab/gogo
+uitest 1	prefab/uitest 1
+uitest 2	prefab/uitest 2
+uitest 3	prefab/uitest 3
+uitest 4	prefab/uitest 4
+uitest 5	prefab/uitest 5
+uitest 6	prefab/uitest 6
 uitest	prefab/uitest
 dl_01	sprite/dl_01
 dl_01.png	sprite/dl_01.png
@@ -64,5 +72,11 @@ testwindow	ui/testwindow/testwindow
 testwindowwindow	ui/testwindowwindow/testwindowwindow
 uimanager	ui/uimanager
 gameobject_adasd	gameobject_adasd
+new material 2	new material 2
+new material 3	new material 3
+new material 4	new material 4
+new material 5	new material 5
+new material 6	new material 6
+new material	new material
 resourcesmanifest	resourcesmanifest
 version	version

Assets/Resources/New Material 5.mat

@@ -1036,12 +1036,15 @@ public static void StopAnim(GameObject animGameObject, bool isCallBack = false)
     /// <param name="isCallBack">是否触发回调</param>
     public static void StopAnim(AnimData animData, bool isCallBack = false)
     {
-        if (isCallBack)
+        if(GetInstance().animList.Contains(animData))
         {
-            animData.ExecuteCallBack();
-        }
+            if (isCallBack)
+            {
+                animData.ExecuteCallBack();
+            }
 
-        GetInstance().animList.Remove(animData);
+            GetInstance().animList.Remove(animData);
+        }
     }
 
     /// <summary>

Assets/Resources/ResourcesManifest.txt

@@ -14,7 +14,6 @@ public static ApplicationManager Instance
             if (instance == null)
             {
               instance =  FindObjectOfType<ApplicationManager>();
-
             }
             return ApplicationManager.instance; }
         set { ApplicationManager.instance = value; }
@@ -80,14 +79,31 @@ public static string Version
     /// <summary>
     /// 语言
     /// </summary>
-    public SystemLanguage langguage = SystemLanguage.ChineseSimplified;
+    //public SystemLanguage langguage = SystemLanguage.ChineseSimplified;
     /// <summary>
     /// 显示括号标识多语言转换的字段
     /// </summary>
     public bool showLanguageValue = false;
     public void Awake()
     {
+        Debug.Log("persistentDataPath:" + Application.persistentDataPath);
         instance = this;
+
+        GameInfoCollecter.AddAppInfoValue("Build App Mode", m_AppMode);
+        if (Application.platform != RuntimePlatform.WindowsEditor &&
+            Application.platform != RuntimePlatform.OSXEditor)
+        {
+            try
+            {
+                string modeStr = PlayerPrefs.GetString("AppMode", m_AppMode.ToString());
+                m_AppMode = (AppMode)Enum.Parse(typeof(AppMode), modeStr);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
+        }
+       
         AppLaunch();
     }
     [Tooltip("加载资源时是否使用缓存，Bundle加载不起作用(都为使用)")]
@@ -119,6 +135,8 @@ public void AppLaunch()
 
         SDKManager.Init();                   //初始化SDKManger
 
+        RealNameManager.GetInstance().Init();     //初始化实名制系统
+
         if (AppMode != AppMode.Release)
         {
             GUIConsole.Init(); //运行时Console
@@ -135,7 +153,8 @@ public void AppLaunch()
             DevelopReplayManager.Init(m_quickLunch);   //开发者复盘管理器
 
             LanguageManager.Init();
-            LanguageManager.SetLanguage(langguage);
+            Debug.LogWarning("非 release 模式下，语言 受 ApplicationManager 控制");
+            //LanguageManager.SetLanguage(langguage);
         }
         else
         {
@@ -150,10 +169,18 @@ public void AppLaunch()
             LanguageManager.Init();
 
         }
+
+        if (s_OnApplicationModuleInitEnd != null)
+        {
+            s_OnApplicationModuleInitEnd();
+        }
     }
 
     #region 程序生命周期事件派发
- 
+    /// <summary>
+    /// 框架模块初始化完成回调
+    /// </summary>
+    public static ApplicationVoidCallback s_OnApplicationModuleInitEnd = null;
     public static ApplicationVoidCallback s_OnApplicationQuit = null;
     public static ApplicationBoolCallback s_OnApplicationPause = null;
     public static ApplicationBoolCallback s_OnApplicationFocus = null;
@@ -254,7 +281,7 @@ void SetResourceLoadType(bool useCache)
     {
         if (UseAssetsBundle)
         {
-
+            HotUpdateManager.CheckLocalVersion();
             ResourceManager.Initialize ( AssetsLoadType.AssetBundle,useCache);
         }
         else