diff --git a/Assets/Editor/Version.meta b/Assets/Editor/Version.meta new file mode 100644 index 000000000..d592c5592 --- /dev/null +++ b/Assets/Editor/Version.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df38b7b9b2cc6f444bdd86ee9475f911 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Version/VersionIncrementer.cs b/Assets/Editor/Version/VersionIncrementer.cs new file mode 100644 index 000000000..dc458eac0 --- /dev/null +++ b/Assets/Editor/Version/VersionIncrementer.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEditor.Build; +using UnityEditor.Build.Reporting; +using UnityEngine; + +public class VersionIncrementer : IPreprocessBuildWithReport +{ + public int callbackOrder => 0; + + public void OnPreprocessBuild(BuildReport report) + { + string date = DateTime.Now.ToString("yyyyMMdd"); + int build = 1; + // 获取当前版本号 + string[] versionParts = PlayerSettings.bundleVersion.Split('-'); + string oldDate = versionParts[0]; + if (oldDate == date) + { + build = int.Parse(versionParts[1]) + 1; + } + + // 更新版本号 + PlayerSettings.bundleVersion = $"{date}-{build}"; + PlayerSettings.applicationIdentifier = $"{date}-{build}"; + } +} \ No newline at end of file diff --git a/Assets/Editor/Version/VersionIncrementer.cs.meta b/Assets/Editor/Version/VersionIncrementer.cs.meta new file mode 100644 index 000000000..6afe1006d --- /dev/null +++ b/Assets/Editor/Version/VersionIncrementer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 92d80d2f679fa6c428e1522a45cbcf97 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 54cbf9572..81e1a5e3a 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -6862,7 +6862,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &490985570 RectTransform: m_ObjectHideFlags: 0 @@ -13030,6 +13030,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1693917954} + - {fileID: 1609388204} m_Father: {fileID: 1343879457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -20121,7 +20122,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1596350985 RectTransform: m_ObjectHideFlags: 0 @@ -20540,6 +20541,153 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 231574743} m_PrefabAsset: {fileID: 0} +--- !u!1 &1609388203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1609388204} + - component: {fileID: 1609388206} + - component: {fileID: 1609388205} + - component: {fileID: 1609388207} + m_Layer: 5 + m_Name: VerText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1609388204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609388203} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 984233631} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -125, y: 28} + m_SizeDelta: {x: 250, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1609388205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609388203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26 + m_fontSizeBase: 26 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 1.2915039, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1609388206 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609388203} + m_CullTransparentMesh: 1 +--- !u!114 &1609388207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609388203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c5687a714dd62ea478b5e47c721e6898, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1611684199 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Framework/LogKit/LogKit.cs b/Assets/Scripts/Framework/LogKit/LogKit.cs index 49ee792c6..013ff13e9 100644 --- a/Assets/Scripts/Framework/LogKit/LogKit.cs +++ b/Assets/Scripts/Framework/LogKit/LogKit.cs @@ -35,16 +35,14 @@ namespace AibisDream.Kit #if !UNITY_EDITOR DontDestroyOnLoad(gameObject); _fileLogger = new FileLogger(LogFileName, LogPath, SaveDays); + LogMessage($"Ver.{Application.version}", "", LogType.Log); Application.logMessageReceivedThreaded += LogMessage; #endif } private void LogMessage(string condition, string stackTrace, LogType type) { - if (!type.Equals(LogType.Warning)) - { - _fileLogger?.Write(string.Format(LogContent, condition, stackTrace)); - } + _fileLogger?.Write(string.Format(LogContent, condition, stackTrace)); } private void OnDestroy() diff --git a/Assets/Scripts/Framework/LogKit/VerText.cs b/Assets/Scripts/Framework/LogKit/VerText.cs new file mode 100644 index 000000000..ac0329bb6 --- /dev/null +++ b/Assets/Scripts/Framework/LogKit/VerText.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; + +namespace AibisDream.Kit +{ + public class VerText : MonoBehaviour + { + void Start() + { + GetComponent().text = $"Ver.{Application.version}"; + } + } +} diff --git a/Assets/Scripts/Framework/LogKit/VerText.cs.meta b/Assets/Scripts/Framework/LogKit/VerText.cs.meta new file mode 100644 index 000000000..9803b8349 --- /dev/null +++ b/Assets/Scripts/Framework/LogKit/VerText.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c5687a714dd62ea478b5e47c721e6898 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 14d214e28..fa6d23b47 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.0 + bundleVersion: 20250317-2 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -154,13 +154,13 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Standalone: com.Tin-Bird.Love-RobotRepair + Standalone: 20250317-2 buildNumber: Standalone: 0 VisionOS: 0 iPhone: 0 tvOS: 0 - overrideDefaultApplicationIdentifier: 0 + overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0