From 72f63d8598ba229c56f34abc4dd7ead0b33b8a42 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Wed, 19 Mar 2025 15:46:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 指针切换问题 2. 不同分辨率适配问题 --- Assets/Font/Chusung-220206 SDF.asset | 4 +- Assets/RawResources/齿轮/屏幕适应遮罩.png | 3 + .../RawResources/齿轮/屏幕适应遮罩.png.meta | 153 +++ .../FontAsset/VonwaonBitmap-16px SDF.asset | 4 +- .../字小魂清水体(商用需授权) SDF.asset | 4 +- .../字魂像素积木体(商用需授权) SDF.asset | 4 +- Assets/Resources/Prefabs/UI/Aside Text.prefab | 5 +- Assets/Resources/Prefabs/UI/Box.prefab | 76 +- .../Prefabs/UI/Bubble Left Bottom.prefab | 4 +- .../Resources/Prefabs/UI/Bubble Left.prefab | 5 +- .../Prefabs/UI/Bubble Right Bottom.prefab | 5 +- .../Resources/Prefabs/UI/Bubble Right.prefab | 5 +- .../Prefabs/UI/Center Choice Button.prefab | 4 +- .../Resources/Prefabs/UI/Choice Button.prefab | 10 +- Assets/Scenes/Persistence.unity | 328 +---- .../Screen System/ScreenSystem.cs | 2 + .../MiniGame/Engine/MovablePartGroup.cs | 2 - Assets/Scripts/UI/DialogUI/DialogBoxBase.cs | 2 +- .../StreamingAssets/Config/sprite_group.json | 1115 ++++++++++++++++- 19 files changed, 1380 insertions(+), 355 deletions(-) create mode 100644 Assets/RawResources/齿轮/屏幕适应遮罩.png create mode 100644 Assets/RawResources/齿轮/屏幕适应遮罩.png.meta diff --git a/Assets/Font/Chusung-220206 SDF.asset b/Assets/Font/Chusung-220206 SDF.asset index 7ce0b971b..83508a545 100644 --- a/Assets/Font/Chusung-220206 SDF.asset +++ b/Assets/Font/Chusung-220206 SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97838c74f3b27a792a74f6cf13c407b76df3c377178f1cca97d25e93002d98ec -size 2106765 +oid sha256:3a5652279bbd3a236644b0fa69ce9a0d457311d8a09487bd7463d9674712d249 +size 2107286 diff --git a/Assets/RawResources/齿轮/屏幕适应遮罩.png b/Assets/RawResources/齿轮/屏幕适应遮罩.png new file mode 100644 index 000000000..77310a269 --- /dev/null +++ b/Assets/RawResources/齿轮/屏幕适应遮罩.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8f81453ae299071e21349bf54c47145207d8f4939a20d7d636e456c490a4363 +size 10660 diff --git a/Assets/RawResources/齿轮/屏幕适应遮罩.png.meta b/Assets/RawResources/齿轮/屏幕适应遮罩.png.meta new file mode 100644 index 000000000..42e4ba3a7 --- /dev/null +++ b/Assets/RawResources/齿轮/屏幕适应遮罩.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 6cc1227684b7e6742ad1b9946b766592 +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: 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: 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/FontAsset/VonwaonBitmap-16px SDF.asset b/Assets/Resources/Prefabs/FontAsset/VonwaonBitmap-16px SDF.asset index 7ab26e730..bdcac73fa 100644 --- a/Assets/Resources/Prefabs/FontAsset/VonwaonBitmap-16px SDF.asset +++ b/Assets/Resources/Prefabs/FontAsset/VonwaonBitmap-16px SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:760fb8032235230bef9dc3e235d26bc6216bebeb84d0e0136cc5c669dd9a8399 -size 134251573 +oid sha256:4d2cbfad8a2cf644ee200f1671a8794d6dc9735de3836f689328aff1cf42ae8c +size 69517199 diff --git a/Assets/Resources/Prefabs/FontAsset/字小魂清水体(商用需授权) SDF.asset b/Assets/Resources/Prefabs/FontAsset/字小魂清水体(商用需授权) SDF.asset index e17eabc67..a8b6deb8b 100644 --- a/Assets/Resources/Prefabs/FontAsset/字小魂清水体(商用需授权) SDF.asset +++ b/Assets/Resources/Prefabs/FontAsset/字小魂清水体(商用需授权) SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2050cf49881fdf54e74d30008b60b2f6dcdb4ff45cc72423bdb533985ad13b21 -size 2119258 +oid sha256:264e6810fd5274d60faf4ea0dd5927248b4d5853eb6c9a43c880f30ad288d693 +size 2119785 diff --git a/Assets/Resources/Prefabs/FontAsset/字魂像素积木体(商用需授权) SDF.asset b/Assets/Resources/Prefabs/FontAsset/字魂像素积木体(商用需授权) SDF.asset index 0d0b3fde0..fed622194 100644 --- a/Assets/Resources/Prefabs/FontAsset/字魂像素积木体(商用需授权) SDF.asset +++ b/Assets/Resources/Prefabs/FontAsset/字魂像素积木体(商用需授权) SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dc3531d6b691774e5254edbfa940db21dea8022d4b99305986d6c182a6b0eb8 -size 2124082 +oid sha256:5161087a59f00c6e42a608852bb16ae34997463957c6cd85c3ddb9a37708150e +size 2124552 diff --git a/Assets/Resources/Prefabs/UI/Aside Text.prefab b/Assets/Resources/Prefabs/UI/Aside Text.prefab index e9460f954..5ce4310f7 100644 --- a/Assets/Resources/Prefabs/UI/Aside Text.prefab +++ b/Assets/Resources/Prefabs/UI/Aside Text.prefab @@ -102,6 +102,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: role: 0 + idx: 0 maxCharNum: 27 --- !u!114 &2069893582614801070 MonoBehaviour: @@ -202,8 +203,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} + m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Resources/Prefabs/UI/Box.prefab b/Assets/Resources/Prefabs/UI/Box.prefab index 98edf847d..2b0f41dfa 100644 --- a/Assets/Resources/Prefabs/UI/Box.prefab +++ b/Assets/Resources/Prefabs/UI/Box.prefab @@ -18,7 +18,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8421241559617079726 RectTransform: m_ObjectHideFlags: 0 @@ -35,8 +35,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 601.75, y: -173.93996} - m_SizeDelta: {x: 916.934, y: 171.4201} + m_AnchoredPosition: {x: 437, y: -151} + m_SizeDelta: {x: 760, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5975286064066965976 MonoBehaviour: @@ -139,8 +139,8 @@ RectTransform: 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: -630, y: 150} - m_SizeDelta: {x: 196.84, y: 90} + m_AnchoredPosition: {x: -458, y: 95} + m_SizeDelta: {x: 0, y: 90} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3498389414712684730 CanvasRenderer: @@ -163,7 +163,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -247,16 +247,16 @@ RectTransform: m_GameObject: {fileID: 5890622946834639560} 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_LocalScale: {x: 1.2, y: 1.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7131956091114956203} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -142.28, y: 67.7} + m_AnchoredPosition: {x: -60, y: 35} m_SizeDelta: {x: 32, y: 19} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.49999997, y: 0.49999982} --- !u!222 &5639890485129627689 CanvasRenderer: m_ObjectHideFlags: 0 @@ -313,7 +313,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7131956091114956203 RectTransform: m_ObjectHideFlags: 0 @@ -425,8 +425,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 613, y: -170} - m_SizeDelta: {x: 939.4397, y: 132.6784} + m_AnchoredPosition: {x: 433, y: -150} + m_SizeDelta: {x: 750, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8735059991624197031 CanvasRenderer: @@ -450,16 +450,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5BF9\u8BDD\u5185\u5BB9\u663E\u793A\u5728\u8FD9\u91CC\u652F\u6301\u5BCC\u6587\u672C" + m_text: "\u6211\u4EEC\u90FD\u662F\u6309\u7167\u6307\u4EE4\u5DE5\u4F5C\u7684\u673A\u4F53~\u4F46\u533B\u751F\uFF01\u4F60\u7684\u8FD9\u6B21\u5DE5\u4F5C~
\u5DF2\u7ECF\u53D8\u6210\u6211\u6C38\u8FDC\u7684\u56DE\u5FC6\u5566\uFF01" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} + m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -483,19 +483,19 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 46 - m_fontSizeBase: 46 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 8 m_VerticalAlignment: 256 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: 3 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: 32 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -504,7 +504,7 @@ MonoBehaviour: m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 + m_enableKerning: 0 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 @@ -519,7 +519,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: -11.698608, w: -5.858551} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -633,11 +633,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 5969022388722944562} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -45} - m_SizeDelta: {x: 96.84, y: 50.000004} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6323810537521366264 CanvasRenderer: m_ObjectHideFlags: 0 @@ -668,17 +668,17 @@ MonoBehaviour: m_Calls: [] m_text: "\u82F1\u7406" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} + m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, 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} + rgba: 3238002687 + m_fontColor: {r: 1, g: 1, b: 1, a: 0.7529412} m_enableVertexGradient: 0 - m_colorMode: 3 + m_colorMode: 0 m_fontColorGradient: topLeft: {r: 1, g: 1, b: 1, a: 1} topRight: {r: 1, g: 1, b: 1, a: 1} @@ -693,13 +693,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 8 m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 @@ -709,7 +709,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -729,7 +729,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -0.00021362305, w: 0} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab b/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab index 613997fbc..7e89fb6c4 100644 --- a/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab +++ b/Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab @@ -203,8 +203,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u793A\u4F8B\u6587\u5B57" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} + m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Resources/Prefabs/UI/Bubble Left.prefab b/Assets/Resources/Prefabs/UI/Bubble Left.prefab index 5ff084c8f..4156dfb52 100644 --- a/Assets/Resources/Prefabs/UI/Bubble Left.prefab +++ b/Assets/Resources/Prefabs/UI/Bubble Left.prefab @@ -132,6 +132,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: role: 2 + idx: 0 maxCharNum: 14 --- !u!1 &6816142221905378472 GameObject: @@ -202,8 +203,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u793A\u4F8B\u6587\u5B57" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} + m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Resources/Prefabs/UI/Bubble Right Bottom.prefab b/Assets/Resources/Prefabs/UI/Bubble Right Bottom.prefab index 0d2bb5d99..9ba29954d 100644 --- a/Assets/Resources/Prefabs/UI/Bubble Right Bottom.prefab +++ b/Assets/Resources/Prefabs/UI/Bubble Right Bottom.prefab @@ -69,8 +69,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u793A\u4F8B\u6587\u5B57" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} + m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -344,4 +344,5 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: role: 1 + idx: 0 maxCharNum: 14 diff --git a/Assets/Resources/Prefabs/UI/Bubble Right.prefab b/Assets/Resources/Prefabs/UI/Bubble Right.prefab index 38eb689c2..12a76a493 100644 --- a/Assets/Resources/Prefabs/UI/Bubble Right.prefab +++ b/Assets/Resources/Prefabs/UI/Bubble Right.prefab @@ -69,8 +69,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u793A\u4F8B\u6587\u5B57" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} + m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -344,4 +344,5 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: role: 1 + idx: 0 maxCharNum: 14 diff --git a/Assets/Resources/Prefabs/UI/Center Choice Button.prefab b/Assets/Resources/Prefabs/UI/Center Choice Button.prefab index 2d0770e9b..accdf13bf 100644 --- a/Assets/Resources/Prefabs/UI/Center Choice Button.prefab +++ b/Assets/Resources/Prefabs/UI/Center Choice Button.prefab @@ -188,8 +188,8 @@ MonoBehaviour: m_Calls: [] m_text: Button m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} + m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Resources/Prefabs/UI/Choice Button.prefab b/Assets/Resources/Prefabs/UI/Choice Button.prefab index cd9ab027e..c69be59ea 100644 --- a/Assets/Resources/Prefabs/UI/Choice Button.prefab +++ b/Assets/Resources/Prefabs/UI/Choice Button.prefab @@ -233,8 +233,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u9009\u9879\u4E00" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} + m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -258,15 +258,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 46 - m_fontSizeBase: 46 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 52245a72a..ba3332e6c 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -4063,9 +4063,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1696845842} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 200, y: -54.599014} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 240, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &237392156 @@ -7989,7 +7989,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &533176308 RectTransform: m_ObjectHideFlags: 0 @@ -8053,7 +8053,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1992781380} m_HandleRect: {fileID: 1992781379} m_Direction: 0 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -10030,10 +10030,10 @@ MonoBehaviour: - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} - {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} - {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2} - runMode: 0 + runMode: 2 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} - saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED" + saveFileName: "PeipeiDay2_\u505C\u6B62\u60F3\u8C61" --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 @@ -10506,8 +10506,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 485, y: 80.70001} - m_SizeDelta: {x: 950, y: 918.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &761395784 MonoBehaviour: @@ -10582,8 +10582,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 485, y: 80.70001} - m_SizeDelta: {x: 950, y: 918.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &773911911 MonoBehaviour: @@ -12437,10 +12437,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1693917954} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 485, y: 80.70001} - m_SizeDelta: {x: 950, y: 918.6} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &927888435 MonoBehaviour: @@ -12988,7 +12988,7 @@ MonoBehaviour: m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -14512,7 +14512,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 300} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0, y: 1} --- !u!114 &1145374179 MonoBehaviour: @@ -14529,8 +14529,8 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 - m_Bottom: 0 + m_Top: 30 + m_Bottom: 30 m_ChildAlignment: 1 m_Spacing: 10 m_ChildForceExpandWidth: 1 @@ -16359,281 +16359,33 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1604842429} m_Modifications: - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_text - value: "\u6211\u4EEC\u90FD\u662F\u6309\u7167\u6307\u4EE4\u5DE5\u4F5C\u7684\u673A\u4F53~\u4F46\u533B\u751F\uFF01\u4F60\u7684\u8FD9\u6B21\u5DE5\u4F5C~
\u5DF2\u7ECF\u53D8\u6210\u6211\u6C38\u8FDC\u7684\u56DE\u5FC6\u5566\uFF01" - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_fontSize - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_margin.w - value: -5.858551 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_margin.z - value: -11.698608 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_fontStyle - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_isRichText - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_lineSpacing - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_spriteAsset - value: - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_fontSizeBase - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_overflowMode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_enableKerning - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_characterSpacing - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_enableAutoSizing - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_VerticalAlignment - value: 256 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_horizontalMapping - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: checkPaddingRequired - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_enableExtraPadding - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_wordWrappingRatios - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_HorizontalAlignment - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_parseCtrlCharacters - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_useMaxVisibleDescender - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_IsTextObjectScaleStatic - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_fontSize - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_margin.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_colorMode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_fontStyle - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_fontColor.a - value: 0.7529412 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_fontSizeBase - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_enableAutoSizing - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_fontColor32.rgba - value: 3238002687 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_VerticalAlignment - value: 4096 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_enableWordWrapping - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_overrideHtmlColors - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_enableVertexGradient - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_IsTextObjectScaleStatic - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_Pivot.x - value: 0.49999997 - objectReference: {fileID: 0} - - target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_Pivot.y - value: 0.49999982 - objectReference: {fileID: 0} - - target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalScale.x - value: 1.2 - objectReference: {fileID: 0} - - target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchoredPosition.x - value: -60 - objectReference: {fileID: 0} - - target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 35 - objectReference: {fileID: 0} - - target: {fileID: 4013473223034251771, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_SizeDelta.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 4013473223034251771, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_SizeDelta.y - value: 140 - objectReference: {fileID: 0} - - target: {fileID: 4013473223034251771, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 433 - objectReference: {fileID: 0} - - target: {fileID: 4013473223034251771, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchoredPosition.y - value: -150 - objectReference: {fileID: 0} - - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 72.01 objectReference: {fileID: 0} - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 50.000004 objectReference: {fileID: 0} - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 86.005005 objectReference: {fileID: 0} - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5659732676396959192, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_Color.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5659732676396959192, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5659732676396959192, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_Color.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5659732676396959192, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_Color.r - value: 0 + value: -45 objectReference: {fileID: 0} - target: {fileID: 5969022388722944562, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5969022388722944562, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchoredPosition.x - value: -458 - objectReference: {fileID: 0} - - target: {fileID: 5969022388722944562, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 95 + value: 172.01001 objectReference: {fileID: 0} - target: {fileID: 6059188073131988442, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_Name @@ -16641,7 +16393,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6059188073131988442, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_Pivot.x @@ -18447,7 +18199,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: -17} + m_SizeDelta: {x: -17, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1463491729 MonoBehaviour: @@ -20496,9 +20248,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1696845842} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 200, y: -163.79704} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 240, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1596715192 @@ -21001,9 +20753,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1696845842} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 200, y: -272.99506} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 240, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1611684201 @@ -21941,10 +21693,10 @@ RectTransform: - {fileID: 927888434} m_Father: {fileID: 984233631} 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: -485, y: -80.7} - m_SizeDelta: {x: 970, y: 161.4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1694277408 GameObject: @@ -23397,7 +23149,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1788453626 RectTransform: m_ObjectHideFlags: 0 @@ -26424,7 +26176,7 @@ RectTransform: 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: 0, y: 100} + m_AnchoredPosition: {x: 0, y: 54} m_SizeDelta: {x: 700, y: 550} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2038437603 diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs index 7e1ab162d..2b4ae0254 100644 --- a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs @@ -83,7 +83,9 @@ namespace AibisDream.FixSystem // 逐个字符添加 yield return DOTween.To(() => text.text.Length, x => UpdateText(x, targetText, oldText), targetLength, targetText.Length * typeSpeed).WaitForCompletion(); + EnumEventSystem.Global.Send(DialogEventEnum.LineShown); yield return new WaitForSeconds(0.5f); + EnumEventSystem.Global.Send(DialogEventEnum.LineEnd); _nextStep.Invoke(); } diff --git a/Assets/Scripts/MiniGame/Engine/MovablePartGroup.cs b/Assets/Scripts/MiniGame/Engine/MovablePartGroup.cs index 00e7bcc71..5a6e7d02e 100644 --- a/Assets/Scripts/MiniGame/Engine/MovablePartGroup.cs +++ b/Assets/Scripts/MiniGame/Engine/MovablePartGroup.cs @@ -68,8 +68,6 @@ namespace AibisDream var duration = 1 / Mathf.Abs(initSpeed * speedRadio); var target = speedRadio >= 0 ? new Vector3(0, 0, 360) : new Vector3(0, 0, -360); - - Debug.Log("Rotate"); _rotateTween = gear.DORotate(target, duration, RotateMode.LocalAxisAdd) .SetEase(Ease.Linear) .SetLoops(-1, LoopType.Incremental); diff --git a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs index 6a5a4ba4f..481e4c140 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs @@ -203,7 +203,7 @@ namespace AibisDream else { _actorName.transform.parent.localPosition = - character.key == "me" ? new Vector3(460, 150, 0) : new Vector3(-630, 150, 0); + character.key == "me" ? new Vector3(310, 95, 0) : new Vector3(-458, 95, 0); _actorName.transform.parent.gameObject.SetActive(true); _actorName.text = character.GetActorName(); diff --git a/Assets/StreamingAssets/Config/sprite_group.json b/Assets/StreamingAssets/Config/sprite_group.json index f6ac1d28a..e78b6b9f4 100644 --- a/Assets/StreamingAssets/Config/sprite_group.json +++ b/Assets/StreamingAssets/Config/sprite_group.json @@ -1 +1,1114 @@ -{"佩佩最新":{"key":"石头","layerId":941243827,"maxLayer":200,"minLayer":100,"stateDict":{"none":[],"默认":["佩佩默认姿势"],"默认扬眉":["开心眉毛_1","佩佩默认姿势"],"默认扬眉闭眼":["开心眉毛_1","闭眼","佩佩默认姿势"],"低头":["侧低头抱手"],"低头不爽":["侧低头不爽嘴型","侧低头抱手"],"默认扬眉I":["开心眉毛_1","嘴型A","佩佩默认姿势"],"默认扬眉闭嘴I":["开心眉毛_1","闭眼","嘴型A","佩佩默认姿势"],"默认扬眉微笑":["开心眉毛_1","嘴型D","佩佩默认姿势"],"默认扬眉微笑闭眼":["开心眉毛_1","闭眼","嘴型D","佩佩默认姿势"],"默认闭眼":["闭眼","佩佩默认姿势"],"默认扬眉E":["开心眉毛_1","嘴型C","佩佩默认姿势"],"画画扬眉微笑":["开心眉毛_1","嘴型D","画画姿势"],"画画扬眉无神微笑":["开心眉毛_1","无表情眼睛","嘴型D","画画姿势"],"画画":["画画姿势"],"默认微笑":["嘴型D","佩佩默认姿势"],"画画微笑":["嘴型D","画画姿势"],"画画微笑闭眼":["闭眼","嘴型D","画画姿势"],"低头侧目":["测低头侧眼","侧低头抱手"],"默认I":["嘴型A","佩佩默认姿势"],"默认A":["嘴型B","佩佩默认姿势"],"默认垂眼":["无神眼睛","佩佩默认姿势"],"默认垂眼I":["无神眼睛","嘴型A","佩佩默认姿势"],"默认微笑闭眼":["闭眼","嘴型D","佩佩默认姿势"],"默认扬眉垂眼":["开心眉毛_1","无神眼睛","佩佩默认姿势"],"默认扬眉垂眼微笑":["开心眉毛_1","无神眼睛","嘴型D","佩佩默认姿势"],"默认垂眼微笑":["无神眼睛","嘴型D","佩佩默认姿势"],"画画垂眼":["无神眼睛","画画姿势"],"画画闭眼":["闭眼","画画姿势"],"背手":["侧低头背手"],"背手侧眼":["测低头侧眼","侧低头背手"],"背手闭眼":["侧低头闭眼","侧低头背手"],"背手侧眼张嘴":["测低头侧眼","侧低头张嘴 ","侧低头背手"],"背手闭眼微笑":["侧低头闭眼","侧低头侧眼蓝色眼睛","测低头侧眼","侧低头苦笑嘴型","侧低头背手"],"背手侧眼微笑":["测低头侧眼","侧低头苦笑嘴型","侧低头背手"],"默认无神微笑":["无表情眼睛","嘴型D","佩佩默认姿势"],"画画扬眉":["开心眉毛_1","画画姿势"],"画画扬眉微笑闭眼":["开心眉毛_1","闭眼","嘴型D","画画姿势"],"默认闭眼A":["闭眼","嘴型B","佩佩默认姿势"],"默认闭眼I":["闭眼","嘴型A","佩佩默认姿势"],"默认无神A":["无表情眼睛","嘴型B","佩佩默认姿势"],"默认无神":["无表情眼睛","佩佩默认姿势"],"默认扬眉无神微笑":["开心眉毛_1","无表情眼睛","嘴型D","佩佩默认姿势"],"默认扬眉无神":["开心眉毛_1","无表情眼睛","佩佩默认姿势"],"低头黑线流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头抱手"],"低头黑线张嘴流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"头痛":["画画头疼"],"低头黑线张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头张嘴 ","侧低头抱手"],"低头黑线侧目张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","测低头侧眼","侧低头张嘴 ","侧低头抱手"],"低头黑线流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头抱手"],"默认皱眉无神流汗":["流汗","生气眉毛","无表情眼睛","佩佩默认姿势"],"画画皱眉流汗闭眼A":["流汗","生气眉毛","闭眼","嘴型B","画画姿势"],"画画皱眉流汗闭眼":["大汗淋漓流汗","生气眉毛","闭眼","画画姿势"],"画画皱眉大汗淋漓闭眼I":["大汗淋漓流汗","流汗","生气眉毛","闭眼","嘴型A","画画姿势"],"画画皱眉流汗无神A":["流汗","生气眉毛","无表情眼睛","嘴型B","画画姿势"],"默认皱眉流汗无神A":["流汗","生气眉毛","无表情眼睛","嘴型B","佩佩默认姿势"],"画画皱眉大汗淋漓闭眼":["大汗淋漓流汗","流汗","生气眉毛","闭眼","画画姿势"],"默认皱眉大汗淋漓垂眼A":["大汗淋漓流汗","流汗","生气眉毛","无神眼睛","嘴型B","佩佩默认姿势"],"画画皱眉大汗淋漓垂眼":["大汗淋漓流汗","流汗","生气眉毛","无神眼睛","画画姿势"],"画画皱眉流汗垂眼":["大汗淋漓流汗","生气眉毛","无神眼睛","画画姿势"],"默认皱眉流汗闭眼":["流汗","生气眉毛","闭眼","佩佩默认姿势"],"默认皱眉闭眼":["生气眉毛","闭眼","佩佩默认姿势"],"默认皱眉流汗难受I":["流汗","生气眉毛","难受眼睛","嘴型A","佩佩默认姿势"],"默认皱眉流汗难受":["流汗","生气眉毛","难受眼睛","佩佩默认姿势"],"默认皱眉流汗闭眼I":["流汗","生气眉毛","闭眼","嘴型A","佩佩默认姿势"],"背手黑线张嘴闭眼":["侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头背手"],"背手黑线流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头背手"],"背手黑线侧目张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","测低头侧眼","侧低头张嘴 ","侧低头背手"],"背手黑线张嘴流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头背手"],"默认皱眉流汗无神":["流汗","生气眉毛","无表情眼睛","佩佩默认姿势"],"默认皱眉流泪流汗闭眼I":["流汗","站姿流泪","生气眉毛","闭眼","嘴型A","佩佩默认姿势"],"默认皱眉流泪流汗难受":["流汗","站姿流泪","生气眉毛","难受眼睛","佩佩默认姿势"],"默认皱眉流泪流汗难受I":["流汗","站姿流泪","生气眉毛","难受眼睛","嘴型A","佩佩默认姿势"],"默认皱眉流泪流汗闭眼":["流汗","站姿流泪","生气眉毛","闭眼","佩佩默认姿势"],"背手黑线流泪张嘴闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头背手"],"背手黑线流泪张嘴":["侧低头流泪","侧低头阴郁排线阴影","侧低头张嘴 ","侧低头背手"],"低头黑线流泪张嘴闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"背手黑线流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头背手"],"背手黑线闭眼张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头背手"],"默认流泪流汗难受":["流汗","站姿流泪","难受眼睛","佩佩默认姿势"],"默认流泪流汗闭眼":["流汗","站姿流泪","闭眼","佩佩默认姿势"],"画画流汗无神A":["流汗","无表情眼睛","嘴型B","画画姿势"],"画画流汗无神":["流汗","无表情眼睛","画画姿势"],"画画流泪流汗无神":["大汗淋漓流汗","站姿流泪","生气眉毛","无表情眼睛","画画姿势"],"画画流泪流汗难受":["流汗","站姿流泪","难受眼睛","画画姿势"],"画画流泪流汗难受A":["流汗","站姿流泪","难受眼睛","嘴型B","画画姿势"],"画画皱眉流泪流汗闭眼":["大汗淋漓流汗","站姿流泪","生气眉毛","闭眼","画画姿势"],"默认流泪流汗难受E":["流汗","站姿流泪","难受眼睛","嘴型C","嘴型A","佩佩默认姿势"],"默认流泪流汗难受A":["流汗","站姿流泪","难受眼睛","嘴型B","嘴型A","佩佩默认姿势"],"画画流泪流汗闭眼":["流汗","站姿流泪","闭眼","画画姿势"],"画画皱眉流泪流汗垂眼":["大汗淋漓流汗","站姿流泪","生气眉毛","无神眼睛","画画姿势"],"画画皱眉流泪大汗淋漓闭眼I":["大汗淋漓流汗","流汗","站姿流泪","生气眉毛","闭眼","嘴型A","画画姿势"],"画画流泪流汗难受I":["流汗","站姿流泪","难受眼睛","嘴型A","画画姿势"],"默认大汗淋漓I":["大汗淋漓流汗","流汗","嘴型A","佩佩默认姿势"],"默认大汗淋漓":["大汗淋漓流汗","流汗","佩佩默认姿势"],"默认大汗淋漓闭眼I":["大汗淋漓流汗","流汗","闭眼","嘴型A","佩佩默认姿势"],"默认大汗淋漓难受I":["大汗淋漓流汗","流汗","难受眼睛","嘴型A","佩佩默认姿势"],"低头黑线":["侧低头阴郁排线阴影","侧低头抱手"],"低头黑线闭眼":["侧低头阴郁排线阴影","侧低头闭眼","侧低头抱手"],"低头侧目张嘴":["测低头侧眼","侧低头张嘴 ","侧低头抱手"],"低头闭眼":["侧低头闭眼","侧低头抱手"],"低头张嘴闭眼":["侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"默认流汗闭眼":["流汗","闭眼","无表情眼睛","佩佩默认姿势"],"默认流汗张嘴":["流汗","嘴型A","佩佩默认姿势"],"默认流汗张嘴闭眼":["流汗","闭眼","嘴型A","佩佩默认姿势"],"默认流汗I":["流汗","嘴型A","佩佩默认姿势"],"默认流汗闭眼I":["流汗","闭眼","嘴型A","佩佩默认姿势"],"默认流汗微笑":["流汗","嘴型D","佩佩默认姿势"],"默认流汗E":["流汗","嘴型C","佩佩默认姿势"],"默认流汗微笑闭眼":["流汗","闭眼","嘴型D","佩佩默认姿势"],"默认流汗闭眼A":["流汗","闭眼","嘴型B","佩佩默认姿势"],"默认流汗A":["流汗","嘴型B","佩佩默认姿势"],"低头黑线张嘴闭眼":["侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"低头黑线微笑闭眼":["侧低头阴郁排线阴影","侧低头闭眼","侧低头苦笑嘴型","侧低头抱手"],"低头黑线微笑":["侧低头阴郁排线阴影","侧低头苦笑嘴型","侧低头抱手"],"低头黑线侧目微笑":["侧低头阴郁排线阴影","测低头侧眼","侧低头苦笑嘴型","侧低头抱手"],"默认流汗无神I":["流汗","无表情眼睛","嘴型A","佩佩默认姿势"],"默认流汗无神闭眼I":["流汗","闭眼","无表情眼睛","嘴型A","佩佩默认姿势"],"默认流汗":["流汗","佩佩默认姿势"],"默认流汗无神":["流汗","无表情眼睛","佩佩默认姿势"],"默认扬眉闭眼I":["开心眉毛_1","闭眼","嘴型A","佩佩默认姿势"],"默认无神I":["无表情眼睛","嘴型A","佩佩默认姿势"],"默认蓝眼无神I":["无表情眼睛","UF修好后蓝色眼睛","嘴型A","佩佩默认姿势"],"默认蓝眼A":["UF修好后蓝色眼睛","嘴型B","佩佩默认姿势"],"默认蓝眼流汗A":["流汗","UF修好后蓝色眼睛","嘴型B","嘴型A","佩佩默认姿势"],"默认蓝眼流汗无神微笑":["流汗","无表情眼睛","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认闭眼微笑":["闭眼","无表情眼睛","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认闭眼E":["闭眼","无表情眼睛","UF修好后蓝色眼睛","嘴型C","佩佩默认姿势"],"默认蓝眼无神E":["无表情眼睛","UF修好后蓝色眼睛","嘴型C","佩佩默认姿势"],"默认蓝眼无神微笑":["无表情眼睛","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认扬眉闭眼A":["开心眉毛_1","闭眼","无表情眼睛","UF修好后蓝色眼睛","嘴型B","佩佩默认姿势"],"低头扬眉张嘴闭眼":["开心眉毛","侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"低头扬眉微笑闭眼":["开心眉毛","侧低头闭眼","侧低头侧眼蓝色眼睛","侧低头苦笑嘴型","侧低头抱手"],"低头微笑闭眼":["侧低头闭眼","侧低头侧眼蓝色眼睛","侧低头苦笑嘴型","侧低头抱手"],"低头蓝眼侧目":["侧低头侧眼蓝色眼睛","侧低头抱手"],"低头蓝眼侧目微笑":["侧低头侧眼蓝色眼睛","侧低头苦笑嘴型","侧低头抱手"],"低头蓝眼侧目张嘴":["侧低头侧眼蓝色眼睛","侧低头张嘴 ","侧低头抱手"],"低头蓝眼微笑":["侧低头蓝色眼睛","侧低头苦笑嘴型","侧低头抱手"],"低头蓝眼":["侧低头蓝色眼睛","侧低头抱手"],"默认蓝眼微笑":["UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认蓝眼无神A":["无表情眼睛","UF修好后蓝色眼睛","嘴型B","佩佩默认姿势"],"默认蓝眼扬眉E":["开心眉毛_1","UF修好后蓝色眼睛","嘴型C","佩佩默认姿势"],"默认流泪闭眼":["站姿流泪","闭眼","佩佩默认姿势"],"默认流泪微笑闭眼":["站姿流泪","闭眼","嘴型D","佩佩默认姿势"],"默认流泪无神微笑":["站姿流泪","无表情眼睛","嘴型D","佩佩默认姿势"],"默认蓝眼流泪无神微笑":["站姿流泪","无表情眼睛","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认蓝眼流泪无神E":["站姿流泪","无表情眼睛","UF修好后蓝色眼睛","嘴型C","佩佩默认姿势"],"默认蓝眼":["UF修好后蓝色眼睛","佩佩默认姿势"],"默认蓝眼I":["UF修好后蓝色眼睛","嘴型A","佩佩默认姿势"],"默认蓝眼扬眉I":["开心眉毛_1","UF修好后蓝色眼睛","嘴型A","佩佩默认姿势"],"默认蓝眼无神":["无表情眼睛","UF修好后蓝色眼睛","佩佩默认姿势"],"默认蓝眼扬眉微笑":["开心眉毛_1","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认蓝眼扬眉":["开心眉毛_1","UF修好后蓝色眼睛","佩佩默认姿势"],"默认蓝眼E":["UF修好后蓝色眼睛","嘴型C","佩佩默认姿势"],"低头流泪闭眼":["侧低头流泪","侧低头闭眼","侧低头抱手"],"低头蓝眼流泪张嘴":["侧低头流泪","侧低头蓝色眼睛","侧低头张嘴 ","侧低头抱手"],"低头蓝眼流泪":["侧低头流泪","侧低头蓝色眼睛","侧低头抱手"],"低头流泪张嘴闭眼":["侧低头流泪","侧低头闭眼","侧低头蓝色眼睛","侧低头张嘴 ","侧低头抱手"],"低头蓝眼侧目流泪":["侧低头流泪","侧低头侧眼蓝色眼睛","侧低头蓝色眼睛","侧低头抱手"],"低头蓝眼侧目流泪张嘴":["侧低头流泪","侧低头侧眼蓝色眼睛","侧低头蓝色眼睛","侧低头张嘴 ","侧低头抱手"],"默认蓝眼流泪":["站姿流泪","UF修好后蓝色眼睛","佩佩默认姿势"],"默认蓝眼流泪微笑":["站姿流泪","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认扬眉无神E":["开心眉毛_1","无表情眼睛","嘴型C","佩佩默认姿势"],"画画无神微笑":["无表情眼睛","嘴型D","画画姿势"]}},"佩佩旧":{"key":"佩佩旧","layerId":941243827,"maxLayer":200,"minLayer":100,"stateDict":{"背手闭眼":["管子","换液设备","闭眼","佩佩背后别手"],"背手":["管子","换液设备","佩佩背后别手"],"背手微笑":["管子","换液设备","嘴巴笑","佩佩背后别手"],"默认扬眉笑":["管子","换液设备","微笑","垂手"],"默认微笑":["管子","换液设备","嘴巴笑","垂手"]}},"石头":{"key":"石头","layerId":941243827,"maxLayer":200,"minLayer":100,"stateDict":{"none":[],"默认":["佩佩默认姿势"],"默认扬眉":["开心眉毛_1","佩佩默认姿势"],"默认扬眉闭眼":["开心眉毛_1","闭眼","佩佩默认姿势"],"低头":["侧低头抱手"],"低头不爽":["侧低头不爽嘴型","侧低头抱手"],"默认扬眉I":["开心眉毛_1","嘴型A","佩佩默认姿势"],"默认扬眉闭嘴I":["开心眉毛_1","闭眼","嘴型A","佩佩默认姿势"],"默认扬眉微笑":["开心眉毛_1","嘴型D","佩佩默认姿势"],"默认扬眉微笑闭眼":["开心眉毛_1","闭眼","嘴型D","佩佩默认姿势"],"默认闭眼":["闭眼","佩佩默认姿势"],"默认扬眉E":["开心眉毛_1","嘴型C","佩佩默认姿势"],"画画扬眉微笑":["开心眉毛_1","嘴型D","画画姿势"],"画画扬眉无神微笑":["开心眉毛_1","无表情眼睛","嘴型D","画画姿势"],"画画":["画画姿势"],"默认微笑":["嘴型D","佩佩默认姿势"],"画画微笑":["嘴型D","画画姿势"],"画画微笑闭眼":["闭眼","嘴型D","画画姿势"],"低头侧目":["测低头侧眼","侧低头抱手"],"默认I":["嘴型A","佩佩默认姿势"],"默认A":["嘴型B","佩佩默认姿势"],"默认垂眼":["无神眼睛","佩佩默认姿势"],"默认垂眼I":["无神眼睛","嘴型A","佩佩默认姿势"],"默认微笑闭眼":["闭眼","嘴型D","佩佩默认姿势"],"默认扬眉垂眼":["开心眉毛_1","无神眼睛","佩佩默认姿势"],"默认扬眉垂眼微笑":["开心眉毛_1","无神眼睛","嘴型D","佩佩默认姿势"],"默认垂眼微笑":["无神眼睛","嘴型D","佩佩默认姿势"],"画画垂眼":["无神眼睛","画画姿势"],"画画闭眼":["闭眼","画画姿势"],"背手":["侧低头背手"],"背手侧眼":["测低头侧眼","侧低头背手"],"背手闭眼":["侧低头闭眼","侧低头背手"],"背手侧眼张嘴":["测低头侧眼","侧低头张嘴 ","侧低头背手"],"背手闭眼微笑":["侧低头闭眼","侧低头侧眼蓝色眼睛","测低头侧眼","侧低头苦笑嘴型","侧低头背手"],"背手侧眼微笑":["测低头侧眼","侧低头苦笑嘴型","侧低头背手"],"默认无神微笑":["无表情眼睛","嘴型D","佩佩默认姿势"],"画画扬眉":["开心眉毛_1","画画姿势"],"画画扬眉微笑闭眼":["开心眉毛_1","闭眼","嘴型D","画画姿势"],"默认闭眼A":["闭眼","嘴型B","佩佩默认姿势"],"默认闭眼I":["闭眼","嘴型A","佩佩默认姿势"],"默认无神A":["无表情眼睛","嘴型B","佩佩默认姿势"],"默认无神":["无表情眼睛","佩佩默认姿势"],"默认扬眉无神微笑":["开心眉毛_1","无表情眼睛","嘴型D","佩佩默认姿势"],"默认扬眉无神":["开心眉毛_1","无表情眼睛","佩佩默认姿势"],"低头黑线流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头抱手"],"低头黑线张嘴流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"头痛":["画画头疼"],"低头黑线张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头张嘴 ","侧低头抱手"],"低头黑线侧目张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","测低头侧眼","侧低头张嘴 ","侧低头抱手"],"低头黑线流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头抱手"],"默认皱眉无神流汗":["流汗","生气眉毛","无表情眼睛","佩佩默认姿势"],"画画皱眉流汗闭眼A":["流汗","生气眉毛","闭眼","嘴型B","画画姿势"],"画画皱眉流汗闭眼":["大汗淋漓流汗","生气眉毛","闭眼","画画姿势"],"画画皱眉大汗淋漓闭眼I":["大汗淋漓流汗","流汗","生气眉毛","闭眼","嘴型A","画画姿势"],"画画皱眉流汗无神A":["流汗","生气眉毛","无表情眼睛","嘴型B","画画姿势"],"默认皱眉流汗无神A":["流汗","生气眉毛","无表情眼睛","嘴型B","佩佩默认姿势"],"画画皱眉大汗淋漓闭眼":["大汗淋漓流汗","流汗","生气眉毛","闭眼","画画姿势"],"默认皱眉大汗淋漓垂眼A":["大汗淋漓流汗","流汗","生气眉毛","无神眼睛","嘴型B","佩佩默认姿势"],"画画皱眉大汗淋漓垂眼":["大汗淋漓流汗","流汗","生气眉毛","无神眼睛","画画姿势"],"画画皱眉流汗垂眼":["大汗淋漓流汗","生气眉毛","无神眼睛","画画姿势"],"默认皱眉流汗闭眼":["流汗","生气眉毛","闭眼","佩佩默认姿势"],"默认皱眉闭眼":["生气眉毛","闭眼","佩佩默认姿势"],"默认皱眉流汗难受I":["流汗","生气眉毛","难受眼睛","嘴型A","佩佩默认姿势"],"默认皱眉流汗难受":["流汗","生气眉毛","难受眼睛","佩佩默认姿势"],"默认皱眉流汗闭眼I":["流汗","生气眉毛","闭眼","嘴型A","佩佩默认姿势"],"背手黑线张嘴闭眼":["侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头背手"],"背手黑线流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头背手"],"背手黑线侧目张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","测低头侧眼","侧低头张嘴 ","侧低头背手"],"背手黑线张嘴流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头背手"],"默认皱眉流汗无神":["流汗","生气眉毛","无表情眼睛","佩佩默认姿势"],"默认皱眉流泪流汗闭眼I":["流汗","站姿流泪","生气眉毛","闭眼","嘴型A","佩佩默认姿势"],"默认皱眉流泪流汗难受":["流汗","站姿流泪","生气眉毛","难受眼睛","佩佩默认姿势"],"默认皱眉流泪流汗难受I":["流汗","站姿流泪","生气眉毛","难受眼睛","嘴型A","佩佩默认姿势"],"默认皱眉流泪流汗闭眼":["流汗","站姿流泪","生气眉毛","闭眼","佩佩默认姿势"],"背手黑线流泪张嘴闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头背手"],"背手黑线流泪张嘴":["侧低头流泪","侧低头阴郁排线阴影","侧低头张嘴 ","侧低头背手"],"低头黑线流泪张嘴闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"背手黑线流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头背手"],"背手黑线闭眼张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头背手"],"默认流泪流汗难受":["流汗","站姿流泪","难受眼睛","佩佩默认姿势"],"默认流泪流汗闭眼":["流汗","站姿流泪","闭眼","佩佩默认姿势"],"画画流汗无神A":["流汗","无表情眼睛","嘴型B","画画姿势"],"画画流汗无神":["流汗","无表情眼睛","画画姿势"],"画画流泪流汗无神":["大汗淋漓流汗","站姿流泪","生气眉毛","无表情眼睛","画画姿势"],"画画流泪流汗难受":["流汗","站姿流泪","难受眼睛","画画姿势"],"画画流泪流汗难受A":["流汗","站姿流泪","难受眼睛","嘴型B","画画姿势"],"画画皱眉流泪流汗闭眼":["大汗淋漓流汗","站姿流泪","生气眉毛","闭眼","画画姿势"],"默认流泪流汗难受E":["流汗","站姿流泪","难受眼睛","嘴型C","嘴型A","佩佩默认姿势"],"默认流泪流汗难受A":["流汗","站姿流泪","难受眼睛","嘴型B","嘴型A","佩佩默认姿势"],"画画流泪流汗闭眼":["流汗","站姿流泪","闭眼","画画姿势"],"画画皱眉流泪流汗垂眼":["大汗淋漓流汗","站姿流泪","生气眉毛","无神眼睛","画画姿势"],"画画皱眉流泪大汗淋漓闭眼I":["大汗淋漓流汗","流汗","站姿流泪","生气眉毛","闭眼","嘴型A","画画姿势"],"画画流泪流汗难受I":["流汗","站姿流泪","难受眼睛","嘴型A","画画姿势"],"默认大汗淋漓I":["大汗淋漓流汗","流汗","嘴型A","佩佩默认姿势"],"默认大汗淋漓":["大汗淋漓流汗","流汗","佩佩默认姿势"],"默认大汗淋漓闭眼I":["大汗淋漓流汗","流汗","闭眼","嘴型A","佩佩默认姿势"],"默认大汗淋漓难受I":["大汗淋漓流汗","流汗","难受眼睛","嘴型A","佩佩默认姿势"],"低头黑线":["侧低头阴郁排线阴影","侧低头抱手"],"低头黑线闭眼":["侧低头阴郁排线阴影","侧低头闭眼","侧低头抱手"],"低头侧目张嘴":["测低头侧眼","侧低头张嘴 ","侧低头抱手"],"低头闭眼":["侧低头闭眼","侧低头抱手"],"低头张嘴闭眼":["侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"默认流汗闭眼":["流汗","闭眼","无表情眼睛","佩佩默认姿势"],"默认流汗张嘴":["流汗","嘴型A","佩佩默认姿势"],"默认流汗张嘴闭眼":["流汗","闭眼","嘴型A","佩佩默认姿势"],"默认流汗I":["流汗","嘴型A","佩佩默认姿势"],"默认流汗闭眼I":["流汗","闭眼","嘴型A","佩佩默认姿势"],"默认流汗微笑":["流汗","嘴型D","佩佩默认姿势"],"默认流汗E":["流汗","嘴型C","佩佩默认姿势"],"默认流汗微笑闭眼":["流汗","闭眼","嘴型D","佩佩默认姿势"],"默认流汗闭眼A":["流汗","闭眼","嘴型B","佩佩默认姿势"],"默认流汗A":["流汗","嘴型B","佩佩默认姿势"],"低头黑线张嘴闭眼":["侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"低头黑线微笑闭眼":["侧低头阴郁排线阴影","侧低头闭眼","侧低头苦笑嘴型","侧低头抱手"],"低头黑线微笑":["侧低头阴郁排线阴影","侧低头苦笑嘴型","侧低头抱手"],"低头黑线侧目微笑":["侧低头阴郁排线阴影","测低头侧眼","侧低头苦笑嘴型","侧低头抱手"],"默认流汗无神I":["流汗","无表情眼睛","嘴型A","佩佩默认姿势"],"默认流汗无神闭眼I":["流汗","闭眼","无表情眼睛","嘴型A","佩佩默认姿势"],"默认流汗":["流汗","佩佩默认姿势"],"默认流汗无神":["流汗","无表情眼睛","佩佩默认姿势"],"默认扬眉闭眼I":["开心眉毛_1","闭眼","嘴型A","佩佩默认姿势"],"默认无神I":["无表情眼睛","嘴型A","佩佩默认姿势"],"默认蓝眼无神I":["无表情眼睛","UF修好后蓝色眼睛","嘴型A","佩佩默认姿势"],"默认蓝眼A":["UF修好后蓝色眼睛","嘴型B","佩佩默认姿势"],"默认蓝眼流汗A":["流汗","UF修好后蓝色眼睛","嘴型B","嘴型A","佩佩默认姿势"],"默认蓝眼流汗无神微笑":["流汗","无表情眼睛","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认闭眼微笑":["闭眼","无表情眼睛","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认闭眼E":["闭眼","无表情眼睛","UF修好后蓝色眼睛","嘴型C","佩佩默认姿势"],"默认蓝眼无神E":["无表情眼睛","UF修好后蓝色眼睛","嘴型C","佩佩默认姿势"],"默认蓝眼无神微笑":["无表情眼睛","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认扬眉闭眼A":["开心眉毛_1","闭眼","无表情眼睛","UF修好后蓝色眼睛","嘴型B","佩佩默认姿势"],"低头扬眉张嘴闭眼":["开心眉毛","侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"低头扬眉微笑闭眼":["开心眉毛","侧低头闭眼","侧低头侧眼蓝色眼睛","侧低头苦笑嘴型","侧低头抱手"],"低头微笑闭眼":["侧低头闭眼","侧低头侧眼蓝色眼睛","侧低头苦笑嘴型","侧低头抱手"],"低头蓝眼侧目":["侧低头侧眼蓝色眼睛","侧低头抱手"],"低头蓝眼侧目微笑":["侧低头侧眼蓝色眼睛","侧低头苦笑嘴型","侧低头抱手"],"低头蓝眼侧目张嘴":["侧低头侧眼蓝色眼睛","侧低头张嘴 ","侧低头抱手"],"低头蓝眼微笑":["侧低头蓝色眼睛","侧低头苦笑嘴型","侧低头抱手"],"低头蓝眼":["侧低头蓝色眼睛","侧低头抱手"],"默认蓝眼微笑":["UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认蓝眼无神A":["无表情眼睛","UF修好后蓝色眼睛","嘴型B","佩佩默认姿势"],"默认蓝眼扬眉E":["开心眉毛_1","UF修好后蓝色眼睛","嘴型C","佩佩默认姿势"],"默认流泪闭眼":["站姿流泪","闭眼","佩佩默认姿势"],"默认流泪微笑闭眼":["站姿流泪","闭眼","嘴型D","佩佩默认姿势"],"默认流泪无神微笑":["站姿流泪","无表情眼睛","嘴型D","佩佩默认姿势"],"默认蓝眼流泪无神微笑":["站姿流泪","无表情眼睛","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认蓝眼流泪无神E":["站姿流泪","无表情眼睛","UF修好后蓝色眼睛","嘴型C","佩佩默认姿势"],"默认蓝眼":["UF修好后蓝色眼睛","佩佩默认姿势"],"默认蓝眼I":["UF修好后蓝色眼睛","嘴型A","佩佩默认姿势"],"默认蓝眼扬眉I":["开心眉毛_1","UF修好后蓝色眼睛","嘴型A","佩佩默认姿势"],"默认蓝眼无神":["无表情眼睛","UF修好后蓝色眼睛","佩佩默认姿势"],"默认蓝眼扬眉微笑":["开心眉毛_1","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认蓝眼扬眉":["开心眉毛_1","UF修好后蓝色眼睛","佩佩默认姿势"],"默认蓝眼E":["UF修好后蓝色眼睛","嘴型C","佩佩默认姿势"],"低头流泪闭眼":["侧低头流泪","侧低头闭眼","侧低头抱手"],"低头蓝眼流泪张嘴":["侧低头流泪","侧低头蓝色眼睛","侧低头张嘴 ","侧低头抱手"],"低头蓝眼流泪":["侧低头流泪","侧低头蓝色眼睛","侧低头抱手"],"低头流泪张嘴闭眼":["侧低头流泪","侧低头闭眼","侧低头蓝色眼睛","侧低头张嘴 ","侧低头抱手"],"低头蓝眼侧目流泪":["侧低头流泪","侧低头侧眼蓝色眼睛","侧低头蓝色眼睛","侧低头抱手"],"低头蓝眼侧目流泪张嘴":["侧低头流泪","侧低头侧眼蓝色眼睛","侧低头蓝色眼睛","侧低头张嘴 ","侧低头抱手"],"默认蓝眼流泪":["站姿流泪","UF修好后蓝色眼睛","佩佩默认姿势"],"默认蓝眼流泪微笑":["站姿流泪","UF修好后蓝色眼睛","嘴型D","佩佩默认姿势"],"默认扬眉无神E":["开心眉毛_1","无表情眼睛","嘴型C","佩佩默认姿势"],"画画无神微笑":["无表情眼睛","嘴型D","画画姿势"]}}} \ No newline at end of file +{ + "佩佩最新": { + "key": "佩佩最新", + "layerId": 941243827, + "maxLayer": 200, + "minLayer": 100, + "stateDict": { + "none": [], + "默认": [ + "佩佩默认姿势" + ], + "默认扬眉": [ + "开心眉毛_1", + "佩佩默认姿势" + ], + "默认扬眉闭眼": [ + "开心眉毛_1", + "闭眼", + "佩佩默认姿势" + ], + "低头": [ + "侧低头抱手" + ], + "低头不爽": [ + "侧低头不爽嘴型", + "侧低头抱手" + ], + "默认扬眉I": [ + "开心眉毛_1", + "嘴型A", + "佩佩默认姿势" + ], + "默认扬眉闭嘴I": [ + "开心眉毛_1", + "闭眼", + "嘴型A", + "佩佩默认姿势" + ], + "默认扬眉微笑": [ + "开心眉毛_1", + "嘴型D", + "佩佩默认姿势" + ], + "默认扬眉微笑闭眼": [ + "开心眉毛_1", + "闭眼", + "嘴型D", + "佩佩默认姿势" + ], + "默认闭眼": [ + "闭眼", + "佩佩默认姿势" + ], + "默认扬眉E": [ + "开心眉毛_1", + "嘴型C", + "佩佩默认姿势" + ], + "画画扬眉微笑": [ + "开心眉毛_1", + "嘴型D", + "画画姿势" + ], + "画画扬眉无神微笑": [ + "开心眉毛_1", + "无表情眼睛", + "嘴型D", + "画画姿势" + ], + "画画": [ + "画画姿势" + ], + "默认微笑": [ + "嘴型D", + "佩佩默认姿势" + ], + "画画微笑": [ + "嘴型D", + "画画姿势" + ], + "画画微笑闭眼": [ + "闭眼", + "嘴型D", + "画画姿势" + ], + "低头侧目": [ + "测低头侧眼", + "侧低头抱手" + ], + "默认I": [ + "嘴型A", + "佩佩默认姿势" + ], + "默认A": [ + "嘴型B", + "佩佩默认姿势" + ], + "默认垂眼": [ + "无神眼睛", + "佩佩默认姿势" + ], + "默认垂眼I": [ + "无神眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "默认微笑闭眼": [ + "闭眼", + "嘴型D", + "佩佩默认姿势" + ], + "默认扬眉垂眼": [ + "开心眉毛_1", + "无神眼睛", + "佩佩默认姿势" + ], + "默认扬眉垂眼微笑": [ + "开心眉毛_1", + "无神眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "默认垂眼微笑": [ + "无神眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "画画垂眼": [ + "无神眼睛", + "画画姿势" + ], + "画画闭眼": [ + "闭眼", + "画画姿势" + ], + "背手": [ + "侧低头背手" + ], + "背手侧眼": [ + "测低头侧眼", + "侧低头背手" + ], + "背手闭眼": [ + "侧低头闭眼", + "侧低头背手" + ], + "背手侧眼张嘴": [ + "测低头侧眼", + "侧低头张嘴 ", + "侧低头背手" + ], + "背手闭眼微笑": [ + "侧低头闭眼", + "侧低头侧眼蓝色眼睛", + "测低头侧眼", + "侧低头苦笑嘴型", + "侧低头背手" + ], + "背手侧眼微笑": [ + "测低头侧眼", + "侧低头苦笑嘴型", + "侧低头背手" + ], + "默认无神微笑": [ + "无表情眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "画画扬眉": [ + "开心眉毛_1", + "画画姿势" + ], + "画画扬眉微笑闭眼": [ + "开心眉毛_1", + "闭眼", + "嘴型D", + "画画姿势" + ], + "默认闭眼A": [ + "闭眼", + "嘴型B", + "佩佩默认姿势" + ], + "默认闭眼I": [ + "闭眼", + "嘴型A", + "佩佩默认姿势" + ], + "默认无神A": [ + "无表情眼睛", + "嘴型B", + "佩佩默认姿势" + ], + "默认无神": [ + "无表情眼睛", + "佩佩默认姿势" + ], + "默认扬眉无神微笑": [ + "开心眉毛_1", + "无表情眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "默认扬眉无神": [ + "开心眉毛_1", + "无表情眼睛", + "佩佩默认姿势" + ], + "低头黑线流泪闭眼": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头抱手" + ], + "低头黑线张嘴流泪闭眼": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头抱手" + ], + "头痛": [ + "画画头疼" + ], + "低头黑线张嘴流泪": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头张嘴 ", + "侧低头抱手" + ], + "低头黑线侧目张嘴流泪": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "测低头侧眼", + "侧低头张嘴 ", + "侧低头抱手" + ], + "低头黑线流泪": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头抱手" + ], + "默认皱眉无神流汗": [ + "流汗", + "生气眉毛", + "无表情眼睛", + "佩佩默认姿势" + ], + "画画皱眉流汗闭眼A": [ + "流汗", + "生气眉毛", + "闭眼", + "嘴型B", + "画画姿势" + ], + "画画皱眉流汗闭眼": [ + "大汗淋漓流汗", + "生气眉毛", + "闭眼", + "画画姿势" + ], + "画画皱眉大汗淋漓闭眼I": [ + "大汗淋漓流汗", + "流汗", + "生气眉毛", + "闭眼", + "嘴型A", + "画画姿势" + ], + "画画皱眉流汗无神A": [ + "流汗", + "生气眉毛", + "无表情眼睛", + "嘴型B", + "画画姿势" + ], + "默认皱眉流汗无神A": [ + "流汗", + "生气眉毛", + "无表情眼睛", + "嘴型B", + "佩佩默认姿势" + ], + "画画皱眉大汗淋漓闭眼": [ + "大汗淋漓流汗", + "流汗", + "生气眉毛", + "闭眼", + "画画姿势" + ], + "默认皱眉大汗淋漓垂眼A": [ + "大汗淋漓流汗", + "流汗", + "生气眉毛", + "无神眼睛", + "嘴型B", + "佩佩默认姿势" + ], + "画画皱眉大汗淋漓垂眼": [ + "大汗淋漓流汗", + "流汗", + "生气眉毛", + "无神眼睛", + "画画姿势" + ], + "画画皱眉流汗垂眼": [ + "大汗淋漓流汗", + "生气眉毛", + "无神眼睛", + "画画姿势" + ], + "默认皱眉流汗闭眼": [ + "流汗", + "生气眉毛", + "闭眼", + "佩佩默认姿势" + ], + "默认皱眉闭眼": [ + "生气眉毛", + "闭眼", + "佩佩默认姿势" + ], + "默认皱眉流汗难受I": [ + "流汗", + "生气眉毛", + "难受眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "默认皱眉流汗难受": [ + "流汗", + "生气眉毛", + "难受眼睛", + "佩佩默认姿势" + ], + "默认皱眉流汗闭眼I": [ + "流汗", + "生气眉毛", + "闭眼", + "嘴型A", + "佩佩默认姿势" + ], + "背手黑线张嘴闭眼": [ + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头背手" + ], + "背手黑线流泪": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头背手" + ], + "背手黑线侧目张嘴流泪": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "测低头侧眼", + "侧低头张嘴 ", + "侧低头背手" + ], + "背手黑线张嘴流泪闭眼": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头背手" + ], + "默认皱眉流汗无神": [ + "流汗", + "生气眉毛", + "无表情眼睛", + "佩佩默认姿势" + ], + "默认皱眉流泪流汗闭眼I": [ + "流汗", + "站姿流泪", + "生气眉毛", + "闭眼", + "嘴型A", + "佩佩默认姿势" + ], + "默认皱眉流泪流汗难受": [ + "流汗", + "站姿流泪", + "生气眉毛", + "难受眼睛", + "佩佩默认姿势" + ], + "默认皱眉流泪流汗难受I": [ + "流汗", + "站姿流泪", + "生气眉毛", + "难受眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "默认皱眉流泪流汗闭眼": [ + "流汗", + "站姿流泪", + "生气眉毛", + "闭眼", + "佩佩默认姿势" + ], + "背手黑线流泪张嘴闭眼": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头背手" + ], + "背手黑线流泪张嘴": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头张嘴 ", + "侧低头背手" + ], + "低头黑线流泪张嘴闭眼": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头抱手" + ], + "背手黑线流泪闭眼": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头背手" + ], + "背手黑线闭眼张嘴流泪": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头背手" + ], + "默认流泪流汗难受": [ + "流汗", + "站姿流泪", + "难受眼睛", + "佩佩默认姿势" + ], + "默认流泪流汗闭眼": [ + "流汗", + "站姿流泪", + "闭眼", + "佩佩默认姿势" + ], + "画画流汗无神A": [ + "流汗", + "无表情眼睛", + "嘴型B", + "画画姿势" + ], + "画画流汗无神": [ + "流汗", + "无表情眼睛", + "画画姿势" + ], + "画画流泪流汗无神": [ + "大汗淋漓流汗", + "站姿流泪", + "生气眉毛", + "无表情眼睛", + "画画姿势" + ], + "画画流泪流汗难受": [ + "流汗", + "站姿流泪", + "难受眼睛", + "画画姿势" + ], + "画画流泪流汗难受A": [ + "流汗", + "站姿流泪", + "难受眼睛", + "嘴型B", + "画画姿势" + ], + "画画皱眉流泪流汗闭眼": [ + "大汗淋漓流汗", + "站姿流泪", + "生气眉毛", + "闭眼", + "画画姿势" + ], + "默认流泪流汗难受E": [ + "流汗", + "站姿流泪", + "难受眼睛", + "嘴型C", + "嘴型A", + "佩佩默认姿势" + ], + "默认流泪流汗难受A": [ + "流汗", + "站姿流泪", + "难受眼睛", + "嘴型B", + "嘴型A", + "佩佩默认姿势" + ], + "画画流泪流汗闭眼": [ + "流汗", + "站姿流泪", + "闭眼", + "画画姿势" + ], + "画画皱眉流泪流汗垂眼": [ + "大汗淋漓流汗", + "站姿流泪", + "生气眉毛", + "无神眼睛", + "画画姿势" + ], + "画画皱眉流泪大汗淋漓闭眼I": [ + "大汗淋漓流汗", + "流汗", + "站姿流泪", + "生气眉毛", + "闭眼", + "嘴型A", + "画画姿势" + ], + "画画流泪流汗难受I": [ + "流汗", + "站姿流泪", + "难受眼睛", + "嘴型A", + "画画姿势" + ], + "默认大汗淋漓I": [ + "大汗淋漓流汗", + "流汗", + "嘴型A", + "佩佩默认姿势" + ], + "默认大汗淋漓": [ + "大汗淋漓流汗", + "流汗", + "佩佩默认姿势" + ], + "默认大汗淋漓闭眼I": [ + "大汗淋漓流汗", + "流汗", + "闭眼", + "嘴型A", + "佩佩默认姿势" + ], + "默认大汗淋漓难受I": [ + "大汗淋漓流汗", + "流汗", + "难受眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "低头黑线": [ + "侧低头阴郁排线阴影", + "侧低头抱手" + ], + "低头黑线闭眼": [ + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头抱手" + ], + "低头侧目张嘴": [ + "测低头侧眼", + "侧低头张嘴 ", + "侧低头抱手" + ], + "低头闭眼": [ + "侧低头闭眼", + "侧低头抱手" + ], + "低头张嘴闭眼": [ + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头抱手" + ], + "默认流汗闭眼": [ + "流汗", + "闭眼", + "无表情眼睛", + "佩佩默认姿势" + ], + "默认流汗张嘴": [ + "流汗", + "嘴型A", + "佩佩默认姿势" + ], + "默认流汗张嘴闭眼": [ + "流汗", + "闭眼", + "嘴型A", + "佩佩默认姿势" + ], + "默认流汗I": [ + "流汗", + "嘴型A", + "佩佩默认姿势" + ], + "默认流汗闭眼I": [ + "流汗", + "闭眼", + "嘴型A", + "佩佩默认姿势" + ], + "默认流汗微笑": [ + "流汗", + "嘴型D", + "佩佩默认姿势" + ], + "默认流汗E": [ + "流汗", + "嘴型C", + "佩佩默认姿势" + ], + "默认流汗微笑闭眼": [ + "流汗", + "闭眼", + "嘴型D", + "佩佩默认姿势" + ], + "默认流汗闭眼A": [ + "流汗", + "闭眼", + "嘴型B", + "佩佩默认姿势" + ], + "默认流汗A": [ + "流汗", + "嘴型B", + "佩佩默认姿势" + ], + "低头黑线张嘴闭眼": [ + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头抱手" + ], + "低头黑线微笑闭眼": [ + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头苦笑嘴型", + "侧低头抱手" + ], + "低头黑线微笑": [ + "侧低头阴郁排线阴影", + "侧低头苦笑嘴型", + "侧低头抱手" + ], + "低头黑线侧目微笑": [ + "侧低头阴郁排线阴影", + "测低头侧眼", + "侧低头苦笑嘴型", + "侧低头抱手" + ], + "默认流汗无神I": [ + "流汗", + "无表情眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "默认流汗无神闭眼I": [ + "流汗", + "闭眼", + "无表情眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "默认流汗": [ + "流汗", + "佩佩默认姿势" + ], + "默认流汗无神": [ + "流汗", + "无表情眼睛", + "佩佩默认姿势" + ], + "默认扬眉闭眼I": [ + "开心眉毛_1", + "闭眼", + "嘴型A", + "佩佩默认姿势" + ], + "默认无神I": [ + "无表情眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "默认蓝眼无神I": [ + "无表情眼睛", + "UF修好后蓝色眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "默认蓝眼A": [ + "UF修好后蓝色眼睛", + "嘴型B", + "佩佩默认姿势" + ], + "默认蓝眼流汗A": [ + "流汗", + "UF修好后蓝色眼睛", + "嘴型B", + "嘴型A", + "佩佩默认姿势" + ], + "默认蓝眼流汗无神微笑": [ + "流汗", + "无表情眼睛", + "UF修好后蓝色眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "默认闭眼微笑": [ + "闭眼", + "无表情眼睛", + "UF修好后蓝色眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "默认闭眼E": [ + "闭眼", + "无表情眼睛", + "UF修好后蓝色眼睛", + "嘴型C", + "佩佩默认姿势" + ], + "默认蓝眼无神E": [ + "无表情眼睛", + "UF修好后蓝色眼睛", + "嘴型C", + "佩佩默认姿势" + ], + "默认蓝眼无神微笑": [ + "无表情眼睛", + "UF修好后蓝色眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "默认扬眉闭眼A": [ + "开心眉毛_1", + "闭眼", + "无表情眼睛", + "UF修好后蓝色眼睛", + "嘴型B", + "佩佩默认姿势" + ], + "低头扬眉张嘴闭眼": [ + "开心眉毛", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头抱手" + ], + "低头扬眉微笑闭眼": [ + "开心眉毛", + "侧低头闭眼", + "侧低头侧眼蓝色眼睛", + "侧低头苦笑嘴型", + "侧低头抱手" + ], + "低头微笑闭眼": [ + "侧低头闭眼", + "侧低头侧眼蓝色眼睛", + "侧低头苦笑嘴型", + "侧低头抱手" + ], + "低头蓝眼侧目": [ + "侧低头侧眼蓝色眼睛", + "侧低头抱手" + ], + "低头蓝眼侧目微笑": [ + "侧低头侧眼蓝色眼睛", + "侧低头苦笑嘴型", + "侧低头抱手" + ], + "低头蓝眼侧目张嘴": [ + "侧低头侧眼蓝色眼睛", + "侧低头张嘴 ", + "侧低头抱手" + ], + "低头蓝眼微笑": [ + "侧低头蓝色眼睛", + "侧低头苦笑嘴型", + "侧低头抱手" + ], + "低头蓝眼": [ + "侧低头蓝色眼睛", + "侧低头抱手" + ], + "默认蓝眼微笑": [ + "UF修好后蓝色眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "默认蓝眼无神A": [ + "无表情眼睛", + "UF修好后蓝色眼睛", + "嘴型B", + "佩佩默认姿势" + ], + "默认蓝眼扬眉E": [ + "开心眉毛_1", + "UF修好后蓝色眼睛", + "嘴型C", + "佩佩默认姿势" + ], + "默认流泪闭眼": [ + "站姿流泪", + "闭眼", + "佩佩默认姿势" + ], + "默认流泪微笑闭眼": [ + "站姿流泪", + "闭眼", + "嘴型D", + "佩佩默认姿势" + ], + "默认流泪无神微笑": [ + "站姿流泪", + "无表情眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "默认蓝眼流泪无神微笑": [ + "站姿流泪", + "无表情眼睛", + "UF修好后蓝色眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "默认蓝眼流泪无神E": [ + "站姿流泪", + "无表情眼睛", + "UF修好后蓝色眼睛", + "嘴型C", + "佩佩默认姿势" + ], + "默认蓝眼": [ + "UF修好后蓝色眼睛", + "佩佩默认姿势" + ], + "默认蓝眼I": [ + "UF修好后蓝色眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "默认蓝眼扬眉I": [ + "开心眉毛_1", + "UF修好后蓝色眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "默认蓝眼无神": [ + "无表情眼睛", + "UF修好后蓝色眼睛", + "佩佩默认姿势" + ], + "默认蓝眼扬眉微笑": [ + "开心眉毛_1", + "UF修好后蓝色眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "默认蓝眼扬眉": [ + "开心眉毛_1", + "UF修好后蓝色眼睛", + "佩佩默认姿势" + ], + "默认蓝眼E": [ + "UF修好后蓝色眼睛", + "嘴型C", + "佩佩默认姿势" + ], + "低头流泪闭眼": [ + "侧低头流泪", + "侧低头闭眼", + "侧低头抱手" + ], + "低头蓝眼流泪张嘴": [ + "侧低头流泪", + "侧低头蓝色眼睛", + "侧低头张嘴 ", + "侧低头抱手" + ], + "低头蓝眼流泪": [ + "侧低头流泪", + "侧低头蓝色眼睛", + "侧低头抱手" + ], + "低头流泪张嘴闭眼": [ + "侧低头流泪", + "侧低头闭眼", + "侧低头蓝色眼睛", + "侧低头张嘴 ", + "侧低头抱手" + ], + "低头蓝眼侧目流泪": [ + "侧低头流泪", + "侧低头侧眼蓝色眼睛", + "侧低头蓝色眼睛", + "侧低头抱手" + ], + "低头蓝眼侧目流泪张嘴": [ + "侧低头流泪", + "侧低头侧眼蓝色眼睛", + "侧低头蓝色眼睛", + "侧低头张嘴 ", + "侧低头抱手" + ], + "默认蓝眼流泪": [ + "站姿流泪", + "UF修好后蓝色眼睛", + "佩佩默认姿势" + ], + "默认蓝眼流泪微笑": [ + "站姿流泪", + "UF修好后蓝色眼睛", + "嘴型D", + "佩佩默认姿势" + ], + "默认扬眉无神E": [ + "开心眉毛_1", + "无表情眼睛", + "嘴型C", + "佩佩默认姿势" + ], + "画画无神微笑": [ + "无表情眼睛", + "嘴型D", + "画画姿势" + ] + } + }, + "佩佩旧": { + "key": "佩佩旧", + "layerId": 941243827, + "maxLayer": 200, + "minLayer": 100, + "stateDict": { + "背手闭眼": [ + "管子", + "换液设备", + "闭眼", + "佩佩背后别手" + ], + "背手": [ + "管子", + "换液设备", + "佩佩背后别手" + ], + "背手微笑": [ + "管子", + "换液设备", + "嘴巴笑", + "佩佩背后别手" + ], + "默认扬眉笑": [ + "管子", + "换液设备", + "微笑", + "垂手" + ], + "默认微笑": [ + "管子", + "换液设备", + "嘴巴笑", + "垂手" + ] + } + }, + "石头": { + "key": "石头", + "layerId": 941243827, + "maxLayer": 200, + "minLayer": 100, + "stateDict": { + "默认": [ + "正常微微笑", + "默认姿势石头" + ], + "默认大笑": [ + "大笑", + "默认姿势石头" + ], + "默认思索": [ + "思索走神", + "默认姿势石头" + ], + "默认闭眼": [ + "石头闭眼", + "正常微微笑", + "默认姿势石头" + ], + "默认大笑闭眼": [ + "石头闭眼", + "大笑", + "默认姿势石头" + ], + "默认走神闭眼": [ + "石头闭眼", + "思索走神", + "默认姿势石头" + ], + "默认低眉微笑": [ + "低眉", + "正常微微笑", + "默认姿势石头" + ], + "默认低眉大笑": [ + "低眉", + "大笑", + "默认姿势石头" + ], + "默认低眉走神": [ + "低眉", + "思索走神", + "默认姿势石头" + ], + "默认低眉闭眼": [ + "低眉", + "石头闭眼", + "正常微微笑", + "默认姿势石头" + ], + "默认低眉大笑闭眼": [ + "低眉", + "石头闭眼", + "大笑", + "默认姿势石头" + ], + "默认低眉走神闭眼": [ + "低眉", + "石头闭眼", + "思索走神", + "默认姿势石头" + ], + "摸头": [ + "正常微微笑", + "石头摸头" + ], + "摸头大笑": [ + "大笑", + "石头摸头" + ], + "摸头走神": [ + "思索走神", + "石头摸头" + ], + "摸头闭眼": [ + "石头闭眼", + "正常微微笑", + "石头摸头" + ], + "摸头大笑闭眼": [ + "石头闭眼", + "大笑", + "石头摸头" + ], + "摸头走神闭眼": [ + "石头闭眼", + "思索走神", + "石头摸头" + ], + "摸头低眉": [ + "低眉", + "正常微微笑", + "石头摸头" + ], + "摸头低眉大笑": [ + "低眉", + "大笑", + "石头摸头" + ], + "摸头低眉走神": [ + "低眉", + "思索走神", + "石头摸头" + ], + "摸头低眉闭眼": [ + "低眉", + "石头闭眼", + "正常微微笑", + "石头摸头" + ], + "摸头低眉大笑闭眼": [ + "低眉", + "石头闭眼", + "大笑", + "石头摸头" + ], + "摸头低眉走神闭眼": [ + "低眉", + "石头闭眼", + "思索走神", + "石头摸头" + ], + "捂头痛苦": [ + "石头捂头" + ], + "none": [], + "默认走神": [ + "思索走神", + "默认姿势石头" + ], + "默认低眉": [ + "低眉", + "正常微微笑", + "默认姿势石头" + ] + } + } +}