diff --git a/Assets/Resources/Art/UI/按钮底图.png b/Assets/Resources/Art/UI/按钮底图.png new file mode 100644 index 000000000..a733eda0e --- /dev/null +++ b/Assets/Resources/Art/UI/按钮底图.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6691454d6b9d056be0bd8d902691b8c84b2f3bf44e3fdb296d304c4115b80289 +size 959 diff --git a/Assets/Resources/Art/UI/按钮底图.png.meta b/Assets/Resources/Art/UI/按钮底图.png.meta new file mode 100644 index 000000000..1472f18bd --- /dev/null +++ b/Assets/Resources/Art/UI/按钮底图.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 9bf4d25ebf1ef354e82f5295791cf4b7 +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/Art/UI/日常对话气泡.png b/Assets/Resources/Art/UI/日常对话气泡.png index d5d52b5e0..c75001dbf 100644 --- a/Assets/Resources/Art/UI/日常对话气泡.png +++ b/Assets/Resources/Art/UI/日常对话气泡.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e028d97a3cc8c1a61a702b1b10b0cb1570dc325bceba2cf4362b9d9813aa60ee -size 19580 +oid sha256:2397031d637729046dde5d2f844ea080f5602088d92e7ef6a7e82fa45748b679 +size 19878 diff --git a/Assets/Resources/Art/UI/日常对话气泡.png.meta b/Assets/Resources/Art/UI/日常对话气泡.png.meta index b96029c00..0eb5c180a 100644 --- a/Assets/Resources/Art/UI/日常对话气泡.png.meta +++ b/Assets/Resources/Art/UI/日常对话气泡.png.meta @@ -119,6 +119,19 @@ TextureImporter: 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 spriteSheet: serializedVersion: 2 sprites: @@ -128,11 +141,11 @@ TextureImporter: serializedVersion: 2 x: 0 y: 749 - width: 582 + width: 583 height: 331 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 255, y: 135, z: 38, w: 37} + border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 @@ -168,13 +181,13 @@ TextureImporter: name: "\u65E5\u5E38\u5BF9\u8BDD\u6C14\u6CE1_2" rect: serializedVersion: 2 - x: 827 + x: 826 y: 846 width: 680 height: 234 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 43, y: 40, z: 143, w: 87} + border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 @@ -195,7 +208,7 @@ TextureImporter: height: 66 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 75, y: 0, z: 36, w: 0} + border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 @@ -216,7 +229,7 @@ TextureImporter: height: 234 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 39, y: 45, z: 41, w: 38} + border: {x: 26, y: 23, z: 23, w: 27} outline: [] physicsShape: [] tessellationDetail: 0 @@ -227,6 +240,27 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: "\u65E5\u5E38\u5BF9\u8BDD\u6C14\u6CE1_5" + rect: + serializedVersion: 2 + x: 776 + y: 497 + width: 113 + height: 46 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 4, y: 5, z: 3, w: 5} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0848d3be7b69f62408715eb819d17f40 + internalID: -187902626 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -243,6 +277,7 @@ TextureImporter: "\u65E5\u5E38\u5BF9\u8BDD\u6C14\u6CE1_2": -727467337 "\u65E5\u5E38\u5BF9\u8BDD\u6C14\u6CE1_3": -1163943723 "\u65E5\u5E38\u5BF9\u8BDD\u6C14\u6CE1_4": -683341770 + "\u65E5\u5E38\u5BF9\u8BDD\u6C14\u6CE1_5": -187902626 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Resources/Prefabs/UI/Box.prefab b/Assets/Resources/Prefabs/UI/Box.prefab index b0732059d..d14b7313c 100644 --- a/Assets/Resources/Prefabs/UI/Box.prefab +++ b/Assets/Resources/Prefabs/UI/Box.prefab @@ -102,6 +102,124 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4227014537172106758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5969022388722944562} + - component: {fileID: 3498389414712684730} + - component: {fileID: 5659732676396959192} + - component: {fileID: 5187829012510734086} + - component: {fileID: 7704007643722311252} + m_Layer: 5 + m_Name: Actor Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5969022388722944562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4227014537172106758} + 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: 4734035430968629439} + m_Father: {fileID: 7131956091114956203} + 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: 0, y: 70} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3498389414712684730 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4227014537172106758} + m_CullTransparentMesh: 1 +--- !u!114 &5659732676396959192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4227014537172106758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: -187902626, guid: c8409501d0e34af47b749d1d13131442, 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: 1 +--- !u!114 &5187829012510734086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4227014537172106758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 30 + m_Right: 30 + m_Top: 20 + m_Bottom: 20 + m_ChildAlignment: 3 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &7704007643722311252 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4227014537172106758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &5890622946834639560 GameObject: m_ObjectHideFlags: 0 @@ -195,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 @@ -208,10 +326,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4734035430968629439} - {fileID: 4013473223034251771} - {fileID: 2340543909228546517} - {fileID: 8421241559617079726} + - {fileID: 5969022388722944562} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} @@ -457,6 +575,8 @@ MonoBehaviour: triggerEventsOnSkip: 0 resetTypingSpeedAtStartup: 1 disappearanceOrientation: 0 + triggerShowedAfterEffectsEnd: 0 + triggerDisappearedAfterEffectsEnd: 0 onTextShowed: m_PersistentCalls: m_Calls: [] @@ -475,7 +595,7 @@ MonoBehaviour: waitForNormalChars: 0.033333335 waitLong: 0.6 waitMiddle: 0.2 - avoidMultiplePunctuactionWait: 0 + avoidMultiplePunctuationWait: 0 waitForNewLines: 1 waitForLastCharacter: 1 useTypewriterWaitForDisappearances: 1 @@ -493,7 +613,7 @@ GameObject: - component: {fileID: 6323810537521366264} - component: {fileID: 2256868743146392351} m_Layer: 5 - m_Name: Actor Name + m_Name: Name m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -511,13 +631,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7131956091114956203} + 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: 297.8283, y: -53} - m_SizeDelta: {x: 483.6566, y: 50} - m_Pivot: {x: 0.5, 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, y: 0.5} --- !u!222 &6323810537521366264 CanvasRenderer: m_ObjectHideFlags: 0 @@ -609,7 +729,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -0.00018310547, w: 0} + m_margin: {x: 0, y: 0, z: -0.00021362305, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/Resources/Prefabs/UI/Center Choice Button.prefab b/Assets/Resources/Prefabs/UI/Center Choice Button.prefab new file mode 100644 index 000000000..2d0770e9b --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Center Choice Button.prefab @@ -0,0 +1,257 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2831695685783823246 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3175932164576970450} + - component: {fileID: 5976863416321242783} + - component: {fileID: 8437347680415685861} + - component: {fileID: 7725980928702500686} + m_Layer: 5 + m_Name: Center Choice Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3175932164576970450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2831695685783823246} + 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: 1551847431753483204} + m_Father: {fileID: 0} + 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: 960, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5976863416321242783 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2831695685783823246} + m_CullTransparentMesh: 1 +--- !u!114 &8437347680415685861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2831695685783823246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 9bf4d25ebf1ef354e82f5295791cf4b7, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7725980928702500686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2831695685783823246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.6037736, g: 0.6037736, b: 0.6037736, a: 1} + m_PressedColor: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1} + m_SelectedColor: {r: 0.6415094, g: 0.6415094, b: 0.6415094, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5045998712088251647} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &3621154367891971503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1551847431753483204} + - component: {fileID: 6220797397505161798} + - component: {fileID: 5045998712088251647} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1551847431753483204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3621154367891971503} + 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: 3175932164576970450} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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!222 &6220797397505161798 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3621154367891971503} + m_CullTransparentMesh: 1 +--- !u!114 &5045998712088251647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3621154367891971503} + 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: Button + 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: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Resources/Prefabs/UI/Center Choice Button.prefab.meta b/Assets/Resources/Prefabs/UI/Center Choice Button.prefab.meta new file mode 100644 index 000000000..0ef348fe2 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Center Choice Button.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7b38c32597bbad84e92958938ef655dd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Player Bubble.prefab b/Assets/Resources/Prefabs/UI/Player Bubble.prefab index ab423e81c..1968adb6f 100644 --- a/Assets/Resources/Prefabs/UI/Player Bubble.prefab +++ b/Assets/Resources/Prefabs/UI/Player Bubble.prefab @@ -222,6 +222,7 @@ GameObject: - component: {fileID: 2673124579144078471} - component: {fileID: 6304324492443822404} - component: {fileID: 276549186829526868} + - component: {fileID: 1254416171759915895} m_Layer: 5 m_Name: Dialog Text m_TagString: Untagged @@ -395,6 +396,8 @@ MonoBehaviour: triggerEventsOnSkip: 0 resetTypingSpeedAtStartup: 1 disappearanceOrientation: 0 + triggerShowedAfterEffectsEnd: 0 + triggerDisappearedAfterEffectsEnd: 0 onTextShowed: m_PersistentCalls: m_Calls: [] @@ -413,12 +416,26 @@ MonoBehaviour: waitForNormalChars: 0.1 waitLong: 0.6 waitMiddle: 0.2 - avoidMultiplePunctuactionWait: 0 + avoidMultiplePunctuationWait: 0 waitForNewLines: 1 waitForLastCharacter: 1 useTypewriterWaitForDisappearances: 1 disappearanceWaitTime: 0.015 disappearanceSpeedMultiplier: 1 +--- !u!114 &1254416171759915895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8350799087752378543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 0 --- !u!1 &8518890624210964847 GameObject: m_ObjectHideFlags: 0 @@ -431,6 +448,7 @@ GameObject: - component: {fileID: 9109024175080783090} - component: {fileID: 7036814853636706666} - component: {fileID: 1577716708503439262} + - component: {fileID: 2923959433269043823} m_Layer: 5 m_Name: Player Bubble m_TagString: Untagged @@ -511,3 +529,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: delayTime: 300 +--- !u!114 &2923959433269043823 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8518890624210964847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 0 diff --git a/Assets/Resources/Yarn/View/View1.yarn b/Assets/Resources/Yarn/View/View1.yarn index 8105b29e6..fe128710a 100644 --- a/Assets/Resources/Yarn/View/View1.yarn +++ b/Assets/Resources/Yarn/View/View1.yarn @@ -2,6 +2,17 @@ tags: --- <> +peipei: 正常对话 +me: 正常对话1 +<> +CenterText: 中央对话1 +CenterText: 中央对话2 +<> +me: 正常对话2 +-> CenterOption: 中心选项1 + me: 正常对话3 +-> CenterOption: 中心选项2 + me: 正常对话4 <> === diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 89eaecdc4..ba0b60b82 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -262,6 +262,218 @@ GameObject: m_CorrespondingSourceObject: {fileID: 8732203183804650455, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} m_PrefabInstance: {fileID: 1282326175} m_PrefabAsset: {fileID: 0} +--- !u!1 &27659197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 27659198} + - component: {fileID: 27659202} + - component: {fileID: 27659201} + - component: {fileID: 27659200} + - component: {fileID: 27659199} + m_Layer: 5 + m_Name: Dialog Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &27659198 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 27659197} + 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: 1403558893} + 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: 0} + m_SizeDelta: {x: 1400, y: 800} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &27659199 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 27659197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57a6945b90dcd0c4b81619c0d8b5c283, type: 3} + m_Name: + m_EditorClassIdentifier: + useTypeWriter: 1 + startTypewriterMode: 2 + hideAppearancesOnSkip: 1 + hideDisappearancesOnSkip: 0 + triggerEventsOnSkip: 0 + resetTypingSpeedAtStartup: 1 + disappearanceOrientation: 0 + triggerShowedAfterEffectsEnd: 0 + triggerDisappearedAfterEffectsEnd: 0 + onTextShowed: + m_PersistentCalls: + m_Calls: [] + onTypewriterStart: + m_PersistentCalls: + m_Calls: [] + onTextDisappeared: + m_PersistentCalls: + m_Calls: [] + onCharacterVisible: + m_PersistentCalls: + m_Calls: [] + onMessage: + m_PersistentCalls: + m_Calls: [] + waitForNormalChars: 0.033333335 + waitLong: 0.6 + waitMiddle: 0.2 + avoidMultiplePunctuationWait: 0 + waitForNewLines: 1 + waitForLastCharacter: 1 + useTypewriterWaitForDisappearances: 1 + disappearanceWaitTime: 0.015 + disappearanceSpeedMultiplier: 1 +--- !u!114 &27659200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 27659197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e8ace8ced0e81c847968cdca0aeda757, type: 3} + m_Name: + m_EditorClassIdentifier: + typewriterStartsAutomatically: 1 + animationLoop: 0 + timeScale: 0 + _text: "\u5BF9\u8BDD\u5185\u5BB9\u663E\u793A\u5728\u8FD9\u91CC\u652F\u6301\u5BCC\u6587\u672C" + useDynamicScaling: 1 + referenceFontSize: 10 + isResettingTimeOnNewText: 1 + useDefaultDatabases: 1 + databaseBehaviors: {fileID: 11400000, guid: ab7e07cba198f4345b19d351e6a3034f, type: 2} + databaseAppearances: {fileID: 11400000, guid: 71ecf6147756deb4ca20570628f94f96, type: 2} + useDefaultStyleSheet: 1 + styleSheet: {fileID: 0} + databaseActions: {fileID: 11400000, guid: de78232a60d74f6459e57e5606304209, type: 2} + defaultAppearancesTags: + - 'fade ' + defaultDisappearancesTags: + - fade + defaultBehaviorsTags: [] + defaultTagsMode: 0 +--- !u!114 &27659201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 27659197} + 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: "\u5BF9\u8BDD\u5185\u5BB9\u663E\u793A\u5728\u8FD9\u91CC\u652F\u6301\u5BCC\u6587\u672C" + 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: 46 + m_fontSizeBase: 46 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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: 0, z: 0, w: 0} + 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 &27659202 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 27659197} + m_CullTransparentMesh: 1 --- !u!1001 &37345342 PrefabInstance: m_ObjectHideFlags: 0 @@ -12806,7 +13018,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_AnchoredPosition.y - value: 180 + value: 203 objectReference: {fileID: 0} - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13474,6 +13686,65 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1403558892 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1403558893} + - component: {fileID: 1403558895} + - component: {fileID: 1403558896} + m_Layer: 5 + m_Name: Center Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1403558893 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1403558892} + 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: 27659198} + m_Father: {fileID: 1604842429} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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!222 &1403558895 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1403558892} + m_CullTransparentMesh: 1 +--- !u!114 &1403558896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1403558892} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6722100b986b0f42994441d3c0aa9e7, type: 3} + m_Name: + m_EditorClassIdentifier: + delayTime: 300 --- !u!1001 &1404026337 PrefabInstance: m_ObjectHideFlags: 0 @@ -14809,6 +15080,122 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 465bacc132ec6ce4e85f8e68354f60ad, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1586904152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1586904153} + - component: {fileID: 1586904155} + - component: {fileID: 1586904154} + - component: {fileID: 1586904156} + - component: {fileID: 1586904157} + m_Layer: 5 + m_Name: Center Option + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1586904153 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586904152} + 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: 1604842429} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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!114 &1586904154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586904152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.5294118} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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: 1 +--- !u!222 &1586904155 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586904152} + m_CullTransparentMesh: 1 +--- !u!114 &1586904156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586904152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 200 + m_Bottom: 400 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1586904157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586904152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 144fae82f06c3c248b4fb76f6823baba, type: 3} + m_Name: + m_EditorClassIdentifier: + choiceButtonPrefab: {fileID: 2831695685783823246, guid: 7b38c32597bbad84e92958938ef655dd, type: 3} --- !u!1001 &1592246586 PrefabInstance: m_ObjectHideFlags: 0 @@ -15440,7 +15827,9 @@ RectTransform: m_Children: - {fileID: 1794129319} - {fileID: 1302630844} + - {fileID: 1586904153} - {fileID: 50234111} + - {fileID: 1403558893} - {fileID: 1108164746} m_Father: {fileID: 1343879457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Dialog System/BaseYarnCommand.cs b/Assets/Scripts/Dialog System/BaseYarnCommand.cs index 5c8583e91..cdcd60d7d 100644 --- a/Assets/Scripts/Dialog System/BaseYarnCommand.cs +++ b/Assets/Scripts/Dialog System/BaseYarnCommand.cs @@ -50,13 +50,13 @@ namespace AibisDream } [YarnCommand("fade_in")] - public static IEnumerator FadeIn(float duration) + public static IEnumerator FadeIn(float duration = 1) { return MainUIController.Instance.FadeInSync(duration); } [YarnCommand("fade_out")] - public static IEnumerator FadeOut(float duration) + public static IEnumerator FadeOut(float duration = 1) { return MainUIController.Instance.FadeOutSync(duration); } diff --git a/Assets/Scripts/Dialog System/LineView.cs b/Assets/Scripts/Dialog System/LineView.cs index 40e17044f..a3adbcfd3 100644 --- a/Assets/Scripts/Dialog System/LineView.cs +++ b/Assets/Scripts/Dialog System/LineView.cs @@ -7,20 +7,8 @@ namespace AibisDream { public class LineView : DialogueViewBase { - // 进入指令选项模式 - private bool _isInCommand; - public override void RunLine(LocalizedLine dialogueLine, Action onDialogueLineFinished) { - _isInCommand = dialogueLine.Text.HasCommandAttr(); - - if (_isInCommand) - { - DialogCanvasManager.Instance.HideDialog(); - base.RunLine(dialogueLine, onDialogueLineFinished); - return; - } - EnumEventSystem.Global.Send(DialogEventEnum.LineStart, DialogText.GetLine(dialogueLine)); Action jumpVoice = SkipVoice; @@ -56,13 +44,6 @@ namespace AibisDream public override void RunOptions(DialogueOption[] dialogueOptions, Action onOptionSelected) { - if (_isInCommand) - { - DialogCanvasManager.Instance.HideDialog(); - base.RunOptions(dialogueOptions, onOptionSelected); - return; - } - EnumEventSystem.Global.Send(DialogEventEnum.OptionShow); var options = DialogOption.GeneOptions(dialogueOptions, onOptionSelected); DialogCanvasManager.Instance.ShowOptions(options); diff --git a/Assets/Scripts/UI/DialogUI/CenterOption.cs b/Assets/Scripts/UI/DialogUI/CenterOption.cs new file mode 100644 index 000000000..ae9305492 --- /dev/null +++ b/Assets/Scripts/UI/DialogUI/CenterOption.cs @@ -0,0 +1,67 @@ +using System; +using AibisDream.Framework; +using AibisDream.Kit; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace AibisDream +{ + public class CenterOption : MonoBehaviour, IDialogView + { + #region 索引 + + public GameObject choiceButtonPrefab; + + #endregion + + private void Awake() + { + EnumEventSystem.Global.Register(DialogEventEnum.OptionSelected, + _ => HideDialog()); + } + + public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed = null, + bool isAutoSkip = false) + { + Debug.Log("CenterOption只显示选项"); + } + + public void ShowOptions(DialogOption[] dialogueOptions) + { + gameObject.SetActive(true); + + // 销毁原来的按钮 + foreach (Transform child in transform) + { + Destroy(child.gameObject); + } + + // 生成新按钮 + foreach (var option in dialogueOptions) + { + if (!option.IsAvailable) continue; + + var choiceInstance = Instantiate(choiceButtonPrefab, transform); + choiceInstance.GetComponentInChildren().text = option.Line; + choiceInstance.GetComponent