diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index 37ec1c29..82157f46 100644 --- a/Assets/000_assets/material/M_SquareFrame 1.mat +++ b/Assets/000_assets/material/M_SquareFrame 1.mat @@ -213,7 +213,7 @@ Material: - _Dst: 10 - _DstBlend: 0 - _DstBlendAlpha: 0 - - _EdgeValue: 0.4454634 + - _EdgeValue: 0.5453637 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.5545366 + - _Opacity: 0.45463628 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index 10c8306a..fd529962 100644 Binary files a/Assets/AddressableAssetsData/Android/addressables_content_state.bin and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ diff --git a/Assets/Editor/AssetBundleComponent.cs b/Assets/Editor/AssetBundleComponent.cs index 0509d70a..8ebb5c5f 100644 --- a/Assets/Editor/AssetBundleComponent.cs +++ b/Assets/Editor/AssetBundleComponent.cs @@ -6,7 +6,6 @@ using System.Linq; using Ichni; using UnityEditor; using UnityEditor.Build; -using UnityEditor.Build.Reporting; using UnityEngine; /// @@ -107,13 +106,18 @@ public class BuildAssetBundle } } -public class AssetBundleBuildPreprocessor : IPreprocessBuildWithReport +[InitializeOnLoad] +public static class AssetBundleBuildPlayerHandler { - public int callbackOrder => 0; - - public void OnPreprocessBuild(BuildReport report) + static AssetBundleBuildPlayerHandler() { - Debug.Log($"Rebuild AssetBundles before player build: {report.summary.platform}"); - BuildAssetBundle.BuildForTarget(report.summary.platform); + BuildPlayerWindow.RegisterBuildPlayerHandler(BuildPlayerWithAssetBundles); + } + + private static void BuildPlayerWithAssetBundles(BuildPlayerOptions options) + { + Debug.Log($"Rebuild AssetBundles before player build: {options.target}"); + BuildAssetBundle.BuildForTarget(options.target); + BuildPlayerWindow.DefaultBuildMethods.BuildPlayer(options); } } diff --git a/Assets/Scripts/NewStorySystem/Helper/StoryHelperController.cs b/Assets/Scripts/NewStorySystem/Helper/StoryHelperController.cs index 67142e94..70997d10 100644 --- a/Assets/Scripts/NewStorySystem/Helper/StoryHelperController.cs +++ b/Assets/Scripts/NewStorySystem/Helper/StoryHelperController.cs @@ -118,12 +118,14 @@ namespace Ichni.Story /// 点击 Helper 的统一入口:播放反馈后创建一条新的专属气泡。 private void HandleHelperClicked() { - if (Time.unscaledTime < _nextClickTime) - return; + if (Time.unscaledTime >= _nextClickTime) + { + TryCreateRandomTalk(); + _nextClickTime = Time.unscaledTime + clickCooldown; + } - _nextClickTime = Time.unscaledTime + clickCooldown; PlayClickAnimation(); - TryCreateRandomTalk(); + } /// diff --git a/Assets/StreamingAssets/ThemeBundles/Android/Android b/Assets/StreamingAssets/ThemeBundles/Android/Android index 12db8461..a2f9cd87 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Android/Android and b/Assets/StreamingAssets/ThemeBundles/Android/Android differ diff --git a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest index f2972f1f..220a0273 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 369232788 +CRC: 1212460786 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/ThemeBundles/Android/basic b/Assets/StreamingAssets/ThemeBundles/Android/basic index db3a6616..6dc588d1 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Android/basic and b/Assets/StreamingAssets/ThemeBundles/Android/basic differ diff --git a/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest b/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest index c2cb76e0..a0f77f99 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 3948698453 +CRC: 4187162310 Hashes: AssetFileHash: serializedVersion: 2 - Hash: af7857bf316830adc26e256fe67e7e6e + Hash: 041639c891c497f5cda773d76795250a TypeTreeHash: serializedVersion: 2 Hash: dfed41e3b38758e5f34df30221d719dc IncrementalBuildHash: serializedVersion: 2 - Hash: 8b2370a964ccb84ad839925da51b1839 + Hash: fd431a0871b3281e203d8c5ae1ef07e3 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse index 4965a5d4..7d73eb98 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse +++ b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b786314cb5bad5741079f6d3bb81be876de3d8202fb4f065f846eebfb9cab1b -size 1504123 +oid sha256:ee34964900f07e3853f5b0fc28cfa81dbca697d08d6ddb7f7e741d984ca6c6b7 +size 1502797 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest index 0544f06e..36a55626 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 3534727336 +CRC: 1325295300 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 51cebaae174d01d837ffac32a2fa6871 + Hash: 5451f82a726dcc14425b20ee9bc64122 TypeTreeHash: serializedVersion: 2 Hash: 6d9f9b8bc1074349261a0dbbf7f0f9f8 IncrementalBuildHash: serializedVersion: 2 - Hash: 1a80e1aa74a3d257e8fdbb3bbe3af29f + Hash: 93d05b1cb2304ccbb2af18c7f4892613 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e6feffa3..f2a9d94e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98070dc3faf2c78cc7ecd30a9ae94234da040e23f97124f83b0ce8ee09f0d877 -size 29405 +oid sha256:88f3289dbf0b17be0eed0a0b23214dab461bb159e595a7c371f21cabc6b9e212 +size 29407