diff --git a/Assets/Editor/Version.meta b/Assets/Editor/Version.meta new file mode 100644 index 000000000..d592c5592 --- /dev/null +++ b/Assets/Editor/Version.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df38b7b9b2cc6f444bdd86ee9475f911 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Version/VersionIncrementer.cs b/Assets/Editor/Version/VersionIncrementer.cs new file mode 100644 index 000000000..540d6bba6 --- /dev/null +++ b/Assets/Editor/Version/VersionIncrementer.cs @@ -0,0 +1,27 @@ +using System; +using UnityEditor; +using UnityEditor.Build; +using UnityEditor.Build.Reporting; + +public class VersionIncrementer : IPreprocessBuildWithReport +{ + public int callbackOrder => 0; + + public void OnPreprocessBuild(BuildReport report) + { + // 去除时间戳 + string[] bundleVersionParts = PlayerSettings.bundleVersion.Split('-'); + string version = bundleVersionParts[0]; + + // 获取当前版本号 + string[] versionParts = version.Split('.'); + int major = int.Parse(versionParts[0]); + int minor = int.Parse(versionParts[1]); + int revision = int.Parse(versionParts[2]); + int build = int.Parse(versionParts[3]); + + // 更新版本号 + string date = DateTime.Now.ToString("yyyyMMdd-HHmmss"); + PlayerSettings.bundleVersion = $"{major}.{minor}.{revision}.{build + 1}-{date}"; + } +} \ No newline at end of file diff --git a/Assets/Editor/Version/VersionIncrementer.cs.meta b/Assets/Editor/Version/VersionIncrementer.cs.meta new file mode 100644 index 000000000..6afe1006d --- /dev/null +++ b/Assets/Editor/Version/VersionIncrementer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 92d80d2f679fa6c428e1522a45cbcf97 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta b/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta new file mode 100644 index 000000000..05e590027 --- /dev/null +++ b/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 117dcc671050f5247bd8743b91ecaab7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn index 8df804c43..5a20c6321 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn @@ -151,6 +151,9 @@ position: 557,756 <> <> <> + <> + me:我们得试试去观察别的目标。 + <> <> === @@ -163,10 +166,8 @@ colorID: 8 group:视觉检查 position: 1228,749 --- -<> me:这里似乎本来也没办法唤起记忆，我们得看看别的地方。 -<> - <> + <> === diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage10_术前谈话2.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage10_术前谈话2.yarn index 640d3b9b8..31ecfb08e 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage10_术前谈话2.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage10_术前谈话2.yarn @@ -218,15 +218,20 @@ peipei: 幸福市太小了…你知道我们走不掉。 me: 你不会想这么做的。 me: 况且…你刚刚发生了排异反应，这已经足够让我头疼了…… me: 我不知道这会不会诱发什么更复杂的问题。 + <> me: 你是我的病人，我不能把我的病人置于任何危险之中。 - <> - <> - <> - <> peipei: 对不起…医生。 peipei: 我只是突然冒出了这个想法。 - peipei: 但我还是… + <> + <> + <> + <> + <> <> + <> + <> + <> + peipei: 但我还是… peipei: 我很快就会回来的…我不会走远。不会有什么问题的…… <> ->CenterOption:同意安装色觉晶圆 @@ -242,21 +247,38 @@ title: 色彩抹除后续 position: -265,-201 --- peipei: 医生…… -<> +<> + <> +<> + <> + <> + <> + <> + <> + <> +<> peipei: 如果你离开这里…你会去哪里？ peipei: 但我是说真的，现在，你从这间诊所离开了…… peipei: 你会去哪里？ me: 我不知道。 me: 我好像…无处可去。 <> -<> +<> + <> +<> + <> +<> <> peipei: 我们都没有也没有任何机会真的逃走。
不是吗？ peipei: 我们都是没有家的人。 peipei: 我的家在很远很远的南方……
但是那个地方已经早就不存在了。 peipei: 我所拥有的…也就只有那些记忆罢了。
我能去的只有幸福市…只有这个罐头厂。 peipei: 所以，我不可能离开的。医生。 -<> +<> + <> +<> + <> +<> peipei: 求求你了，帮我把晶圆装上去吧。 <> <> @@ -264,12 +286,15 @@ me: 如果我的患者要变成那个样子了…我想它应该也至少享有 me: 再说了，这是你自己的选择…… <> <> -<> -<> -<> -<> -<> -<> +<> + <> + <> + <> + <> + <> + <> + <> +<> <> <> <> @@ -302,17 +327,20 @@ position: -739,-206 me: 对不起，这风险太大了…
不符合最优化操作指令。 <> <> - <> - <> + <> + <> + <> + <> <> peipei: 医生…求你了。 peipei: 求你了…… peipei: 我不要那样… <> <> - <> + <> <> peipei: 我不要忘掉那些色彩…… + <> <> ->CenterOption:同意安装色觉晶圆 me: 这意味着你会在看到颜色之后很快就失去它…你能接受吗？ @@ -348,31 +376,36 @@ position: -733,301 me: 佩佩，你是我的患者…
我必须要对我的患者负责任。 <> <> -<> -<> +<> <> me: 而且…你知道你逃不掉的，对吧？ me: 你最后还是会要抹掉它们…这是不会有差别的。 //me: 短暂的获得终将失去的美好…我想你会更痛苦。 //如果因为认为别人会有这种感受而替他做选择，反而不合理；这里最好保持在理性上 <> -<> -<> -<> -<> +<> +<> peipei:……… me: 我不知道你身体里的那个进程会不会什么时候又开始活跃。 me: 那很危险，我不能将你置于危险之中。 peipei:……… <> <> -<> -<> +<> +<> +<> +<> +<> +<> +<> +<> +<> peipei: 我会记得我曾经有过那些彩色的记忆吗？ me: 你只会记得你曾经有一些记忆… me: 但不再记得它们是什么了。 me: 就像梦一样。 peipei: 就像梦一样… +<> peipei: 医生…… peipei: 请把它们清除得干净一些。 peipei: 不要让我痛苦…… diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn index b9f2a9e2c..488eb7bc4 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn @@ -21,63 +21,69 @@ position: 275,-222 --- <> <> -<> <> +<> <> -<> -<> -<> -<> -<> -<> -<> <> - +<> +<> +<> +<> +<> +<> +<> peipei: …我这是怎么了？
明明早就已经看不见了。 <> <> peipei: 怎么还这么优柔寡断的。 <> <> -<> -<> -<> -<> +<> +<> +<> peipei: 像一场梦一样。 <> <> me: 眼睛还会痛吗？ -<> +<> peipei: 不痛了。脑袋还有点晕，但我想应该是正常的，对吧？ me: 记忆经过这么大程度的修改…
是的，感觉晕眩是正常的。很快就会恢复。 me: 你还能…感受到那个念头吗？
那个…念头。 <> <> -<> +<> +<> +<> +<> +<> +<> +<> peipei:来吧，医生，我们测一下。
美人鱼，罐头广告？ <> <> -<> +<> <> -<> <> <> peipei: 医生，现在的颜色是正确的吗？ me: 正确…算是吧。 peipei: 很好。 - <> <> - +<> peipei: 好…还有很多事情等着我去做。 <> <> -<> +<> +<> +<> +<> +<> <> peipei: 谢谢你…医生。 @@ -85,7 +91,7 @@ peipei: 谢谢你让我醒来。 <> <> -<> +<> me: 醒来…或者说睡去。
总之，又一个病历结束了。但愿…… diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn index 6524ebbae..928217ed3 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn @@ -88,7 +88,7 @@ ULM自训练进程: 检测到进程接管请求！正在识别手动选择的目 <> <> //颜色不出现，一会又出现了 - <> + <> <> <> me: 很好… @@ -169,9 +169,9 @@ ULM自训练进程: 检测到进程接管请求！正在识别手动选择的目 peipei: 都是因为你，都是因为你！我才…… me: 佩佩，快停下。#auto_next <> - ULM自训练进程: 已生成所选目标的自训练图像！图像可以用于以下用途：1.广告宣传：用于推广产品，吸引消费者的注意，增加品牌曝光率。2.店内展示：作为超市或商店的宣传材料，提升产品吸引力。3.活动海报：用于与海洋相关的主题活动或促销活动。#auto_next + ULM自训练进程: 已生成所选目标的自动训练图像！
图像正在上传至UF共享数据集…… <> - ULM自训练进程: 图像正在上传至数据集过滤器……
图像未通过筛查！原因：存在不合规范的内容。 + ULM自训练进程: 上传被拒绝：图像未通过自动审查！
原因：存在不合规范的内容。 peipei: 不合规范？…什么是不合规范？…到底什么是规范？到底什么是规范？？？ <> peipei: 你还不明白吗？这在他们看来一点都不重要！！ diff --git a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn index ca840ccff..0129e082d 100644 --- a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn +++ b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn @@ -159,7 +159,6 @@ HeartModule: 将机体的燃料转化为电能/机械能，驱动机体和内部 <> Analysing: 正在获取检验报告，请稍候… <> - HeartModule: #auto_next HeartModule: 报告传输完毕。 <> me: 看起来…
你的积碳情况正常…空气滤芯最近才换过…
变速箱有点卡，但是还算正常… @@ -184,11 +183,10 @@ HeartModule: 将机体的燃料转化为电能/机械能，驱动机体和内部 //shitou: 那倒不用！哈哈，
医生！这只是一种比喻~
我只要能跑到25000转就够啦！ //me: 那么…小小调整一下齿轮应该就可以做到。 <> - HeartModule: #auto_next <> <> HeartModule: 已授权深入检查。 - ->深入 + ->深入检查 <> <> <> @@ -196,7 +194,7 @@ HeartModule: 将机体的燃料转化为电能/机械能，驱动机体和内部 ->结束 <> me: 嗯…这就是那个*涡轮增压动力模块*，给它加点压就可以跑得更快了。 - ->深入 + ->深入检查 <> <> <> @@ -205,7 +203,7 @@ HeartModule: 将机体的燃料转化为电能/机械能，驱动机体和内部 <> me: 嗯…这就是那个*涡轮增压动力模块*。我已经给它加过压，现在可以跑很快了。 <> -->深入<> +->深入检查<> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn index 888fca3ae..8ae40e372 100644 --- a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn @@ -218,6 +218,7 @@ position: 195,-3243 <> Linking: 正在建立连接… <> +<> MemModule: 已与记忆模块建立连接！ MemModule: 未检测到可查看的记忆卡带。 ->检查 @@ -228,10 +229,9 @@ MemModule: 未检测到可查看的记忆卡带。 <> <> <> - Error: 检查完成！检测到1个错误。 Error: 错误：磁盘损坏！ - Error: 磁盘空间不足！已进入覆盖写入模式… - Error: 未格式化的记忆！正在覆盖… + Error: 磁盘空间不足，无法写入新记忆！ + Error: 进入覆盖模式，正在覆盖旧记忆… <> <> shitou: 医生！我好像忘了…大大的城市…前面是什么？ diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 635c8c3c3..794317e0d 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -22279,7 +22279,7 @@ SpriteMask: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 2463790466339844292, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} + m_Sprite: {fileID: 3581718187618583822, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3} m_MaskAlphaCutoff: 0.2 m_FrontSortingLayerID: 0 m_BackSortingLayerID: 0 @@ -22330,7 +22330,7 @@ SpriteRenderer: m_SortingLayerID: 1034535805 m_SortingLayer: 9 m_SortingOrder: 100 - m_Sprite: {fileID: 2463790466339844292, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} + m_Sprite: {fileID: 3581718187618583822, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -22373,7 +22373,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.32595062, y: -7.157303} + m_AnchoredPosition: {x: 0.59, y: -6.9} m_SizeDelta: {x: 3.2558138, y: 8.637209} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1271136867 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index c9874b2cf..9f6cfad07 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -257,6 +257,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 17373561} m_CullTransparentMesh: 1 +--- !u!1 &21653044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 21653045} + - component: {fileID: 21653048} + - component: {fileID: 21653047} + - component: {fileID: 21653046} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &21653045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21653044} + 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: 2142750573} + m_Father: {fileID: 1523716943} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -200, y: 85} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &21653046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21653044} + 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.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 21653047} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &21653047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21653044} + 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: 10905, 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 &21653048 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21653044} + m_CullTransparentMesh: 1 --- !u!1 &25317973 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8732203183804650455, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} @@ -1983,6 +2104,42 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 99451801} m_PrefabAsset: {fileID: 0} +--- !u!1 &99607231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 99607232} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &99607232 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 99607231} + 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: 370188405} + m_Father: {fileID: 1637168177} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &114645688 GameObject: m_ObjectHideFlags: 0 @@ -4777,6 +4934,81 @@ MonoBehaviour: Data3: 1610383794 Data4: -1468709119 Path: event:/Amb/amb +--- !u!1 &370188404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 370188405} + - component: {fileID: 370188407} + - component: {fileID: 370188406} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &370188405 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370188404} + 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: 99607232} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &370188406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370188404} + 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: 10905, 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 &370188407 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370188404} + m_CullTransparentMesh: 1 --- !u!1 &387510857 GameObject: m_ObjectHideFlags: 0 @@ -5482,6 +5714,115 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 435293759} m_CullTransparentMesh: 1 +--- !u!1 &440651092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 440651093} + - component: {fileID: 440651096} + - component: {fileID: 440651095} + - component: {fileID: 440651094} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &440651093 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440651092} + 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: 1463491728} + - {fileID: 533176308} + - {fileID: 1637168177} + m_Father: {fileID: 1523716943} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 412.76636, y: 0} + m_SizeDelta: {x: 577.4163, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &440651094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440651092} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1145374178} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 10 + m_Viewport: {fileID: 1463491728} + m_HorizontalScrollbar: {fileID: 533176309} + m_VerticalScrollbar: {fileID: 1637168178} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &440651095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440651092} + 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: 0.392} + 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 &440651096 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440651092} + m_CullTransparentMesh: 1 --- !u!1 &441218356 GameObject: m_ObjectHideFlags: 0 @@ -7630,6 +7971,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 524083454} m_CullTransparentMesh: 1 +--- !u!1 &533176307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 533176308} + - component: {fileID: 533176311} + - component: {fileID: 533176310} + - component: {fileID: 533176309} + m_Layer: 5 + m_Name: Scrollbar Horizontal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &533176308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533176307} + 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: 1707566063} + m_Father: {fileID: 440651093} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: 20} + m_Pivot: {x: 0, y: 0} +--- !u!114 &533176309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533176307} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 1992781380} + m_HandleRect: {fileID: 1992781379} + m_Direction: 0 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &533176310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533176307} + 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: 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 &533176311 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533176307} + m_CullTransparentMesh: 1 --- !u!1001 &538535839 PrefabInstance: m_ObjectHideFlags: 0 @@ -9563,7 +10030,7 @@ MonoBehaviour: - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} - {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} - {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2} - runMode: 2 + runMode: 0 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED" @@ -12563,6 +13030,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1693917954} + - {fileID: 1609388204} m_Father: {fileID: 1343879457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -14009,6 +14477,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1134033127} m_CullTransparentMesh: 1 +--- !u!1 &1145374177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1145374178} + - component: {fileID: 1145374179} + - component: {fileID: 1145374180} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1145374178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1145374177} + 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: 1463491728} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 0, y: 1} +--- !u!114 &1145374179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1145374177} + 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: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1145374180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1145374177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &1153212192 GameObject: m_ObjectHideFlags: 0 @@ -15706,8 +16251,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: 321, y: 173} - m_SizeDelta: {x: 1102.2378, y: 150} + m_AnchoredPosition: {x: 46, y: 237} + m_SizeDelta: {x: 575.1715, y: 157.0747} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1299926726 MonoBehaviour: @@ -15763,7 +16308,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 16 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 8192 m_textAlignment: 65535 m_characterSpacing: 0 @@ -17865,6 +18410,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1457081868} m_CullTransparentMesh: 1 +--- !u!1 &1463491727 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1463491728} + - component: {fileID: 1463491731} + - component: {fileID: 1463491730} + - component: {fileID: 1463491729} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1463491728 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463491727} + 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: 1145374178} + m_Father: {fileID: 440651093} + 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: -17, y: -17} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1463491729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463491727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1463491730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463491727} + 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: 10917, 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 &1463491731 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463491727} + m_CullTransparentMesh: 1 --- !u!1 &1491006728 GameObject: m_ObjectHideFlags: 0 @@ -18314,6 +18949,100 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1516166493} m_CullTransparentMesh: 1 +--- !u!1 &1523716942 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1523716943} + - component: {fileID: 1523716946} + - component: {fileID: 1523716945} + - component: {fileID: 1523716944} + m_Layer: 5 + m_Name: SaveFilePanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1523716943 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523716942} + 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: 1901749477} + - {fileID: 440651093} + - {fileID: 21653045} + m_Father: {fileID: 1788453626} + 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 &1523716944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523716942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a351e509c8dd5944f9e6406f59ea5c0b, type: 3} + m_Name: + m_EditorClassIdentifier: + buttonPrefab: {fileID: 6573215660023343737, guid: e614898efb9229e499751794da301c4b, type: 3} + buttonParent: {fileID: 1145374178} + returnButton: {fileID: 21653046} +--- !u!114 &1523716945 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523716942} + 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.88235295} + 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 &1523716946 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523716942} + m_CullTransparentMesh: 1 --- !u!1 &1539899064 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -20092,6 +20821,153 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 231574743} m_PrefabAsset: {fileID: 0} +--- !u!1 &1609388203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1609388204} + - component: {fileID: 1609388206} + - component: {fileID: 1609388205} + - component: {fileID: 1609388207} + m_Layer: 5 + m_Name: VerText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1609388204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609388203} + 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: 984233631} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 20} + m_SizeDelta: {x: 350, y: 25} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1609388205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609388203} + 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: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 22 + m_fontSizeBase: 22 + 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: 1.2915039, 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 &1609388206 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609388203} + m_CullTransparentMesh: 1 +--- !u!114 &1609388207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609388203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c5687a714dd62ea478b5e47c721e6898, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1611684199 GameObject: m_ObjectHideFlags: 0 @@ -20579,6 +21455,132 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &1637168176 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1637168177} + - component: {fileID: 1637168180} + - component: {fileID: 1637168179} + - component: {fileID: 1637168178} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1637168177 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1637168176} + 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: 99607232} + m_Father: {fileID: 440651093} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: -17} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1637168178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1637168176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 370188406} + m_HandleRect: {fileID: 370188405} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1637168179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1637168176} + 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: 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 &1637168180 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1637168176} + m_CullTransparentMesh: 1 --- !u!114 &1643440533 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -21050,13 +22052,14 @@ RectTransform: m_Children: - {fileID: 237392155} - {fileID: 1596715191} + - {fileID: 1960600462} - {fileID: 1611684200} m_Father: {fileID: 429395227} 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: -236} - m_SizeDelta: {x: 400, y: 327.5941} + m_AnchoredPosition: {x: 46, y: -236} + m_SizeDelta: {x: 400, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1696845843 MonoBehaviour: @@ -21564,6 +22567,42 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 892337495822208186, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} m_PrefabInstance: {fileID: 1704919983} m_PrefabAsset: {fileID: 0} +--- !u!1 &1707566062 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1707566063} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1707566063 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707566062} + 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: 1992781379} + m_Father: {fileID: 533176308} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1729236132 GameObject: m_ObjectHideFlags: 0 @@ -22373,6 +23412,7 @@ RectTransform: m_Children: - {fileID: 429395227} - {fileID: 490985570} + - {fileID: 1523716943} - {fileID: 504647226} - {fileID: 1589364489} m_Father: {fileID: 1343879457} @@ -23048,6 +24088,140 @@ RectTransform: m_AnchoredPosition: {x: -6, y: -10.75} m_SizeDelta: {x: 300, y: 871.5} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1901749476 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1901749477} + - component: {fileID: 1901749479} + - component: {fileID: 1901749478} + 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 &1901749477 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901749476} + 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: 1523716943} + 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: 55, y: 53} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1901749478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901749476} + 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: "\u8FD9\u662F\u4E00\u4E2A\u4E3A\u4FBF\u4E8E\u6D4B\u8BD5\u51C6\u5907\u7684\u4E34\u65F6\u529F\u80FD\n\n\u5982\u679C\u9996\u6B21\u6E38\u73A9\uFF0C\u63A8\u8350\u60A8\u8FD4\u56DE\u5E76\u70B9\u51FB\u5F00\u59CB\u6E38\u620F\u76F4\u63A5\u5F00\u59CB\n\n\u63A8\u8350\u60F3\u8981\u9009\u5173\u7684\u73A9\u5BB6\u91CD\u542F\u6E38\u620F\u540E\u518D\u4F7F\u7528\u672C\u529F\u80FD,\u5426\u5219\u53EF\u80FD\u51FA\u73B0bug" + 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: -384.6062, 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 &1901749479 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901749476} + m_CullTransparentMesh: 1 --- !u!1 &1904990749 GameObject: m_ObjectHideFlags: 0 @@ -23622,6 +24796,197 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1956227899} m_CullTransparentMesh: 1 +--- !u!1 &1960600461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1960600462} + - component: {fileID: 1960600465} + - component: {fileID: 1960600464} + - component: {fileID: 1960600463} + m_Layer: 5 + m_Name: Load Save File + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1960600462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1960600461} + 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: 1696845842} + 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: 240, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1960600463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1960600461} + 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.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 1960600464} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1523716944} + m_TargetAssemblyTypeName: AibisDream.SaveFileUIController, Assembly-CSharp + m_MethodName: ShowSaveFileUI + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1960600464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1960600461} + 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: "\u52A0\u8F7D\u5B58\u6863" + 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: 64 + m_fontSizeBase: 64 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 32 + m_VerticalAlignment: 4096 + 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 &1960600465 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1960600461} + m_CullTransparentMesh: 1 --- !u!1 &1982630668 GameObject: m_ObjectHideFlags: 0 @@ -24060,6 +25425,81 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 1989818781} m_PrefabAsset: {fileID: 0} +--- !u!1 &1992781378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1992781379} + - component: {fileID: 1992781381} + - component: {fileID: 1992781380} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1992781379 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992781378} + 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: 1707566063} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1992781380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992781378} + 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: 10905, 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 &1992781381 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992781378} + m_CullTransparentMesh: 1 --- !u!1001 &2001435037 PrefabInstance: m_ObjectHideFlags: 0 @@ -25936,6 +27376,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2139849580} m_CullTransparentMesh: 1 +--- !u!1 &2142750572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2142750573} + - component: {fileID: 2142750575} + - component: {fileID: 2142750574} + 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 &2142750573 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142750572} + 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: 21653045} + 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 &2142750574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142750572} + 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: "\u8FD4\u56DE" + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 40 + m_fontSizeBase: 40 + 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 &2142750575 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142750572} + m_CullTransparentMesh: 1 --- !u!114 &2850418607733108 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Dialog System/LineView.cs b/Assets/Scripts/Dialog System/LineView.cs index 3964def07..6d85745f2 100644 --- a/Assets/Scripts/Dialog System/LineView.cs +++ b/Assets/Scripts/Dialog System/LineView.cs @@ -15,6 +15,7 @@ namespace AibisDream if (DialogController.Instance.quickRunMode) { + DialogCanvasManager.Instance.TrySkipLine(true); DialogCanvasManager.Instance.NextStep(); } } diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs index 0fa975d28..c590d2f9b 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs @@ -57,9 +57,9 @@ namespace AibisDream // } // SpriteGroup加载 - characterGroup.config.key = data.groupName; - characterGroup.InstantiateByConfig(); - characterGroup.SwitchState(data.state); + characterGroup.config.key = data.configKey; + yield return characterGroup.InstantiateByConfigAsync(); + characterGroup.SwitchState(data.curState); yield return characterGroup.Fade(data.shown); } @@ -99,10 +99,10 @@ namespace AibisDream public bool hasDevice; public bool isShow; - public string groupName; - public string state; + public string configKey; + public string curState; public bool shown; - + public event Action LoadEvent; public void Load() diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs index 39daf0890..7e1ab162d 100644 --- a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs @@ -186,7 +186,7 @@ namespace AibisDream.FixSystem // HideDialog应该由其他函数控制 } - public bool TrySkipLine() + public bool TrySkipLine(bool isAutoSkip) { // 这里不能跳过对话 return true; diff --git a/Assets/Scripts/Framework/LogKit/LogKit.cs b/Assets/Scripts/Framework/LogKit/LogKit.cs index 49ee792c6..013ff13e9 100644 --- a/Assets/Scripts/Framework/LogKit/LogKit.cs +++ b/Assets/Scripts/Framework/LogKit/LogKit.cs @@ -35,16 +35,14 @@ namespace AibisDream.Kit #if !UNITY_EDITOR DontDestroyOnLoad(gameObject); _fileLogger = new FileLogger(LogFileName, LogPath, SaveDays); + LogMessage($"Ver.{Application.version}", "", LogType.Log); Application.logMessageReceivedThreaded += LogMessage; #endif } private void LogMessage(string condition, string stackTrace, LogType type) { - if (!type.Equals(LogType.Warning)) - { - _fileLogger?.Write(string.Format(LogContent, condition, stackTrace)); - } + _fileLogger?.Write(string.Format(LogContent, condition, stackTrace)); } private void OnDestroy() diff --git a/Assets/Scripts/Framework/LogKit/VerText.cs b/Assets/Scripts/Framework/LogKit/VerText.cs new file mode 100644 index 000000000..ac0329bb6 --- /dev/null +++ b/Assets/Scripts/Framework/LogKit/VerText.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; + +namespace AibisDream.Kit +{ + public class VerText : MonoBehaviour + { + void Start() + { + GetComponent().text = $"Ver.{Application.version}"; + } + } +} diff --git a/Assets/Scripts/Framework/LogKit/VerText.cs.meta b/Assets/Scripts/Framework/LogKit/VerText.cs.meta new file mode 100644 index 000000000..9803b8349 --- /dev/null +++ b/Assets/Scripts/Framework/LogKit/VerText.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c5687a714dd62ea478b5e47c721e6898 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game Loop/GameLoopManager.cs b/Assets/Scripts/Game Loop/GameLoopManager.cs index 540a3d663..ed3081607 100644 --- a/Assets/Scripts/Game Loop/GameLoopManager.cs +++ b/Assets/Scripts/Game Loop/GameLoopManager.cs @@ -68,6 +68,12 @@ namespace AibisDream StartCoroutine(LoadScene()); } + public void StartWithSaveFile(string saveFileName) + { + StartMenu.Instance.HideStartMenu(); + StartCoroutine(LoadSaveFile(saveFileName)); + } + public void StartNewGame() { _currentTalkSceneSo = firstTalkSo; diff --git a/Assets/Scripts/UI/DialogUI/CenterOption.cs b/Assets/Scripts/UI/DialogUI/CenterOption.cs index 62010fb3b..85269f1bf 100644 --- a/Assets/Scripts/UI/DialogUI/CenterOption.cs +++ b/Assets/Scripts/UI/DialogUI/CenterOption.cs @@ -52,7 +52,7 @@ namespace AibisDream gameObject.SetActive(false); } - public bool TrySkipLine() + public bool TrySkipLine(bool isForceSkip) { // 无法跳过 return true; diff --git a/Assets/Scripts/UI/DialogUI/CenterText.cs b/Assets/Scripts/UI/DialogUI/CenterText.cs index 3e98a6cd4..676949922 100644 --- a/Assets/Scripts/UI/DialogUI/CenterText.cs +++ b/Assets/Scripts/UI/DialogUI/CenterText.cs @@ -76,9 +76,9 @@ namespace AibisDream gameObject.SetActive(false); } - public bool TrySkipLine() + public bool TrySkipLine(bool isForceSkip) { - if (_skipLineDelay) + if (_skipLineDelay && !isForceSkip) { return true; } diff --git a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs index d114752e9..6a5a4ba4f 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs @@ -165,9 +165,9 @@ namespace AibisDream /// false说明对话已经显示完成了，可以跳过 /// /// - public virtual bool TrySkipLine() + public virtual bool TrySkipLine(bool isForceSkip) { - if (_skipLineDelay) + if (_skipLineDelay && !isForceSkip) { return true; } diff --git a/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs b/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs index 326c80dda..f84b8e213 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs @@ -68,9 +68,9 @@ namespace AibisDream _dialogViews?.ForEach(item => item.HideDialog()); } - public bool TrySkipLine() + public bool TrySkipLine(bool isForceSkip = false) { - return _currentView == null || _currentView.TrySkipLine(); + return _currentView == null || _currentView.TrySkipLine(isForceSkip); } public void NextStep() diff --git a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs index a59bbc517..7fa8fcb19 100644 --- a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs +++ b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs @@ -169,9 +169,9 @@ namespace AibisDream _curView.HideDialog(); } - public bool TrySkipLine() + public bool TrySkipLine(bool isForceSkip = false) { - return _lastShowView != null && _lastShowView.TrySkipLine(); + return _lastShowView != null && _lastShowView.TrySkipLine(isForceSkip); } public void NextStep() diff --git a/Assets/Scripts/UI/DialogUI/IDialogView.cs b/Assets/Scripts/UI/DialogUI/IDialogView.cs index dc6d81e6f..e7ad425fe 100644 --- a/Assets/Scripts/UI/DialogUI/IDialogView.cs +++ b/Assets/Scripts/UI/DialogUI/IDialogView.cs @@ -16,7 +16,7 @@ namespace AibisDream public void HideDialog(); - public bool TrySkipLine(); + public bool TrySkipLine(bool isForceSkip = false); public void NextStep(); } diff --git a/Assets/Scripts/UI/DialogUI/TextBubble.cs b/Assets/Scripts/UI/DialogUI/TextBubble.cs index 59664134e..8c72f85fe 100644 --- a/Assets/Scripts/UI/DialogUI/TextBubble.cs +++ b/Assets/Scripts/UI/DialogUI/TextBubble.cs @@ -18,8 +18,6 @@ namespace AibisDream.Framework #endregion - private bool _skipLineDelay; - public bool IsShowingText => _typewriter.isShowingText; private void Awake() diff --git a/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs index 1809642cf..05e720049 100644 --- a/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs +++ b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs @@ -103,9 +103,9 @@ namespace AibisDream } } - public bool TrySkipLine() + public bool TrySkipLine(bool isForceSkip) { - if (_skipLineDelay) + if (_skipLineDelay && !isForceSkip) { return true; } diff --git a/Assets/Scripts/UI/SaveFileUIController.cs b/Assets/Scripts/UI/SaveFileUIController.cs new file mode 100644 index 000000000..4ff457585 --- /dev/null +++ b/Assets/Scripts/UI/SaveFileUIController.cs @@ -0,0 +1,61 @@ +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace AibisDream +{ + public class SaveFileUIController : MonoBehaviour + { + private static readonly string SaveFilePath = Application.streamingAssetsPath + "/SaveFiles"; + + #region 索引 + public Button buttonPrefab; + public Transform buttonParent; + public Button returnButton; + #endregion + + private void Start() + { + returnButton.onClick.AddListener(HideSaveFileUI); + } + + public void ShowSaveFileUI() + { + // 清空旧按钮 + foreach (Transform child in buttonParent) + { + Destroy(child.gameObject); + } + + // 加载存档文件 + string[] saveFiles = Directory.GetFiles(SaveFilePath, "*.json"); + var orderedSaveFiles = saveFiles.OrderByDescending(item => item).ToArray(); + foreach (var saveFile in orderedSaveFiles) + { + var button = Instantiate(buttonPrefab, buttonParent); + button.GetComponentInChildren().text = Path.GetFileNameWithoutExtension(saveFile); + button.onClick.AddListener(() => OnSaveFileSelected(saveFile)); + } + + gameObject.SetActive(true); + } + + private void OnSaveFileSelected(string saveFileName) + { + // 隐藏UI + gameObject.SetActive(false); + // 开始游戏 + GameLoopManager.Instance.StartWithSaveFile(saveFileName); + } + + public void HideSaveFileUI() + { + gameObject.SetActive(false); + } + } +} + diff --git a/Assets/Scripts/UI/SaveFileUIController.cs.meta b/Assets/Scripts/UI/SaveFileUIController.cs.meta new file mode 100644 index 000000000..76217cb44 --- /dev/null +++ b/Assets/Scripts/UI/SaveFileUIController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a351e509c8dd5944f9e6406f59ea5c0b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Config/sprite_group.json b/Assets/StreamingAssets/Config/sprite_group.json index 52bb785ef..f6ac1d28a 100644 --- a/Assets/StreamingAssets/Config/sprite_group.json +++ b/Assets/StreamingAssets/Config/sprite_group.json @@ -1 +1 @@ -{"佩佩最新":{"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","佩佩默认姿势"]}},"佩佩旧":{"key":"佩佩旧","layerId":941243827,"maxLayer":200,"minLayer":100,"stateDict":{"背手闭眼":["管子","换液设备","闭眼","佩佩背后别手"],"背手":["管子","换液设备","佩佩背后别手"],"背手微笑":["管子","换液设备","嘴巴笑","佩佩背后别手"],"默认扬眉笑":["管子","换液设备","微笑","垂手"],"默认微笑":["管子","换液设备","嘴巴笑","垂手"]}},"石头":{"key":"石头","layerId":941243827,"maxLayer":200,"minLayer":100,"stateDict":{"默认":["正常微微笑","默认姿势石头"],"默认大笑":["大笑","默认姿势石头"],"默认思索":["思索走神","默认姿势石头"],"默认闭眼":["石头闭眼","正常微微笑","默认姿势石头"],"默认大笑闭眼":["石头闭眼","大笑","默认姿势石头"],"默认走神闭眼":["石头闭眼","思索走神","默认姿势石头"],"默认低眉微笑":["低眉","正常微微笑","默认姿势石头"],"默认低眉大笑":["低眉","大笑","默认姿势石头"],"默认低眉走神":["低眉","思索走神","默认姿势石头"],"默认低眉闭眼":["低眉","石头闭眼","正常微微笑","默认姿势石头"],"默认低眉大笑闭眼":["低眉","石头闭眼","大笑","默认姿势石头"],"默认低眉走神闭眼":["低眉","石头闭眼","思索走神","默认姿势石头"],"摸头":["正常微微笑","石头摸头"],"摸头大笑":["大笑","石头摸头"],"摸头走神":["思索走神","石头摸头"],"摸头闭眼":["石头闭眼","正常微微笑","石头摸头"],"摸头大笑闭眼":["石头闭眼","大笑","石头摸头"],"摸头走神闭眼":["石头闭眼","思索走神","石头摸头"],"摸头低眉":["低眉","正常微微笑","石头摸头"],"摸头低眉大笑":["低眉","大笑","石头摸头"],"摸头低眉走神":["低眉","思索走神","石头摸头"],"摸头低眉闭眼":["低眉","石头闭眼","正常微微笑","石头摸头"],"摸头低眉大笑闭眼":["低眉","石头闭眼","大笑","石头摸头"],"摸头低眉走神闭眼":["低眉","石头闭眼","思索走神","石头摸头"],"捂头痛苦":["石头捂头"],"none":[],"默认走神":["思索走神","默认姿势石头"],"默认低眉":["低眉","正常微微笑","默认姿势石头"]}}} \ 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":[],"默认":["佩佩默认姿势"],"默认扬眉":["开心眉毛_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 diff --git a/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank b/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank index 7e5e86ed1..f4f2bb576 100644 Binary files a/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank and b/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 14d214e28..c392523b3 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -100,7 +100,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 1 + fullscreenMode: 0 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 @@ -133,7 +133,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.0 + bundleVersion: 0.1.2.3-20250317-200355 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -160,7 +160,7 @@ PlayerSettings: VisionOS: 0 iPhone: 0 tvOS: 0 - overrideDefaultApplicationIdentifier: 0 + overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0