diff --git a/Assets/Resources/so/ally/30206_erendira.asset b/Assets/Resources/so/ally/30206_erendira.asset index 3ef54619..a4fc3705 100644 --- a/Assets/Resources/so/ally/30206_erendira.asset +++ b/Assets/Resources/so/ally/30206_erendira.asset @@ -19,8 +19,8 @@ MonoBehaviour: allyType: 0 obsessionTag: "\u9898\u6D77\u6218\u672F" sourceDlcId: - ally_heroImage: {fileID: 21300000, guid: 09a8dd532919ad74daabf8e2cd345d26, type: 3} - ally_heroProfile: {fileID: 21300000, guid: 09a8dd532919ad74daabf8e2cd345d26, type: 3} + ally_heroImage: {fileID: 21300000, guid: c8f373c5ea610a345a513f33ba768314, type: 3} + ally_heroProfile: {fileID: 21300000, guid: c8f373c5ea610a345a513f33ba768314, type: 3} ally_heroSelectIcon: {fileID: 21300000, guid: de8218d6b3882874f9ef628b364db638, type: 3} ally_heroIcon: {fileID: 0} ally_heroPoster: {fileID: 21300000, guid: 686269cdfb8d8974a9a78b052960de44, type: 3} diff --git a/Assets/Scenes/gamePlay_gamePlay.unity b/Assets/Scenes/gamePlay_gamePlay.unity index 430f2dfb..25a4a7aa 100644 --- a/Assets/Scenes/gamePlay_gamePlay.unity +++ b/Assets/Scenes/gamePlay_gamePlay.unity @@ -11041,7 +11041,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 668 m_Sprite: {fileID: 21300000, guid: e816a07ba153c4647b5544d5edd6d3c6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0.3529412} m_FlipX: 0 @@ -17541,7 +17541,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 1500/1500 + m_text: 560/560 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 7cad3f54ac7b53d4885f00c16f1a6929, type: 2} m_sharedMaterial: {fileID: -346136068272202111, guid: 7cad3f54ac7b53d4885f00c16f1a6929, type: 2} @@ -24466,7 +24466,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 668 m_Sprite: {fileID: 21300000, guid: e816a07ba153c4647b5544d5edd6d3c6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0.3529412} m_FlipX: 0 @@ -40852,7 +40852,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 668 m_Sprite: {fileID: 21300000, guid: e816a07ba153c4647b5544d5edd6d3c6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0.3529412} m_FlipX: 0 @@ -55156,7 +55156,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 668 m_Sprite: {fileID: 21300000, guid: e816a07ba153c4647b5544d5edd6d3c6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0.3529412} m_FlipX: 0 @@ -67321,14 +67321,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: slotIndex: 4 - maxHP: 1500 - currentHP: 1500 - maxMana: 300 + maxHP: 560 + currentHP: 560 + maxMana: 100 currentMana: 0 damageResistance: 0 - scoreEfficiency: 0.09 + scoreEfficiency: 0.01 bmm: {fileID: 1261342020} - attack: 38 + attack: 8 baseTrackScore: 1000 perfectRatio: 1 greatRatio: 0.75 @@ -69920,7 +69920,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 668 m_Sprite: {fileID: 21300000, guid: e816a07ba153c4647b5544d5edd6d3c6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0.3529412} m_FlipX: 0 diff --git a/Assets/Scenes/gamePlay_gamePlay/gpGV.asset b/Assets/Scenes/gamePlay_gamePlay/gpGV.asset index 69d71e42..0a18256b 100644 --- a/Assets/Scenes/gamePlay_gamePlay/gpGV.asset +++ b/Assets/Scenes/gamePlay_gamePlay/gpGV.asset @@ -67,18 +67,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 29fa0085f50d5e54f8144f766051a691, type: 3} m_Name: FilmGrain m_EditorClassIdentifier: - active: 1 + active: 0 type: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 0 intensity: - m_OverrideState: 1 - m_Value: 0.5 + m_OverrideState: 0 + m_Value: 0 response: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 0 texture: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: {fileID: 0} --- !u!114 &2046802184354103511 MonoBehaviour: diff --git a/Assets/__UI_NEW/gameplay/gameplayDark/3386c402ef0de01e64703b2efac5af22.png b/Assets/__UI_NEW/gameplay/gameplayDark/3386c402ef0de01e64703b2efac5af22.png new file mode 100644 index 00000000..fa84e431 Binary files /dev/null and b/Assets/__UI_NEW/gameplay/gameplayDark/3386c402ef0de01e64703b2efac5af22.png differ diff --git a/Assets/__UI_NEW/gameplay/gameplayDark/3386c402ef0de01e64703b2efac5af22.png.meta b/Assets/__UI_NEW/gameplay/gameplayDark/3386c402ef0de01e64703b2efac5af22.png.meta new file mode 100644 index 00000000..3d0feb66 --- /dev/null +++ b/Assets/__UI_NEW/gameplay/gameplayDark/3386c402ef0de01e64703b2efac5af22.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: c8f373c5ea610a345a513f33ba768314 +TextureImporter: + internalIDToNameTable: + - first: + 213: -7340647889261795041 + second: 3386c402ef0de01e64703b2efac5af22_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: 3386c402ef0de01e64703b2efac5af22_0 + rect: + serializedVersion: 2 + x: 13 + y: 0 + width: 151 + height: 98 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f19645b13a7c02a90800000000000000 + internalID: -7340647889261795041 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + 3386c402ef0de01e64703b2efac5af22_0: -7340647889261795041 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/gamePlay_gameplay/TrackTouchInput.cs b/Assets/scripts/gamePlay_gameplay/TrackTouchInput.cs index c2e4e847..46953ee4 100644 --- a/Assets/scripts/gamePlay_gameplay/TrackTouchInput.cs +++ b/Assets/scripts/gamePlay_gameplay/TrackTouchInput.cs @@ -50,6 +50,15 @@ public class TrackTouchInput : MonoBehaviour } } + private void Awake() + { + // 【多点触控根因修复】若 multiTouchEnabled 为 false,Input.touchCount 永远 ≤1, + // 同时按多条轨道时只会报告一个触点 → 只能触发一个轨道。强制开启多点触控。 + // simulateMouseWithTouches 关掉:避免触摸被合成成鼠标事件,与真实多指冲突。 + Input.multiTouchEnabled = true; + Input.simulateMouseWithTouches = false; + } + private void Update() { var im = InputManager.Instance; diff --git a/Assets/scripts/settings/StartupSettingsApplier.cs b/Assets/scripts/settings/StartupSettingsApplier.cs index dd90ab89..cd0355c7 100644 --- a/Assets/scripts/settings/StartupSettingsApplier.cs +++ b/Assets/scripts/settings/StartupSettingsApplier.cs @@ -36,10 +36,43 @@ public sealed class StartupSettingsApplier : MonoBehaviour private void ApplyStartupSettings() { ApplyAndroidLandscapeOrientation(); + ApplyStartupFrameRate(); graphicSettings.ApplySavedDisplaySettingsAtStartup(this); ApplySavedAudioSettings(); } + // 启动即应用帧率。原本 targetFrameRate 只在设置面板 graphicSettings.Start() 里设置, + // 而设置面板不在启动/gameplay 场景中,导致移动端启动后一直停在 Unity 默认 30fps — + // 触摸每帧才采样一次(~33ms),表现为点击延迟大、快速连点丢按键。 + // 这里在启动时读取与设置面板相同的 PlayerPrefs(frameRateIndex),无存档时默认 90, + // 让帧率从进游戏起就正确,且玩家改过的设置下次启动立即生效。不改变原有设置逻辑。 + private void ApplyStartupFrameRate() + { + int[] fpsValues = { 24, 30, 60, 90, 120, 144, 165, 210, 240, 300 }; + int index = PlayerPrefs.GetInt("frameRateIndex", -999); + + if (index < 0 || index > fpsValues.Length + 1) + { + index = 3; // 默认 90,与 graphicSettings 设置面板一致 + } + + if (index < fpsValues.Length) + { + QualitySettings.vSyncCount = 0; + Application.targetFrameRate = fpsValues[index]; + } + else if (index == fpsValues.Length) + { + QualitySettings.vSyncCount = 0; + Application.targetFrameRate = -1; // 无限制 + } + else + { + QualitySettings.vSyncCount = 1; // 垂直同步 + Application.targetFrameRate = -1; + } + } + private void ApplyAndroidLandscapeOrientation() { #if UNITY_ANDROID && !UNITY_EDITOR diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 24628e39..19955b04 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -165,6 +165,7 @@ PlayerSettings: androidMaxAspectRatio: 2.1 androidMinAspectRatio: 1 applicationIdentifier: + Android: com.FloatGamingStudio.Bansonic Standalone: com.FloatGamingStudio.Bansonic buildNumber: Standalone: 0 @@ -418,7 +419,10 @@ PlayerSettings: m_TextureStreamingPriority: 0 m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] - m_BuildTargetDefaultTextureCompressionFormat: [] + m_BuildTargetDefaultTextureCompressionFormat: + - serializedVersion: 3 + m_BuildTarget: Android + m_Formats: 01000000 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1