diff --git a/Assets/AddressableAssetsData/Android.meta b/Assets/AddressableAssetsData/Android.meta new file mode 100644 index 000000000..7942a2417 --- /dev/null +++ b/Assets/AddressableAssetsData/Android.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e18e867254e972440881f602d4e5f6fa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/OSX.meta b/Assets/AddressableAssetsData/OSX.meta new file mode 100644 index 000000000..a6f1a539a --- /dev/null +++ b/Assets/AddressableAssetsData/OSX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6a6197bc054ac245a76943fb61ec0f9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 9bebfac1e..d3df27388 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -1053,15 +1053,19 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 0.007228916 - - 0.043749984 - - 0.12409639 - - 0.20444278 - - 0.24096388 - - 0.20444278 - - 0.12409639 - - 0.043749984 - - 0.007228916 + - 0.0048309183 + - 0.016401261 + - 0.04532712 + - 0.08293076 + - 0.12053438 + - 0.14946026 + - 0.1610306 + - 0.14946026 + - 0.12053438 + - 0.08293076 + - 0.04532712 + - 0.016401261 + - 0.0048309183 --- !u!114 &-6086986437317696584 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Resources/Yarn/FP_Peipei3/Stage3_全身检查.yarn b/Assets/Resources/Yarn/FP_Peipei3/Stage3_全身检查.yarn index 9bb4da391..4ddf12375 100644 --- a/Assets/Resources/Yarn/FP_Peipei3/Stage3_全身检查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei3/Stage3_全身检查.yarn @@ -11,13 +11,13 @@ position: -449,-3574 -title: 全身检查状态 -position: -436,-2338 ---- -<> - <> -<> -=== +// title: 全身检查状态 +// position: -436,-2338 +// --- +// <> +// <> +// <> +// === @@ -45,14 +45,14 @@ me: 对不起了。
等你一觉醒来,应该就都结束了。 -title: PlugFinished -position: 151,-2688 ---- -<> - <> - <> -<> -=== +// title: PlugFinished +// position: 151,-2688 +// --- +// <> +// <> +// <> +// <> +// === @@ -62,7 +62,7 @@ tags: position: 43,-97 --- <> -<> +// <> === @@ -99,7 +99,7 @@ EmoModule: 已与情绪模块建立连接! ->结束 <> <> -<> +// <> === @@ -135,7 +135,7 @@ SpeakerModule: 已与表达模块建立连接! ->结束 <> <> -<> +//<> === @@ -172,7 +172,7 @@ LogicModule: 已与逻辑处理模块建立连接! ->结束 <> <> -<> +//<> === @@ -209,7 +209,7 @@ ChipModule: 已与附加模块建立连接! ->结束 <> <> -<> +//<> === @@ -246,7 +246,7 @@ MemModule: 未检测到可查看的记忆卡带。 ->结束 <> <> -<> +//<> === @@ -288,7 +288,8 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接! ->结束 <> <> -<> +<> +//<> === @@ -326,7 +327,7 @@ EyeModule: 已与视觉模块建立连接! ->结束 <> <> -<> +//<> === diff --git a/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn b/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn index 9161a5982..9145a151e 100644 --- a/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn +++ b/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn @@ -3,7 +3,6 @@ tags: colorID: 3 position: 246,-866 --- -<> me: 来吧…… <> === diff --git a/Assets/Resources/Yarn/FP_Peipei3/Start.yarn b/Assets/Resources/Yarn/FP_Peipei3/Start.yarn index 2b0be4cb5..4dd4ac186 100644 --- a/Assets/Resources/Yarn/FP_Peipei3/Start.yarn +++ b/Assets/Resources/Yarn/FP_Peipei3/Start.yarn @@ -68,7 +68,13 @@ position: 248,-1739 <> ///一些状态初始化 - +<> +<> +<> +<> +<> +<> +<> //没有色彩晶圆 <> === diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn index 9e5d8ba1a..7b432f31b 100644 --- a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn @@ -464,6 +464,8 @@ shitou: 这一定比原曲还要好!毕竟这是我和医生共同演奏和演 me: 哈哈。别取笑我了。 me: 结束了,让我们出去听听吧。 +<> + <> <> diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 4fbdc70cc..7c49eaa96 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -20989,7 +20989,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1134468525 m_SortingLayer: 10 - m_SortingOrder: 5 + m_SortingOrder: 6 m_Sprite: {fileID: 3822937466802405960, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/ProjectSettings/BurstAotSettings_StandaloneOSX.json b/ProjectSettings/BurstAotSettings_StandaloneOSX.json new file mode 100644 index 000000000..ca7cf1a19 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneOSX.json @@ -0,0 +1,17 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +}