更新

Author: kisence-mian

Assets/Script/Core/Application/ApplicationManager.cs

@@ -65,7 +65,10 @@ public static SystemLanguage Langguage
     {
         get
         {
-            return instance.langguage;
+            if (Application.isPlaying)
+                return instance.langguage;
+            else
+                return Application.systemLanguage;
         }
 
         set

Assets/Script/Core/Develop/DevelopReplayManager.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System;
-using FrameWork;
 
 public class DevelopReplayManager 
 {
@@ -51,6 +50,8 @@ public static Action OnLunchCallBack
         set { s_onLunchCallBack = value; }
     }
 
+    #region Init
+
     public static void Init(bool isQuickLunch)
     {
 
@@ -151,6 +152,8 @@ public static void OnGetRandomCallBack(int random)
         WriteRandomRecord(random);
     }
 
+    #endregion
+
     #region SaveReplayFile
 
     static void OpenWriteFileStream(string fileName)
@@ -277,6 +280,16 @@ static void LoadRandomList(string[] content)
 
     #endregion
 
+    #region SaveScreenShot
+
+    static void SaveScreenShot(string fileName)
+    {
+        FileTool.CreatFilePath(fileName);
+        UnityEngine.ScreenCapture.CaptureScreenshot(fileName);
+    }
+
+    #endregion
+
     #region GUI
 
     static int margin = 3;
@@ -760,6 +773,14 @@ static void DevelopHotKeyLogic()
 
             Time.timeScale *= 0.5f;
         }
+
+        if (Input.GetKeyDown(KeyCode.F12))
+        {
+            string name = GetScreenshotFileName();
+            Debug.Log("已保存 屏幕截图 " + name);
+
+            SaveScreenShot(name);
+        }
     }
 
 #endregion
@@ -884,7 +905,7 @@ static string GetHotKey(int fn,bool isShowInRun = true)
 
 #endregion
 
-#region Update
+    #region Update
 
     static float s_currentTime = 0;
 
@@ -919,7 +940,9 @@ static void OnRecordUpdate()
         s_currentTime += Time.deltaTime;
     }
 
-#endregion
+    #endregion
+
+    #region Tool
 
     public static string[] GetRelpayFileNames()
     {
@@ -948,6 +971,24 @@ static string GetReplayFileName()
         return logName;
     }
 
+    static string GetScreenshotFileName()
+    {
+        DateTime now = System.DateTime.Now;
+        //string screenshotName = string.Format("Screenshot{0}-{1:D2}-{2:D2}#{3:D2}-{4:D2}-{5:D2}",
+        //    now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second);
+
+        string screenshotName = string.Format("ScreenShot_{0}x{1}_{2}", Screen.width, Screen.height, System.DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds);
+
+
+        string path = PathTool.GetAbsolutePath(ResLoadLocation.Persistent,
+                                         PathTool.GetRelativelyPath(
+                                                        "ScreenShot",
+                                                        screenshotName,
+                                                        "jpg"));
+
+        return path;
+    }
+
     static void UploadCallBack(string result)
     {
         GUIUtil.ShowTips(result);
@@ -960,4 +1001,6 @@ enum DevMenuEnum
         Log,
         PersistentFile
     }
+
+    #endregion
 }

Assets/Script/Core/Editor/UI/UICreateService.cs

@@ -45,7 +45,7 @@ public static void CreateUICamera(UIManager UIManager,string key, float cameraDe
         //UIcamera
         GameObject cameraGo = new GameObject("UICamera");
         cameraGo.transform.SetParent(canvas.transform);
-        cameraGo.transform.localPosition = new Vector3(0, 0, -1000);
+        cameraGo.transform.localPosition = new Vector3(0, 0, -5000);
         Camera camera = cameraGo.AddComponent<Camera>();
         camera.cullingMask = LayerMask.GetMask("UI");
         camera.orthographic = true;

Assets/Script/Core/Editor/Utils/String2MD5Window.cs

@@ -0,0 +1,42 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using System;
+using HDJ.Framework.Utils;
+
+public class String2MD5Window : EditorWindow
+{
+    [MenuItem("Window/String转MD5(1003)", priority = 1003)]
+    private static void OpenWindow()
+    {
+        String2MD5Window win = GetWindow<String2MD5Window>();
+        win.autoRepaintOnSceneChange = true;
+        win.wantsMouseMove = true;
+        EditorWindow.FocusWindowIfItsOpen<String2MD5Window>();
+        win.Init();
+    }
+
+    private void Init()
+    {
+       
+    }
+
+    string inputText = "";
+    string resText = "";
+    private void OnGUI()
+    {
+        GUILayout.FlexibleSpace();
+        GUILayout.Space(5);
+        GUILayout.BeginHorizontal();
+      inputText =  EditorDrawGUIUtil.DrawBaseValue("输入字符串：", inputText).ToString();
+        if (GUILayout.Button("转换"))
+        {
+            resText= MD5Utils.GetObjectMD5(inputText);
+        }
+        GUILayout.EndHorizontal();
+
+        EditorDrawGUIUtil.DrawBaseValue("MD5：", resText);
+        GUILayout.FlexibleSpace();
+    }
+}

…Network/Message/AdmiLogin2Client.cs.meta …re/Editor/Utils/String2MD5Window.cs.metaAssets/Script/Core/Network/Message/AdmiLogin2Client.cs.meta renamed to Assets/Script/Core/Editor/Utils/String2MD5Window.cs.meta Assets/Script/Core/Network/Message/AdmiLogin2Client.cs.meta renamed to Assets/Script/Core/Editor/Utils/String2MD5Window.cs.meta

@@ -159,15 +159,16 @@ private void Update()
 
     private void RunComplete(CameraFadeData data)
     {
-        if (data.completeCallBack != null)
-        {
-            data.completeCallBack();
-        }
         if (currentFadeDatas.Contains(data))
         {
             currentFadeDatas.Remove(data);
             cacheData.Add(data);
         }
+        if (data.completeCallBack != null)
+        {
+            data.completeCallBack();
+        }
+       
         if (FadeCompleteCallBack != null)
         {
             FadeCompleteCallBack();

Assets/Script/Core/Effect/CameraFade.cs

@@ -45,11 +45,11 @@ public static void StartHotUpdate(HotUpdateCallBack CallBack)
         Init();
 
         //检查Streaming版本和Persistent版本哪一个更新
-        if(!CheckLocalVersion())
+        if (!CheckLocalVersion())
         {
             return;
         }
-        
+
         //开始热更新
         ApplicationManager.Instance.StartCoroutine(HotUpdateProgress());
     }
@@ -105,6 +105,7 @@ static bool CheckLocalVersion()
             }
             else
             {
+                Debug.Log("没有使用Bundle 无需更新");
                 UpdateDateCallBack(HotUpdateStatusEnum.NoUpdate, 0);
                 return false;
             }
@@ -136,7 +137,7 @@ static IEnumerator CheckVersion()
         //取得服务器版本文件
         WWW www = new WWW(s_versionFileDownLoadPath);
 
-        //Debug.Log("服务器获取版本文件 ：" + s_versionFileDownLoadPath);
+        Debug.Log("服务器获取版本文件 ：" + s_versionFileDownLoadPath);
         //yield return www;
 
         while (!www.isDone)
@@ -148,7 +149,7 @@ static IEnumerator CheckVersion()
         if (www.error != null && www.error != "")
         {
             //下载失败
-            //Debug.LogError("Version File DownLoad Error URL:" + s_versionFileDownLoadPath + " error:" + www.error);
+            Debug.LogError("Version File DownLoad Error URL:" + s_versionFileDownLoadPath + " error:" + www.error);
 
             UpdateDateCallBack(HotUpdateStatusEnum.VersionFileDownLoadFail, 0);
             yield break;
@@ -162,8 +163,8 @@ static IEnumerator CheckVersion()
 
         //Debug.Log("Version File :text: " + m_versionFileCatch);
 
-        Debug.Log("Service Version File :text: " + s_versionFileCache);
-        Debug.Log("local Version  : " + GetInt(s_versionConfig[c_largeVersionKey]) + " " + GetInt(s_versionConfig[c_smallVersonKey]));
+        //Debug.Log("Service Version File :text: " + s_versionFileCache);
+        //Debug.Log("local Version  : " + GetInt(s_versionConfig[c_largeVersionKey]) + " " + GetInt(s_versionConfig[c_smallVersonKey]));
 
         Dictionary<string, object> ServiceVersion = (Dictionary<string, object>)FrameWork.Json.Deserialize(s_versionFileCache);
 
@@ -353,11 +354,13 @@ static void Init()
         }
 
         string downLoadPath = downLoadServicePath + "/" + platform + "/" + Application.version + "/";
-        Debug.Log("=====>"+downLoadPath);
+        
 
         s_versionFileDownLoadPath   = downLoadPath + c_versionFileName.ToLower() ;
         s_ManifestFileDownLoadPath  = downLoadPath + AssetsManifestManager.c_ManifestFileName;
         s_resourcesFileDownLoadPath = downLoadPath;
+
+        Debug.Log("=====>" + s_versionFileDownLoadPath);
     }
 
     static void UpdateDateCallBack(HotUpdateStatusEnum status, float progress)

Assets/Script/Core/HotUpdate/HotUpdateManager.cs

@@ -33,7 +33,6 @@ public static void Init()
         {
             isInit = true;
 
-            Debug.Log("当前语言: " + Application.systemLanguage);
             config = LanguageDataUtils.LoadEditorConfig();
             SetLanguage(ApplicationManager.Langguage);
         }

Assets/Script/Core/Language/LanguageManager.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+
+public class KeyValueData
+{
+    public string key="";
+    public string value="";
+
+    public KeyValueData() { }
+
+    public KeyValueData(string key,string value)
+    {
+        this.key = key;
+        this.value = value;
+    }
+}
+