From 2bb41f4649d65669b2e4435da804164a5c52ccf9 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Thu, 14 Nov 2024 11:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E7=A5=9E=E7=A7=98=E5=85=88=E6=8F=90=E4=BA=A4=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prototype/佩佩/Scripts/UFProcess.cs | 130 +++++++++---------- Assets/Prototype/佩佩/佩佩视觉模块.unity | 137 ++++++++++++++++++++- Assets/Scenes/Persistence.unity | 14 +-- 3 files changed, 209 insertions(+), 72 deletions(-) diff --git a/Assets/Prototype/佩佩/Scripts/UFProcess.cs b/Assets/Prototype/佩佩/Scripts/UFProcess.cs index 5b59ffac7..e9bd6c11e 100644 --- a/Assets/Prototype/佩佩/Scripts/UFProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/UFProcess.cs @@ -25,12 +25,12 @@ public class UFProcess : MonoBehaviour,IViewLifecycle //drawButton.onClick.AddListener(ProcessMemory); // 初始化UI状态 - memoryProcessImage.gameObject.SetActive(true); - memoryFinishedImage.gameObject.SetActive(false); - memoryFinishedImageColorWrong.gameObject.SetActive(false); - UFImage.gameObject.SetActive(false); - memoryProcessImage.material.SetFloat("_StrongTintFade", 1); - memoryProcessImage.material.SetFloat("_GlitchFade", 0); + // memoryProcessImage.gameObject.SetActive(true); + // memoryFinishedImage.gameObject.SetActive(false); + // memoryFinishedImageColorWrong.gameObject.SetActive(false); + // UFImage.gameObject.SetActive(false); + // memoryProcessImage.material.SetFloat("_StrongTintFade", 1); + // memoryProcessImage.material.SetFloat("_GlitchFade", 0); } public void Initialize() { @@ -44,8 +44,8 @@ public class UFProcess : MonoBehaviour,IViewLifecycle } public void OnShow() { - Debug.Log("UFview Show"); - StartCoroutine(ProcessMemory("liuying1-2")); + // Debug.Log("UFview Show"); + // StartCoroutine(ProcessMemory("liuying1-2")); } public void OnExit() @@ -68,79 +68,81 @@ public class UFProcess : MonoBehaviour,IViewLifecycle isProcessing = true; // 开始处理，设置为true - Sprite memoryFinishedSprite = Resources.Load("Art/Memory/" + memoryFinishedImageName); - Sprite UFMemorySprite = Resources.Load("Art/Photos/" + memoryFinishedImageName+"Error"); - if (memoryFinishedSprite == null) - { - Debug.LogError("Memory finished image not found: " + memoryFinishedImageName); - yield break; - } - - // if (UFMemorySprite == null) + // Sprite memoryFinishedSprite = Resources.Load("Art/Memory/" + memoryFinishedImageName); + // Sprite UFMemorySprite = Resources.Load("Art/Photos/" + memoryFinishedImageName+"Error"); + // if (memoryFinishedSprite == null) // { - // Debug.LogError("UF image not found: " + UFImageName); + // Debug.LogError("Memory finished image not found: " + memoryFinishedImageName); // yield break; // } - memoryFinishedImage.material.SetFloat("_TwistUvAmount", 0); // 设置 Pixel_Fade 为0 + + // // if (UFMemorySprite == null) + // // { + // // Debug.LogError("UF image not found: " + UFImageName); + // // yield break; + // // } + // memoryFinishedImage.material.SetFloat("_TwistUvAmount", 0); // 设置 Pixel_Fade 为0 - // 开始处理记忆的表现 - memoryProcessImage.gameObject.SetActive(true); - //memoryProcessImage.sprite = defaultSprite; // 设置默认图片 - memoryProcessImage.color = Color.white; // 设置初始颜色 + // // 开始处理记忆的表现 + // memoryProcessImage.gameObject.SetActive(true); + // //memoryProcessImage.sprite = defaultSprite; // 设置默认图片 + // memoryProcessImage.color = Color.white; // 设置初始颜色 - Sequence memorySequence = DOTween.Sequence(); + // Sequence memorySequence = DOTween.Sequence(); - // 修改memoryprocess的参数 - memorySequence.Append(memoryProcessImage.material.DOFloat(0, "_StrongTintFade", 1)); - memorySequence.Join(memoryProcessImage.material.DOFloat(1, "_GlitchFade", 1)); + // // 修改memoryprocess的参数 + // memorySequence.Append(memoryProcessImage.material.DOFloat(0, "_StrongTintFade", 1)); + // memorySequence.Join(memoryProcessImage.material.DOFloat(1, "_GlitchFade", 1)); - memorySequence.AppendInterval(2f); + // memorySequence.AppendInterval(2f); - // 记忆处理结束，激活memoryFinishedImage - memorySequence.AppendCallback(() => - { - memoryFinishedImage.color= Color.white; - memoryProcessImage.gameObject.SetActive(false); + // // 记忆处理结束，激活memoryFinishedImage + // memorySequence.AppendCallback(() => + // { + // memoryFinishedImage.color= Color.white; + // memoryProcessImage.gameObject.SetActive(false); - memoryFinishedImage.gameObject.SetActive(true); - memoryFinishedImage.sprite = memoryFinishedSprite; // 设置记忆处理结束的图片 - memoryFinishedImage.material.SetFloat("_TwistUvAmount", 0); // 设置 Pixel_Fade 为0 - }); + // memoryFinishedImage.gameObject.SetActive(true); + // memoryFinishedImage.sprite = memoryFinishedSprite; // 设置记忆处理结束的图片 + // memoryFinishedImage.material.SetFloat("_TwistUvAmount", 0); // 设置 Pixel_Fade 为0 + // }); - memorySequence.AppendInterval(0f); // 添加4秒的延时 + // memorySequence.AppendInterval(0f); // 添加4秒的延时 - memorySequence.Append(memoryFinishedImage.material.DOFloat(1, "_TwistUvAmount", 3f)); - memorySequence.Join(memoryFinishedImage.material.DOFloat(0, "_Alpha", 3f)); - memorySequence.AppendInterval(1f); // 添加1.5秒的延时 + // memorySequence.Append(memoryFinishedImage.material.DOFloat(1, "_TwistUvAmount", 3f)); + // memorySequence.Join(memoryFinishedImage.material.DOFloat(0, "_Alpha", 3f)); + // memorySequence.AppendInterval(1f); // 添加1.5秒的延时 - // 激活UFImage，并开始像素淡入效果 - memorySequence.AppendCallback(() => - { - memoryFinishedImage.gameObject.SetActive(false); - UFImage.gameObject.SetActive(true); - UFImage.color= Color.white; - UFImage.sprite = UFMemorySprite; // 设置糅合后的广告图 - UFImage.material.SetFloat("Pixel_Fade", 1); // 设置 Pixel_Fade 为1 - UFImage.rectTransform.anchoredPosition = new Vector2(0, -111f); // 重置位置 - }); + // // 激活UFImage，并开始像素淡入效果 + // memorySequence.AppendCallback(() => + // { + // memoryFinishedImage.gameObject.SetActive(false); + // UFImage.gameObject.SetActive(true); + // UFImage.color= Color.white; + // UFImage.sprite = UFMemorySprite; // 设置糅合后的广告图 + // UFImage.material.SetFloat("Pixel_Fade", 1); // 设置 Pixel_Fade 为1 + // UFImage.rectTransform.anchoredPosition = new Vector2(0, -111f); // 重置位置 + // }); - // Pixel_Fade 从1变为0，持续1.5秒 - memorySequence.Append(DOTween.To(() => UFImage.material.GetFloat("Pixel_Fade"), x => UFImage.material.SetFloat("Pixel_Fade", x), 0, 3f)); + // // Pixel_Fade 从1变为0，持续1.5秒 + // memorySequence.Append(DOTween.To(() => UFImage.material.GetFloat("Pixel_Fade"), x => UFImage.material.SetFloat("Pixel_Fade", x), 0, 3f)); - memorySequence.AppendInterval(1f); // 添加2秒的延时 + // memorySequence.AppendInterval(1f); // 添加2秒的延时 - // UFImage向右移动 - memorySequence.Append(UFImage.rectTransform.DOAnchorPosX(1000, 1f)); // 假设向右移动1000单位 + // // UFImage向右移动 + // memorySequence.Append(UFImage.rectTransform.DOAnchorPosX(1000, 1f)); // 假设向右移动1000单位 - // 序列完成时更新索引 - memorySequence.OnComplete(() => - { - UFImage.gameObject.SetActive(false); - isProcessing = false; // 处理完成，设置为false - AudioManager.PauseLoopAudio(); - }); - yield return memorySequence.WaitForCompletion(); + // // 序列完成时更新索引 + // memorySequence.OnComplete(() => + // { + // UFImage.gameObject.SetActive(false); + // isProcessing = false; // 处理完成，设置为false + // AudioManager.PauseLoopAudio(); + // }); + yield return new WaitForSeconds(3f); + AudioManager.PauseLoopAudio(); + isProcessing = false; DialogController.Instance.StartDialogNode("UF进程播放完毕"); } public bool IsProcessing() diff --git a/Assets/Prototype/佩佩/佩佩视觉模块.unity b/Assets/Prototype/佩佩/佩佩视觉模块.unity index cbc38ac76..b015043ee 100644 --- a/Assets/Prototype/佩佩/佩佩视觉模块.unity +++ b/Assets/Prototype/佩佩/佩佩视觉模块.unity @@ -11560,7 +11560,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &473383454 RectTransform: m_ObjectHideFlags: 0 @@ -15117,6 +15117,140 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7e1248171f8348e4db6e10ab0667a497, type: 3} +--- !u!1 &618295247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 618295248} + - component: {fileID: 618295250} + - component: {fileID: 618295249} + 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 &618295248 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618295247} + 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: 1294333831} + 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: 36, y: -16} + m_SizeDelta: {x: 1006.2036, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &618295249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618295247} + 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: "\u5360\u4F4D\uFF1AUF\u628A\u62FF\u5230\u7684\u8BB0\u5FC6\u8FDB\u884C\u5904\u7406\uFF0C\u5904\u7406\u6210\u9519\u8BEF\u7684\u989C\u8272\u4F20\u9012\u4E86\u51FA\u53BB" + 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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 &618295250 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618295247} + m_CullTransparentMesh: 1 --- !u!1 &619430172 GameObject: m_ObjectHideFlags: 0 @@ -29246,6 +29380,7 @@ RectTransform: - {fileID: 2126911510} - {fileID: 1683803164} - {fileID: 132335204} + - {fileID: 618295248} m_Father: {fileID: 594466392} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 1e8993405..cc502cd52 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -8213,14 +8213,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _nodes: - - {fileID: 38676759} - - {fileID: 679539979} - - {fileID: 798685759} - - {fileID: 1204800887} - - {fileID: 1282326177} - - {fileID: 1392825347} - - {fileID: 1844301390} - {fileID: 2001435038} + - {fileID: 1844301390} + - {fileID: 1392825347} + - {fileID: 1282326177} + - {fileID: 1204800887} + - {fileID: 798685759} + - {fileID: 679539979} + - {fileID: 38676759} _connections: [] _cacheRaycasters: 1 --- !u!4 &1620453322