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

yyl

2026-05-22 20057cf412be22de40b0e25b884fb11cd0c7af1f

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

 Assets/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs

@@ -96,6 +96,12 @@
            set { LocalSave.SetString("AndroidExportPath", value); }

        }



        public bool ExportForAppBundle

        {

            get { return LocalSave.GetBool("ExportForAppBundle", false); }

            set { LocalSave.SetBool("ExportForAppBundle", value); }

        }



        string m_Publishers;

        public string publishers

        {

@@ -545,6 +551,9 @@
            {

                BrowseForAndroidExport();

            }

            GUILayout.EndHorizontal();

            GUILayout.BeginHorizontal();

            ExportForAppBundle = EditorGUILayout.Toggle("导出aab", ExportForAppBundle);

            GUILayout.EndHorizontal();

            GUILayout.BeginHorizontal();

            if (GUILayout.Button("Export Android Project"))

@@ -1016,7 +1025,7 @@
            }

            packageIndex++;

            var assetBundlePath = Application.dataPath.Replace("Assets", m_UserData.m_OutputPath);

            ClientPackage.ExportAndroidProject(publishers, packageIndex, false, AndroidExportPath, assetBundlePath);

            ClientPackage.ExportAndroidProject(publishers, packageIndex, false, AndroidExportPath, assetBundlePath, ExportForAppBundle);

        }



        private void ExecuteExportAndroidProjectDev()

@@ -1028,7 +1037,7 @@
            }

            packageIndex++;

            var assetBundlePath = Application.dataPath.Replace("Assets", m_UserData.m_OutputPath);

            ClientPackage.ExportAndroidProject(publishers, packageIndex, true, AndroidExportPath, assetBundlePath);

            ClientPackage.ExportAndroidProject(publishers, packageIndex, true, AndroidExportPath, assetBundlePath, ExportForAppBundle);

        }



        private void ExecuteBuildClientPackageStandalone()


 Assets/Editor/SpritePacking/SpriteSettings.asset

@@ -1641,6 +1641,94 @@
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: HeroSkinFlashSaleSkin_5100111
    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
  - folderName: HeroSkinFlashSaleSkin_5100121
    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
  - folderName: HeroSkinFlashSaleSkin_5100131
    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
  - folderName: HeroSkinFlashSaleSkin_5100141
    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
  - folderName: HeroSkinFlashSaleSkin_5100161
    blockOffset: 1
    enableRotation: 0
@@ -1663,7 +1751,7 @@
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: HeroSkinFlashSaleSkin_5400161
  - folderName: HeroSkinFlashSaleSkin_5100171
    blockOffset: 1
    enableRotation: 0
    enableTightPacking: 0
@@ -1685,7 +1773,51 @@
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: HeroSkinFlashSaleSkin_5300161
  - folderName: HeroSkinFlashSaleSkin_5200111
    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
  - folderName: HeroSkinFlashSaleSkin_5200121
    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
  - folderName: HeroSkinFlashSaleSkin_5200141
    blockOffset: 1
    enableRotation: 0
    enableTightPacking: 0
@@ -1729,7 +1861,161 @@
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: HeroSkinFlashSaleSkin_5100171
  - folderName: HeroSkinFlashSaleSkin_5300081
    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
  - folderName: HeroSkinFlashSaleSkin_5300131
    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
  - folderName: HeroSkinFlashSaleSkin_5300141
    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
  - folderName: HeroSkinFlashSaleSkin_5300161
    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
  - folderName: HeroSkinFlashSaleSkin_5400091
    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
  - folderName: HeroSkinFlashSaleSkin_5400131
    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
  - folderName: HeroSkinFlashSaleSkin_5400141
    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
  - folderName: HeroSkinFlashSaleSkin_5400161
    blockOffset: 1
    enableRotation: 0
    enableTightPacking: 0

 Assets/Editor/Tool/ClientPackage.cs

@@ -390,7 +390,7 @@
    /// 导出Android工程给AS打包

    /// Unity只负责导出unityLibrary，SDK/Gradle/签名等均由AS工程处理

    /// </summary>

    public static void ExportAndroidProject(string _publisher, int _buildIndex, bool _development, string _outputPath, string _assetBundlePath)

    public static void ExportAndroidProject(string _publisher, int _buildIndex, bool _development, string _outputPath, string _assetBundlePath, bool exportForAppBundle = false)

    {

        if (string.IsNullOrEmpty(_outputPath) || !Directory.Exists(_outputPath))

        {

@@ -444,6 +444,7 @@
        EditorUserBuildSettings.exportAsGoogleAndroidProject = true;

        EditorUserBuildSettings.androidBuildSystem = AndroidBuildSystem.Gradle;

        EditorUserBuildSettings.development = _development;

        EditorUserBuildSettings.buildAppBundle = exportForAppBundle;



        // 导出路径

        _outputPath = Path.GetFullPath(_outputPath);

@@ -465,6 +466,7 @@
        // 导出完成后恢复设置

        EditorUserBuildSettings.exportAsGoogleAndroidProject = false;

        EditorUserBuildSettings.development = false;

        EditorUserBuildSettings.buildAppBundle = false;

    }



    /// <summary>


 Assets/Editor/VersionConfigs/Versions.txt

@@ -7,4 +7,5 @@
900    xssg    xssg    1    1.1.7    2026    900    xssg    2    1    艾尔指挥官    com.bl.aezhg.quick    xmplaygame    xmpg260325    xmpg_alias    xmpg260325        0    0    (-32,144)            0        xssg
101    txws    txws    1    1.1.7    2026    1    xssg    2    1    天下无双HD    com.bl.aezhg.quick    xmplaygame    xmpg260325    xmpg_alias    xmpg260325        0    0    (-32,144)            0        txws
111    txws    txws    1    1.1.7    2026    11    xssg    2    1    天下无双HD    com.bl.aezhg.quick    xmplaygame    xmpg260325    xmpg_alias    xmpg260325        0    0    (-32,144)            0        txws
21    ryzj    ryzj    1    2.2.1    2026    1    xssg    2    1    荣耀战将    com.ryzj.bhwf    xmplaygame    xmpg260325    xmpg_alias    xmpg260325        0    0    (-32,144)            0        ryzj
21    ryzj    ryzj    1    2.2.1    2026    1    xssg    2    1    荣耀战将    com.ryzj.bhwf    xmplaygame    xmpg260325    xmpg_alias    xmpg260325        0    0    (-32,144)            0        ryzj
31    sghy    sghy    1    2.2.1    2026    1    xssg    2    1    艾尔指挥官    com.szqdgames.android.arzhg    xmplaygame    xmpg260325    xmpg_alias    xmpg260325        0    0    (-32,144)            0        sghy

 Assets/Launch/Launch.cs

@@ -144,7 +144,7 @@
                ? null

                : WebGLRemoteConfig.CreateRemoteServices();

            if (!string.IsNullOrEmpty(webCdnUrl))

                remoteCdnBaseUrl = webCdnUrl + "/" + Application.platform.ToString().ToLower();

                remoteCdnBaseUrl = webCdnUrl;

            Debug.Log($"[Launch] WebGL remoteCdnBaseUrl={remoteCdnBaseUrl ?? WebGLRemoteConfig.ActiveServerURL}");

#else

            // 非 WebGL 正式包：

@@ -157,7 +157,7 @@
            if (!string.IsNullOrEmpty(cdnUrl))

            {

                playMode = EPlayMode.HostPlayMode;

                remoteCdnBaseUrl = cdnUrl + "/" + Application.platform.ToString().ToLower();

                remoteCdnBaseUrl = cdnUrl;

                Debug.Log($"[Launch] cdnUrl={cdnUrl}, using HostPlayMode");

            }

            else

@@ -168,7 +168,7 @@
#endif



            Debug.Log($"[Launch] Initializing YooAsset early with PlayMode={playMode}");

            await YooAssetInitializer.Instance.InitializeAsync(playMode, remoteServices, remoteCdnBaseUrl);

            await YooAssetInitializer.Instance.InitializeAsync(playMode, remoteServices, remoteCdnBaseUrl + LocalResManager.fixPath);



#if UNITY_WEBGL

            await VersionConfigEx.Get();


 Assets/Launch/Manager/YooAssetInitializer.cs

@@ -161,6 +161,7 @@
        _playMode = playMode;
        _remoteServices = remoteServices;
        _remoteCdnBaseUrl = remoteCdnBaseUrl;
        Debug.LogFormat("Yoo InitializeAsync cdn地址 {0}", remoteCdnBaseUrl);

        var names = packageNames ?? LAUNCH_PACKAGES;
        int successCount = 0;