From 0229e944a9f77b8622ae2b34ef0fa314a8aa0fc2 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 15 五月 2026 15:32:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_client
---
Assets/Editor/SpritePacking/SpriteSettings.asset | 44 ++++++++++++++
Assets/Editor/Tool/ClientPackage.cs | 105 +++++++++++++++++++++++++---------
Assets/Editor/Tool/ChangeTextAndImage.cs | 7 ++
Assets/Launch/Launch.cs | 5 -
4 files changed, 128 insertions(+), 33 deletions(-)
diff --git a/Assets/Editor/SpritePacking/SpriteSettings.asset b/Assets/Editor/SpritePacking/SpriteSettings.asset
index e0182cc..4dd4786 100644
--- a/Assets/Editor/SpritePacking/SpriteSettings.asset
+++ b/Assets/Editor/SpritePacking/SpriteSettings.asset
@@ -1619,6 +1619,28 @@
maxTextureSize: 2048
textureCompression: 1
textureFormat: 50
+ - folderName: HeroDebutHero_540017
+ 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: SkinGift
blockOffset: 1
enableRotation: 0
@@ -1751,3 +1773,25 @@
maxTextureSize: 2048
textureCompression: 1
textureFormat: 50
+ - folderName: SuperVIP
+ 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
diff --git a/Assets/Editor/Tool/ChangeTextAndImage.cs b/Assets/Editor/Tool/ChangeTextAndImage.cs
index 6228764..a55c7c4 100644
--- a/Assets/Editor/Tool/ChangeTextAndImage.cs
+++ b/Assets/Editor/Tool/ChangeTextAndImage.cs
@@ -78,7 +78,12 @@
TextEx textEx = go.AddMissingComponent<TextEx>();
textEx.text = textContent;
- textEx.font = FontUtility.preferred;
+ var font = FontUtility.preferred;
+ if (font == null)
+ {
+ font = AssetDatabase.LoadAssetAtPath<Font>("Assets/ResourcesOut/Font/GameFont1.ttf");
+ }
+ textEx.font = font;
textEx.fontSize = textFontSize;
textEx.raycastTarget = false;
textEx.alignment = TextAnchor.MiddleCenter;
diff --git a/Assets/Editor/Tool/ClientPackage.cs b/Assets/Editor/Tool/ClientPackage.cs
index 197ab9e..b551587 100644
--- a/Assets/Editor/Tool/ClientPackage.cs
+++ b/Assets/Editor/Tool/ClientPackage.cs
@@ -316,8 +316,8 @@
File.Copy(copySdkFile, File_baseProjectTemplate);
copySdkFile = StringUtility.Concat(_sdkPath, "/Channel/Android/", versionConfig.sdkFileName, "/deps.gradle");
File.Copy(copySdkFile, File_deps);
- copySdkFile = StringUtility.Concat(_sdkPath, "/Channel/Android/", versionConfig.sdkFileName, "/google-services.json");
- File.Copy(copySdkFile, File_google_services);
+ // copySdkFile = StringUtility.Concat(_sdkPath, "/Channel/Android/", versionConfig.sdkFileName, "/google-services.json");
+ // File.Copy(copySdkFile, File_google_services);
copySdkFile = StringUtility.Concat(_sdkPath, "/Channel/Android/", versionConfig.sdkFileName, "/gradleTemplate.properties");
File.Copy(copySdkFile, File_gradleTemplate);
copySdkFile = StringUtility.Concat(_sdkPath, "/Channel/Android/", versionConfig.sdkFileName, "/LauncherManifest.xml");
@@ -399,40 +399,47 @@
return;
}
- PreBuild(_publisher, _buildIndex);
-
var versionName = string.Empty;
var versionConfig = GetVersionConfig(_publisher, out versionName);
+ // 瀵煎嚭鍓嶆竻鐞� Assets/Plugins/Android锛堜繚鐣� libs 鐩綍锛�
+ CleanupPluginsAndroidForExport();
+ string copySdkFile;
+ copySdkFile = StringUtility.Concat(SDK_PLUGIN_PROJECT, "/Channel/Android/", versionConfig.sdkFileName, "/AndroidManifest.xml");
+ File.Copy(copySdkFile, MANIFEST_PATH);
+ PreBuild(_publisher, _buildIndex);
+
PlayerSettings.Android.bundleVersionCode = VersionConfig.GetVersionNumber(versionConfig.version);
PlayerSettings.enableInternalProfiler = _development;
- // 鍏堟竻鐞哠treamingAssets锛屽啀鏍规嵁assetAccess閰嶇疆鎷疯礉璧勬簮鍒癝treamingAssets
- var streamingPath = ResourcesPath.Instance.StreamingAssetPath;
- if (Directory.Exists(streamingPath))
- Directory.Delete(streamingPath, true);
+ //瀹屾暣鍙朣treamingAssets 璧勬簮
+
+ // // 鍏堟竻鐞哠treamingAssets锛屽啀鏍规嵁assetAccess閰嶇疆鎷疯礉璧勬簮鍒癝treamingAssets
+ // var streamingPath = ResourcesPath.Instance.StreamingAssetPath;
+ // if (Directory.Exists(streamingPath))
+ // Directory.Delete(streamingPath, true);
- if (!string.IsNullOrEmpty(_assetBundlePath) && Directory.Exists(_assetBundlePath))
- {
- switch (versionConfig.assetAccess)
- {
- case InstalledAsset.NullAsset:
- CopyNullAssetResources(_assetBundlePath, streamingPath);
- break;
- case InstalledAsset.HalfAsset:
- CopyHalfAssetResources(_assetBundlePath, streamingPath);
- break;
- case InstalledAsset.FullAsset:
- case InstalledAsset.IngoreDownLoad:
- CopyFullAssetResources(_assetBundlePath, streamingPath);
- break;
- }
- Debug.LogFormat("璧勬簮鎷疯礉瀹屾垚({0})锛屼粠 {1} 鍒� {2}", versionConfig.assetAccess, _assetBundlePath, streamingPath);
- }
- else
- {
- Debug.LogWarningFormat("AssetBundle璺緞涓虹┖鎴栦笉瀛樺湪: {0}锛屽鍑哄伐绋嬪皢涓嶅寘鍚父鎴忚祫婧�", _assetBundlePath);
- }
+ // if (!string.IsNullOrEmpty(_assetBundlePath) && Directory.Exists(_assetBundlePath))
+ // {
+ // switch (versionConfig.assetAccess)
+ // {
+ // case InstalledAsset.NullAsset:
+ // CopyNullAssetResources(_assetBundlePath, streamingPath);
+ // break;
+ // case InstalledAsset.HalfAsset:
+ // CopyHalfAssetResources(_assetBundlePath, streamingPath);
+ // break;
+ // case InstalledAsset.FullAsset:
+ // case InstalledAsset.IngoreDownLoad:
+ // CopyFullAssetResources(_assetBundlePath, streamingPath);
+ // break;
+ // }
+ // Debug.LogFormat("璧勬簮鎷疯礉瀹屾垚({0})锛屼粠 {1} 鍒� {2}", versionConfig.assetAccess, _assetBundlePath, streamingPath);
+ // }
+ // else
+ // {
+ // Debug.LogWarningFormat("AssetBundle璺緞涓虹┖鎴栦笉瀛樺湪: {0}锛屽鍑哄伐绋嬪皢涓嶅寘鍚父鎴忚祫婧�", _assetBundlePath);
+ // }
// 鍏抽敭璁剧疆锛氬鍑轰负Gradle宸ョ▼鑰岄潪鐩存帴鎵揂PK
EditorUserBuildSettings.exportAsGoogleAndroidProject = true;
@@ -908,6 +915,46 @@
}
}
+ /// <summary>
+ /// 瀵煎嚭 Gradle 宸ョ▼鍓嶆竻鐞� Assets/Plugins/Android锛堜繚鐣� libs 鐩綍锛�
+ /// </summary>
+ static void CleanupPluginsAndroidForExport()
+ {
+ var androidPluginPath = Path.Combine(Application.dataPath, "Plugins/Android");
+ if (!Directory.Exists(androidPluginPath))
+ return;
+
+ Debug.Log("寮�濮嬫竻鐞� Assets/Plugins/Android锛堜繚鐣� libs 鐩綍锛�...");
+
+ // 鍒犻櫎鎵�鏈夊瓙鐩綍锛堥櫎浜� libs锛�
+ var subDirs = Directory.GetDirectories(androidPluginPath);
+ foreach (var dir in subDirs)
+ {
+ var dirName = Path.GetFileName(dir);
+ if (dirName != "libs")
+ {
+ Directory.Delete(dir, true);
+ Debug.LogFormat("宸插垹闄� Plugins/Android/{0} 鐩綍", dirName);
+ }
+ }
+
+ // 鍒犻櫎鏍圭洰褰曚笅鐨勬墍鏈夋枃浠讹紙淇濈暀 .aar 鍜� .aar.meta锛�
+ var rootFiles = Directory.GetFiles(androidPluginPath);
+ foreach (var file in rootFiles)
+ {
+ var fileName = Path.GetFileName(file);
+ if (fileName.EndsWith(".aar") || fileName.EndsWith(".aar.meta"))
+ {
+ Debug.LogFormat("宸蹭繚鐣欐枃浠�: {0}", fileName);
+ continue;
+ }
+ File.Delete(file);
+ Debug.LogFormat("宸插垹闄ゆ枃浠�: {0}", fileName);
+ }
+
+
+ }
+
static BuildTargetGroup GetBuildTarget()
{
#if UNITY_ANDROID
diff --git a/Assets/Launch/Launch.cs b/Assets/Launch/Launch.cs
index 41a035e..abbe593 100644
--- a/Assets/Launch/Launch.cs
+++ b/Assets/Launch/Launch.cs
@@ -324,7 +324,7 @@
{
Debug.LogError("鏃犳硶鎵惧埌get_Instance鏂规硶");
}
- LocalResManager.Instance.RecordLauchEvent(6);
+ LocalResManager.Instance.RecordLauchEvent(3);
Debug.Log("杩涘叆娓告垙娴佺▼");
}
@@ -378,13 +378,12 @@
return;
else if (LocalResManager.step == LocalResManager.LoadDllStep.RequestVersion)
{
- LocalResManager.Instance.RecordLauchEvent(2);
LocalResManager.step = LocalResManager.LoadDllStep.Wait;
LocalResManager.Instance.RequestVersionCheck();
}
else if (LocalResManager.step == LocalResManager.LoadDllStep.ReadBytes)
{
- LocalResManager.Instance.RecordLauchEvent(5);
+ LocalResManager.Instance.RecordLauchEvent(2);
LocalResManager.step = LocalResManager.LoadDllStep.Wait;
ReadDllBytes(this.StartGame).Forget();
}
--
Gitblit v1.8.0