From edc8f5525faee13f751684f1f260d11b7f823a08 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Sat, 8 Mar 2025 21:33:29 +0800 Subject: [PATCH 1/5] Update YarnUtil.cs --- Assets/Scripts/Utility/YarnUtil.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Assets/Scripts/Utility/YarnUtil.cs b/Assets/Scripts/Utility/YarnUtil.cs index 4a6a3ea13..aaaedda0b 100644 --- a/Assets/Scripts/Utility/YarnUtil.cs +++ b/Assets/Scripts/Utility/YarnUtil.cs @@ -35,16 +35,13 @@ namespace AibisDream.Utility // 直接写就使用配置选项 if (characterAttribute.Properties.TryGetValue("name", out var nameValue)) { - return GetCharacterVoByKey(nameValue.StringValue); - } - - // 带key就说明可能有自定义属性 - if (characterAttribute.Properties.TryGetValue("key", out var keyValue)) - { - // 先从配置文件找 - var charVo = GetCharacterVoByKey(keyValue.StringValue); - // 再用自定义填充 - return FullCharVoWithProps(charVo, characterAttribute.Properties); + var charVo = GetCharacterVoByKey(nameValue.StringValue); + if (characterAttribute.Properties.Count > 1) + { + charVo = FullCharVoWithProps(charVo, characterAttribute.Properties); + } + + return charVo; } // 找不到Name和Key From 7ac013554da8a8b1ad364ebfb71f33f8c86042ca Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Sat, 8 Mar 2025 21:34:08 +0800 Subject: [PATCH 2/5] Update Persistence.unity --- Assets/Scenes/Persistence.unity | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 7d29304e2..ce1440f54 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -4697,10 +4697,10 @@ MonoBehaviour: m_EditorClassIdentifier: ambEvent: Guid: - Data1: -1978560838 - Data2: 1285599156 - Data3: -1740780130 - Data4: -337441980 + Data1: 1700888787 + Data2: 1189708601 + Data3: 1610383794 + Data4: -1468709119 Path: event:/Amb/amb --- !u!1 &387510857 GameObject: From 0d7ef2fe4ed703b5c0ace3651eb5246157f7fd71 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Sat, 8 Mar 2025 21:48:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B0=94=E6=B3=A1=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/RawResources/齿轮/场外气泡3.png | 3 + Assets/RawResources/齿轮/场外气泡3.png.meta | 153 ++++++++++++++++++ Assets/RawResources/齿轮/场外气泡4.png | 3 + Assets/RawResources/齿轮/场外气泡4.png.meta | 153 ++++++++++++++++++ .../Prefabs/UI/Bubble Left Bottom.prefab | 7 +- Assets/Scenes/ClinicOut.unity | 127 +++++++++++++++ 6 files changed, 443 insertions(+), 3 deletions(-) create mode 100644 Assets/RawResources/齿轮/场外气泡3.png create mode 100644 Assets/RawResources/齿轮/场外气泡3.png.meta create mode 100644 Assets/RawResources/齿轮/场外气泡4.png create mode 100644 Assets/RawResources/齿轮/场外气泡4.png.meta diff --git a/Assets/RawResources/齿轮/场外气泡3.png b/Assets/RawResources/齿轮/场外气泡3.png new file mode 100644 index 000000000..9728a92cd --- /dev/null +++ b/Assets/RawResources/齿轮/场外气泡3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84521b454bc5239e2e6a34f3a590924c38b2a0b7bcba1b1edd4c7dec2b60c849 +size 4693 diff --git a/Assets/RawResources/齿轮/场外气泡3.png.meta b/Assets/RawResources/齿轮/场外气泡3.png.meta new file mode 100644 index 000000000..cfb12aa8a --- /dev/null +++ b/Assets/RawResources/齿轮/场外气泡3.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 5f8db6ae003ae0f449e77e8df3bd9556 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 215 + spriteBorder: {x: 0, y: 0, z: 68, w: 53} + 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: 3 + 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: 3 + buildTarget: WebGL + 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: 3 + 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: 3 + 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 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/齿轮/场外气泡4.png b/Assets/RawResources/齿轮/场外气泡4.png new file mode 100644 index 000000000..ce920a656 --- /dev/null +++ b/Assets/RawResources/齿轮/场外气泡4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:072c3cb01f1b9225f2abb2050ae825743e5b89223cb40640022ca34095679fe2 +size 2220 diff --git a/Assets/RawResources/齿轮/场外气泡4.png.meta b/Assets/RawResources/齿轮/场外气泡4.png.meta new file mode 100644 index 000000000..5ac6aea38 --- /dev/null +++ b/Assets/RawResources/齿轮/场外气泡4.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: a1a333888259d9f46a66d7d57b2a8716 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 215 + 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: 3 + 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: 3 + buildTarget: WebGL + 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: 3 + 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: 3 + 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 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab b/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab index 0752e7150..2e6a985d8 100644 --- a/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab +++ b/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab @@ -69,7 +69,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 79e04f9b22fb71d4c8009e561c6e2849, type: 3} + m_Sprite: {fileID: 21300000, guid: 5f8db6ae003ae0f449e77e8df3bd9556, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -94,8 +94,8 @@ MonoBehaviour: m_Padding: m_Left: 30 m_Right: 45 - m_Top: 30 - m_Bottom: 50 + m_Top: 50 + m_Bottom: 30 m_ChildAlignment: 4 m_Spacing: 0 m_ChildForceExpandWidth: 0 @@ -132,6 +132,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: role: 2 + idx: 1 maxCharNum: 14 --- !u!1 &6816142221905378472 GameObject: diff --git a/Assets/Scenes/ClinicOut.unity b/Assets/Scenes/ClinicOut.unity index 374b4f759..57df47ef7 100644 --- a/Assets/Scenes/ClinicOut.unity +++ b/Assets/Scenes/ClinicOut.unity @@ -10565,6 +10565,7 @@ RectTransform: - {fileID: 683476662073257099} - {fileID: 146077694} - {fileID: 2071726610} + - {fileID: 6077222920005442532} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -18415,6 +18416,132 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} m_PrefabInstance: {fileID: 7283383166883411261} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6077222920005442531 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 370776970} + m_Modifications: + - target: {fileID: 4266339626480639172, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_Name + value: Bubble Left Bottom + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 647 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 268 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} +--- !u!224 &6077222920005442532 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3} + m_PrefabInstance: {fileID: 6077222920005442531} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7283383166883411261 PrefabInstance: m_ObjectHideFlags: 0 From 9cd1a832c35fc50f7f7401946fb801ac0192db46 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Sat, 8 Mar 2025 22:57:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=80=85=E5=B7=A5?= =?UTF-8?q?=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Bubble Left Bottom.prefab | 2 +- Assets/Scenes/Persistence.unity | 45 +++++++++ Assets/Scripts/Framework/LogKit.meta | 8 ++ Assets/Scripts/Framework/LogKit/FileLogger.cs | 99 +++++++++++++++++++ .../Framework/LogKit/FileLogger.cs.meta | 3 + Assets/Scripts/Framework/LogKit/LogKit.cs | 57 +++++++++++ .../Scripts/Framework/LogKit/LogKit.cs.meta | 11 +++ 7 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 Assets/Scripts/Framework/LogKit.meta create mode 100644 Assets/Scripts/Framework/LogKit/FileLogger.cs create mode 100644 Assets/Scripts/Framework/LogKit/FileLogger.cs.meta create mode 100644 Assets/Scripts/Framework/LogKit/LogKit.cs create mode 100644 Assets/Scripts/Framework/LogKit/LogKit.cs.meta diff --git a/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab b/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab index 2e6a985d8..613997fbc 100644 --- a/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab +++ b/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab @@ -94,7 +94,7 @@ MonoBehaviour: m_Padding: m_Left: 30 m_Right: 45 - m_Top: 50 + m_Top: 55 m_Bottom: 30 m_ChildAlignment: 4 m_Spacing: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index ce1440f54..b7fe3e8b6 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -12469,6 +12469,7 @@ Transform: - {fileID: 1317294298} - {fileID: 1620453322} - {fileID: 369430730} + - {fileID: 1068968715} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1015707783 @@ -12564,6 +12565,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1068968714 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1068968715} + - component: {fileID: 1068968716} + m_Layer: 0 + m_Name: Log Kit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1068968715 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068968714} + serializedVersion: 2 + 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: 1009826577} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1068968716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068968714} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 647335bd723dab94ea97b993d03af61e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1076102355 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Framework/LogKit.meta b/Assets/Scripts/Framework/LogKit.meta new file mode 100644 index 000000000..2661da971 --- /dev/null +++ b/Assets/Scripts/Framework/LogKit.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bfe8aa3a0b2c8c144af979bb5714ae85 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Framework/LogKit/FileLogger.cs b/Assets/Scripts/Framework/LogKit/FileLogger.cs new file mode 100644 index 000000000..373d8efc6 --- /dev/null +++ b/Assets/Scripts/Framework/LogKit/FileLogger.cs @@ -0,0 +1,99 @@ +using System; +using System.IO; + +namespace AibisDream.Kit +{ + internal class FileLogger + { + private StreamWriter _fileWriter; + + private readonly string _filename; + private readonly string _filePath; + private readonly int _saveDays; + + private static string CurrentDay => DateTime.Now.ToString("yyyyMMdd"); + private string _currentLogDay; + private string _preSavePath; + + /// + /// 开始打印 + /// + public FileLogger(string filename, string filePath, int saveDays) + { + _filename = filename; + _filePath = filePath.TrimEnd('/') + "/"; + _saveDays = saveDays; + StartNewFile(); + DeleteOldFile(); + _currentLogDay = CurrentDay; + Write("*********************************************************\nSystem Start at " + + DateTime.Now.ToString("HH:mm:ss") + + "\n*********************************************************\n"); + } + + /// + /// 新建文件 + /// + private void StartNewFile() + { + if (_fileWriter != null) + { + _fileWriter.Close(); + _fileWriter.Dispose(); + } + + _fileWriter = null; + + if (!Directory.Exists(_filePath)) + { + Directory.CreateDirectory(_filePath); + } + + _fileWriter = File.AppendText(_filePath + string.Format(_filename, DateTime.Now)); + } + + public void Write(string content) + { + System.Globalization.CultureInfo.CurrentCulture.ClearCachedData(); + if (_currentLogDay != CurrentDay) + { + StartNewFile(); + DeleteOldFile(); + _currentLogDay = CurrentDay; + } + + if (_fileWriter is { BaseStream: { CanWrite: true } }) + _fileWriter.WriteLine(content); + } + + void DeleteOldFile() + { + var fileList = Directory.GetFiles(_filePath); + if (fileList.Length > _saveDays) + { + _preSavePath = _filePath + string.Format(this._filename, DateTime.Now.AddDays(-_saveDays + 1)); + foreach (var t in fileList) + { + if (string.CompareOrdinal(_preSavePath, t) == 1) + { + File.Delete(t); + } + } + } + } + + public void OnDestroy() + { + if (_fileWriter == null) + return; + + Write("*********************************************************\nSystem Shutdown at " + + DateTime.Now.ToString("HH:mm:ss") + + "\n*********************************************************\n"); + + _fileWriter.Flush(); + _fileWriter.Close(); + _fileWriter = null; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Framework/LogKit/FileLogger.cs.meta b/Assets/Scripts/Framework/LogKit/FileLogger.cs.meta new file mode 100644 index 000000000..b2e55a25c --- /dev/null +++ b/Assets/Scripts/Framework/LogKit/FileLogger.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7a2dc29290b545c1974b6473534df853 +timeCreated: 1741445068 \ No newline at end of file diff --git a/Assets/Scripts/Framework/LogKit/LogKit.cs b/Assets/Scripts/Framework/LogKit/LogKit.cs new file mode 100644 index 000000000..2fb63c542 --- /dev/null +++ b/Assets/Scripts/Framework/LogKit/LogKit.cs @@ -0,0 +1,57 @@ +using System; +using UnityEngine; + +namespace AibisDream.Kit +{ + internal class LogKit : MonoBehaviour + { + /// + /// 文件名称格式 + /// 请注意，不要删除时间格式，否则会造成保存不成功 + /// + public static string LogFileName => "Log{0:_yyyy_MM_dd}.txt"; + + /// + /// 日志文件路径 + /// + public static string LogPath => Application.streamingAssetsPath + "/LogFile"; + + /// + /// 日志保存最近几天的内容 + /// + public const int SaveDays = 30; + + /// + /// 每一行的打印内容 + /// + private static string LogContent => "--------------------------" + Time + "--------------------------\n{0}\n{1}"; + + private FileLogger _fileLogger; + + private static string Time => DateTime.Now.ToString("[HH:mm:ss.fffd]"); + + private void Awake() + { +#if !UNITY_EDITOR + DontDestroyOnLoad(gameObject); + _fileLogger = new FileLogger(LogFileName, LogPath, SaveDays); + 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)); + } + } + + private void OnDestroy() + { + _fileLogger?.OnDestroy(); + _fileLogger = null; + Application.logMessageReceivedThreaded -= LogMessage; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Framework/LogKit/LogKit.cs.meta b/Assets/Scripts/Framework/LogKit/LogKit.cs.meta new file mode 100644 index 000000000..09cb677d3 --- /dev/null +++ b/Assets/Scripts/Framework/LogKit/LogKit.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 647335bd723dab94ea97b993d03af61e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 942881423e7fcd691263259856376cbaca54ddcf Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Sun, 9 Mar 2025 17:44:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?UI=E5=88=87=E6=8D=A2=E4=B8=BAworldcanvas?= =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E4=BF=9D=E5=85=A8=E5=88=86=E8=BE=A8=E7=8E=87?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/CameraData/Main Camera Blends.asset | 22 + Assets/Render/Renderer2Dtest.asset | 65 ++- Assets/Scenes/PeipeiFixScene.unity | 467 +++++++++++++++++- Assets/Scenes/Persistence.unity | 2 +- .../FixSystem/Effect/MouseFollowEffect.cs | 64 +-- .../Scripts/FixSystemNew/FixStateMachine.cs | 4 +- .../Scripts/Framework/OtherKit/CameraKit.cs | 3 +- .../Scripts/MiniGame/Peipei/Eye/EyeSystem.cs | 2 + 8 files changed, 574 insertions(+), 55 deletions(-) diff --git a/Assets/CameraData/Main Camera Blends.asset b/Assets/CameraData/Main Camera Blends.asset index ebcd6ec71..7b326ff83 100644 --- a/Assets/CameraData/Main Camera Blends.asset +++ b/Assets/CameraData/Main Camera Blends.asset @@ -57,3 +57,25 @@ MonoBehaviour: m_PreInfinity: 0 m_PostInfinity: 0 m_RotationOrder: 0 + - m_From: '**ANY CAMERA**' + m_To: Eye DeepCamera + m_Blend: + m_Style: 0 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + - m_From: Eye DeepCamera + m_To: '**ANY CAMERA**' + m_Blend: + m_Style: 0 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 9bebfac1e..dcfcb4302 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -1053,15 +1053,19 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 0.007228916 - - 0.043749984 - - 0.12409639 - - 0.20444278 - - 0.24096388 - - 0.20444278 - - 0.12409639 - - 0.043749984 - - 0.007228916 + - 0.0048309183 + - 0.016401261 + - 0.04532712 + - 0.08293076 + - 0.12053438 + - 0.14946026 + - 0.1610306 + - 0.14946026 + - 0.12053438 + - 0.08293076 + - 0.04532712 + - 0.016401261 + - 0.0048309183 --- !u!114 &-6086986437317696584 MonoBehaviour: m_ObjectHideFlags: 3 @@ -1200,10 +1204,10 @@ MonoBehaviour: enabled: 1 value: 0 _mask: - enabled: 0 + enabled: 1 value: serializedVersion: 2 - m_Bits: 0 + m_Bits: 8183 _source: _source: 0 _globalTex: _inputTex @@ -1546,7 +1550,8 @@ MonoBehaviour: - {fileID: 8662106111246897391} - {fileID: 7564190746689473555} - {fileID: -5089752464249933462} - m_RendererFeatureMap: 53e73d20cf257bd5ef909c479dfb3578130cb9456867f9686ab1b6b519915db9 + - {fileID: 5536734238448200336} + m_RendererFeatureMap: 53e73d20cf257bd5ef909c479dfb3578130cb9456867f9686ab1b6b519915db990aa727a746ed64c m_UseNativeRenderPass: 0 m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 1, z: 0} @@ -3108,6 +3113,42 @@ MonoBehaviour: - _audio: {fileID: 8300000, guid: 0cd16cc3ec9c6764a92c2b2bd029573c, type: 3} - _audio: {fileID: 8300000, guid: c99a484cd6b915f4087a45277c1d42ac, type: 3} - _audio: {fileID: 8300000, guid: bf48bc9e7e3ea1c4b94a886bb19bb56d, type: 3} +--- !u!114 &5536734238448200336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c53165b379c3d94ca34b12cb8eb10f1, type: 3} + m_Name: VolFx + m_EditorClassIdentifier: + m_Active: 1 + _event: 550 + _format: + enabled: 1 + value: 0 + _mask: + enabled: 1 + value: + serializedVersion: 2 + m_Bits: 1015 + _source: + _source: 1 + _globalTex: _inputTex + _renderTex: {fileID: 0} + _pool: {fileID: 0} + _output: + _output: 0 + _renderTex: {fileID: 0} + _outputTex: _VolFxTex + _sortingOrder: 0 + _camDistance: 100 + _passes: + m_List: [] + _blitShader: {fileID: 4800000, guid: a8a709d9db2241741ab3032b946ef258, type: 3} --- !u!114 &5662228631772262042 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 956e7452e..87de5f69e 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -1746,6 +1746,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 709172887} + - {fileID: 746183474} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &110632229 @@ -4007,19 +4008,22 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - insertIndex: 1 + insertIndex: 0 + addedObject: {fileID: 1771330436} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + insertIndex: 2 addedObject: {fileID: 522320917} - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - insertIndex: 3 + insertIndex: 4 addedObject: {fileID: 1962447341} - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - insertIndex: 6 + insertIndex: 7 addedObject: {fileID: 2115011992} - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - insertIndex: 8 + insertIndex: 9 addedObject: {fileID: 1632118595} - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} - insertIndex: 9 + insertIndex: 10 addedObject: {fileID: 783319748} - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} insertIndex: -1 @@ -4052,15 +4056,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: virtualCamera: {fileID: 0} - targetIndicator: {fileID: 1597388062} - targetNameText: {fileID: 1307071591} + targetIndicator: {fileID: 1845777037} + targetNameText: {fileID: 1675815171} zoomInScale: 1.5 zoomDuration: 2 sceneBoundsMin: {x: 37.6, y: -6.64} sceneBoundsMax: {x: 42.2, y: -5.21} viewCamera: {fileID: 105412842} - parallaxEffectMultiplier: 0.1 - maxOffset: {x: 2, y: 2} + parallaxEffectMultiplier: 0.15 + maxOffset: {x: 3, y: 3} --- !u!1001 &188784455 PrefabInstance: m_ObjectHideFlags: 0 @@ -12921,6 +12925,50 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 +--- !u!1 &687321787 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 687321788} + - component: {fileID: 687321791} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &687321788 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687321787} + serializedVersion: 2 + 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: 746183474} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &687321791 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687321787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &689619333 GameObject: m_ObjectHideFlags: 0 @@ -13508,6 +13556,78 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &746183473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 746183474} + - component: {fileID: 746183475} + m_Layer: 0 + m_Name: Eye DeepCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &746183474 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746183473} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 70.3, y: 0, z: -21.866077} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 687321788} + m_Father: {fileID: 110632228} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &746183475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746183473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 34 + OrthographicSize: 4 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 687321788} --- !u!1 &748395814 GameObject: m_ObjectHideFlags: 0 @@ -28673,6 +28793,140 @@ Transform: - {fileID: 773382375} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1675815169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1675815170} + - component: {fileID: 1675815172} + - component: {fileID: 1675815171} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1675815170 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1675815169} + 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: 1845777038} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 4.25, y: 0.99} + m_SizeDelta: {x: 8.5, y: 2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1675815171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1675815169} + 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: ASDADASDASDASDASDAS + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, 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: 0.3 + m_fontSizeBase: 0.3 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + 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: 0, y: 1.3556561, z: 0.87083054, w: -0.18333292} + 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 &1675815172 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1675815169} + m_CullTransparentMesh: 1 --- !u!1 &1678197548 GameObject: m_ObjectHideFlags: 0 @@ -31034,6 +31288,108 @@ Material: - _WorldTilingOffset: {r: 0, g: 0, b: 0, a: 0} - _WorldTilingScale: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!1 &1771330435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1771330436} + - component: {fileID: 1771330439} + - component: {fileID: 1771330438} + - component: {fileID: 1771330437} + m_Layer: 0 + m_Name: EyeDeepCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1771330436 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771330435} + 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: + - {fileID: 1845777038} + m_Father: {fileID: 183765384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1771330437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771330435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1771330438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771330435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!223 &1771330439 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771330435} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 1134468525 + m_SortingOrder: 10 + m_TargetDisplay: 0 --- !u!1 &1792059973 GameObject: m_ObjectHideFlags: 0 @@ -31745,6 +32101,99 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1845777037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1845777038} + - component: {fileID: 1845777041} + - component: {fileID: 1845777040} + - component: {fileID: 1845777039} + m_Layer: 0 + m_Name: TargetIndicator (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1845777038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845777037} + 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: + - {fileID: 1675815170} + m_Father: {fileID: 1771330436} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 7.94, y: 8.44} + m_SizeDelta: {x: 1.94, y: 2.77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1845777039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845777037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee158225ee1e59f4791627785501d950, type: 3} + m_Name: + m_EditorClassIdentifier: + shaderTypes: 0 + normalStrength: 5 + normalSmoothing: 1 + computingNormal: 0 +--- !u!114 &1845777040 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845777037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 145797215} + m_Color: {r: 0, g: 1, b: 0.13094902, 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_Sprite: {fileID: 21300000, guid: cea54104e2c247643a67ac75df3db9d2, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 150 +--- !u!222 &1845777041 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845777037} + m_CullTransparentMesh: 1 --- !u!1 &1848677582 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index b7fe3e8b6..8b11faf8e 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -9336,7 +9336,7 @@ MonoBehaviour: - {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} - {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} - runMode: 0 + runMode: 2 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} testTalkSo: {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} saveFileName: "PeipeiDay2_UF\u68C0\u67E5" diff --git a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs index 0786b887d..241f4f516 100644 --- a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs +++ b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs @@ -25,7 +25,7 @@ public class MouseFollowAndZoom : MonoBehaviour private Vector3 initialPosition; - private float viewOffset = 40.3f; + private float viewOffset = 0; // 读写访问 public void SetIsActive(bool value) @@ -103,7 +103,7 @@ public class MouseFollowAndZoom : MonoBehaviour // 获取鼠标位置 Vector3 mousePosition = Input.mousePosition; mousePosition.x += viewOffset; // 添加偏移量 - Vector3 worldPosition = viewCamera.ScreenToWorldPoint(mousePosition); + Vector3 worldPosition = Camera.main.ScreenToWorldPoint(mousePosition); RaycastHit2D hit = Physics2D.Raycast(worldPosition, Vector2.zero); // 检查是否有目标 @@ -132,38 +132,40 @@ public class MouseFollowAndZoom : MonoBehaviour } void HandleTargetIndicator() +{ + if (currentTarget == null) { - if (currentTarget == null) - { - targetIndicator.SetActive(false); // 隐藏指示器 - return; - } - - // 获取目标的 BoxCollider2D - BoxCollider2D boxCollider = currentTarget.GetComponent(); - if (boxCollider != null) - { - Vector3 boxCenter = boxCollider.bounds.center; - Vector3 boxSize = boxCollider.bounds.size; - - // 转换为屏幕坐标 - Vector3 screenCenter = viewCamera.WorldToScreenPoint(boxCenter); - Vector2 screenSize = viewCamera.WorldToScreenPoint(boxCenter + boxSize) - - viewCamera.WorldToScreenPoint(boxCenter); - - // 设置目标框位置和大小 - RectTransform indicatorRectTransform = targetIndicator.GetComponent(); - indicatorRectTransform.position = screenCenter; - indicatorRectTransform.sizeDelta = screenSize; - - // 设置目标名称 - targetNameText.text = currentTarget.name+" "+"R"+currentTarget._color.r.ToString("F1") +" G"+currentTarget._color.g.ToString("F1")+" B"+currentTarget._color.b.ToString("F1") ; - - // 显示指示器 - targetIndicator.SetActive(true); - } + targetIndicator.SetActive(false); // 隐藏指示器 + return; } + // 获取目标的 BoxCollider2D + BoxCollider2D boxCollider = currentTarget.GetComponent(); + if (boxCollider != null) + { + Vector3 boxCenter = boxCollider.bounds.center; + Vector3 boxSize = boxCollider.bounds.size; + + // 转换为世界空间坐标 + Vector3 worldCenter = boxCenter; + Vector3 worldSize = boxSize; + + // 设置目标框的位置 + RectTransform indicatorRectTransform = targetIndicator.GetComponent(); + indicatorRectTransform.position = worldCenter; + indicatorRectTransform.sizeDelta=new Vector2(worldSize.x, worldSize.y)*1.2f; + + // 设置目标名称 + targetNameText.text = currentTarget.name + " " + + "R" + currentTarget._color.r.ToString("F1") + + " G" + currentTarget._color.g.ToString("F1") + + " B" + currentTarget._color.b.ToString("F1"); + + // 显示指示器 + targetIndicator.SetActive(true); + } +} + public void SetIndicatorTarget(EyeTarget target) { currentTarget = target; diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index af864fcce..2ebf69d7e 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using AibisDream.Framework; using UnityEngine; @@ -276,6 +276,7 @@ namespace AibisDream.FixSystem // 切换相机 yield return CameraKit.Instance.SwitchCamera(CameraEnum.UF); UFSystem.OpenUFView(); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.EyeDeep); EyeSystem.OnEnter(); } @@ -317,6 +318,7 @@ namespace AibisDream.FixSystem // 切换相机 yield return CameraKit.Instance.SwitchCamera(CameraEnum.Eye); yield return MainUIController.Instance?.FadeInSync(0.5f); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.EyeDeep); eyeSystem.OnEnter(); yield return MainUIController.Instance?.FadeOutSync(0.5f); } diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index 1fee39dc4..5739016f0 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -268,6 +268,7 @@ namespace AibisDream.Framework Eye, UF, Engine, - Gear + Gear, + EyeDeep, } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs index 6be81cc8b..064e52a54 100644 --- a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs +++ b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs @@ -35,7 +35,9 @@ public class EyeSystem : MonoBehaviour { FixSystemCenter.SystemDic.Register(this); var virtualCam = transform.Find("Eye Camera").GetComponent(); + var virtualCamDeep = transform.Find("Eye DeepCamera").GetComponent(); CameraKit.Instance.RegisterCamera(CameraEnum.Eye, virtualCam); + CameraKit.Instance.RegisterCamera(CameraEnum.EyeDeep, virtualCamDeep); GameLoopManager.FixDataContainer.Register(_eyeData); // 添加加载逻辑 _eyeData.LoadEvent += LoadData;