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/3] 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/3] 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/3] =?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