Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_client

yyl

昨天 0f5f8ee064c8c5ae775a275a726ad8b6b0c1d94f

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_client

 Assets/Editor/SpritePacking/SpriteSettings.asset

@@ -959,3 +959,25 @@
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: Chat
    blockOffset: 1
    enableRotation: 0
    enableTightPacking: 0
    padding: 4
    readable: 0
    generateMipMaps: 0
    sRGB: 1
    filterMode: 1
    platformSettings:
    - name: Standalone
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 4
    - name: Android
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
    - name: iPhone
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50

 Assets/Editor/Tool/InGameDownTestWindow.cs

@@ -50,7 +50,7 @@
        EditorGUILayout.Space();

        EditorGUILayout.Space();

        InGameDownTestUtility.isReadVesionEx = EditorGUILayout.Toggle("是否下载热更代码", InGameDownTestUtility.isReadVesionEx);

        EditorGUILayout.TextField("开启下载热更代码，会读取VersionConfigEx.txt 分支需配置正确, 检测logicbytes.txt");

        EditorGUILayout.TextField("开启下载热更代码会检查StreamingAssets目录，测试功能可以不勾选，会读取VersionConfigEx.txt 分支需配置正确, 检测logicbytes.txt");

    }



}


 Assets/Editor/VersionConfigs/Versions.txt

@@ -2,4 +2,4 @@
版本标识    版本名称    渠道id    版本权限，0是测试版本，1是发布版本    版本号    客户端标识    分支    游戏项目标识    资源,0NullAsset,1HalfAsset,2FullAsset,3IgnoreDownLoad    是否分包，0不分包，1分包    产品名    产品包名    签名文件名    签名文件密码    签名文件别名    签名文件别名密码    开发者账号密码    是否debug版本，0否1是    是否版署版本，0否1是    登录界面的Logo位置    版号    运营商ID    充值界面风格    创角场景风格    sdk目录别名
9999    TheSecondWorld    test    0    1.0.2    2025    3    xbqy    2    0    xssg    com.secondworld.xssg    thesecondworld    thesecondworld2018    thesecondworld    thesecondworld2018        0    0    (-32,144)            0        test
9998    TheSecondWorld    test    0    1.0.2    2025    4    xbqy    2    0    xssg    com.secondworld.xssg    thesecondworld    thesecondworld2018    thesecondworld    thesecondworld2018        0    0    (-32,144)            0        test
1    xssg    xssg    0    1.1.1    2025    1    xssg    2    0    xssg    com.wgyx.xssg    thesecondworld    thesecondworld2018    thesecondworld    thesecondworld2018        0    0    (-32,144)            0        xssg
1    xssg    xssg    1    1.1.1    2025    1    xssg    2    0    艾尔指挥官    com.bl.aezhg.quick    thesecondworld    thesecondworld2018    thesecondworld    thesecondworld2018        0    0    (-32,144)            0        xssg

 Assets/Launch/Launch.cs

@@ -91,6 +91,7 @@
        _hotUpdateAss = System.AppDomain.CurrentDomain.GetAssemblies().First(a => a.GetName().Name == "Main");

        Type type = _hotUpdateAss.GetType("InGameDownTestUtility");

        LocalResManager.Instance.isPCTestDownLoad = (bool)type.GetMethod("GetReadVerionEx").Invoke(null, null);

        LocalResManager.Instance.isOpenDownLoad = (bool)type.GetMethod("GetDownloadEnable").Invoke(null, null);

#endif

        SDKInit();

        LocalResManager.Instance.Init();

@@ -102,7 +103,7 @@
#if !UNITY_EDITOR

            LocalResManager.step = LocalResManager.LoadDllStep.RequestVersion;

#else

            if (LocalResManager.Instance.isPCTestDownLoad)

            if (LocalResManager.Instance.isOpenDownLoad)

            {

                LocalResManager.step = LocalResManager.LoadDllStep.RequestVersion;

            }


 Assets/Launch/Manager/LocalResManager.cs

@@ -62,7 +62,8 @@
        }
    }

    public bool isPCTestDownLoad = false;
    public bool isPCTestDownLoad = false;   //开启下载并开启下载bytes
    public bool isOpenDownLoad = false; //只开启下载

    public static int downLoadCount = 0;