少年修仙传客户端代码仓库
client_Wu Xijin
2019-05-07 d616a31e808d2f56c484582e351c1c37dac9fae5
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
7个文件已修改
101 ■■■■ 已修改文件
Core/Common/ResourcesPath.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/ClientVersion/VersionUpdateWin.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/ClientVersion/VersionUtility.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServer/CrossServerUtility.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/HazyRegionIncidentPanel.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/HazyRegionModel.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/Common/ResourcesPath.cs
@@ -1,9 +1,10 @@
using UnityEngine;
using System;
using System.IO;
[XLua.LuaCallCSharp]
public class ResourcesPath : Singleton<ResourcesPath>
{
    public const string AssetDependentFileBundleName =
#if UNITY_ANDROID
        "android";
@@ -58,7 +59,22 @@
        StreamingAssetPath = Application.streamingAssetsPath + "/standalone/";
#endif
        ExternalStorePath = Application.persistentDataPath + "/";
        if (!Application.isEditor)
        {
            switch (Application.platform)
            {
                case RuntimePlatform.WindowsPlayer:
                    ExternalStorePath = Path.GetDirectoryName(Application.streamingAssetsPath) + "/ExternalAssets/";
                    break;
                default:
                    ExternalStorePath = Application.persistentDataPath + "/";
                    break;
            }
        }
        else
        {
            ExternalStorePath = Application.persistentDataPath + "/";
        }
        DebugEx.Log("Stream Path: " + StreamingAssetPath);
        DebugEx.Log("External Path: " + ExternalStorePath);
Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -426,7 +426,12 @@
            ClientPackage.obfuscatorEnabled = EditorGUILayout.Toggle("Obfuscator Enable ", ClientPackage.obfuscatorEnabled, GUILayout.Width(250));
#if UNITY_ANDROID
#if UNITY_STANDALONE
            if (GUILayout.Button("EXE"))
            {
                EditorApplication.delayCall += ExecuteBuildClientPackageStandalone;
            }
#elif UNITY_ANDROID
            if (GUILayout.Button("APK"))
            {
                EditorApplication.delayCall += ExecuteBuildClientPackageApk;
@@ -438,7 +443,12 @@
            }
#endif
#if UNITY_ANDROID
#if UNITY_STANDALONE
            if (GUILayout.Button("EXE Development "))
            {
                EditorApplication.delayCall += ExecuteBuildClientPackageStandaloneDevelopment;
            }
#elif UNITY_ANDROID
            if (GUILayout.Button("APK Development"))
            {
                EditorApplication.delayCall += ExecuteBuildClientPackageDevelopApk;
@@ -711,6 +721,34 @@
            ClientPackage.BuildPublishers(ClientPackage.SDK_PLUGIN_PROJECT, outputPath, ApkOutputPath, publishers, packageIndex, true, false);
        }
        private void ExecuteBuildClientPackageStandalone()
        {
            packageIndex++;
            var outputPath = Application.dataPath.Replace("Assets", m_UserData.m_OutputPath);
            ClientPackage_Standalone.Build(new ClientPackage_Standalone.BuildParams()
            {
                assetBundle = outputPath,
                output = ApkOutputPath,
                buildIndex = packageIndex,
                development = false,
                publisher = publishers,
            });
        }
        private void ExecuteBuildClientPackageStandaloneDevelopment()
        {
            packageIndex++;
            var outputPath = Application.dataPath.Replace("Assets", m_UserData.m_OutputPath);
            ClientPackage_Standalone.Build(new ClientPackage_Standalone.BuildParams()
            {
                assetBundle = outputPath,
                output = ApkOutputPath,
                buildIndex = packageIndex,
                development = true,
                publisher = publishers,
            });
        }
        private void ExecuteSwitchVersionConfig()
        {
            var newVersionConfigPath = StringUtility.Contact("Assets/Resources/ScriptableObject/Config/VersionConfig", ".asset");
System/ClientVersion/VersionUpdateWin.cs
@@ -198,14 +198,19 @@
                    SDKUtility.Instance.InstallAPK(VersionUtility.Instance.GetApkLocalUrl());
                    break;
                case VersionUtility.Step.DownLoadPrepared:
                    if (Application.platform == RuntimePlatform.Android)
                    switch (Application.platform)
                    {
                        VersionUtility.Instance.StartDownLoad();
                    }
                    else if (Application.platform == RuntimePlatform.IPhonePlayer)
                    {
                        Application.OpenURL(VersionUtility.Instance.GetApkRemoteUrl());
                        //打开应用商店链接
                        case RuntimePlatform.Android:
                            VersionUtility.Instance.StartDownLoad();
                            break;
                        case RuntimePlatform.IPhonePlayer:
                            Application.OpenURL(VersionUtility.Instance.GetApkRemoteUrl());
                            //打开应用商店链接
                            break;
                        case RuntimePlatform.WindowsPlayer:
                            //打开下载链接
                            Application.OpenURL(VersionUtility.Instance.GetApkRemoteUrl());
                            break;
                    }
                    break;
                case VersionUtility.Step.DownLoadFailed:
System/ClientVersion/VersionUtility.cs
@@ -74,7 +74,7 @@
            versionInfo = JsonMapper.ToObject<VersionInfo>(_result);
            if (NeedNormalUpdate())
            {
                if (Application.isMobilePlatform)
                if (Application.isMobilePlatform || Application.platform == RuntimePlatform.WindowsPlayer)
                {
                    RequestApkDownConfigs();
                }
@@ -137,6 +137,10 @@
                    step = Step.DownLoadPrepared;
                    WindowCenter.Instance.OpenFromLocal<VersionUpdateWin>();
                    break;
                case RuntimePlatform.WindowsPlayer:
                    step = Step.DownLoadPrepared;
                    WindowCenter.Instance.OpenFromLocal<VersionUpdateWin>();
                    break;
                default:
                    step = Step.Completed;
                    break;
System/CrossServer/CrossServerUtility.cs
@@ -15,6 +15,8 @@
    public const int CrossServerRedKey = 213;
    static Redpoint crossServerRedpoint = new Redpoint(CrossServerRedKey);
    static HazyRegionModel hazyRegionModel { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } }
    public static void UpdateCrossServerRedpoint()
    {
        var oneVsOneCount = CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch
@@ -27,6 +29,11 @@
            crossServerRedpoint.count = count;
            crossServerRedpoint.state = RedPointState.Quantity;
        }
        else if (hazyRegionModel.redpoint.state == RedPointState.Simple)
        {
            crossServerRedpoint.count = 0;
            crossServerRedpoint.state = RedPointState.Simple;
        }
        else
        {
            crossServerRedpoint.count = 0;
System/HazyRegion/HazyRegionIncidentPanel.cs
@@ -76,6 +76,11 @@
            m_CyclicScroll.Init(incidents);
            if (!model.requireIncidentAnimation && model.selectIncident != incidents[0])
            {
                m_CyclicScroll.MoveToCenter(incidents.IndexOf(model.selectIncident));
            }
            if (model.requireIncidentAnimation)
            {
                m_CyclicScroll.DisplayAnimation();
System/HazyRegion/HazyRegionModel.cs
@@ -638,6 +638,8 @@
            entranceRedpoint.state = satisfyEntrance ? RedPointState.Simple : RedPointState.None;
            incidentRedpoint.state = satisfyIncident ? RedPointState.Simple : RedPointState.None;
            CrossServerUtility.UpdateCrossServerRedpoint();
        }
        public enum IncidentState