From 2825fbef474d3bf00a17b30be2b47a2b91baf429 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Thu, 23 Jan 2025 18:32:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BC=95=E6=93=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Art/Fix/20250123-164940.psb | 3 + .../Art/Fix/20250123-164940.psb.meta | 242 ++++++++++++++++++ Assets/Resources/Materials/FadeRing.mat | 50 ++++ Assets/Resources/Materials/FadeRing.mat.meta | 8 + Assets/Resources/Shader/FadeRing.shader | 64 +++++ Assets/Resources/Shader/FadeRing.shader.meta | 9 + Assets/Scenes/ExpressFixScene.unity | 228 ++++++++++++++--- .../Scripts/Dialog System/DialogController.cs | 12 + Assets/Scripts/Dialog System/LineView.cs | 25 -- .../Scripts/FixSystemNew/FixSystemCenter.cs | 2 +- .../Scripts/Framework/OtherKit/MonoCenter.cs | 9 - Assets/Scripts/Game Loop/EventEnums.cs | 6 +- Assets/Scripts/MiniGame/Engine/CordPull.cs | 26 +- .../Scripts/MiniGame/Engine/EngineSystem.cs | 112 +++----- .../MiniGame/Engine/EngineYarnCommand.cs | 24 ++ .../Scripts/MiniGame/Engine/SpeedDashboard.cs | 27 +- .../MiniGame/Engine/SpeedDashboard.cs.meta | 14 +- Assets/Scripts/MiniGame/Engine/StaticGear.cs | 8 +- Assets/Scripts/MiniGame/Gear/GearSystem.cs | 6 + Assets/Scripts/MiniGame/Gear/Shaft.cs | 9 +- Assets/Scripts/MiniGame/Gear/ShaftGraph.cs | 30 ++- Assets/Scripts/UI/Cursor/CursorManager.cs | 38 ++- .../UI/DialogUI/DialogCanvasManager.cs | 1 + 23 files changed, 726 insertions(+), 227 deletions(-) create mode 100644 Assets/Resources/Art/Fix/20250123-164940.psb create mode 100644 Assets/Resources/Art/Fix/20250123-164940.psb.meta create mode 100644 Assets/Resources/Materials/FadeRing.mat create mode 100644 Assets/Resources/Materials/FadeRing.mat.meta create mode 100644 Assets/Resources/Shader/FadeRing.shader create mode 100644 Assets/Resources/Shader/FadeRing.shader.meta diff --git a/Assets/Resources/Art/Fix/20250123-164940.psb b/Assets/Resources/Art/Fix/20250123-164940.psb new file mode 100644 index 000000000..53723ee53 --- /dev/null +++ b/Assets/Resources/Art/Fix/20250123-164940.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11655b5e77152ef26c1226f17c9fa0092f94d37fac5e81c410660167fa939c4b +size 5834369 diff --git a/Assets/Resources/Art/Fix/20250123-164940.psb.meta b/Assets/Resources/Art/Fix/20250123-164940.psb.meta new file mode 100644 index 000000000..c560bb593 --- /dev/null +++ b/Assets/Resources/Art/Fix/20250123-164940.psb.meta @@ -0,0 +1,242 @@ +fileFormatVersion: 2 +guid: 64008f2c27d35ac409386015a6bb5887 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: b2a9591990af98743ba3ff7cf1000886, type: 3} + textureImporterSettings: + alphaSource: 1 + mipMapMode: 0 + enableMipMap: 1 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + convertToNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + swizzle: 50462976 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + nPOTScale: 1 + sRGBTexture: 1 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 500 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 0 + flipbookColumns: 0 + ignorePngGamma: 0 + cookieMode: 0 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + normalMap: 0 + textureFormat: 0 + maxTextureSize: 0 + lightmap: 0 + compressionQuality: 0 + linearTexture: 0 + grayScaleToAlpha: 0 + rGBM: 0 + cubemapConvolutionSteps: 0 + cubemapConvolutionExponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + spriteImportData: + - name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} + mosaicSpriteImportData: [] + rigSpriteImportData: + - name: "\u56FE\u5C42 2" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 1823 + height: 1127 + spriteID: bebac499b546daf4893c5ecd0bf27294 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} + characterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + sharedRigSpriteImportData: [] + sharedRigCharacterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + platformSettings: + - name: DefaultTexturePlatform + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Standalone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Server + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Android + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: WebGL + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + mosaicLayers: 1 + characterMode: 1 + documentPivot: {x: 0, y: 0} + documentAlignment: 7 + importHiddenLayers: 0 + layerMappingOption: 2 + generatePhysicsShape: 0 + paperDollMode: 0 + keepDupilcateSpriteName: 1 + skeletonAssetReferenceID: + padding: 4 + spriteSizeExpand: 0 + spriteCategoryList: + categories: [] + spritePackingTag: + resliceFromLayer: 0 + mosaicPSDLayers: [] + rigPSDLayers: + - name: "\u56FE\u5C42 2" + spriteName: "\u56FE\u5C42 2" + isGroup: 0 + parentIndex: -1 + spriteID: bebac499b546daf4893c5ecd0bf27294 + layerID: 8 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u56FE\u5C42 1" + spriteName: "\u56FE\u5C42 1" + isGroup: 0 + parentIndex: -1 + spriteID: 079b5602caf6ad6459a584388bf71067 + layerID: 2 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 0 + isVisible: 0 + sharedRigPSDLayers: [] + pSDLayerImportSetting: [] + importFileNodeState: 1 + platformSettingsDirtyTick: 0 + spriteSizeExpandChanged: 0 + generateGOHierarchy: 0 + textureAssetName: + prefabAssetName: + spriteLibAssetName: + skeletonAssetName: + secondarySpriteTextures: [] diff --git a/Assets/Resources/Materials/FadeRing.mat b/Assets/Resources/Materials/FadeRing.mat new file mode 100644 index 000000000..3bf489852 --- /dev/null +++ b/Assets/Resources/Materials/FadeRing.mat @@ -0,0 +1,50 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FadeRing + m_Shader: {fileID: 4800000, guid: bb8f232219e0a3a488c321b63e85281f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _EnableExternalAlpha: 0 + - _Progress: 0.137 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Materials/FadeRing.mat.meta b/Assets/Resources/Materials/FadeRing.mat.meta new file mode 100644 index 000000000..4df5ace33 --- /dev/null +++ b/Assets/Resources/Materials/FadeRing.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d5f7d9c99f43ce4b8ec277a4ab03080 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Shader/FadeRing.shader b/Assets/Resources/Shader/FadeRing.shader new file mode 100644 index 000000000..ff983b5e7 --- /dev/null +++ b/Assets/Resources/Shader/FadeRing.shader @@ -0,0 +1,64 @@ +Shader "Unlit/CircleProgressBar" +{ + Properties + { + _MainTex("Texture", 2D) = "white" {} + _Progress("Progress",Range(0,1)) = 0.5 + } + SubShader + { + Tags + { + "RenderType"="Transparent" + } + Blend SrcAlpha OneMinusSrcAlpha + LOD 100 + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + float _Progress; + + v2f vert(appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + return o; + } + + fixed4 frag(v2f i) : SV_Target + { + float4 col = tex2D(_MainTex, i.uv); + float4 final = step(1 - col.r, _Progress); + float3 ramp = lerp(float3(0, 1, 0), float3(1, 0, 0), _Progress); + final.rgb = final.rgb * ramp; + final.a = col.a; + if (1 - col.r > _Progress) + { + final.a = 0; + } + return final; + } + ENDCG + } + } +} \ No newline at end of file diff --git a/Assets/Resources/Shader/FadeRing.shader.meta b/Assets/Resources/Shader/FadeRing.shader.meta new file mode 100644 index 000000000..b4558876c --- /dev/null +++ b/Assets/Resources/Shader/FadeRing.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: bb8f232219e0a3a488c321b63e85281f +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 57cab7e87..bc679010f 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -555,6 +555,103 @@ Transform: m_CorrespondingSourceObject: {fileID: 2309837242789316790, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} m_PrefabInstance: {fileID: 154381820} m_PrefabAsset: {fileID: 0} +--- !u!1 &158974636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 158974637} + - component: {fileID: 158974638} + - component: {fileID: 158974639} + m_Layer: 0 + m_Name: "\u6E10\u53D8\u73AF" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &158974637 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158974636} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.164, y: 2.846, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1112213369} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &158974638 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158974636} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2d5f7d9c99f43ce4b8ec277a4ab03080, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 5 + m_Sprite: {fileID: 3967710112523861117, guid: 64008f2c27d35ac409386015a6bb5887, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.646, y: 2.254} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &158974639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158974636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d9cead340d34293bf0fd9631aede238, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &160015711 GameObject: m_ObjectHideFlags: 0 @@ -1671,7 +1768,7 @@ Transform: m_GameObject: {fileID: 463110380} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.8, y: 0.406, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2118,6 +2215,90 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxDistance: 0.8 +--- !u!1 &535044715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 535044717} + - component: {fileID: 535044716} + m_Layer: 0 + m_Name: "\u8EAB\u4F53\u7EF4\u4FEE\u754C\u9762\u5BFC\u51FA_1227" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &535044716 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535044715} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: d461b69b519107a4c8d7203943963833, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 38.399998, y: 21.599998} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &535044717 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535044715} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 31.557453, y: -1.5650738, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &536896723 GameObject: m_ObjectHideFlags: 0 @@ -3657,14 +3838,13 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 885292092} - - component: {fileID: 885292093} m_Layer: 0 m_Name: Speed Dashboard m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &885292092 Transform: m_ObjectHideFlags: 0 @@ -3674,7 +3854,7 @@ Transform: m_GameObject: {fileID: 885292091} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.0550704, y: 0.47555804, z: 0} + m_LocalPosition: {x: -5.199, y: 2.197, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3682,20 +3862,6 @@ Transform: - {fileID: 463110381} m_Father: {fileID: 1112213369} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &885292093 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885292091} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73c497ccb39448718a07911a5e674d5f, type: 3} - m_Name: - m_EditorClassIdentifier: - leftRot: 0 - rightRot: 137 --- !u!1 &900787527 GameObject: m_ObjectHideFlags: 0 @@ -3722,7 +3888,7 @@ Transform: m_GameObject: {fileID: 900787527} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.792, y: 0.406, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4018,6 +4184,7 @@ Transform: - {fileID: 885292092} - {fileID: 5177406695049049041} - {fileID: 13903366} + - {fileID: 158974637} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1112213371 @@ -4033,28 +4200,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: engineConfig: - oilRate: 0.5 - resistance: 0.1 gearSpeed: 0.1 speedRate: 15 - targetDuration: 2 + pullCount: 5 pullMaxSpeed: 1.2 returnSpeed: 5 - engineData: - config: - oilRate: 0 - resistance: 0 - gearSpeed: 0 - speedRate: 0 - targetDuration: 0 - pullMaxSpeed: 0 - returnSpeed: 0 - curSpeed: 0 - curOil: 0 - curAcceleration: 0 - isSuccess: 0 - reachTargetTime: 0 isAvailable: 0 + isPullActive: 0 + curSpeed: 0 updateSpeedEvent: m_PersistentCalls: m_Calls: [] @@ -12150,7 +12303,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: field of view @@ -12263,3 +12416,4 @@ SceneRoots: - {fileID: 1112213369} - {fileID: 5393568355081744312} - {fileID: 9210352354887959608} + - {fileID: 535044717} diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs index 9d398db03..09f60ec37 100644 --- a/Assets/Scripts/Dialog System/DialogController.cs +++ b/Assets/Scripts/Dialog System/DialogController.cs @@ -135,6 +135,18 @@ namespace AibisDream return false; } } + + /// + /// 跳到下一句 + /// + public void JumpLine() + { + if (!DialogCanvasManager.GetCurView().TrySkipLine()) + { + AudioManager.Instance.StopVoice(); + DialogCanvasManager.GetCurView().NextStep(); + } + } #region 命令名 diff --git a/Assets/Scripts/Dialog System/LineView.cs b/Assets/Scripts/Dialog System/LineView.cs index 559ccd58c..56701b942 100644 --- a/Assets/Scripts/Dialog System/LineView.cs +++ b/Assets/Scripts/Dialog System/LineView.cs @@ -68,30 +68,5 @@ namespace AibisDream var options = DialogOption.GeneOptions(dialogueOptions, onOptionSelected); DialogCanvasManager.GetCurView().ShowOptions(options); } - - private void Update() - { - if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space)) - { - JumpLine(); - } - } - - /// - /// 跳到下一句 - /// - private void JumpLine() - { - if (_isInCommand) - { - return; - } - - if (!DialogCanvasManager.GetCurView().TrySkipLine()) - { - AudioManager.Instance.StopVoice(); - DialogCanvasManager.GetCurView().NextStep(); - } - } } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index ea6e868df..56d81b2e1 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -16,7 +16,7 @@ namespace AibisDream.FixSystem // 初始化状态机 StateMachine = new FixStateMachine(); - StartCoroutine(StateMachine.SwitchState(FixState.Clinic)); + StartCoroutine(StateMachine.SwitchState(FixState.Engine)); } public override void OnSingletonDestroy() diff --git a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs index e937f82f1..0d5ccd764 100644 --- a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs +++ b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs @@ -1,5 +1,4 @@ using System; -using AibisDream.FixSystem; using UnityEngine; namespace AibisDream.Framework @@ -47,14 +46,6 @@ namespace AibisDream.Framework { public void OnUpdate() { - if (Input.GetKeyDown(KeyCode.K)) - { - MonoCenter.Mono.StartCoroutine(CameraKit.Instance.TransCameraAsync(new Vector3(5f, 5f, -10), 5, 5f)); - } - - if (Input.GetKeyDown(KeyCode.A)) - { - } } } diff --git a/Assets/Scripts/Game Loop/EventEnums.cs b/Assets/Scripts/Game Loop/EventEnums.cs index 7afd3390e..cae81e375 100644 --- a/Assets/Scripts/Game Loop/EventEnums.cs +++ b/Assets/Scripts/Game Loop/EventEnums.cs @@ -8,7 +8,8 @@ namespace AibisDream { NextYarn, PlugIn, - PlugOut + PlugOut, + Menu } public enum DialogEventEnum @@ -17,8 +18,7 @@ namespace AibisDream LineShowed, LineEnd, OptionShow, - OptionSelected, - Command + OptionSelected } public enum InteractionEventEnum diff --git a/Assets/Scripts/MiniGame/Engine/CordPull.cs b/Assets/Scripts/MiniGame/Engine/CordPull.cs index 7d9f7446c..d36cf2e16 100644 --- a/Assets/Scripts/MiniGame/Engine/CordPull.cs +++ b/Assets/Scripts/MiniGame/Engine/CordPull.cs @@ -34,11 +34,6 @@ namespace AibisDream _trigger.Register(EventTriggerType.Drag, OnDrag); } - public float GetCurOil() - { - return Mathf.Abs((transform.localPosition.y - _initPos.y) / maxDistance); - } - private void Update() { if (_isDragging) @@ -58,15 +53,10 @@ namespace AibisDream // 如果拖拽点在下方，限速移动 else { - if (Mathf.Abs(_dragPoint.y - transform.position.y) / Time.deltaTime > - _engineSystem.engineConfig.pullMaxSpeed) - { - curY = transform.position.y - _engineSystem.engineConfig.pullMaxSpeed * Time.deltaTime; - } - else - { - curY = _dragPoint.y; - } + curY = _dragPoint.y; + var pullDelta = Mathf.Abs(curY - transform.position.y) / maxDistance; + // 将增量同步给Engine + _engineSystem.AddAirPress(pullDelta); } transform.position = new Vector3(transform.position.x, curY, transform.position.y); @@ -75,7 +65,8 @@ namespace AibisDream private void OnDrag(BaseEventData data) { // 这里是一些阻碍拖动的情况 - + if (!IsActive) return; + // 正常情况下不会出错 if (data is not PointerEventData pointerData) return; @@ -85,6 +76,9 @@ namespace AibisDream private void OnBeginDrag(BaseEventData data) { + // 这里是一些阻碍拖动的情况 + if (!IsActive) return; + // 正常情况下不会出错 if (data is not PointerEventData pointerData) return; // 设置拖拽目标点 @@ -112,7 +106,7 @@ namespace AibisDream _dragPoint = new Vector3(transform.position.x, dragY, transform.position.z); } - public bool IsActive => true; + public bool IsActive => _engineSystem.isPullActive; public bool IsAvailable => _engineSystem.isAvailable; diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs index bee4d96af..226580568 100644 --- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs @@ -1,8 +1,10 @@ using System; +using System.Collections; using AibisDream.FixSystem; using AibisDream.Framework; using AibisDream.Utility; using Cinemachine; +using DG.Tweening; using UnityEngine; using UnityEngine.Events; @@ -10,15 +12,15 @@ namespace AibisDream { public class EngineSystem : MonoBehaviour { - private CordPull _cordPull; private StaticGear _centerGear; [Header("系统配置")] public EngineConfig engineConfig; - [Header("系统数据")] public EngineData engineData; - public bool isAvailable; + public bool isPullActive; + private bool _isSuccess; - [HideInInspector] public UnityEvent updateSpeedEvent = new(); + public float curSpeed; + [HideInInspector] public UnityEvent updateSpeedEvent = new(); [SerializeField] private float coverMoveDuration = 5f; @@ -27,10 +29,9 @@ namespace AibisDream private void Awake() { FixSystemCenter.SystemDic.Register(this); - _cordPull = transform.Find("拉绳").GetComponent(); _centerGear = transform.Find("中央齿轮").GetComponent(); _centerGear.initSpeed = engineConfig.gearSpeed; - + // 注册相机 var virtualCam = transform.Find("Engine Camera").GetComponentInChildren(); CameraKit.Instance.RegisterCamera(CameraEnum.Engine, virtualCam); @@ -38,36 +39,41 @@ namespace AibisDream private void Start() { - // 初始化数据 - engineData = new EngineData - { - config = engineConfig - }; _centerGear.StartRotate(); } + public IEnumerator StepOnGas(float targetSpeed, float duration) + { + // 逐渐加速 + yield return DOTween.To(() => curSpeed, x => { curSpeed = x; }, targetSpeed, duration).WaitForCompletion(); + } + + public void AddAirPress(float speedDelta) + { + curSpeed = CommonUtil.Limit(curSpeed + speedDelta / engineConfig.pullCount, 1, 0); + } + private void OnDestroy() { CameraKit.Instance.UnRegisterCamera(CameraEnum.Engine); } - public void Update() + private void Update() { - // 收集数据 - engineData.curOil = _cordPull.GetCurOil(); - // 更新数据 - engineData.CalcSpeed(); - - // 传递速度 - updateSpeedEvent.Invoke(engineData.GetRealSpeed()); - - if (engineData.CheckSuccess()) + updateSpeedEvent.Invoke(curSpeed, GetSpeedScale()); + if (curSpeed >= 0.99f && !_isSuccess) { - Debug.Log("引擎成功"); + _isSuccess = true; + isPullActive = false; DialogController.Instance?.StartDialogNode("EngineSuccess"); } } + private float GetSpeedScale() + { + return 1 + curSpeed * engineConfig.speedRate; + } + /// /// 开启系统交互 /// @@ -88,70 +94,10 @@ namespace AibisDream [Serializable] public struct EngineConfig { - [Header("油门倍率")] public float oilRate; - [Header("阻力倍率")] public float resistance; [Header("齿轮基础速度")] public float gearSpeed; [Header("齿轮速度倍率")] public float speedRate; - [Header("成功所需时间")] public float targetDuration; + [Header("拉满几次到全速")] public float pullCount; [Header("拉绳最大速度")] public float pullMaxSpeed; [Header("拉绳回缩速度")] public float returnSpeed; } - - [Serializable] - public struct EngineData - { - public EngineConfig config; - public float curSpeed; - public float curOil; - public float curAcceleration; - public bool isSuccess; - public float reachTargetTime; - - public void CalcSpeed() - { - if (curOil != 0) - { - curAcceleration = curAcceleration < 0 ? 0 : curAcceleration; - curAcceleration = CommonUtil.Limit(curOil * config.oilRate * Time.deltaTime + curAcceleration, 100, 0); - } - else - { - curAcceleration = -config.resistance * (1f + curSpeed); - } - - - curSpeed = CommonUtil.Limit(curSpeed + curAcceleration * Time.deltaTime, 1, 0); - } - - public bool CheckSuccess() - { - // 已经成功就不用校验了 - if (isSuccess) return false; - - if (curSpeed >= 0.95f) - { - reachTargetTime += Time.deltaTime; - } - else - { - reachTargetTime = 0; - } - - // 如果速度达标时间足够就判断成功 - if (!(reachTargetTime >= config.targetDuration)) return false; - - isSuccess = true; - return true; - } - - - /// - /// 获取处理后的速度 - /// - /// 速度 - public float GetRealSpeed() - { - return 1 + curSpeed * config.speedRate; - } - } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs b/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs index 9611397ec..02920c84a 100644 --- a/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs +++ b/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs @@ -1,4 +1,5 @@ using System.Collections; +using AibisDream.FixSystem; using UnityEngine; using Yarn.Unity; @@ -6,6 +7,8 @@ namespace AibisDream { public static class EngineYarnCommand { + private static EngineSystem EngineSystem => FixSystemCenter.SystemDic.Get(); + // 打开引擎盖 [YarnCommand("open_engine_cover")] public static IEnumerator OpenEngineCover() @@ -21,5 +24,26 @@ namespace AibisDream Debug.LogWarning("关闭引擎盖命令已废弃，请尽快删除"); yield break; } + + /// + /// 踩油门 + /// + /// 目标速度 + /// 用时 + /// 协程 + [YarnCommand("step_on_gas")] + public static IEnumerator StepOnGas(float targetSpeed, float duration) + { + return EngineSystem.StepOnGas(targetSpeed, duration); + } + + /// + /// 激活拉绳 + /// + [YarnCommand("active_engine_pull")] + public static void ActivePull() + { + EngineSystem.isPullActive = true; + } } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs index c2749ba35..39c46e80f 100644 --- a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs +++ b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs @@ -1,25 +1,24 @@ -using UnityEngine; +using UnityEngine; namespace AibisDream { public class SpeedDashboard : MonoBehaviour { - private Transform _pointer; - - [SerializeField] private float leftRot; - [SerializeField] private float rightRot; + private Material _material; + private EngineSystem _engineSystem; + private static readonly int Progress1 = Shader.PropertyToID("_Progress"); - protected void OnStart() + private void Awake() { - _pointer = transform.Find("Pointer"); + _material = GetComponent().material; + _engineSystem = transform.parent.GetComponent(); + + _engineSystem.updateSpeedEvent.AddListener(OnSpeedChange); } - - protected void UpdateDashboard(EngineData data) + + private void OnSpeedChange(float originSpeed, float speedScale) { - var targetRot = (rightRot - leftRot) * data.curSpeed + leftRot; - - _pointer.eulerAngles = new Vector3(0, 0, -targetRot); + _material.SetFloat(Progress1, originSpeed); } } -} - +} \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs.meta b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs.meta index c1a0126ef..cf176307d 100644 --- a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs.meta +++ b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs.meta @@ -1,11 +1,3 @@ -fileFormatVersion: 2 -guid: 73c497ccb39448718a07911a5e674d5f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 4d9cead340d34293bf0fd9631aede238 +timeCreated: 1737626210 \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Engine/StaticGear.cs b/Assets/Scripts/MiniGame/Engine/StaticGear.cs index 1a807b3b7..8c2e35568 100644 --- a/Assets/Scripts/MiniGame/Engine/StaticGear.cs +++ b/Assets/Scripts/MiniGame/Engine/StaticGear.cs @@ -22,12 +22,8 @@ namespace AibisDream .SetEase(Ease.Linear) .SetLoops(-1, LoopType.Incremental); } - - /// - /// 为旋转加速 - /// - /// 速度倍率 - private void UpdateSpeedScale(float speed) + + private void UpdateSpeedScale(float originSpeed, float speed) { _rotateTween.timeScale = speed; } diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs index 25041a4b5..f7fa72685 100644 --- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs +++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs @@ -39,6 +39,8 @@ namespace AibisDream private bool _isTargetReached; private bool _isDiscReady; + public float initSpeed = 1; + private void Awake() { Init(); @@ -65,6 +67,10 @@ namespace AibisDream var panelShafts = _panel.GetComponentsInChildren(); _shaftGraph = new ShaftGraph(shafts, panelShafts); + var engine = FixSystemCenter.SystemDic.Get(); + _shaftGraph.StartRotate(initSpeed); + engine.updateSpeedEvent.AddListener(_shaftGraph.Accelerate); + _panel.gameObject.SetActive(false); } diff --git a/Assets/Scripts/MiniGame/Gear/Shaft.cs b/Assets/Scripts/MiniGame/Gear/Shaft.cs index e67a2d4a2..06b5bf420 100644 --- a/Assets/Scripts/MiniGame/Gear/Shaft.cs +++ b/Assets/Scripts/MiniGame/Gear/Shaft.cs @@ -23,9 +23,6 @@ namespace AibisDream [SerializeField] private Gear childGear; - // 初始角速度 - [SerializeField] private float initialSpeed; - // 目标角速度 [SerializeField] private float targetSpeed; @@ -70,8 +67,7 @@ namespace AibisDream // 如果带齿轮，要根据齿轮类型生成 childGear = InitGear(initRadius, initSprite, isInitGearBroken, isInitGearDisc); - - speed = initialSpeed; + childGear.UpdateRotation(speed, _speedScale); } @@ -274,7 +270,6 @@ namespace AibisDream isInitGearBroken = levelData.isGearBroken; isInitGearDisc = levelData.isDisc; discIdx = levelData.discIdx; - initialSpeed = levelData.initialSpeed; targetSpeed = levelData.targetSpeed; initRadius = levelData.radius; } @@ -291,7 +286,6 @@ namespace AibisDream isGearBroken = isInitGearBroken, isDisc = isInitGearDisc, discIdx = discIdx, - initialSpeed = initialSpeed, targetSpeed = targetSpeed, radius = initRadius }; @@ -315,7 +309,6 @@ namespace AibisDream // 关卡数据 public ShaftType shaftType; - public float initialSpeed; public float targetSpeed; public bool hasChildGear; public float radius; diff --git a/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs b/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs index aab90b35b..3db039a3b 100644 --- a/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs +++ b/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs @@ -43,6 +43,24 @@ namespace AibisDream UpdateSpeed(); } + /// + /// 初始化速度 + /// + /// 初始速度 + public void StartRotate(float initSpeed) + { + _vertexArray[_rootIdx].speed = initSpeed; + UpdateSpeed(); + } + + public void Accelerate(float originSpeed, float speed) + { + foreach (var shaft in _vertexArray) + { + if (shaft.HasChildGear()) shaft.UpdateSpeedScale(speed); + } + } + private int FindDriverIdx() { for (int i = 0; i < _vertexSize; i++) @@ -261,17 +279,5 @@ namespace AibisDream return isShaftAvailable; } - - /// - /// 通过引擎系统加速 - /// - /// 当前速度 - private void Accelerate(float curSpeed) - { - foreach (var shaft in _vertexArray) - { - if (shaft.HasChildGear()) shaft.UpdateSpeedScale(1 + curSpeed); - } - } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Cursor/CursorManager.cs b/Assets/Scripts/UI/Cursor/CursorManager.cs index 5fa622d49..ab095737d 100644 --- a/Assets/Scripts/UI/Cursor/CursorManager.cs +++ b/Assets/Scripts/UI/Cursor/CursorManager.cs @@ -15,13 +15,13 @@ namespace AibisDream public Sprite nextTalk, talking, option, interactive, holding, disable, eye; private Image _cursor; - private RectTransform _cursorCanvas; #region 状态相关 private Coroutine _switchCoroutine; private CursorState _curState = CursorState.Default; private bool _isTalking; + [HideInInspector] public bool isInMenu; #endregion @@ -59,12 +59,18 @@ namespace AibisDream private void InitRefs() { _cursor = transform.Find("Cursor").GetComponent(); - _cursorCanvas = GetComponent(); } private void RegisterEvent() { // 此处监听所有可能对鼠标状态产生影响的事件 + RegisterDialogEvent(); + RegisterTriggerEvent(); + RegisterMenu(); + } + + private void RegisterDialogEvent() + { // 对话相关 _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.LineStart, OnLineStart)); @@ -74,7 +80,10 @@ namespace AibisDream _unRegisters.Add( EnumEventSystem.Global.Register(DialogEventEnum.OptionSelected, OnOptionSelect)); + } + private void RegisterTriggerEvent() + { // 交互相关 _unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.Start, OnInteractiveStart)); _unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.End, OnInteractiveEnd)); @@ -89,6 +98,22 @@ namespace AibisDream EnumEventSystem.Global.Register(TriggerEnum.PointerUp, OnPointerUp)); } + private void RegisterMenu() + { + _unRegisters.Add(EnumEventSystem.Global.Register(EventEnum.Menu, OnMenuChange)); + } + + private void Update() + { + if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space)) + { + if (_isTalking && !isInMenu) + { + DialogController.Instance.JumpLine(); + } + } + } + private void LateUpdate() { // // 将虚拟指针与鼠标位置同步 @@ -190,6 +215,15 @@ namespace AibisDream #endregion + #region 菜单打开 + + private void OnMenuChange(bool isMenuOpen) + { + isInMenu = isMenuOpen; + } + + #endregion + #region 指针切换 /// diff --git a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs index cb2e13812..c9f7ad2ac 100644 --- a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs +++ b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs @@ -162,6 +162,7 @@ namespace AibisDream { var logObj = transform.Find("Dialogue Log").gameObject; logObj.SetActive(!logObj.activeSelf); + EnumEventSystem.Global.Send(EventEnum.Menu, logObj.activeSelf); } #endregion From 083c39544ec363fba2ce797e3a5ddf9c02cf593e Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Thu, 23 Jan 2025 19:22:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FMOD/Resources/FMODStudioSettings.asset | 500 +++++++++--------- Assets/Scenes/ExpressFixScene.unity | 102 +--- .../Scripts/FixSystemNew/FixSystemCenter.cs | 2 +- 3 files changed, 253 insertions(+), 351 deletions(-) diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index c1d8a490d..4282c1859 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6421979802148699356 +--- !u!114 &-6174243690473532038 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9,10 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} + m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3} m_Name: FMODStudioSettingsPlatform m_EditorClassIdentifier: - identifier: b7716510a1f36934c87976f3a81dbf3d + identifier: e7a046c753c3c3d4aacc91f6597f310d parentIdentifier: default active: 0 Properties: @@ -73,153 +73,7 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &-2493609972237370556 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8f591a193113347409efedcc618e83d6, type: 3} - m_Name: FMODStudioSettingsPlatform - m_EditorClassIdentifier: - identifier: de700ef3f37a49b58a57ae3addf01ad9 - parentIdentifier: default - active: 0 - Properties: - LiveUpdate: - Value: 0 - HasValue: 0 - LiveUpdatePort: - Value: 0 - HasValue: 0 - Overlay: - Value: 0 - HasValue: 0 - OverlayPosition: - Value: 0 - HasValue: 0 - OverlayFontSize: - Value: 0 - HasValue: 0 - Logging: - Value: 0 - HasValue: 0 - SampleRate: - Value: 0 - HasValue: 0 - BuildDirectory: - Value: - HasValue: 0 - SpeakerMode: - Value: 0 - HasValue: 0 - VirtualChannelCount: - Value: 0 - HasValue: 0 - RealChannelCount: - Value: 0 - HasValue: 0 - DSPBufferLength: - Value: 0 - HasValue: 0 - DSPBufferCount: - Value: 0 - HasValue: 0 - Plugins: - Value: [] - HasValue: 0 - StaticPlugins: - Value: [] - HasValue: 0 - CallbackHandler: - Value: {fileID: 0} - HasValue: 0 - OutputTypeName: - threadAffinities: - Value: [] - HasValue: 0 - displaySortOrder: 0 - childIdentifiers: [] - codecChannels: - Value: [] - HasValue: 0 ---- !u!114 &-1580684736993228498 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} - m_Name: FMODStudioSettingsPlatform - m_EditorClassIdentifier: - identifier: 46fbfdf3fc43db0458918377fd40293e - parentIdentifier: default - active: 0 - Properties: - LiveUpdate: - Value: 0 - HasValue: 0 - LiveUpdatePort: - Value: 0 - HasValue: 0 - Overlay: - Value: 0 - HasValue: 0 - OverlayPosition: - Value: 0 - HasValue: 0 - OverlayFontSize: - Value: 0 - HasValue: 0 - Logging: - Value: 0 - HasValue: 0 - SampleRate: - Value: 0 - HasValue: 0 - BuildDirectory: - Value: - HasValue: 0 - SpeakerMode: - Value: 0 - HasValue: 0 - VirtualChannelCount: - Value: 0 - HasValue: 0 - RealChannelCount: - Value: 0 - HasValue: 0 - DSPBufferLength: - Value: 0 - HasValue: 0 - DSPBufferCount: - Value: 0 - HasValue: 0 - Plugins: - Value: [] - HasValue: 0 - StaticPlugins: - Value: [] - HasValue: 0 - CallbackHandler: - Value: {fileID: 0} - HasValue: 0 - OutputTypeName: - threadAffinities: - Value: [] - HasValue: 0 - displaySortOrder: 0 - childIdentifiers: [] - codecChannels: - Value: [] - HasValue: 0 ---- !u!114 &-785679389004310805 +--- !u!114 &-3974345589865759223 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -292,7 +146,7 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &-712030531834803398 +--- !u!114 &-2057712728005687216 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -301,10 +155,83 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} + m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} m_Name: FMODStudioSettingsPlatform m_EditorClassIdentifier: - identifier: fd7c55dab0fce234b8c25f6ffca523c1 + identifier: c88d16e5272a4e241b0ef0ac2e53b73d + parentIdentifier: default + active: 0 + Properties: + LiveUpdate: + Value: 0 + HasValue: 0 + LiveUpdatePort: + Value: 0 + HasValue: 0 + Overlay: + Value: 0 + HasValue: 0 + OverlayPosition: + Value: 0 + HasValue: 0 + OverlayFontSize: + Value: 0 + HasValue: 0 + Logging: + Value: 0 + HasValue: 0 + SampleRate: + Value: 0 + HasValue: 0 + BuildDirectory: + Value: + HasValue: 0 + SpeakerMode: + Value: 0 + HasValue: 0 + VirtualChannelCount: + Value: 0 + HasValue: 0 + RealChannelCount: + Value: 0 + HasValue: 0 + DSPBufferLength: + Value: 0 + HasValue: 0 + DSPBufferCount: + Value: 0 + HasValue: 0 + Plugins: + Value: [] + HasValue: 0 + StaticPlugins: + Value: [] + HasValue: 0 + CallbackHandler: + Value: {fileID: 0} + HasValue: 0 + OutputTypeName: + threadAffinities: + Value: [] + HasValue: 0 + displaySortOrder: 0 + childIdentifiers: [] + codecChannels: + Value: [] + HasValue: 0 +--- !u!114 &-1479416721063755007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} + m_Name: FMODStudioSettingsPlatform + m_EditorClassIdentifier: + identifier: 0f8eb3f400726694eb47beb1a9f94ce8 parentIdentifier: default active: 0 Properties: @@ -419,20 +346,20 @@ MonoBehaviour: HideSetupWizard: 1 LastEventReferenceScanVersion: 131621 Platforms: - - {fileID: 9010303474896345012} - - {fileID: 6330521338056678831} - - {fileID: 3979222738758991920} - - {fileID: -1580684736993228498} - - {fileID: 1100827045814593625} - - {fileID: 6477534247104662684} - - {fileID: -785679389004310805} - - {fileID: 1132312529069990576} - - {fileID: -6421979802148699356} - - {fileID: 5613685733850034091} - - {fileID: -2493609972237370556} - - {fileID: -712030531834803398} + - {fileID: 4449505234930665929} + - {fileID: 6611559040954684553} + - {fileID: -1479416721063755007} + - {fileID: 1697475330856183958} + - {fileID: 119274062029799480} + - {fileID: -6174243690473532038} + - {fileID: -3974345589865759223} + - {fileID: 1182458898857209987} + - {fileID: 7988466420741846663} + - {fileID: -2057712728005687216} + - {fileID: 6428052061351901060} + - {fileID: 2121415354943079641} MigratedPlatforms: 0500000000000000060000000a0000000800000009000000120000000c000000150000000b0000000200000001000000 ---- !u!114 &1100827045814593625 +--- !u!114 &119274062029799480 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -505,7 +432,7 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &1132312529069990576 +--- !u!114 &1182458898857209987 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -578,7 +505,7 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &3979222738758991920 +--- !u!114 &1697475330856183958 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -587,10 +514,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} + m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} m_Name: FMODStudioSettingsPlatform m_EditorClassIdentifier: - identifier: 0f8eb3f400726694eb47beb1a9f94ce8 + identifier: 46fbfdf3fc43db0458918377fd40293e parentIdentifier: default active: 0 Properties: @@ -651,7 +578,7 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &5613685733850034091 +--- !u!114 &2121415354943079641 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -660,10 +587,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} + m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} m_Name: FMODStudioSettingsPlatform m_EditorClassIdentifier: - identifier: c88d16e5272a4e241b0ef0ac2e53b73d + identifier: fd7c55dab0fce234b8c25f6ffca523c1 parentIdentifier: default active: 0 Properties: @@ -724,7 +651,153 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &6330521338056678831 +--- !u!114 &4449505234930665929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 335f0a4b26fb46942858ea029e030d2a, type: 3} + m_Name: FMODStudioSettingsPlatform + m_EditorClassIdentifier: + identifier: playInEditor + parentIdentifier: + active: 1 + Properties: + LiveUpdate: + Value: 1 + HasValue: 1 + LiveUpdatePort: + Value: 0 + HasValue: 0 + Overlay: + Value: 1 + HasValue: 1 + OverlayPosition: + Value: 0 + HasValue: 0 + OverlayFontSize: + Value: 0 + HasValue: 0 + Logging: + Value: 0 + HasValue: 0 + SampleRate: + Value: 48000 + HasValue: 1 + BuildDirectory: + Value: + HasValue: 0 + SpeakerMode: + Value: 0 + HasValue: 0 + VirtualChannelCount: + Value: 1024 + HasValue: 1 + RealChannelCount: + Value: 256 + HasValue: 1 + DSPBufferLength: + Value: 0 + HasValue: 0 + DSPBufferCount: + Value: 0 + HasValue: 0 + Plugins: + Value: [] + HasValue: 0 + StaticPlugins: + Value: [] + HasValue: 0 + CallbackHandler: + Value: {fileID: 0} + HasValue: 0 + OutputTypeName: + threadAffinities: + Value: [] + HasValue: 0 + displaySortOrder: 0 + childIdentifiers: [] + codecChannels: + Value: [] + HasValue: 0 +--- !u!114 &6428052061351901060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f591a193113347409efedcc618e83d6, type: 3} + m_Name: FMODStudioSettingsPlatform + m_EditorClassIdentifier: + identifier: de700ef3f37a49b58a57ae3addf01ad9 + parentIdentifier: default + active: 0 + Properties: + LiveUpdate: + Value: 0 + HasValue: 0 + LiveUpdatePort: + Value: 0 + HasValue: 0 + Overlay: + Value: 0 + HasValue: 0 + OverlayPosition: + Value: 0 + HasValue: 0 + OverlayFontSize: + Value: 0 + HasValue: 0 + Logging: + Value: 0 + HasValue: 0 + SampleRate: + Value: 0 + HasValue: 0 + BuildDirectory: + Value: + HasValue: 0 + SpeakerMode: + Value: 0 + HasValue: 0 + VirtualChannelCount: + Value: 0 + HasValue: 0 + RealChannelCount: + Value: 0 + HasValue: 0 + DSPBufferLength: + Value: 0 + HasValue: 0 + DSPBufferCount: + Value: 0 + HasValue: 0 + Plugins: + Value: [] + HasValue: 0 + StaticPlugins: + Value: [] + HasValue: 0 + CallbackHandler: + Value: {fileID: 0} + HasValue: 0 + OutputTypeName: + threadAffinities: + Value: [] + HasValue: 0 + displaySortOrder: 0 + childIdentifiers: [] + codecChannels: + Value: [] + HasValue: 0 +--- !u!114 &6611559040954684553 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -807,7 +880,7 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &6477534247104662684 +--- !u!114 &7988466420741846663 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -816,10 +889,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3} + m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} m_Name: FMODStudioSettingsPlatform m_EditorClassIdentifier: - identifier: e7a046c753c3c3d4aacc91f6597f310d + identifier: b7716510a1f36934c87976f3a81dbf3d parentIdentifier: default active: 0 Properties: @@ -880,76 +953,3 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &9010303474896345012 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 335f0a4b26fb46942858ea029e030d2a, type: 3} - m_Name: FMODStudioSettingsPlatform - m_EditorClassIdentifier: - identifier: playInEditor - parentIdentifier: - active: 1 - Properties: - LiveUpdate: - Value: 1 - HasValue: 1 - LiveUpdatePort: - Value: 0 - HasValue: 0 - Overlay: - Value: 1 - HasValue: 1 - OverlayPosition: - Value: 0 - HasValue: 0 - OverlayFontSize: - Value: 0 - HasValue: 0 - Logging: - Value: 0 - HasValue: 0 - SampleRate: - Value: 48000 - HasValue: 1 - BuildDirectory: - Value: - HasValue: 0 - SpeakerMode: - Value: 0 - HasValue: 0 - VirtualChannelCount: - Value: 1024 - HasValue: 1 - RealChannelCount: - Value: 256 - HasValue: 1 - DSPBufferLength: - Value: 0 - HasValue: 0 - DSPBufferCount: - Value: 0 - HasValue: 0 - Plugins: - Value: [] - HasValue: 0 - StaticPlugins: - Value: [] - HasValue: 0 - CallbackHandler: - Value: {fileID: 0} - HasValue: 0 - OutputTypeName: - threadAffinities: - Value: [] - HasValue: 0 - displaySortOrder: 0 - childIdentifiers: [] - codecChannels: - Value: [] - HasValue: 0 diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index bc679010f..fa3a52e32 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -249,7 +249,6 @@ MonoBehaviour: initSprite: {fileID: -611960561148999933, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &24693787 @@ -1202,7 +1201,6 @@ MonoBehaviour: initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &255072952 @@ -1311,7 +1309,6 @@ MonoBehaviour: initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0.3 speed: 0 --- !u!212 &263279953 @@ -2215,90 +2212,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxDistance: 0.8 ---- !u!1 &535044715 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 535044717} - - component: {fileID: 535044716} - m_Layer: 0 - m_Name: "\u8EAB\u4F53\u7EF4\u4FEE\u754C\u9762\u5BFC\u51FA_1227" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &535044716 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 535044715} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: d461b69b519107a4c8d7203943963833, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 38.399998, y: 21.599998} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &535044717 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 535044715} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 31.557453, y: -1.5650738, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &536896723 GameObject: m_ObjectHideFlags: 0 @@ -2432,7 +2345,6 @@ MonoBehaviour: initSprite: {fileID: -1467070179034526403, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &594749269 @@ -2582,6 +2494,7 @@ MonoBehaviour: - {x: 0, y: 0, z: -6.878} - {x: 0, y: 0, z: 20} needleDuration: 1.5 + initSpeed: 1 --- !u!1 &695150750 GameObject: m_ObjectHideFlags: 0 @@ -3129,7 +3042,6 @@ MonoBehaviour: initSprite: {fileID: 2228576813345793800, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &720342595 @@ -3665,7 +3577,6 @@ MonoBehaviour: initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &863746365 @@ -3774,7 +3685,6 @@ MonoBehaviour: initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &876556889 @@ -4000,7 +3910,6 @@ MonoBehaviour: initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &933662731 @@ -4569,7 +4478,6 @@ MonoBehaviour: initSprite: {fileID: -611960561148999933, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &1192211357 @@ -5110,7 +5018,6 @@ MonoBehaviour: initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 1 targetSpeed: 0 speed: 0 --- !u!212 &1634570222 @@ -5864,7 +5771,6 @@ MonoBehaviour: initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &1895400171 @@ -6068,7 +5974,6 @@ MonoBehaviour: initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &1969730207 @@ -6249,7 +6154,6 @@ MonoBehaviour: initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &2021157135 @@ -6474,7 +6378,6 @@ MonoBehaviour: initSprite: {fileID: -1467070179034526403, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} - initialSpeed: 0 targetSpeed: 0 speed: 0 --- !u!212 &2069725406 @@ -12303,7 +12206,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: field of view @@ -12416,4 +12319,3 @@ SceneRoots: - {fileID: 1112213369} - {fileID: 5393568355081744312} - {fileID: 9210352354887959608} - - {fileID: 535044717} diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index 56d81b2e1..ea6e868df 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -16,7 +16,7 @@ namespace AibisDream.FixSystem // 初始化状态机 StateMachine = new FixStateMachine(); - StartCoroutine(StateMachine.SwitchState(FixState.Engine)); + StartCoroutine(StateMachine.SwitchState(FixState.Clinic)); } public override void OnSingletonDestroy() From da77bb60234ebb2630fb80084c6dc8c0301ed486 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Thu, 23 Jan 2025 23:07:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=9F=B3=E5=A4=B4=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E5=90=88=E5=85=A5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=8A=96?= =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E8=BF=9B=E5=BA=A6=E6=9D=A1=EF=BC=8C=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProgressBar/ProgressBarGridCircular.cs | 18 +- .../FMOD/Resources/FMODStudioSettings.asset | 660 ++--- Assets/Resources/Art/Obj/变速箱唱片齿轮.asset | 212 ++ .../Art/Obj/变速箱唱片齿轮.asset.meta | 8 + .../WenQuanYi Bitmap Song 14px SDF.asset | 4 +- .../Yarn/FP_Shitou1/Stage2_提速.yarn | 159 +- Assets/Scenes/ExpressFixScene.unity | 2296 ++++++++++------- Assets/Scenes/Persistence.unity | 7 +- .../Scripts/MiniGame/Engine/EngineSystem.cs | 3 +- .../Scripts/MiniGame/Engine/SpeedDashboard.cs | 12 +- 10 files changed, 2051 insertions(+), 1328 deletions(-) create mode 100644 Assets/Resources/Art/Obj/变速箱唱片齿轮.asset create mode 100644 Assets/Resources/Art/Obj/变速箱唱片齿轮.asset.meta diff --git a/Assets/Plugins/CleanFlatUI/Scripts/ProgressBar/ProgressBarGridCircular.cs b/Assets/Plugins/CleanFlatUI/Scripts/ProgressBar/ProgressBarGridCircular.cs index 743b7df57..15d1f27ec 100644 --- a/Assets/Plugins/CleanFlatUI/Scripts/ProgressBar/ProgressBarGridCircular.cs +++ b/Assets/Plugins/CleanFlatUI/Scripts/ProgressBar/ProgressBarGridCircular.cs @@ -140,6 +140,7 @@ namespace RainbowArt.CleanFlatUI for(int i = 0; i < fgList.Count; i++) { RectTransform rectTrans = fgList[i]; + Image image=rectTrans.transform.GetChild(0).GetComponent(); if(i < currentValue) { rectTrans.gameObject.SetActive(true); @@ -147,10 +148,19 @@ namespace RainbowArt.CleanFlatUI else { rectTrans.gameObject.SetActive(false); - } + } + if(i<16) + { + image.color=Color.Lerp(Color.green, Color.yellow, i/16f); + } + else + { + image.color = Color.Lerp(Color.yellow, Color.red, (i - 16) / 16f); + } } } + void UpdateText() { if (text != null && text.gameObject.activeSelf != hasText) @@ -159,8 +169,10 @@ namespace RainbowArt.CleanFlatUI } if (hasText && (text != null)) { - float val = (float)currentValue / (float)maxValue; - text.text = Mathf.FloorToInt(val * 100) + "%"; + //float val = (float)currentValue / (float)maxValue; + //text.text = Mathf.FloorToInt(val * 100) + "%"; + + text.text=currentValue*500+" 马力"; } } } diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 4282c1859..f4008c630 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6174243690473532038 +--- !u!114 &-6421979802148699356 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9,10 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3} + m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} m_Name: FMODStudioSettingsPlatform m_EditorClassIdentifier: - identifier: e7a046c753c3c3d4aacc91f6597f310d + identifier: b7716510a1f36934c87976f3a81dbf3d parentIdentifier: default active: 0 Properties: @@ -73,7 +73,153 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &-3974345589865759223 +--- !u!114 &-2493609972237370556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f591a193113347409efedcc618e83d6, type: 3} + m_Name: FMODStudioSettingsPlatform + m_EditorClassIdentifier: + identifier: de700ef3f37a49b58a57ae3addf01ad9 + parentIdentifier: default + active: 0 + Properties: + LiveUpdate: + Value: 0 + HasValue: 0 + LiveUpdatePort: + Value: 0 + HasValue: 0 + Overlay: + Value: 0 + HasValue: 0 + OverlayPosition: + Value: 0 + HasValue: 0 + OverlayFontSize: + Value: 0 + HasValue: 0 + Logging: + Value: 0 + HasValue: 0 + SampleRate: + Value: 0 + HasValue: 0 + BuildDirectory: + Value: + HasValue: 0 + SpeakerMode: + Value: 0 + HasValue: 0 + VirtualChannelCount: + Value: 0 + HasValue: 0 + RealChannelCount: + Value: 0 + HasValue: 0 + DSPBufferLength: + Value: 0 + HasValue: 0 + DSPBufferCount: + Value: 0 + HasValue: 0 + Plugins: + Value: [] + HasValue: 0 + StaticPlugins: + Value: [] + HasValue: 0 + CallbackHandler: + Value: {fileID: 0} + HasValue: 0 + OutputTypeName: + threadAffinities: + Value: [] + HasValue: 0 + displaySortOrder: 0 + childIdentifiers: [] + codecChannels: + Value: [] + HasValue: 0 +--- !u!114 &-1580684736993228498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} + m_Name: FMODStudioSettingsPlatform + m_EditorClassIdentifier: + identifier: 46fbfdf3fc43db0458918377fd40293e + parentIdentifier: default + active: 0 + Properties: + LiveUpdate: + Value: 0 + HasValue: 0 + LiveUpdatePort: + Value: 0 + HasValue: 0 + Overlay: + Value: 0 + HasValue: 0 + OverlayPosition: + Value: 0 + HasValue: 0 + OverlayFontSize: + Value: 0 + HasValue: 0 + Logging: + Value: 0 + HasValue: 0 + SampleRate: + Value: 0 + HasValue: 0 + BuildDirectory: + Value: + HasValue: 0 + SpeakerMode: + Value: 0 + HasValue: 0 + VirtualChannelCount: + Value: 0 + HasValue: 0 + RealChannelCount: + Value: 0 + HasValue: 0 + DSPBufferLength: + Value: 0 + HasValue: 0 + DSPBufferCount: + Value: 0 + HasValue: 0 + Plugins: + Value: [] + HasValue: 0 + StaticPlugins: + Value: [] + HasValue: 0 + CallbackHandler: + Value: {fileID: 0} + HasValue: 0 + OutputTypeName: + threadAffinities: + Value: [] + HasValue: 0 + displaySortOrder: 0 + childIdentifiers: [] + codecChannels: + Value: [] + HasValue: 0 +--- !u!114 &-785679389004310805 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -146,7 +292,7 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &-2057712728005687216 +--- !u!114 &-712030531834803398 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -155,83 +301,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} + m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} m_Name: FMODStudioSettingsPlatform m_EditorClassIdentifier: - identifier: c88d16e5272a4e241b0ef0ac2e53b73d - parentIdentifier: default - active: 0 - Properties: - LiveUpdate: - Value: 0 - HasValue: 0 - LiveUpdatePort: - Value: 0 - HasValue: 0 - Overlay: - Value: 0 - HasValue: 0 - OverlayPosition: - Value: 0 - HasValue: 0 - OverlayFontSize: - Value: 0 - HasValue: 0 - Logging: - Value: 0 - HasValue: 0 - SampleRate: - Value: 0 - HasValue: 0 - BuildDirectory: - Value: - HasValue: 0 - SpeakerMode: - Value: 0 - HasValue: 0 - VirtualChannelCount: - Value: 0 - HasValue: 0 - RealChannelCount: - Value: 0 - HasValue: 0 - DSPBufferLength: - Value: 0 - HasValue: 0 - DSPBufferCount: - Value: 0 - HasValue: 0 - Plugins: - Value: [] - HasValue: 0 - StaticPlugins: - Value: [] - HasValue: 0 - CallbackHandler: - Value: {fileID: 0} - HasValue: 0 - OutputTypeName: - threadAffinities: - Value: [] - HasValue: 0 - displaySortOrder: 0 - childIdentifiers: [] - codecChannels: - Value: [] - HasValue: 0 ---- !u!114 &-1479416721063755007 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} - m_Name: FMODStudioSettingsPlatform - m_EditorClassIdentifier: - identifier: 0f8eb3f400726694eb47beb1a9f94ce8 + identifier: fd7c55dab0fce234b8c25f6ffca523c1 parentIdentifier: default active: 0 Properties: @@ -346,20 +419,20 @@ MonoBehaviour: HideSetupWizard: 1 LastEventReferenceScanVersion: 131621 Platforms: - - {fileID: 4449505234930665929} - - {fileID: 6611559040954684553} - - {fileID: -1479416721063755007} - - {fileID: 1697475330856183958} - - {fileID: 119274062029799480} - - {fileID: -6174243690473532038} - - {fileID: -3974345589865759223} - - {fileID: 1182458898857209987} - - {fileID: 7988466420741846663} - - {fileID: -2057712728005687216} - - {fileID: 6428052061351901060} - - {fileID: 2121415354943079641} + - {fileID: -6421979802148699356} + - {fileID: -2493609972237370556} + - {fileID: -1580684736993228498} + - {fileID: -785679389004310805} + - {fileID: -712030531834803398} + - {fileID: 1100827045814593625} + - {fileID: 1132312529069990576} + - {fileID: 3979222738758991920} + - {fileID: 5613685733850034091} + - {fileID: 6330521338056678831} + - {fileID: 6477534247104662684} + - {fileID: 9010303474896345012} MigratedPlatforms: 0500000000000000060000000a0000000800000009000000120000000c000000150000000b0000000200000001000000 ---- !u!114 &119274062029799480 +--- !u!114 &1100827045814593625 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -432,7 +505,7 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &1182458898857209987 +--- !u!114 &1132312529069990576 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -505,7 +578,7 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &1697475330856183958 +--- !u!114 &3979222738758991920 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -514,10 +587,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} + m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} m_Name: FMODStudioSettingsPlatform m_EditorClassIdentifier: - identifier: 46fbfdf3fc43db0458918377fd40293e + identifier: 0f8eb3f400726694eb47beb1a9f94ce8 parentIdentifier: default active: 0 Properties: @@ -578,7 +651,7 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &2121415354943079641 +--- !u!114 &5613685733850034091 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -587,10 +660,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} + m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} m_Name: FMODStudioSettingsPlatform m_EditorClassIdentifier: - identifier: fd7c55dab0fce234b8c25f6ffca523c1 + identifier: c88d16e5272a4e241b0ef0ac2e53b73d parentIdentifier: default active: 0 Properties: @@ -651,7 +724,163 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &4449505234930665929 +--- !u!114 &6330521338056678831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} + m_Name: FMODStudioSettingsPlatform + m_EditorClassIdentifier: + identifier: default + parentIdentifier: + active: 1 + Properties: + LiveUpdate: + Value: 0 + HasValue: 0 + LiveUpdatePort: + Value: 9264 + HasValue: 1 + Overlay: + Value: 0 + HasValue: 0 + OverlayPosition: + Value: 0 + HasValue: 0 + OverlayFontSize: + Value: 0 + HasValue: 0 + Logging: + Value: 0 + HasValue: 0 + SampleRate: + Value: 0 + HasValue: 0 + BuildDirectory: + Value: + HasValue: 0 + SpeakerMode: + Value: 0 + HasValue: 0 + VirtualChannelCount: + Value: 0 + HasValue: 0 + RealChannelCount: + Value: 0 + HasValue: 0 + DSPBufferLength: + Value: 0 + HasValue: 0 + DSPBufferCount: + Value: 0 + HasValue: 0 + Plugins: + Value: [] + HasValue: 1 + StaticPlugins: + Value: [] + HasValue: 1 + CallbackHandler: + Value: {fileID: 0} + HasValue: 0 + OutputTypeName: + threadAffinities: + Value: [] + HasValue: 0 + displaySortOrder: 0 + childIdentifiers: + - b7716510a1f36934c87976f3a81dbf3d + - de700ef3f37a49b58a57ae3addf01ad9 + - 46fbfdf3fc43db0458918377fd40293e + - 52eb9df5db46521439908db3a29a1bbb + - fd7c55dab0fce234b8c25f6ffca523c1 + - 2fea114e74ecf3c4f920e1d5cc1c4c40 + - 2c5177b11d81d824dbb064f9ac8527da + - 0f8eb3f400726694eb47beb1a9f94ce8 + - c88d16e5272a4e241b0ef0ac2e53b73d + - e7a046c753c3c3d4aacc91f6597f310d + codecChannels: + Value: [] + HasValue: 0 +--- !u!114 &6477534247104662684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3} + m_Name: FMODStudioSettingsPlatform + m_EditorClassIdentifier: + identifier: e7a046c753c3c3d4aacc91f6597f310d + parentIdentifier: default + active: 0 + Properties: + LiveUpdate: + Value: 0 + HasValue: 0 + LiveUpdatePort: + Value: 0 + HasValue: 0 + Overlay: + Value: 0 + HasValue: 0 + OverlayPosition: + Value: 0 + HasValue: 0 + OverlayFontSize: + Value: 0 + HasValue: 0 + Logging: + Value: 0 + HasValue: 0 + SampleRate: + Value: 0 + HasValue: 0 + BuildDirectory: + Value: + HasValue: 0 + SpeakerMode: + Value: 0 + HasValue: 0 + VirtualChannelCount: + Value: 0 + HasValue: 0 + RealChannelCount: + Value: 0 + HasValue: 0 + DSPBufferLength: + Value: 0 + HasValue: 0 + DSPBufferCount: + Value: 0 + HasValue: 0 + Plugins: + Value: [] + HasValue: 0 + StaticPlugins: + Value: [] + HasValue: 0 + CallbackHandler: + Value: {fileID: 0} + HasValue: 0 + OutputTypeName: + threadAffinities: + Value: [] + HasValue: 0 + displaySortOrder: 0 + childIdentifiers: [] + codecChannels: + Value: [] + HasValue: 0 +--- !u!114 &9010303474896345012 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -724,232 +953,3 @@ MonoBehaviour: codecChannels: Value: [] HasValue: 0 ---- !u!114 &6428052061351901060 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8f591a193113347409efedcc618e83d6, type: 3} - m_Name: FMODStudioSettingsPlatform - m_EditorClassIdentifier: - identifier: de700ef3f37a49b58a57ae3addf01ad9 - parentIdentifier: default - active: 0 - Properties: - LiveUpdate: - Value: 0 - HasValue: 0 - LiveUpdatePort: - Value: 0 - HasValue: 0 - Overlay: - Value: 0 - HasValue: 0 - OverlayPosition: - Value: 0 - HasValue: 0 - OverlayFontSize: - Value: 0 - HasValue: 0 - Logging: - Value: 0 - HasValue: 0 - SampleRate: - Value: 0 - HasValue: 0 - BuildDirectory: - Value: - HasValue: 0 - SpeakerMode: - Value: 0 - HasValue: 0 - VirtualChannelCount: - Value: 0 - HasValue: 0 - RealChannelCount: - Value: 0 - HasValue: 0 - DSPBufferLength: - Value: 0 - HasValue: 0 - DSPBufferCount: - Value: 0 - HasValue: 0 - Plugins: - Value: [] - HasValue: 0 - StaticPlugins: - Value: [] - HasValue: 0 - CallbackHandler: - Value: {fileID: 0} - HasValue: 0 - OutputTypeName: - threadAffinities: - Value: [] - HasValue: 0 - displaySortOrder: 0 - childIdentifiers: [] - codecChannels: - Value: [] - HasValue: 0 ---- !u!114 &6611559040954684553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} - m_Name: FMODStudioSettingsPlatform - m_EditorClassIdentifier: - identifier: default - parentIdentifier: - active: 1 - Properties: - LiveUpdate: - Value: 0 - HasValue: 0 - LiveUpdatePort: - Value: 9264 - HasValue: 1 - Overlay: - Value: 0 - HasValue: 0 - OverlayPosition: - Value: 0 - HasValue: 0 - OverlayFontSize: - Value: 0 - HasValue: 0 - Logging: - Value: 0 - HasValue: 0 - SampleRate: - Value: 0 - HasValue: 0 - BuildDirectory: - Value: - HasValue: 0 - SpeakerMode: - Value: 0 - HasValue: 0 - VirtualChannelCount: - Value: 0 - HasValue: 0 - RealChannelCount: - Value: 0 - HasValue: 0 - DSPBufferLength: - Value: 0 - HasValue: 0 - DSPBufferCount: - Value: 0 - HasValue: 0 - Plugins: - Value: [] - HasValue: 1 - StaticPlugins: - Value: [] - HasValue: 1 - CallbackHandler: - Value: {fileID: 0} - HasValue: 0 - OutputTypeName: - threadAffinities: - Value: [] - HasValue: 0 - displaySortOrder: 0 - childIdentifiers: - - 0f8eb3f400726694eb47beb1a9f94ce8 - - 46fbfdf3fc43db0458918377fd40293e - - 2fea114e74ecf3c4f920e1d5cc1c4c40 - - e7a046c753c3c3d4aacc91f6597f310d - - 52eb9df5db46521439908db3a29a1bbb - - 2c5177b11d81d824dbb064f9ac8527da - - b7716510a1f36934c87976f3a81dbf3d - - c88d16e5272a4e241b0ef0ac2e53b73d - - de700ef3f37a49b58a57ae3addf01ad9 - - fd7c55dab0fce234b8c25f6ffca523c1 - codecChannels: - Value: [] - HasValue: 0 ---- !u!114 &7988466420741846663 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} - m_Name: FMODStudioSettingsPlatform - m_EditorClassIdentifier: - identifier: b7716510a1f36934c87976f3a81dbf3d - parentIdentifier: default - active: 0 - Properties: - LiveUpdate: - Value: 0 - HasValue: 0 - LiveUpdatePort: - Value: 0 - HasValue: 0 - Overlay: - Value: 0 - HasValue: 0 - OverlayPosition: - Value: 0 - HasValue: 0 - OverlayFontSize: - Value: 0 - HasValue: 0 - Logging: - Value: 0 - HasValue: 0 - SampleRate: - Value: 0 - HasValue: 0 - BuildDirectory: - Value: - HasValue: 0 - SpeakerMode: - Value: 0 - HasValue: 0 - VirtualChannelCount: - Value: 0 - HasValue: 0 - RealChannelCount: - Value: 0 - HasValue: 0 - DSPBufferLength: - Value: 0 - HasValue: 0 - DSPBufferCount: - Value: 0 - HasValue: 0 - Plugins: - Value: [] - HasValue: 0 - StaticPlugins: - Value: [] - HasValue: 0 - CallbackHandler: - Value: {fileID: 0} - HasValue: 0 - OutputTypeName: - threadAffinities: - Value: [] - HasValue: 0 - displaySortOrder: 0 - childIdentifiers: [] - codecChannels: - Value: [] - HasValue: 0 diff --git a/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset b/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset new file mode 100644 index 000000000..f15ace907 --- /dev/null +++ b/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset @@ -0,0 +1,212 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!213 &21300000 +Sprite: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E" + m_Rect: + serializedVersion: 2 + x: 3962 + y: 5054 + width: 130 + height: 130 + m_Offset: {x: 0, y: 0} + m_Border: {x: 0, y: 0, z: 0, w: 0} + m_PixelsToUnits: 215 + m_Pivot: {x: 0.5, y: 0.5} + m_Extrude: 1 + m_IsPolygon: 0 + m_AtlasName: + m_PackingTag: + m_RenderDataKey: + 149a798e8f987264f82beb4f4052eb5e: -611960561148999933 + m_AtlasTags: [] + m_SpriteAtlas: {fileID: 0} + m_RD: + serializedVersion: 3 + texture: {fileID: -8328923581568760697, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 8 + format: 0 + dimension: 4 + - stream: 1 + offset: 24 + format: 10 + dimension: 4 + m_DataSize: 208 + _typelessdata: 6bca9abe6bca9a3e000000006bca9a3e6bca9a3e000000006bca9abe6bca9abe000000006bca9a3e6bca9abe0000000000a0773f0000223f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f0000223f0000803f0000000000000000000000000000000000000000000000000000000000a0773f00f01d3f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f00f01d3f0000803f00000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + textureRect: + serializedVersion: 2 + x: 3962 + y: 5054 + width: 130 + height: 130 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 0 + uvTransform: {x: 215, y: 4027, z: 215, w: 5119} + downscaleMultiplier: 1 + m_AtlasRD: + serializedVersion: 3 + texture: {fileID: -8328923581568760697, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 8 + format: 0 + dimension: 4 + - stream: 1 + offset: 24 + format: 10 + dimension: 4 + m_DataSize: 208 + _typelessdata: 6bca9abe6bca9a3e000000006bca9a3e6bca9a3e000000006bca9abe6bca9abe000000006bca9a3e6bca9abe0000000000a0773f0000223f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f0000223f0000803f0000000000000000000000000000000000000000000000000000000000a0773f00f01d3f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f00f01d3f0000803f00000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + textureRect: + serializedVersion: 2 + x: 3962 + y: 5054 + width: 130 + height: 130 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 0 + uvTransform: {x: 215, y: 4027, z: 215, w: 5119} + downscaleMultiplier: 1 + m_PhysicsShape: [] + m_Bones: [] + m_SpriteID: db22083879843b843b69dc1550fe5bfc diff --git a/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset.meta b/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset.meta new file mode 100644 index 000000000..2fde69665 --- /dev/null +++ b/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f33b33323f3c1314dbd795a207653ce0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 21300000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset b/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset index a399777c3..d50da42bc 100644 --- a/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset +++ b/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa224ff7087aa1bc5792900a8767095d0f100c88f92db11ac5c85c0aa8a6c879 -size 70553863 +oid sha256:f8d6bf6f06a114bf431a8be438c4a99a2dbff84c14056cee77ebf103e8b856b2 +size 70553921 diff --git a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn index f225eea77..57b92cc80 100644 --- a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn +++ b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn @@ -316,53 +316,79 @@ me: 那来吧。在调整之前…
让我看看，你现在能跑多快。 shitou: 收到~ shitou: 呜——！ - -石头加起速来，引擎轰鸣着达到了跑到了某个速度。#auto_next -<> - +<> +//石头加起速来，引擎轰鸣着达到了跑到了某个速度。#auto_next +//<> me: 9800转…好高啊。 shitou: 嘿嘿，医生，我要跑得双倍快才行哩！ me: 双倍快？ shitou: 对！我要比大家都快一倍！这样我才能跑双倍的货~ - <> <> - me: ……你是想跑到20000转吗？那样要赶上火车了。 shitou: 哈哈，我真能变成火车…那就……太酷啦！ shitou: 开玩笑~医生！这只是一种比喻~
我只要能跑到12000转就够啦！ - <> <> - me: 那么…加压应该是可以做到的。 +me:拉动左边的拉绳，就可以提升涡轮部分的转速了 +<> +//【加压按钮可用】#auto_next +//<> -【加压按钮可用】#auto_next -<> +// ->加压 -->加压 +// <> -<> +// 你向气阀内压入气体，石头的速度变得更高了。#auto_next +// <> -你向气阀内压入气体，石头的速度变得更高了。#auto_next -<> +// <> -<> +// <> -<> + +//<> +//me: 嗯…看起来一切正常？没有缺齿轮之类的报告…… +//shitou: 正常？不可能，医生。我明显感觉它有问题。 +//me: 虽然我不知道你说的会是什么问题…
但这确实是最有可能掉出齿轮的地方。 +//<> +//me: 来都来了……
以防万一，最好让它跑一次；
确认它在运行状态下是没问题的。 +//<> +//<> +//<> +//<> +//<> +//<> +//me: …… +//me: 2500，哇哦。 +//shitou: 怎么了，医生？找到问题了？ +//me: 不是。正常机体的动力系统只能跑到500RPM…
而且还得是在劳累或者激动的情况下。 +//me: 但你能跑到2500RPM。这是一般机体的…5倍。
通常转到这个速度，就意味着机体要接近报废了。 +//me: 不过也不奇怪，毕竟你是需要跑货的。
……你简直就是一台人形货车了。 +//shitou: 嗨！我要是能天天跑到2500就好了！
可惜城里的红绿灯实在是太多了。 +//me: 你现在就有机会了。
我需要手动把你提到2500RPM，来完整测试引擎的运行能力。 +//shitou: 要开跑了吗，医生？太好啦！我最喜欢跑货了！
…哎呀，可惜！要是我状态完美，能边跑边唱…… +//me: 这是治疗，不是赛车。
让它跑起来是为了确认它到底有没有问题。 +//shitou: 不过医生…如果里面缺一个齿轮，不会有问题吗？
比如把其他的齿轮也甩飞出来之类的…… +//me: 按理来说不会…至少手册说不会。 + +=== +title: 调速后测速 +tags: +colorID: 8 +group: 插入触发 +position: -158,370 +--- shitou: 哇~好快啊，从来没有过的感觉！ - <> <> - <> -石头的速度忽然掉了下来，逐渐回到怠速。 <> - +<> shitou: 啊！ shitou: 医生…我怎么…动不了了！ - <> <> @@ -372,30 +398,24 @@ me: 听起来像是变速箱里的声音……我这就看看。 <> ->打开变速箱盖 - + <> + <> <> <> - -你打开引擎的变速箱盖…#auto_next -<> - <> - me: 哎呀……有几个齿轮松脱了。 <> - <> <> -<> <> - +->拿起齿轮 +<> me: 这些齿轮表面有一部分竟然是塑胶的…
…看起来强度很低啊。 -【拿起齿轮端详(show obj)】 - +<> +<> <> <> - me: 齿轮箱里看起来也有一些不属于这里的结构…这根杆子是什么？ shitou: 噢~？你说的是我的~唱片机吗？ me: 唱片机……？这里不应该是变速箱吗…… @@ -414,33 +434,27 @@ me: 无论如何，我先把这些脱落的齿轮装回去吧。 //shitou: 噢？你说的是*那些*齿轮吗？ //me: 什么是*那些*齿轮？ //shitou: 嘿嘿。快把它放回去，让我演示给你看！ - ->放回去 - <> <> -<> - +// <> <> <> - <> - me: 好了。石头，再试试吧，跑起来。 -shitou: 该播放音乐了吗？医生！ - +// <> +<> <> <> +shitou: 该播放音乐了吗？医生！ +// 石头加起速来，引擎轰鸣着达到了跑到了某个速度。#auto_next +// <> -石头加起速来，引擎轰鸣着达到了跑到了某个速度。#auto_next -<> - +<> +<> <> -那根奇怪的杆子转了下来，搭在一张唱片上。#auto_next <> - me: 原来如此…… - shitou: 医生，这可是我的得意改装！我从小！就喜欢音乐！可惜我~五音不全。 shitou: 工作后一攒够钱！我就买了一直心念念的爱索~Walkman音乐！唱片机！ shitou: 我把它改装进了动力模块里！这样我就可以随时随地哼我最喜欢的旋律了—— @@ -452,24 +466,24 @@ me: 这倒是…很巧妙的改造。 <> <> - -me: 但是，有一个问题…… - +shitou: 好了，现在可以~马力全开！ +me: 等等石头，那些齿轮... <> <> - +<> +shitou: 哇，感觉充满力量！要来了！ +<> <> <> <> -石头的速度又掉了下来，逐渐回到怠速。#auto_next +<> <> - shitou: 哎呀，医生！我又动不了了！ me: 这就是我说的问题。刚才已经发生过一次了…… me: 我先给你安回去吧…但你别再加速了。不然还得飞出来。 你将齿轮装了回去。（自动）#auto_next + <> <> - <> <> <> @@ -524,21 +538,17 @@ me: 啊…那倒不贵。不过是一些铁块罢了。 shitou: 哈哈哈！那太好了，那还等什么？医生，我们来吧。 <> -<> +<> <> - +<> me: 让我找找…镍铬齿轮… - <> - <> <> <> <> - ->将镍铬齿轮替换上去 - <> <> <> @@ -555,32 +565,5 @@ me: 好了…再播…跑一次吧。 <> shitou: 呜呼！医生~我感觉~我像在飞一样！ - -//<> -//me: 嗯…看起来一切正常？没有缺齿轮之类的报告…… -//shitou: 正常？不可能，医生。我明显感觉它有问题。 -//me: 虽然我不知道你说的会是什么问题…
但这确实是最有可能掉出齿轮的地方。 -//<> -//me: 来都来了……
以防万一，最好让它跑一次；
确认它在运行状态下是没问题的。 -//<> -//<> -//<> -//<> -//<> -//<> -//me: …… -//me: 2500，哇哦。 -//shitou: 怎么了，医生？找到问题了？ -//me: 不是。正常机体的动力系统只能跑到500RPM…
而且还得是在劳累或者激动的情况下。 -//me: 但你能跑到2500RPM。这是一般机体的…5倍。
通常转到这个速度，就意味着机体要接近报废了。 -//me: 不过也不奇怪，毕竟你是需要跑货的。
……你简直就是一台人形货车了。 -//shitou: 嗨！我要是能天天跑到2500就好了！
可惜城里的红绿灯实在是太多了。 -//me: 你现在就有机会了。
我需要手动把你提到2500RPM，来完整测试引擎的运行能力。 -//shitou: 要开跑了吗，医生？太好啦！我最喜欢跑货了！
…哎呀，可惜！要是我状态完美，能边跑边唱…… -//me: 这是治疗，不是赛车。
让它跑起来是为了确认它到底有没有问题。 -//shitou: 不过医生…如果里面缺一个齿轮，不会有问题吗？
比如把其他的齿轮也甩飞出来之类的…… -//me: 按理来说不会…至少手册说不会。 - <> - -=== +=== \ No newline at end of file diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index fa3a52e32..cae521343 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -581,8 +581,8 @@ Transform: m_GameObject: {fileID: 158974636} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.164, y: 2.846, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -3.178, y: 2.969, z: 0} + m_LocalScale: {x: 0.8284966, y: 0.84974, z: 0.84974} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1112213369} @@ -594,7 +594,7 @@ SpriteRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 158974636} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -1164,7 +1164,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &255072950 Transform: m_ObjectHideFlags: 0 @@ -1272,7 +1272,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &263279951 Transform: m_ObjectHideFlags: 0 @@ -1282,7 +1282,7 @@ Transform: m_GameObject: {fileID: 263279950} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.1499996, y: -0.92100006, z: 0} + m_LocalPosition: {x: -2.1499996, y: -0.914, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1363,7 +1363,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &298621639 +--- !u!1 &318200498 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1371,9 +1371,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 298621640} - - component: {fileID: 298621642} - - component: {fileID: 298621641} + - component: {fileID: 318200499} + - component: {fileID: 318200501} + - component: {fileID: 318200500} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -1381,32 +1381,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &298621640 +--- !u!224 &318200499 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 298621639} + m_GameObject: {fileID: 318200498} 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: 753279731} + m_Father: {fileID: 1538548680} 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: 6, y: 103} - m_SizeDelta: {x: 300, y: 3} + m_AnchoredPosition: {x: 0, y: 60.5} + m_SizeDelta: {x: 45, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &298621641 +--- !u!114 &318200500 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 298621639} + m_GameObject: {fileID: 318200498} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1430,14 +1430,98 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &298621642 +--- !u!222 &318200501 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 298621639} + m_GameObject: {fileID: 318200498} m_CullTransparentMesh: 1 +--- !u!1 &334807551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 334807552} + - component: {fileID: 334807553} + m_Layer: 0 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &334807552 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334807551} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.427, y: -0.171, z: 0} + m_LocalScale: {x: 2.5784917, y: 2.5784917, z: 2.5784917} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1015381349462535075} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &334807553 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334807551} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 4 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 0.16037738, g: 0.16037738, b: 0.16037738, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &363642008 GameObject: m_ObjectHideFlags: 0 @@ -1823,140 +1907,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &466676742 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 466676743} - - component: {fileID: 466676745} - - component: {fileID: 466676744} - 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 &466676743 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466676742} - 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: 1502187943} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 2, y: -36} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &466676744 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466676742} - 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: "\u8BCA\u7597\u5355" - 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: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 50 - m_fontSizeBase: 50 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &466676745 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466676742} - m_CullTransparentMesh: 1 --- !u!1 &488146691 GameObject: m_ObjectHideFlags: 0 @@ -2308,7 +2258,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &594749267 Transform: m_ObjectHideFlags: 0 @@ -2321,7 +2271,8 @@ Transform: m_LocalPosition: {x: -1.6999999, y: -0.919, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1738490581} m_Father: {fileID: 199118573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &594749268 @@ -2927,8 +2878,8 @@ Transform: m_GameObject: {fileID: 709691611} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.159, y: -0.146, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0.145, y: -0.319, z: 0} + m_LocalScale: {x: 1.330355, y: 1.467505, z: 1.0972} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 24693785} @@ -3240,170 +3191,805 @@ SpriteMask: m_BackSortingOrder: 42 m_IsCustomRangeActive: 1 m_SpriteSortPoint: 0 ---- !u!1 &753279730 -GameObject: +--- !u!21 &801083269 +Material: + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 753279731} - - component: {fileID: 753279733} - - component: {fileID: 753279732} - m_Layer: 5 - m_Name: TaskManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &753279731 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753279730} - 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: 1502187943} - - {fileID: 2099861573} - - {fileID: 298621640} - m_Father: {fileID: 755572874} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 168, y: 175} - m_SizeDelta: {x: 500, y: 600} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &753279732 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753279730} - m_CullTransparentMesh: 1 ---- !u!114 &753279733 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753279730} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3dee1c6746d58fc4ea504020e5212cd9, type: 3} - m_Name: - m_EditorClassIdentifier: - taskTextPrefab: {fileID: 5295477770541402281, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - taskListParent: {fileID: 2099861573} ---- !u!1 &755572870 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 755572874} - - component: {fileID: 755572873} - - component: {fileID: 755572872} - - component: {fileID: 755572871} - m_Layer: 5 - m_Name: DeepCanvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &755572871 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 755572870} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &755572872 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 755572870} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &755572873 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 755572870} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 ---- !u!224 &755572874 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 755572870} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 753279731} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} + m_Name: AllIn1SpriteShader/AllIn1SpriteShader + m_Shader: {fileID: 4800000, guid: 0803c241834332942abfcbd27c498b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLEVIBRATE_ON + - _SHADERFADING_NONE + - _SHADERSPACE_UV + - _TEXTURELAYER1SHEETTOGGLE_ON + - _TEXTURELAYER2SHEETTOGGLE_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AddColorMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AddHueMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorRampTex: + m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorRampTexGradient: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorSwapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CustomFadeFadeMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeBurnTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadingMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GlowTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _InnerOutlineTintTexture: + m_Texture: {fileID: 2800000, guid: 5af9a397a8643994c829e696a24a7845, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetalMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OuterOutlineTintTexture: + m_Texture: {fileID: 2800000, guid: 5af9a397a8643994c829e696a24a7845, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineDistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OverlayTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _PixelOutlineTintTexture: + m_Texture: {fileID: 2800000, guid: 5af9a397a8643994c829e696a24a7845, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RecolorRGBTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RecolorRGBYCPTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShineMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SineGlowMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _StrongTintMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TextureLayer1Texture: + m_Texture: {fileID: 2800000, guid: 9685c3a024e22a946a7e8c2ce3542300, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TextureLayer2Texture: + m_Texture: {fileID: 2800000, guid: 9685c3a024e22a946a7e8c2ce3542300, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UVDistortMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UberNoiseTexture: + m_Texture: {fileID: 2800000, guid: b8d18cd117976254d94a812a0bfc336e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _texcoord: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _AddColorContrast: 0.5 + - _AddColorContrastToggle: 0 + - _AddColorFade: 1 + - _AddColorMaskToggle: 0 + - _AddHueBrightness: 2 + - _AddHueContrast: 0.5 + - _AddHueFade: 1 + - _AddHueMaskToggle: 0 + - _AddHueSaturation: 1 + - _AddHueSpeed: 1 + - _Alpha: 1 + - _AlphaCutoffValue: 0.25 + - _AlphaOutlineBlend: 1 + - _AlphaOutlineGlow: 5 + - _AlphaOutlineMinAlpha: 0 + - _AlphaOutlinePower: 1 + - _AlphaRoundThreshold: 0.5 + - _AlphaTintFade: 1 + - _AlphaTintMinAlpha: 0.02 + - _BakedMaterial: 0 + - _BillboardY: 0 + - _BlackTintFade: 1 + - _BlackTintPower: 4 + - _BlurHD: 0 + - _BlurIntensity: 10 + - _Brightness: 0 + - _BurnEdgeNoiseFactor: 0.5 + - _BurnFade: 1 + - _BurnInsideContrast: 2 + - _BurnInsideNoiseFactor: 0.2 + - _BurnRadius: 5 + - _BurnSwirlFactor: 1 + - _BurnWidth: 0.1 + - _CamouflageAnimationToggle: 0 + - _CamouflageContrast: 1 + - _CamouflageDensityA: 0.4 + - _CamouflageDensityB: 0.4 + - _CamouflageFade: 1 + - _CamouflageSmoothnessA: 0.2 + - _CamouflageSmoothnessB: 0.2 + - _CheckerboardDarken: 0.5 + - _CheckerboardTiling: 1 + - _ChromAberrAlpha: 0.4 + - _ChromAberrAmount: 1 + - _ClipUvDown: 0 + - _ClipUvLeft: 0 + - _ClipUvRight: 0 + - _ClipUvUp: 0 + - _ColorChangeLuminosity: 0 + - _ColorChangeTolerance: 0.25 + - _ColorChangeTolerance2: 0.25 + - _ColorChangeTolerance3: 0.25 + - _ColorRampBlend: 1 + - _ColorRampLuminosity: 0 + - _ColorRampOutline: 0 + - _ColorReplaceContrast: 1 + - _ColorReplaceFade: 1 + - _ColorReplaceRange: 0.05 + - _ColorReplaceSmoothness: 0.1 + - _ColorSwapBlend: 1 + - _ColorSwapBlueLuminosity: 0.5 + - _ColorSwapGreenLuminosity: 0.5 + - _ColorSwapRedLuminosity: 0.5 + - _Contrast: 1 + - _CullingOption: 0 + - _CustomFadeAlpha: 1 + - _CustomFadeNoiseFactor: 0 + - _CustomFadeSmoothness: 2 + - _DirectionalAlphaFadeFade: 0 + - _DirectionalAlphaFadeInvert: 0 + - _DirectionalAlphaFadeNoiseFactor: 0.2 + - _DirectionalAlphaFadeRotation: 0 + - _DirectionalAlphaFadeWidth: 0.2 + - _DirectionalDistortionFade: 0 + - _DirectionalDistortionInvert: 0 + - _DirectionalDistortionNoiseFactor: 0.2 + - _DirectionalDistortionRandomDirection: 0.1 + - _DirectionalDistortionRotation: 0 + - _DirectionalDistortionWidth: 0.5 + - _DirectionalGlowFadeFade: 0 + - _DirectionalGlowFadeInvert: 0 + - _DirectionalGlowFadeNoiseFactor: 0.2 + - _DirectionalGlowFadeRotation: 0 + - _DirectionalGlowFadeWidth: 0.1 + - _DistortAmount: 0.5 + - _DistortTexXSpeed: 5 + - _DistortTexYSpeed: 5 + - _EditorDrawers: 6 + - _EnableAddColor: 0 + - _EnableAddHue: 0 + - _EnableAlphaTint: 0 + - _EnableBlackTint: 0 + - _EnableBrightness: 0 + - _EnableBurn: 0 + - _EnableCamouflage: 0 + - _EnableCheckerboard: 0 + - _EnableColorReplace: 0 + - _EnableContrast: 0 + - _EnableCustomFade: 0 + - _EnableDirectionalAlphaFade: 0 + - _EnableDirectionalDistortion: 0 + - _EnableDirectionalGlowFade: 0 + - _EnableEnchanted: 0 + - _EnableFlame: 0 + - _EnableFrozen: 0 + - _EnableFullAlphaDissolve: 0 + - _EnableFullDistortion: 0 + - _EnableFullGlowDissolve: 0 + - _EnableGaussianBlur: 0 + - _EnableGlitch: 0 + - _EnableHalftone: 0 + - _EnableHologram: 0 + - _EnableHue: 0 + - _EnableInkSpread: 0 + - _EnableInnerOutline: 0 + - _EnableMetal: 0 + - _EnableNegative: 0 + - _EnableOuterOutline: 0 + - _EnablePingPongGlow: 0 + - _EnablePixelOutline: 0 + - _EnablePixelate: 0 + - _EnablePoison: 0 + - _EnableRainbow: 0 + - _EnableRecolorRGB: 0 + - _EnableRecolorRGBYCP: 0 + - _EnableSaturation: 0 + - _EnableScreenTiling: 0 + - _EnableShadow: 0 + - _EnableSharpen: 0 + - _EnableShiftHue: 0 + - _EnableShifting: 0 + - _EnableShine: 0 + - _EnableSineGlow: 0 + - _EnableSineMove: 0 + - _EnableSineRotate: 0 + - _EnableSineScale: 0 + - _EnableSmoke: 0 + - _EnableSmoothPixelArt: 0 + - _EnableSourceAlphaDissolve: 0 + - _EnableSourceGlowDissolve: 0 + - _EnableSplitToning: 0 + - _EnableSqueeze: 0 + - _EnableSquish: 0 + - _EnableStrongTint: 0 + - _EnableTextureLayer1: 0 + - _EnableTextureLayer2: 0 + - _EnableUVDistort: 0 + - _EnableUVRotate: 0 + - _EnableUVScale: 0 + - _EnableUVScroll: 0 + - _EnableVibrate: 1 + - _EnableWiggle: 0 + - _EnableWind: 0 + - _EnableWorldTiling: 0 + - _EnchantedBrightness: 1 + - _EnchantedContrast: 0.5 + - _EnchantedFade: 1 + - _EnchantedLerpToggle: 0 + - _EnchantedRainbowDensity: 0.5 + - _EnchantedRainbowSaturation: 0.8 + - _EnchantedRainbowSpeed: 0.5 + - _EnchantedRainbowToggle: 0 + - _EnchantedReduce: 0 + - _FadeAmount: -0.1 + - _FadeBurnGlow: 2 + - _FadeBurnTransition: 0.075 + - _FadeBurnWidth: 0.025 + - _FadingFade: 1 + - _FadingNoiseFactor: 0.2 + - _FadingWidth: 0.3 + - _FishEyeUvAmount: 0.35 + - _FlameBrightness: 10 + - _FlameNoiseFactor: 2.5 + - _FlameNoiseHeightFactor: 1.5 + - _FlameRadius: 0.2 + - _FlameSmooth: 2 + - _FlickerAlpha: 0 + - _FlickerFreq: 0.2 + - _FlickerPercent: 0.05 + - _FrozenContrast: 2 + - _FrozenFade: 1 + - _FrozenHighlightContrast: 2 + - _FrozenHighlightDensity: 1 + - _FrozenSnowContrast: 1 + - _FrozenSnowDensity: 0.25 + - _FullAlphaDissolveFade: 0.5 + - _FullAlphaDissolveWidth: 0.5 + - _FullDistortionFade: 1 + - _FullGlowDissolveFade: 0.5 + - _FullGlowDissolveWidth: 0.5 + - _GaussianBlurFade: 1 + - _GaussianBlurOffset: 0.5 + - _GhostBlend: 1 + - _GhostColorBoost: 1 + - _GhostTransparency: 0 + - _GlitchAmount: 3 + - _GlitchBrightness: 4 + - _GlitchFade: 1 + - _GlitchHueSpeed: 1 + - _GlitchMaskMin: 0.4 + - _GlitchSize: 1 + - _Glow: 10 + - _GlowGlobal: 1 + - _GradBlend: 1 + - _GradBoostX: 1.2 + - _GradBoostY: 1.2 + - _GradIsRadial: 0 + - _GrassManualAnim: 1 + - _GrassManualToggle: 0 + - _GrassRadialBend: 0.1 + - _GrassSpeed: 2 + - _GrassWind: 20 + - _GreyscaleBlend: 1 + - _GreyscaleLuminosity: 0 + - _GreyscaleOutline: 0 + - _HalftoneFade: 1 + - _HalftoneFadeWidth: 1.5 + - _HalftoneInvert: 0 + - _HalftoneTiling: 4 + - _HandDrawnAmount: 10 + - _HandDrawnSpeed: 5 + - _HitEffectBlend: 1 + - _HitEffectGlow: 5 + - _HologramBlend: 1 + - _HologramContrast: 1 + - _HologramDistortionDensity: 0.5 + - _HologramDistortionOffset: 0.5 + - _HologramDistortionScale: 10 + - _HologramDistortionSpeed: 2 + - _HologramFade: 1 + - _HologramLineFrequency: 500 + - _HologramLineGap: 3 + - _HologramLineSpeed: 0.01 + - _HologramMaxAlpha: 0.75 + - _HologramMinAlpha: 0.1 + - _HologramStripesAmount: 0.1 + - _HologramStripesSpeed: 4.5 + - _HologramUnmodAmount: 0 + - _HsvBright: 1 + - _HsvSaturation: 1 + - _HsvShift: 180 + - _Hue: 0 + - _InkSpreadContrast: 2 + - _InkSpreadDistance: 3 + - _InkSpreadFade: 1 + - _InkSpreadNoiseFactor: 0.5 + - _InkSpreadWidth: 0.2 + - _InnerOutlineAlpha: 1 + - _InnerOutlineDistortionToggle: 0 + - _InnerOutlineFade: 1 + - _InnerOutlineGlow: 4 + - _InnerOutlineOutlineOnlyToggle: 0 + - _InnerOutlineTextureToggle: 0 + - _InnerOutlineThickness: 1 + - _InnerOutlineWidth: 0.02 + - _MaxXUV: 1 + - _MaxYUV: 1 + - _MetalContrast: 2 + - _MetalFade: 1 + - _MetalHighlightContrast: 2 + - _MetalHighlightDensity: 1 + - _MetalMaskToggle: 0 + - _MinXUV: 0 + - _MinYUV: 0 + - _MotionBlurAngle: 0.1 + - _MotionBlurDist: 1.25 + - _MyDstMode: 10 + - _MySrcMode: 5 + - _NegativeAmount: 1 + - _NegativeFade: 1 + - _OffsetUvX: 0 + - _OffsetUvY: 0 + - _OnlyInnerOutline: 0 + - _OnlyOutline: 0 + - _OuterOutlineDistortionToggle: 0 + - _OuterOutlineFade: 1 + - _OuterOutlineOutlineOnlyToggle: 0 + - _OuterOutlineTextureToggle: 0 + - _OuterOutlineWidth: 0.04 + - _OutlineAlpha: 1 + - _OutlineDistortAmount: 0.5 + - _OutlineDistortTexXSpeed: 5 + - _OutlineDistortTexYSpeed: 5 + - _OutlineGlow: 1.5 + - _OutlinePixelWidth: 1 + - _OutlineTexXSpeed: 10 + - _OutlineTexYSpeed: 0 + - _OutlineWidth: 0.004 + - _OverlayBlend: 1 + - _OverlayGlow: 1 + - _OverlayTextureScrollXSpeed: 0.25 + - _OverlayTextureScrollYSpeed: 0.25 + - _PinchUvAmount: 0.35 + - _PingPongGlowContrast: 1 + - _PingPongGlowFade: 1 + - _PingPongGlowFrequency: 3 + - _PixelOutlineFade: 1 + - _PixelOutlineOutlineOnlyToggle: 0 + - _PixelOutlineTextureToggle: 0 + - _PixelOutlineWidth: 1 + - _PixelPerfectSpace: 0 + - _PixelPerfectUV: 0 + - _PixelateFade: 1 + - _PixelatePixelDensity: 16 + - _PixelatePixelsPerUnit: 100 + - _PixelateSize: 32 + - _PixelsPerUnit: 100 + - _PoisonDensity: 3 + - _PoisonFade: 1 + - _PoisonNoiseBrightness: 2 + - _PoisonRecolorFactor: 0.5 + - _PoisonShiftSpeed: 0.2 + - _PosterizeGamma: 0.75 + - _PosterizeNumColors: 8 + - _PosterizeOutline: 0 + - _RadialClip: 45 + - _RadialClip2: 0 + - _RadialStartAngle: 90 + - _RainbowBrightness: 2 + - _RainbowContrast: 1 + - _RainbowDensity: 0.5 + - _RainbowFade: 1 + - _RainbowNoiseFactor: 0.2 + - _RainbowSaturation: 1 + - _RainbowSpeed: 1 + - _RandomSeed: 0 + - _RecolorRGBFade: 1 + - _RecolorRGBTextureToggle: 0 + - _RecolorRGBYCPFade: 1 + - _RecolorRGBYCPTextureToggle: 0 + - _RectHeight: 100 + - _RectSize: 1 + - _RectWidth: 100 + - _RotateUvAmount: 0 + - _RoundWaveSpeed: 2 + - _RoundWaveStrength: 0.7 + - _Saturation: 1 + - _ScreenTilingPixelsPerUnit: 100 + - _ScreenWidthUnits: 10 + - _ShaderFading: 0 + - _ShaderSpace: 0 + - _ShadowAlpha: 0.5 + - _ShadowFade: 1 + - _ShadowX: 0.1 + - _ShadowY: -0.05 + - _ShakeUvSpeed: 2.5 + - _ShakeUvX: 1.5 + - _ShakeUvY: 1 + - _SharpenFactor: 4 + - _SharpenFade: 1 + - _SharpenOffset: 2 + - _ShiftHueSpeed: 0.5 + - _ShiftingBrightness: 1 + - _ShiftingContrast: 0.5 + - _ShiftingDensity: 1.5 + - _ShiftingFade: 1 + - _ShiftingRainbowToggle: 0 + - _ShiftingSaturation: 0.8 + - _ShiftingSpeed: 0.5 + - _ShineContrast: 2 + - _ShineFade: 1 + - _ShineFrequency: 0.3 + - _ShineGlow: 1 + - _ShineLocation: 0.5 + - _ShineMaskToggle: 0 + - _ShineRotate: 0 + - _ShineRotation: 30 + - _ShineSaturation: 0.5 + - _ShineSmooth: 1 + - _ShineSpeed: 5 + - _ShineWidth: 0.1 + - _SineGlowContrast: 1 + - _SineGlowFade: 1 + - _SineGlowFrequency: 4 + - _SineGlowMaskToggle: 0 + - _SineGlowMax: 1 + - _SineGlowMin: 0 + - _SineMoveFade: 1 + - _SineRotateAngle: 15 + - _SineRotateFade: 1 + - _SineRotateFrequency: 1 + - _SineScaleFrequency: 2 + - _SmokeAlpha: 1 + - _SmokeDarkEdge: 1 + - _SmokeNoiseFactor: 0.4 + - _SmokeNoiseScale: 0.5 + - _SmokeSmoothness: 1 + - _SmokeVertexSeed: 0 + - _SourceAlphaDissolveFade: 1 + - _SourceAlphaDissolveInvert: 0 + - _SourceAlphaDissolveNoiseFactor: 0.2 + - _SourceAlphaDissolveWidth: 0.2 + - _SourceGlowDissolveFade: 1 + - _SourceGlowDissolveInvert: 0 + - _SourceGlowDissolveNoiseFactor: 0.2 + - _SourceGlowDissolveWidth: 0.1 + - _SplitToningBalance: 1 + - _SplitToningContrast: 1 + - _SplitToningFade: 1 + - _SplitToningShift: 0 + - _SpriteSheetFix: 0 + - _SqueezeFade: 1 + - _SqueezePower: 1 + - _SquishFade: 1 + - _SquishFlip: 0 + - _SquishSquish: 0.1 + - _SquishStretch: 0.1 + - _StrongTintContrast: 0 + - _StrongTintContrastToggle: 0 + - _StrongTintFade: 1 + - _StrongTintMaskToggle: 0 + - _TextureLayer1Columns: 3 + - _TextureLayer1Contrast: 1 + - _TextureLayer1ContrastToggle: 0 + - _TextureLayer1EdgeClip: 0.005 + - _TextureLayer1Fade: 1 + - _TextureLayer1Rows: 3 + - _TextureLayer1ScrollToggle: 0 + - _TextureLayer1SheetToggle: 1 + - _TextureLayer1Speed: 20 + - _TextureLayer1StartFrame: 0 + - _TextureLayer2Columns: 3 + - _TextureLayer2Contrast: 1 + - _TextureLayer2ContrastToggle: 0 + - _TextureLayer2EdgeClip: 0.005 + - _TextureLayer2Fade: 1 + - _TextureLayer2Rows: 3 + - _TextureLayer2ScrollToggle: 0 + - _TextureLayer2SheetToggle: 1 + - _TextureLayer2Speed: 20 + - _TextureLayer2StartFrame: 0 + - _TextureScrollXSpeed: 1 + - _TextureScrollYSpeed: 0 + - _TilingFix: 0 + - _TimeFPS: 5 + - _TimeFrequency: 2 + - _TimeRange: 0.5 + - _TimeSpeed: 1 + - _TimeValue: 0 + - _ToggleCustomTime: 0 + - _ToggleTimeFPS: 0 + - _ToggleTimeFrequency: 0 + - _ToggleTimeSpeed: 0 + - _ToggleUnscaledTime: 0 + - _TwistUvAmount: 1 + - _TwistUvPosX: 0.5 + - _TwistUvPosY: 0.5 + - _TwistUvRadius: 0.75 + - _UVDistortFade: 1 + - _UVDistortMaskToggle: 0 + - _UVRotateSpeed: 1 + - _VertexTintFirst: 0 + - _VibrateFade: 0.2 + - _VibrateFrequency: 60 + - _VibrateOffset: 0.02 + - _VibrateRotation: 9.66 + - _WarpScale: 0.5 + - _WarpSpeed: 8 + - _WarpStrength: 0.025 + - _WaveAmount: 7 + - _WaveSpeed: 10 + - _WaveStrength: 7.5 + - _WaveX: 0 + - _WaveY: 0.5 + - _WiggleFade: 1 + - _WiggleFixedGroundToggle: 0 + - _WiggleFrequency: 2 + - _WiggleOffset: 0.02 + - _WiggleSpeed: 2 + - _WindFlip: 0 + - _WindHighQualityNoise: 0 + - _WindIsParallax: 0 + - _WindLocalWind: 0 + - _WindMaxIntensity: 0.4 + - _WindMaxRotation: 2 + - _WindMinIntensity: -0.4 + - _WindNoiseScale: 0.1 + - _WindNoiseSpeed: 1 + - _WindRotation: 0 + - _WindRotationWindFactor: 1 + - _WindSquishFactor: 0.3 + - _WindSquishWindFactor: 0 + - _WindXPosition: 0 + - _WorldTilingPixelsPerUnit: 100 + - _ZTestMode: 4 + - _ZWrite: 0 + - _ZoomUvAmount: 0.5 + m_Colors: + - _AddColorColor: {r: 2.996078, g: 0, b: 0, a: 0} + - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _AlphaTintColor: {r: 95.87451, g: 5.019608, b: 95.87451, a: 0} + - _BlackTintColor: {r: 0, g: 0, b: 1, a: 0} + - _BurnEdgeColor: {r: 11.98431, g: 1.129412, b: 0.1254902, a: 0} + - _BurnEdgeNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _BurnInsideColor: {r: 0.75, g: 0.5625, b: 0.525, a: 0} + - _BurnInsideNoiseColor: {r: 3084.047, g: 257.0039, b: 0, a: 0} + - _BurnInsideNoiseScale: {r: 0.5, g: 0.5, b: 0, a: 0} + - _BurnPosition: {r: 0, g: 5, b: 0, a: 0} + - _BurnSwirlNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _CamouflageBaseColor: {r: 0.7450981, g: 0.7254902, b: 0.5686274, a: 0} + - _CamouflageColorA: {r: 0.62745106, g: 0.5882353, b: 0.43137258, a: 0} + - _CamouflageColorB: {r: 0.47058815, g: 0.43137258, b: 0.31372547, a: 0} + - _CamouflageDistortionIntensity: {r: 0.1, g: 0.1, b: 0, a: 0} + - _CamouflageDistortionScale: {r: 0.5, g: 0.5, b: 0, a: 0} + - _CamouflageDistortionSpeed: {r: 0.1, g: 0.1, b: 0, a: 0} + - _CamouflageNoiseScaleA: {r: 0.25, g: 0.25, b: 0, a: 0} + - _CamouflageNoiseScaleB: {r: 0.25, g: 0.25, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1} + - _ColorReplaceFromColor: {r: 0, g: 0, b: 0, a: 0} + - _ColorReplaceToColor: {r: 0, g: 0, b: 0.2, a: 0} + - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} + - _CustomFadeNoiseScale: {r: 1, g: 1, b: 0, a: 0} + - _DirectionalAlphaFadeNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _DirectionalDistortionDistortion: {r: 0, g: 0.1, b: 0, a: 0} + - _DirectionalDistortionDistortionScale: {r: 1, g: 1, b: 0, a: 0} + - _DirectionalDistortionNoiseScale: {r: 0.4, g: 0.4, b: 0, a: 0} + - _DirectionalGlowFadeEdgeColor: {r: 11.98431, g: 0.6901961, b: 0.6901961, a: 0} + - _DirectionalGlowFadeNoiseScale: {r: 0.4, g: 0.4, b: 0, a: 0} + - _EnchantedHighColor: {r: 0, g: 0.7098798, b: 4.237095, a: 0} + - _EnchantedLowColor: {r: 2.996078, g: 0, b: 0, a: 0} + - _EnchantedScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _EnchantedSpeed: {r: 0, g: 1, b: 0, a: 0} + - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} + - _FadingNoiseScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FadingPosition: {r: 0, g: 0, b: 0, a: 0} + - _FlameNoiseScale: {r: 1.2, g: 0.8, b: 0, a: 0} + - _FlameSpeed: {r: 0, g: -0.5, b: 0, a: 0} + - _FrozenHighlightColor: {r: 1.797647, g: 4.604501, b: 5.992157, a: 1} + - _FrozenHighlightDistortion: {r: 0.5, g: 0.5, b: 0, a: 0} + - _FrozenHighlightDistortionScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FrozenHighlightDistortionSpeed: {r: -0.05, g: -0.05, b: 0, a: 0} + - _FrozenHighlightScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FrozenHighlightSpeed: {r: 0.1, g: 0.1, b: 0, a: 0} + - _FrozenSnowColor: {r: 1.123529, g: 1.373203, b: 1.498039, a: 0} + - _FrozenSnowScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _FrozenTint: {r: 1.819608, g: 4.611765, b: 5.992157, a: 0} + - _FullAlphaDissolveNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _FullDistortionDistortion: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FullDistortionNoiseScale: {r: 0.5, g: 0.5, b: 0, a: 0} + - _FullGlowDissolveEdgeColor: {r: 11.98431, g: 0.627451, b: 0.627451, a: 0} + - _FullGlowDissolveNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _GlitchDistortion: {r: 0.1, g: 0, b: 0, a: 0} + - _GlitchDistortionScale: {r: 0, g: 3, b: 0, a: 0} + - _GlitchDistortionSpeed: {r: 0, g: 1, b: 0, a: 0} + - _GlitchMaskScale: {r: 0, g: 0.2, b: 0, a: 0} + - _GlitchMaskSpeed: {r: 0, g: 4, b: 0, a: 0} + - _GlitchNoiseScale: {r: 0, g: 3, b: 0, a: 0} + - _GlitchNoiseSpeed: {r: 0, g: 1, b: 0, a: 0} + - _GlowColor: {r: 1, g: 1, b: 1, a: 1} + - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} + - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} + - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} + - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} + - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} + - _HalftonePosition: {r: 0, g: 0, b: 0, a: 0} + - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} + - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} + - _HologramTint: {r: 0.3137255, g: 1.662745, b: 2.996078, a: 1} + - _InkSpreadColor: {r: 8.47419, g: 5.013525, b: 0.08873497, a: 0} + - _InkSpreadNoiseScale: {r: 0.4, g: 0.4, b: 0, a: 0} + - _InkSpreadPosition: {r: 0.5, g: -1, b: 0, a: 0} + - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1} + - _InnerOutlineDistortionIntensity: {r: 0.01, g: 0.01, b: 0, a: 0} + - _InnerOutlineNoiseScale: {r: 4, g: 4, b: 0, a: 0} + - _InnerOutlineNoiseSpeed: {r: 0, g: 0.1, b: 0, a: 0} + - _InnerOutlineTextureSpeed: {r: 0.5, g: 0, b: 0, a: 0} + - _MetalColor: {r: 5.992157, g: 3.639216, b: 0.3137255, a: 1} + - _MetalHighlightColor: {r: 5.992157, g: 3.796078, b: 0.6588235, a: 1} + - _MetalNoiseDistortion: {r: 0.5, g: 0.5, b: 0, a: 0} + - _MetalNoiseDistortionScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _MetalNoiseDistortionSpeed: {r: -0.05, g: -0.05, b: 0, a: 0} + - _MetalNoiseScale: {r: 0.25, g: 0.25, b: 0, a: 0} + - _MetalNoiseSpeed: {r: 0.05, g: 0.05, b: 0, a: 0} + - _OuterOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _OuterOutlineDistortionIntensity: {r: 0.01, g: 0.01, b: 0, a: 0} + - _OuterOutlineNoiseScale: {r: 4, g: 4, b: 0, a: 0} + - _OuterOutlineNoiseSpeed: {r: 0, g: 0.1, b: 0, a: 0} + - _OuterOutlineTextureSpeed: {r: 0.5, g: 0, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _OverlayColor: {r: 1, g: 1, b: 1, a: 1} + - _PingPongGlowFrom: {r: 5.992157, g: 0.1882353, b: 0.1882353, a: 0} + - _PingPongGlowTo: {r: 0.1882353, g: 0.1882353, b: 5.992157, a: 0} + - _PixelOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _PixelOutlineTextureSpeed: {r: 0.5, g: 0, b: 0, a: 0} + - _PoisonColor: {r: 0.3137255, g: 2.996078, b: 0.3137255, a: 0} + - _PoisonNoiseScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _PoisonNoiseSpeed: {r: 0, g: -0.2, b: 0, a: 0} + - _RainbowCenter: {r: 0, g: 0, b: 0, a: 0} + - _RainbowNoiseScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _RecolorRGBBlueTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBGreenTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBRedTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPBlueTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPCyanTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPGreenTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPPurpleTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPRedTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPYellowTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _ScreenTilingOffset: {r: 0, g: 0, b: 0, a: 0} + - _ScreenTilingScale: {r: 1, g: 1, b: 0, a: 0} + - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} + - _ShadowOffset: {r: 0.05, g: -0.05, b: 0, a: 0} + - _ShiftingColorA: {r: 1.498039, g: 0, b: 0, a: 0} + - _ShiftingColorB: {r: 1.498039, g: 0.7490196, b: 0, a: 0} + - _ShineColor: {r: 1, g: 1, b: 1, a: 1} + - _SineGlowColor: {r: 0, g: 2.007843, b: 2.996078, a: 0} + - _SineMoveFrequency: {r: 1, g: 1, b: 0, a: 0} + - _SineMoveOffset: {r: 0, g: 0.5, b: 0, a: 0} + - _SineRotatePivot: {r: 0.5, g: 0.5, b: 0, a: 0} + - _SineScaleFactor: {r: 0.2, g: 0.2, b: 0, a: 0} + - _SourceAlphaDissolveNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _SourceAlphaDissolvePosition: {r: 0, g: 0, b: 0, a: 0} + - _SourceGlowDissolveEdgeColor: {r: 11.98431, g: 0.627451, b: 0.627451, a: 0} + - _SourceGlowDissolveNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _SourceGlowDissolvePosition: {r: 0, g: 0, b: 0, a: 0} + - _SplitToningHighlightsColor: {r: 1, g: 0.1, b: 0.1, a: 0} + - _SplitToningShadowsColor: {r: 0.1, g: 0.4000002, b: 1, a: 0} + - _SpriteSheetRect: {r: 0, g: 0, b: 1, a: 1} + - _SqueezeCenter: {r: 0.5, g: 0.5, b: 0, a: 0} + - _SqueezeScale: {r: 2, g: 0, b: 0, a: 0} + - _StrongTintTint: {r: 1, g: 1, b: 1, a: 1} + - _TextureLayer1Color: {r: 0.4494117, g: 1.298301, b: 2.996079, a: 1} + - _TextureLayer1Offset: {r: 0, g: 0, b: 0, a: 0} + - _TextureLayer1Scale: {r: 1, g: 1, b: 0, a: 0} + - _TextureLayer1ScrollSpeed: {r: 0, g: 1, b: 0, a: 0} + - _TextureLayer2Color: {r: 0.4494117, g: 1.298301, b: 2.996079, a: 1} + - _TextureLayer2Offset: {r: 0, g: 0, b: 0, a: 0} + - _TextureLayer2Scale: {r: 1, g: 1, b: 0, a: 0} + - _TextureLayer2ScrollSpeed: {r: 0, g: 1, b: 0, a: 0} + - _UVDistortFrom: {r: -0.02, g: -0.02, b: 0, a: 0} + - _UVDistortNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _UVDistortSpeed: {r: 2, g: 2, b: 0, a: 0} + - _UVDistortTo: {r: 0.02, g: 0.02, b: 0, a: 0} + - _UVRotatePivot: {r: 0.5, g: 0.5, b: 0, a: 0} + - _UVScalePivot: {r: 0.5, g: 0.5, b: 0, a: 0} + - _UVScaleScale: {r: 1, g: 1, b: 0, a: 0} + - _UVScrollSpeed: {r: 0.2, g: 0, b: 0, a: 0} + - _WorldTilingOffset: {r: 0, g: 0, b: 0, a: 0} + - _WorldTilingScale: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &802161902 GameObject: m_ObjectHideFlags: 0 @@ -3520,7 +4106,6 @@ Transform: - {fileID: 882063250679083737} - {fileID: 5876122414023089849} - {fileID: 231674060242171562} - - {fileID: 1015381349462535075} m_Father: {fileID: 1272342139116525773} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &863746362 @@ -3648,7 +4233,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &876556887 Transform: m_ObjectHideFlags: 0 @@ -3883,7 +4468,7 @@ Transform: m_GameObject: {fileID: 933662728} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.3959994, y: 0.3350002, z: 0} + m_LocalPosition: {x: -1.928, y: -0.997, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3906,8 +4491,8 @@ MonoBehaviour: hasGear: 1 isInitGearBroken: 0 isInitGearDisc: 0 - initRadius: 0.18 - initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + initRadius: 0.5 + initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} discIdx: 0 childGear: {fileID: 0} targetSpeed: 0 @@ -4086,6 +4671,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: + - {fileID: 1015381349462535075} - {fileID: 8413601979190625454} - {fileID: 9140135230840944249} - {fileID: 518000626} @@ -4111,12 +4697,13 @@ MonoBehaviour: engineConfig: gearSpeed: 0.1 speedRate: 15 - pullCount: 5 + pullCount: 10 pullMaxSpeed: 1.2 returnSpeed: 5 isAvailable: 0 isPullActive: 0 - curSpeed: 0 + curSpeed: 0.1 + targetSpeed: 0.95 updateSpeedEvent: m_PersistentCalls: m_Calls: [] @@ -4441,7 +5028,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1192211355 Transform: m_ObjectHideFlags: 0 @@ -4871,99 +5458,183 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1502187942 -GameObject: +--- !u!1001 &1538548679 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1502187943} - - component: {fileID: 1502187946} - - component: {fileID: 1502187945} - - component: {fileID: 1502187944} - m_Layer: 5 - m_Name: background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1502187943 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2062639485} + m_Modifications: + - target: {fileID: 2606495908852442944, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_Name + value: ProgressBarGridCircular_RoundThin + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_SizeDelta.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalScale.x + value: 0.017628992 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalScale.y + value: 0.016210567 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalScale.z + value: 0.016210567 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.0009994507 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.35 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2606495909476536426, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 2606495909476536426, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 60.7 + objectReference: {fileID: 0} + - target: {fileID: 3205129848238963301, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_fontSize + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3205129848238963301, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: 3205129848238963301, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_fontSizeBase + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3205129848238963301, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_isOrthographic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3205129848238963301, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: 3205129848238963301, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: 3205129848238963301, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5871060232494687734, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_SizeDelta.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5871060232494687734, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_SizeDelta.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6771085378564992114, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: maxValue + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 6771085378564992114, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: currentValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8174416950032976404, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_SizeDelta.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8174416950032976404, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + propertyPath: m_SizeDelta.y + value: 20 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + insertIndex: 0 + addedObject: {fileID: 318200499} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} +--- !u!224 &1538548680 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} + m_PrefabInstance: {fileID: 1538548679} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1502187942} - 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: 466676743} - m_Father: {fileID: 753279731} - 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: 7, y: 0} - m_SizeDelta: {x: 350, y: 350} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1502187944 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1502187942} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee158225ee1e59f4791627785501d950, type: 3} - m_Name: - m_EditorClassIdentifier: - shaderTypes: 0 - normalStrength: 5 - normalSmoothing: 1 - computingNormal: 0 ---- !u!114 &1502187945 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1502187942} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2091261678} - 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1502187946 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1502187942} - m_CullTransparentMesh: 1 --- !u!1 &1634570219 GameObject: m_ObjectHideFlags: 0 @@ -4991,7 +5662,7 @@ Transform: m_GameObject: {fileID: 1634570219} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.1779988, y: 0.4850002, z: 0} + m_LocalPosition: {x: -2.263, y: 0.193, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5012,9 +5683,9 @@ MonoBehaviour: id: 0 shaftType: 0 hasGear: 1 - isInitGearBroken: 1 + isInitGearBroken: 0 isInitGearDisc: 0 - initRadius: 0.09 + initRadius: 0.49 initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} @@ -5427,6 +6098,90 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!1 &1738490580 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1738490581} + - component: {fileID: 1738490582} + m_Layer: 0 + m_Name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1738490581 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738490580} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -28.3, y: 0.919, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 594749267} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1738490582 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738490580} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -611960561148999933, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.60465115, y: 0.60465115} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1772405953 GameObject: m_ObjectHideFlags: 0 @@ -5744,7 +6499,7 @@ Transform: m_GameObject: {fileID: 1895400168} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.7099988, y: 0.34800008, z: 0} + m_LocalPosition: {x: -2.498, y: -0.502, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5767,8 +6522,8 @@ MonoBehaviour: hasGear: 1 isInitGearBroken: 0 isInitGearDisc: 0 - initRadius: 0.09 - initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + initRadius: 0.3 + initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} discIdx: 0 childGear: {fileID: 0} targetSpeed: 0 @@ -5947,7 +6702,7 @@ Transform: m_GameObject: {fileID: 1969730204} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.9659996, y: 0.34000018, z: 0} + m_LocalPosition: {x: -1.118, y: -0.35, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5966,12 +6721,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - shaftType: 3 + shaftType: 2 hasGear: 1 isInitGearBroken: 0 - isInitGearDisc: 0 - initRadius: 0.18 - initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + isInitGearDisc: 1 + initRadius: 0.65 + initSprite: {fileID: -611960561148999933, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} targetSpeed: 0 @@ -6117,7 +6872,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2021157133 Transform: m_ObjectHideFlags: 0 @@ -6147,7 +6902,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 0 shaftType: 2 - hasGear: 0 + hasGear: 1 isInitGearBroken: 1 isInitGearDisc: 0 initRadius: 0.27 @@ -6208,6 +6963,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2039506651 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2039506652} + - component: {fileID: 2039506653} + m_Layer: 0 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2039506652 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039506651} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.65, y: 0.32, z: 0} + m_LocalScale: {x: 2.1491, y: 2.1491, z: 2.1491} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 231674060242171562} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2039506653 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039506651} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 13 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2057350028 GameObject: m_ObjectHideFlags: 0 @@ -6241,6 +7080,108 @@ Transform: - {fileID: 4723618132295095337} m_Father: {fileID: 5449320178873640439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2062639481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2062639485} + - component: {fileID: 2062639484} + - component: {fileID: 2062639483} + - component: {fileID: 2062639482} + m_Layer: 5 + m_Name: WorldCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2062639482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2062639481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &2062639483 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2062639481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!223 &2062639484 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2062639481} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 1134468525 + m_SortingOrder: 5 + m_TargetDisplay: 0 +--- !u!224 &2062639485 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2062639481} + 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: 1538548680} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 26.8, y: 0.07} + m_SizeDelta: {x: 10, y: 10} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2066386597 GameObject: m_ObjectHideFlags: 0 @@ -6341,7 +7282,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2069725404 Transform: m_ObjectHideFlags: 0 @@ -6432,466 +7373,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!21 &2091261678 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AllIn1SpriteShader/AllIn1SpriteShader - m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _ColorRampTex: - m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ColorRampTexGradient: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ColorSwapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DistortTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _FadeBurnTex: - m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _FadeTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _GlowTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OutlineDistortTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OutlineTex: - m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OverlayTex: - m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ShineMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 1 - - _AlphaCutoffValue: 0.25 - - _AlphaOutlineBlend: 1 - - _AlphaOutlineGlow: 5 - - _AlphaOutlineMinAlpha: 0 - - _AlphaOutlinePower: 1 - - _AlphaRoundThreshold: 0.5 - - _BillboardY: 0 - - _BlurHD: 0 - - _BlurIntensity: 10 - - _Brightness: 0 - - _ChromAberrAlpha: 0.4 - - _ChromAberrAmount: 1 - - _ClipUvDown: 0 - - _ClipUvLeft: 0 - - _ClipUvRight: 0 - - _ClipUvUp: 0 - - _ColorChangeLuminosity: 0 - - _ColorChangeTolerance: 0.25 - - _ColorChangeTolerance2: 0.25 - - _ColorChangeTolerance3: 0.25 - - _ColorRampBlend: 1 - - _ColorRampLuminosity: 0 - - _ColorRampOutline: 0 - - _ColorSwapBlend: 1 - - _ColorSwapBlueLuminosity: 0.5 - - _ColorSwapGreenLuminosity: 0.5 - - _ColorSwapRedLuminosity: 0.5 - - _Contrast: 1 - - _CullingOption: 0 - - _DistortAmount: 0.5 - - _DistortTexXSpeed: 5 - - _DistortTexYSpeed: 5 - - _EditorDrawers: 6 - - _FadeAmount: -0.1 - - _FadeBurnGlow: 2 - - _FadeBurnTransition: 0.075 - - _FadeBurnWidth: 0.025 - - _FishEyeUvAmount: 0.35 - - _FlickerAlpha: 0 - - _FlickerFreq: 0.2 - - _FlickerPercent: 0.05 - - _GhostBlend: 1 - - _GhostColorBoost: 1 - - _GhostTransparency: 0 - - _GlitchAmount: 3 - - _GlitchSize: 1 - - _Glow: 10 - - _GlowGlobal: 1 - - _GradBlend: 1 - - _GradBoostX: 1.2 - - _GradBoostY: 1.2 - - _GradIsRadial: 0 - - _GrassManualAnim: 1 - - _GrassManualToggle: 0 - - _GrassRadialBend: 0.1 - - _GrassSpeed: 2 - - _GrassWind: 20 - - _GreyscaleBlend: 1 - - _GreyscaleLuminosity: 0 - - _GreyscaleOutline: 0 - - _HandDrawnAmount: 10 - - _HandDrawnSpeed: 5 - - _HitEffectBlend: 1 - - _HitEffectGlow: 5 - - _HologramBlend: 1 - - _HologramMaxAlpha: 0.75 - - _HologramMinAlpha: 0.1 - - _HologramStripesAmount: 0.1 - - _HologramStripesSpeed: 4.5 - - _HologramUnmodAmount: 0 - - _HsvBright: 1 - - _HsvSaturation: 1 - - _HsvShift: 180 - - _InnerOutlineAlpha: 1 - - _InnerOutlineGlow: 4 - - _InnerOutlineThickness: 1 - - _MaxXUV: 1 - - _MaxYUV: 1 - - _MinXUV: 0 - - _MinYUV: 0 - - _MotionBlurAngle: 0.1 - - _MotionBlurDist: 1.25 - - _MyDstMode: 10 - - _MySrcMode: 5 - - _NegativeAmount: 1 - - _OffsetUvX: 0 - - _OffsetUvY: 0 - - _OnlyInnerOutline: 0 - - _OnlyOutline: 0 - - _OutlineAlpha: 1 - - _OutlineDistortAmount: 0.5 - - _OutlineDistortTexXSpeed: 5 - - _OutlineDistortTexYSpeed: 5 - - _OutlineGlow: 1.5 - - _OutlinePixelWidth: 1 - - _OutlineTexXSpeed: 10 - - _OutlineTexYSpeed: 0 - - _OutlineWidth: 0.004 - - _OverlayBlend: 1 - - _OverlayGlow: 1 - - _OverlayTextureScrollXSpeed: 0.25 - - _OverlayTextureScrollYSpeed: 0.25 - - _PinchUvAmount: 0.35 - - _PixelateSize: 32 - - _PosterizeGamma: 0.75 - - _PosterizeNumColors: 8 - - _PosterizeOutline: 0 - - _RadialClip: 45 - - _RadialClip2: 0 - - _RadialStartAngle: 90 - - _RandomSeed: 0 - - _RectSize: 1 - - _RotateUvAmount: 0 - - _RoundWaveSpeed: 2 - - _RoundWaveStrength: 0.7 - - _ShadowAlpha: 1 - - _ShadowX: 0.174 - - _ShadowY: 0.379 - - _ShakeUvSpeed: 2.5 - - _ShakeUvX: 1.5 - - _ShakeUvY: 1 - - _ShineGlow: 1 - - _ShineLocation: 0.5 - - _ShineRotate: 0 - - _ShineWidth: 0.1 - - _TextureScrollXSpeed: 1 - - _TextureScrollYSpeed: 0 - - _TwistUvAmount: 1 - - _TwistUvPosX: 0.5 - - _TwistUvPosY: 0.5 - - _TwistUvRadius: 0.75 - - _WarpScale: 0.5 - - _WarpSpeed: 8 - - _WarpStrength: 0.025 - - _WaveAmount: 7 - - _WaveSpeed: 10 - - _WaveStrength: 7.5 - - _WaveX: 0 - - _WaveY: 0.5 - - _ZTestMode: 4 - - _ZWrite: 0 - - _ZoomUvAmount: 0.5 - m_Colors: - - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1} - - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1} - - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1} - - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1} - - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1} - - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1} - - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1} - - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1} - - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} - - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} - - _GlowColor: {r: 1, g: 1, b: 1, a: 1} - - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} - - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} - - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} - - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} - - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} - - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} - - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} - - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1} - - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - - _OverlayColor: {r: 1, g: 1, b: 1, a: 1} - - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - - _ShineColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] ---- !u!1 &2099861572 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2099861573} - - component: {fileID: 2099861576} - - component: {fileID: 2099861575} - - component: {fileID: 2099861574} - m_Layer: 5 - m_Name: element - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2099861573 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2099861572} - 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: 2104582590} - m_Father: {fileID: 753279731} - 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: -16, y: -43} - m_SizeDelta: {x: 300, y: 250} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2099861574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2099861572} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 20 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: -10 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &2099861575 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2099861572} - 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} - 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2099861576 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2099861572} - m_CullTransparentMesh: 1 ---- !u!1001 &2104582589 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 2099861573} - m_Modifications: - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_SizeDelta.x - value: 320 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_SizeDelta.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3556313705934389985, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_text - value: - objectReference: {fileID: 0} - - target: {fileID: 3556313705934389985, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_fontSize - value: 25 - objectReference: {fileID: 0} - - target: {fileID: 3556313705934389985, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_fontSizeBase - value: 25 - objectReference: {fileID: 0} - - target: {fileID: 5295477770541402281, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - propertyPath: m_Name - value: Tasktext - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} ---- !u!224 &2104582590 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} - m_PrefabInstance: {fileID: 2104582589} - m_PrefabAsset: {fileID: 0} --- !u!1 &2144716741 GameObject: m_ObjectHideFlags: 0 @@ -7036,7 +7517,8 @@ Transform: m_LocalPosition: {x: -0.1953497, y: -0.6372094, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2039506652} m_Father: {fileID: 857493864} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &256613255306898996 @@ -7389,6 +7871,7 @@ GameObject: m_Component: - component: {fileID: 1015381349462535075} - component: {fileID: 1843032993026721767} + - component: {fileID: 1843032993026721768} m_Layer: 0 m_Name: "\u5FC3\u810F\u5F15\u64CE" m_TagString: Untagged @@ -7523,11 +8006,12 @@ Transform: m_GameObject: {fileID: 552960619179118509} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.746512, y: 2.5976744, z: 0} + m_LocalPosition: {x: -2.7465115, y: 2.5976744, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 857493864} + m_Children: + - {fileID: 334807552} + m_Father: {fileID: 1112213369} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1173208158741393844 Transform: @@ -8043,7 +8527,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + - {fileID: 801083269} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8075,6 +8559,22 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &1843032993026721768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 552960619179118509} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee158225ee1e59f4791627785501d950, type: 3} + m_Name: + m_EditorClassIdentifier: + shaderTypes: 0 + normalStrength: 5 + normalSmoothing: 1 + computingNormal: 0 --- !u!4 &1855379866570077322 Transform: m_ObjectHideFlags: 0 @@ -10708,7 +11208,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &6673533354654210576 GameObject: m_ObjectHideFlags: 0 @@ -11810,8 +12310,8 @@ Transform: m_GameObject: {fileID: 8254373788995933795} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.704, y: 1.956, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -3.148, y: 2.468, z: 0} + m_LocalScale: {x: 1.2121, y: 1.2121, z: 1.2121} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1112213369} @@ -12311,7 +12811,6 @@ MonoBehaviour: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 755572874} - {fileID: 7026926953013077400} - {fileID: 1272342139116525773} - {fileID: 154381820} @@ -12319,3 +12818,4 @@ SceneRoots: - {fileID: 1112213369} - {fileID: 5393568355081744312} - {fileID: 9210352354887959608} + - {fileID: 2062639485} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 8b8f71cee..a563ab9da 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -6198,7 +6198,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: -0.009999275, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8111,8 +8111,8 @@ MonoBehaviour: - {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} runMode: 2 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - saveFileName: "PeipeiDay3_\u770B\u753B" + testTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} + saveFileName: StoneDay1_2 --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 @@ -10155,6 +10155,7 @@ MonoBehaviour: holding: {fileID: 21300000, guid: acc8d5eb5db1c184ba494e0142fa4d85, type: 3} disable: {fileID: 21300000, guid: c79f612e713a64245b3c78d6ac145b52, type: 3} eye: {fileID: 21300000, guid: 3bdd9ca7d32af494fb1a336b1258c780, type: 3} + isInMenu: 0 --- !u!114 &947129554 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs index 226580568..7329bca97 100644 --- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs @@ -20,6 +20,7 @@ namespace AibisDream private bool _isSuccess; public float curSpeed; + public float targetSpeed=0.95f; [HideInInspector] public UnityEvent updateSpeedEvent = new(); [SerializeField] private float coverMoveDuration = 5f; @@ -61,7 +62,7 @@ namespace AibisDream private void Update() { updateSpeedEvent.Invoke(curSpeed, GetSpeedScale()); - if (curSpeed >= 0.99f && !_isSuccess) + if (curSpeed >= targetSpeed && !_isSuccess) { _isSuccess = true; isPullActive = false; diff --git a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs index 39c46e80f..b5cd7a79f 100644 --- a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs +++ b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs @@ -1,4 +1,5 @@ using UnityEngine; +using RainbowArt.CleanFlatUI; namespace AibisDream { @@ -6,19 +7,24 @@ namespace AibisDream { private Material _material; private EngineSystem _engineSystem; + + private ProgressBarGridCircular progress; private static readonly int Progress1 = Shader.PropertyToID("_Progress"); private void Awake() - { - _material = GetComponent().material; + { _engineSystem = transform.parent.GetComponent(); + _material = _engineSystem.transform.Find("心脏引擎").GetComponent().material; + progress=FindObjectOfType(); _engineSystem.updateSpeedEvent.AddListener(OnSpeedChange); } private void OnSpeedChange(float originSpeed, float speedScale) { - _material.SetFloat(Progress1, originSpeed); + _material.SetFloat("_VibrateFade", originSpeed); + progress.CurrentValue=Mathf.RoundToInt(originSpeed * 50); + //_material.SetFloat(Progress1, originSpeed); } } } \ No newline at end of file From 305f2477542f508a92a99a7c2ceaee4c84f7fe38 Mon Sep 17 00:00:00 2001 From: Ovid Date: Fri, 24 Jan 2025 06:10:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?shitou2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Materials/MemorySearchScreen.mat | 2 +- Assets/Resources/SceneSO/Day2_night.asset | 2 +- Assets/Resources/SceneSO/StoneDay2.asset | 2 +- Assets/Resources/SceneSO/StoneDay2_2.asset | 18 + .../Resources/SceneSO/StoneDay2_2.asset.meta | 8 + Assets/Resources/SceneSO/StoneDay2_head.asset | 18 + .../SceneSO/StoneDay2_head.asset.meta | 8 + Assets/Resources/Yarn/FP_Peipei2/UF检查.yarn | 10 + .../Yarn/FP_Shitou1/Stage1_引入对话.yarn | 5 +- .../Yarn/FP_Shitou1/Stage2_提速.yarn | 7 +- .../Resources/Yarn/FP_Shitou2/EventNode.yarn | 161 +++--- .../Resources/Yarn/FP_Shitou2/FP_Shitou2.yarn | 17 +- .../Yarn/FP_Shitou2/Stage1_引入对话.yarn | 17 +- ...试.yarn => Stage2_调速测试_disposed.yarn} | 2 +- ...eta => Stage2_调速测试_disposed.yarn.meta} | 0 ...话.yarn => Stage3_中间对话_disposed.yarn} | 2 +- ...eta => Stage3_中间对话_disposed.yarn.meta} | 0 .../Yarn/FP_Shitou2/Stage4_头部检查.yarn | 43 -- .../Yarn/FP_Shitou2/Stage5_提出刻录.yarn | 99 ---- .../Yarn/FP_Shitou2/Stage6_刻录.yarn | 341 ------------ .../Yarn/FP_Shitou2/Stage7_结束对话.yarn | 77 --- Assets/Resources/Yarn/FP_Shitou2_2.meta | 8 + .../Yarn/FP_Shitou2_2/EventNode.yarn | 117 +++++ .../EventNode.yarn.meta} | 2 +- .../Yarn/FP_Shitou2_2/FP_Shitou2_2.yarn | 118 +++++ .../FP_Shitou2_2.yarn.meta} | 2 +- .../FP_Shitou2_2/FP_Shitou2_2.yarnproject | 12 + .../FP_Shitou2_2.yarnproject.meta | 13 + .../Yarn/FP_Shitou2_2/Stage3_中间对话.yarn | 108 ++++ .../Stage3_中间对话.yarn.meta} | 2 +- .../Yarn/FP_Shitou2_2/Stage4_刻录.yarn | 488 ++++++++++++++++++ .../Stage4_刻录.yarn.meta} | 2 +- .../Yarn/FP_Shitou2_2/Stage5_结束对话.yarn | 138 +++++ .../FP_Shitou2_2/Stage5_结束对话.yarn.meta | 10 + Assets/Resources/Yarn/FP_Shitou2_head.meta | 8 + .../Yarn/FP_Shitou2_head/EventNode.yarn | 129 +++++ .../Yarn/FP_Shitou2_head/EventNode.yarn.meta | 10 + .../Yarn/FP_Shitou2_head/FP_Shitou2_head.yarn | 118 +++++ .../FP_Shitou2_head/FP_Shitou2_head.yarn.meta | 10 + .../FP_Shitou2_head.yarnproject | 12 + .../FP_Shitou2_head.yarnproject.meta | 13 + .../Yarn/FP_Shitou2_head/Stage2_头部检查.yarn | 434 ++++++++++++++++ .../FP_Shitou2_head/Stage2_头部检查.yarn.meta | 10 + .../Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn | 2 +- Assets/Scenes/Persistence.unity | 4 +- 45 files changed, 1940 insertions(+), 669 deletions(-) create mode 100644 Assets/Resources/SceneSO/StoneDay2_2.asset create mode 100644 Assets/Resources/SceneSO/StoneDay2_2.asset.meta create mode 100644 Assets/Resources/SceneSO/StoneDay2_head.asset create mode 100644 Assets/Resources/SceneSO/StoneDay2_head.asset.meta rename Assets/Resources/Yarn/FP_Shitou2/{Stage2_调速测试.yarn => Stage2_调速测试_disposed.yarn} (99%) rename Assets/Resources/Yarn/FP_Shitou2/{Stage2_调速测试.yarn.meta => Stage2_调速测试_disposed.yarn.meta} (100%) rename Assets/Resources/Yarn/FP_Shitou2/{Stage3_中间对话.yarn => Stage3_中间对话_disposed.yarn} (98%) rename Assets/Resources/Yarn/FP_Shitou2/{Stage3_中间对话.yarn.meta => Stage3_中间对话_disposed.yarn.meta} (100%) delete mode 100644 Assets/Resources/Yarn/FP_Shitou2/Stage4_头部检查.yarn delete mode 100644 Assets/Resources/Yarn/FP_Shitou2/Stage5_提出刻录.yarn delete mode 100644 Assets/Resources/Yarn/FP_Shitou2/Stage6_刻录.yarn delete mode 100644 Assets/Resources/Yarn/FP_Shitou2/Stage7_结束对话.yarn create mode 100644 Assets/Resources/Yarn/FP_Shitou2_2.meta create mode 100644 Assets/Resources/Yarn/FP_Shitou2_2/EventNode.yarn rename Assets/Resources/Yarn/{FP_Shitou2/Stage5_提出刻录.yarn.meta => FP_Shitou2_2/EventNode.yarn.meta} (86%) create mode 100644 Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarn rename Assets/Resources/Yarn/{FP_Shitou2/Stage6_刻录.yarn.meta => FP_Shitou2_2/FP_Shitou2_2.yarn.meta} (86%) create mode 100644 Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarnproject create mode 100644 Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarnproject.meta create mode 100644 Assets/Resources/Yarn/FP_Shitou2_2/Stage3_中间对话.yarn rename Assets/Resources/Yarn/{FP_Shitou2/Stage7_结束对话.yarn.meta => FP_Shitou2_2/Stage3_中间对话.yarn.meta} (86%) create mode 100644 Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn rename Assets/Resources/Yarn/{FP_Shitou2/Stage4_头部检查.yarn.meta => FP_Shitou2_2/Stage4_刻录.yarn.meta} (86%) create mode 100644 Assets/Resources/Yarn/FP_Shitou2_2/Stage5_结束对话.yarn create mode 100644 Assets/Resources/Yarn/FP_Shitou2_2/Stage5_结束对话.yarn.meta create mode 100644 Assets/Resources/Yarn/FP_Shitou2_head.meta create mode 100644 Assets/Resources/Yarn/FP_Shitou2_head/EventNode.yarn create mode 100644 Assets/Resources/Yarn/FP_Shitou2_head/EventNode.yarn.meta create mode 100644 Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarn create mode 100644 Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarn.meta create mode 100644 Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarnproject create mode 100644 Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarnproject.meta create mode 100644 Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn create mode 100644 Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn.meta diff --git a/Assets/Resources/Materials/MemorySearchScreen.mat b/Assets/Resources/Materials/MemorySearchScreen.mat index 77a778d20..e544546b2 100644 --- a/Assets/Resources/Materials/MemorySearchScreen.mat +++ b/Assets/Resources/Materials/MemorySearchScreen.mat @@ -267,7 +267,7 @@ Material: - _FrozenHighlightDensity: 1 - _FrozenSnowContrast: 1 - _FrozenSnowDensity: 0.25 - - _FullAlphaDissolveFade: 0 + - _FullAlphaDissolveFade: 1 - _FullAlphaDissolveWidth: 0.5 - _FullDistortionFade: 1 - _FullGlowDissolveFade: 0.5 diff --git a/Assets/Resources/SceneSO/Day2_night.asset b/Assets/Resources/SceneSO/Day2_night.asset index 373b176ad..fb781ea46 100644 --- a/Assets/Resources/SceneSO/Day2_night.asset +++ b/Assets/Resources/SceneSO/Day2_night.asset @@ -14,5 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} yarnProject: {fileID: 7545569452688597077, guid: ec06c945cb99fb544b1dd9a2a6ea9a7b, type: 3} - firstSceneName: PeipeiFixScene + firstSceneName: ExpressFixScene isEndOfDay: 1 diff --git a/Assets/Resources/SceneSO/StoneDay2.asset b/Assets/Resources/SceneSO/StoneDay2.asset index 779e964d1..ce89d6387 100644 --- a/Assets/Resources/SceneSO/StoneDay2.asset +++ b/Assets/Resources/SceneSO/StoneDay2.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3} m_Name: StoneDay2 m_EditorClassIdentifier: - nextScene: {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2} + nextScene: {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} yarnProject: {fileID: 7545569452688597077, guid: fa8082420f7bb5b4a8ab33a59c70bcc9, type: 3} firstSceneName: ExpressFixScene isEndOfDay: 0 diff --git a/Assets/Resources/SceneSO/StoneDay2_2.asset b/Assets/Resources/SceneSO/StoneDay2_2.asset new file mode 100644 index 000000000..a85373f0a --- /dev/null +++ b/Assets/Resources/SceneSO/StoneDay2_2.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3} + m_Name: StoneDay2_2 + m_EditorClassIdentifier: + nextScene: {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2} + yarnProject: {fileID: 7545569452688597077, guid: b254008a450f4c242b25311130c2592a, type: 3} + firstSceneName: ExpressFixScene + isEndOfDay: 0 diff --git a/Assets/Resources/SceneSO/StoneDay2_2.asset.meta b/Assets/Resources/SceneSO/StoneDay2_2.asset.meta new file mode 100644 index 000000000..8063bbd0b --- /dev/null +++ b/Assets/Resources/SceneSO/StoneDay2_2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 088974ca6c9487041b695af86b6c93a1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/SceneSO/StoneDay2_head.asset b/Assets/Resources/SceneSO/StoneDay2_head.asset new file mode 100644 index 000000000..afd040834 --- /dev/null +++ b/Assets/Resources/SceneSO/StoneDay2_head.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3} + m_Name: StoneDay2_head + m_EditorClassIdentifier: + nextScene: {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2} + yarnProject: {fileID: 7545569452688597077, guid: b7787a998da53b74c854f2e09dccec52, type: 3} + firstSceneName: PeipeiFixScene + isEndOfDay: 0 diff --git a/Assets/Resources/SceneSO/StoneDay2_head.asset.meta b/Assets/Resources/SceneSO/StoneDay2_head.asset.meta new file mode 100644 index 000000000..eb2edd488 --- /dev/null +++ b/Assets/Resources/SceneSO/StoneDay2_head.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7bf300be492f2634580f0eaabcca2b2e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/FP_Peipei2/UF检查.yarn b/Assets/Resources/Yarn/FP_Peipei2/UF检查.yarn index 4016d322a..958307bab 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/UF检查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/UF检查.yarn @@ -6,6 +6,9 @@ position: 43,-97 现在可以插线来深入UF了 === + + + title: 结束UF检查 position: 275,-222 --- @@ -13,6 +16,9 @@ position: 275,-222 <> === + + + title: 第一次进入UF检查 position: 275,-222 --- @@ -23,6 +29,10 @@ position: 275,-222 // 【这个过程变得越来越不受控制，最后你失去了控制，视点在疯狂移动】 // <> === + + + + title: UFCheck tags: colorID: 3 diff --git a/Assets/Resources/Yarn/FP_Shitou1/Stage1_引入对话.yarn b/Assets/Resources/Yarn/FP_Shitou1/Stage1_引入对话.yarn index ce8f9692a..6a2c3edd7 100644 --- a/Assets/Resources/Yarn/FP_Shitou1/Stage1_引入对话.yarn +++ b/Assets/Resources/Yarn/FP_Shitou1/Stage1_引入对话.yarn @@ -26,7 +26,7 @@ position: 250,200 <> <> -shitou: 啊！~自由的小机体，在大大的城市里~
跑呀~跑呀~再多烦恼~统统没掉~ +shitou: 啊！~自由的小机体，在大大的城市里~
跑呀~跑呀~再多烦恼~统统忘掉~ <> <> @@ -63,7 +63,8 @@ me: 听起来不是第一次了？ shitou: 当然啦，医生！我把它保养得可好啦~！听听我这强劲的马达~ 石头运转起它的马达，他的胸腔发出低沉的轰鸣。 me: 好了好了…你可千万别跑起来。
碰坏了这里的东西，你可…我可赔不起。 -me: 来吧，让我们来治疗室好好看看。 +shitou: 什么？医生，引擎太吵~我听不清~ +me: …我说，我们来治疗室来吧。 //shitou: 啊，我嘛……我需要做一个调速，这样就能跑得更快，送更多的货！ //它是一个货务机器人，根据指令把货务送到目的地——大部分都是罐头。 diff --git a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn index f225eea77..578f724bc 100644 --- a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn +++ b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn @@ -25,7 +25,7 @@ position: 380,-239 shitou: 医生~不好意思~每次拆面板我都很害怕~你介意我~放声高歌吗？ me: 没关系，其实你一直在唱歌的。 shitou: 哈哈~！毕竟~音乐就是我的~生命~ -shitou: 啊！~自由的小机体，在大大的城市里~
跑呀~跑呀~再多烦恼~统统没掉~ +shitou: 啊！~自由的小机体，在大大的城市里~
跑呀~跑呀~再多烦恼~统统忘掉~ me: 好多灰尘啊，真难开…… me: 嘿！ @@ -441,9 +441,9 @@ shitou: 该播放音乐了吗？医生！ me: 原来如此…… -shitou: 医生，这可是我的得意改装！我从小！就喜欢音乐！可惜我~五音不全。 +shitou: 医生，这可是我的得意改装！我一直！就喜欢音乐！可惜我~五音不全，而且引擎太吵，我听不到外边的音乐！ shitou: 工作后一攒够钱！我就买了一直心念念的爱索~Walkman音乐！唱片机！ -shitou: 我把它改装进了动力模块里！这样我就可以随时随地哼我最喜欢的旋律了—— +shitou: 我把它改装进了动力模块里！这样我就可以随时随地哼我最喜欢爱的这首歌啦~！ <> <> @@ -472,6 +472,7 @@ me: 我先给你安回去吧…但你别再加速了。不然还得飞出来。 <> <> +<> <> me: 你想跑到12000转……但这些橡胶的“唱片齿轮”的强度太低了。恐怕只有镍铬齿轮的强度才够…… diff --git a/Assets/Resources/Yarn/FP_Shitou2/EventNode.yarn b/Assets/Resources/Yarn/FP_Shitou2/EventNode.yarn index 558b6846f..d93e244ec 100644 --- a/Assets/Resources/Yarn/FP_Shitou2/EventNode.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2/EventNode.yarn @@ -8,12 +8,18 @@ position: -1094,-98 <> === + + + title: HeartPlugIn position: -816,-97 --- <> === + + + title: LiverPlugIn position: -533,-97 --- @@ -24,6 +30,9 @@ position: -533,-97 <> === + + + title: StomachPlugIn position: -267,-102 --- z @@ -34,6 +43,82 @@ position: -267,-102 <> === + + + +title: EmoPlugIn +tags: 待编辑 +colorID: 8 +position: -2,-3039 +--- +<> +=== + + + + +title: SpeakPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-2640 +--- +<> +=== +title: LogicPlugIn +tags: 待编辑 +colorID: 8 +position: 480,-3040 +--- +<> +=== + + + + +title: ColorPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-2840 +--- +<> +=== + + + + +title: MemoryPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-3040 +--- +<> +=== + + + + +title: UFPlugIn +tags: 待编辑 +colorID: 8 +position: 0,-2840 +--- +<> +=== + + + + +title: EyePlugIn +tags: 待编辑 +colorID: 8 +position: 480,-2840 +--- +<> +=== + + + + title: EngineSuccess position: -1092,115 --- @@ -42,79 +127,3 @@ position: -1092,115 <> === -title: 插入冷却液 -position: -809,327 ---- -<> - <> -<> -=== - -title: 泵机运行 -position: -1088,330 ---- -<> - <> -<> -=== - -title: 引擎过速 -description: 引擎过速触发 -position: -257,110 ---- -<> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> -<> -=== - -title: 引擎掉速 -description: 引擎掉速触发 -position: -813,115 ---- -<> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> -<> -=== - -title: 调整进气档位 -description: 调整进气档位时触发 -position: -532,113 ---- -<> - <> -<> -=== diff --git a/Assets/Resources/Yarn/FP_Shitou2/FP_Shitou2.yarn b/Assets/Resources/Yarn/FP_Shitou2/FP_Shitou2.yarn index a596dec48..26a73c703 100644 --- a/Assets/Resources/Yarn/FP_Shitou2/FP_Shitou2.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2/FP_Shitou2.yarn @@ -48,6 +48,13 @@ position: 205,199 //选择的透析剂 <> +<> +<> +<> +<> +<> +<> +<> //【功能相关】 @@ -74,7 +81,7 @@ colorID: 1 // 每次进入维修界面就自动保存 <> -//gamestage:1-引入对话；2-调速；3-中间对话；4-头部检查；5-头部检查后对话；6-刻录；7-结束对话；0-BE对话 +//gamestage:1-引入对话；2-头部检查；3-头部检查后对话；4-刻录；5-结束对话；0-BE对话 // 引入对话 <> <> @@ -97,14 +104,6 @@ colorID: 1 <> <> - <> -<> - -<> - <> -<> - -<> <> <> diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage1_引入对话.yarn b/Assets/Resources/Yarn/FP_Shitou2/Stage1_引入对话.yarn index 71d012c4d..5dfa0c13d 100644 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage1_引入对话.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2/Stage1_引入对话.yarn @@ -4,10 +4,10 @@ group: 入口 position: 250,-26 --- +<> <> <> <> - <> === @@ -59,7 +59,7 @@ shitou: 下一句…是什么？ ->只要歌唱 ->只要工作 -me: 就可以把烦恼都遗忘，什么的。
好像是这样。 +me: 就可以把烦恼都遗忘，什么的。
是这样唱的么…好像是？ me: 你就是来问这个？
…昨天走的时候不是说你还记得的嘛…… @@ -79,13 +79,16 @@ me: 你受伤了？？ 石头垂下手，露出了脸上的伤口。 <> -<> +<> -me: 糟了！看起来可能是头部有些东西受损了… +<> +<> + +me: 记不起来…
可别是头部有些东西受损了。 shitou: 医生…
我还记得…但我想不起来了…… -me: 快……你需要赶紧做个检查。 +me: 快过来……你需要立刻做个检查。 //石头回来了。 //他和昨天的状态几乎一模一样，但是看起来显然要开心得多。 @@ -100,7 +103,7 @@ me: 快……你需要赶紧做个检查。 <> <> -<> +<> === @@ -110,7 +113,7 @@ title: toStage2 group: 出口 position: 248,443 --- - +<> <> <> diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试.yarn b/Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试_disposed.yarn similarity index 99% rename from Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试.yarn rename to Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试_disposed.yarn index c33c55509..272019ed0 100644 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试_disposed.yarn @@ -1,4 +1,4 @@ -title: Stage2 +title: Stage2disposed group: 入口 tags: position: 378,-540 diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试.yarn.meta b/Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试_disposed.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试.yarn.meta rename to Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试_disposed.yarn.meta diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话.yarn b/Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话_disposed.yarn similarity index 98% rename from Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话.yarn rename to Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话_disposed.yarn index a5975f41b..361de42c4 100644 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话_disposed.yarn @@ -1,4 +1,4 @@ -title: Stage3 +title: Stage3disposed tags: position: 210,-342 --- diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话.yarn.meta b/Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话_disposed.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话.yarn.meta rename to Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话_disposed.yarn.meta diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage4_头部检查.yarn b/Assets/Resources/Yarn/FP_Shitou2/Stage4_头部检查.yarn deleted file mode 100644 index 12affaaf9..000000000 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage4_头部检查.yarn +++ /dev/null @@ -1,43 +0,0 @@ -title: Stage4 -tags: -position: 210,-342 ---- -<> -=== - - - - -title: 头部检查 -position: 210,-129 ---- -<> -<> -<> - -me: 看起来受到了严重的冲击…… - -视觉模块: 视觉模块有重影。正在恢复。 -语言模块: 语言模块正常。有些结巴，很快会恢复。 -逻辑模块: 逻辑模块经历了一段时间的宕机，但是现在恢复了。 -情绪模块: 惊恐和悲伤的情绪正占主导，但似乎不是由于撞击导致的。 -记忆模块: 记忆模块受损严重，最大的一个磁盘标记着“音乐，我的最爱！”已经无法读取了。自动恢复了好几次也没成功。 -记忆模块: 同时，一些短期记忆能力也受到了损害，伤势需要进一步观察评估。 -//音频相关记忆受损了，可用的分区变得很小，新的音频记忆会很快覆盖掉旧的音频记忆 -me: …所以说…他的音乐记忆都在这里了？ -me: 机体…真是脆弱啊。 -me: 好吧…万幸的是其他部分似乎都没事…… -me: -<> - -=== - - - - -title: 进入阶段5 -position: 213,321 ---- -<> -<> -=== diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage5_提出刻录.yarn b/Assets/Resources/Yarn/FP_Shitou2/Stage5_提出刻录.yarn deleted file mode 100644 index 8eec04a81..000000000 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage5_提出刻录.yarn +++ /dev/null @@ -1,99 +0,0 @@ -title: Stage5 -tags: -position: 210,-342 ---- -<> -=== - - - - -title: 提出刻录 -position: 210,-129 ---- -<> -<> -<> -<> - -你向石头总结了他的伤势。 - -石头的脸上出现了一种捉摸不透的情绪。 -shitou: 所以说，那些记忆…没办法再被恢复了？ - -<> -<> - -me: 是的。 - -<> -<> - -石头再尝试了一次，依然只能唱出前半句。 -me: 你是怎么撞的？ -shitou: 不是我撞的…是它撞的我…… -shitou: 它逆行过来，我来不及刹住嘛。 -me: 啧……
假如你控制住速度… -me: 你不应该做这个调速的。 - -石头再尝试了一次，依然只能唱出前半句。 - -shitou: 真的一点办法也没有了吗？医生。一点也没有吗？ -me: 这种受损是不可逆的,往后… -me: 你只能记得你拥有过这些残缺的记忆…但不记得它们的内容是什么了。 - -<> -<> - -shitou: 真的一点办法也没有了吗？医生。一点也没有吗？ -me: 唯一的办法就是再录一卷磁盘。 -me: 但是，你的唱片齿轮……已经全部更换掉了。 - -石头低下头许久，重新抬起头看向远方。 - -shitou: 哈哈，看来我们都得向前看…对吧！ -shitou: 仔细想想，音乐其实也没有那么重要……只是我一直没有来得及拿掉罢了。 -shitou: 那么…就请你帮我~把这个记忆，也去掉吧！#auto_next -me: 等一下！ -me: 好像…还有一个办法。 -me: 唱片的原理…就是把胶盘上的划痕转化成歌声的震动…对吧？ -me: 我想我们也可以反过来，把歌声变刻录成划痕…在这些镍铬齿轮上。 - -//shitou: 我想我应该明白了。 -//shitou: 音乐…真的很神奇，不是吗？ -//shitou: 虽然我没有机会停下来，也没有机会记住更多的音乐…… -//shitou: 但是，如果我能每天都像第一次一样听到最喜欢的音乐…
那岂不是比能继续听音乐更好？ -//shitou: 只可惜… -//shitou: 医生，这块齿轮…还有可能复原吗？ -//me: …… -//me: 就算粘好，它也不可能承受住现在的转速了。 -//shitou: …… - -//me: 倒是还有一个办法。 -//你提出了一个方案，这个方案虽然比不上原本的唱片，但是也足够好了。 -//你提出了一个可能性：仿照之前那张唱片，在原有的齿轮上重新刻录一次。 - -me: 这可能不如原来刻在塑胶层上的效果那么好…但应该也能听。 -me: 唯一麻烦的是…这个齿轮已经碎了，原来的声音已经遗失。我们只能凭记忆唱出来了。 -shitou: 可是…这个齿轮已经碎啦，我也已经不记得这首歌的后一半是怎么唱的咯。 -me: 我记得。 -石头抬起头看向你，眼里重新有了光泽。 -me: 但是……我不是很会唱歌。可能会跑调什么的……这可能不是一个好主意…… -shitou: 医生…你真是个天才！ -出乎意料地，石头接受了你的提议。 -shitou: 快，医生，趁着我们都还记得，快开始吧~！ -me: 哎。我真是… - -<> - -=== - - - - -title: 进入阶段6 -position: 213,321 ---- -<> -<> -=== diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage6_刻录.yarn b/Assets/Resources/Yarn/FP_Shitou2/Stage6_刻录.yarn deleted file mode 100644 index 84082b8ac..000000000 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage6_刻录.yarn +++ /dev/null @@ -1,341 +0,0 @@ -title: Stage6 -group: 入口 -tags: -position: 378,-540 ---- - -<> - -<> - - -<> -<> -<> - -<> -<> - -<> -<> - -=== - - - - - - - - -// 事件节点 - -title: 检查_肺_2 -tags: -group: 插入触发 -colorID: 8 -position: -161,-190 ---- -<> -<> -<> -<> -<> -<> -->检查 - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - ->分析 - <> - <> - <> - <> - <> - me: 嗯。你的运动非常充足…应该说有点过于频繁了。 - <> - <> - me: 换气系统的滤板积碳很严重。 - <> -->结束 -<> -=== - - - - -title: 检查_心_2 -tags: -group: 插入触发 -colorID: 8 -position: -158,-3 ---- -<> -<> -<> -<> -<> -->检查 - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - ->分析 - <> - <> - <> - <> - <> - me: 嗯…看起来一切正常。 - <> - ->开始刻录 - <> - <> - me: 这套动力系统很高级，而且一切正常。 - ->开始刻录 - <> - <> -->开始刻录 - <> -->结束 -<> -=== - - - - -title: 检查_胃_2 -tags: -colorID: 8 -group: 插入触发 -position: -160,191 ---- -<> -<> -<> -<> -<> -->检查 - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - me: 油耗…偏高？ - shitou: 对！医生，我就说嘛！
我跑起来怎么都不对劲。 - <> - ->分析 - <> - <> - <> - <> - <> - <> - <> - me: 确实，从今天开始的油耗都比往常高5%左右… - me: 不过看起来…这个模块本身没有什么问题。
虽然还是不知道为什么油耗高。 - me: 嗯…你最近都吃了些啥？ - shitou: 当然是幸福牌~罐头！医生。 - me: 只有罐头？ - shitou: 罐头还不够好嘛！医生，推销员说这一罐罐头就能满足所有需要，不用换食！ - me: 怪不得…内容物这么单一。 - me: 不过这里确实没有和齿轮相关的信息。 - <> - <> - me: 石头最近摄入的食物十分单一，都是最基础款的罐头。 - me: 另外…它的油耗不过这里确实没有和齿轮相关的信息。 - <> -->结束 -<> -=== - - - - -title: 检查_肝_2 -tags: -colorID: 8 -group: 插入触发 -position: -158,370 ---- -<> -<> -<> -<> -<> -<> -->检查 - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - ->分析 - <> - <> - <> - <> - <> - me: 看起来这个模块没有什么太大的问题…算是个好消息。 - <> - <> - me: 看起来这个模块没有什么太大的问题。 - <> -->结束 -<> -=== - - - - -title: 刻录 -position: 728,79 ---- - -<> -<> - -//？？如果玩家在这里拉绳，是不是就听到音乐了？ - -me: 如果我没有理解错这套东西的原理…
我应该可以把这个读取声音的探头，改造成一个刻出声音的钻头。 - -->改造钻头 - -你将探头小心地取下，换成一个坚硬的钻头。 - -me: 好了…接下来，只需要唱出来，声音就会被这个齿轮记录下来。 - -<> -<> - -me: …… -shitou: 快开始吧，医生！ -me: 我有点不记得调了。 -shitou: 没关系，开头我记得。
医生，把它转起来吧！ -shitou: 跟上我的节奏！ - -石头打起了拍子。 -<> - -->拉绳 -<> - -=== - - - - -title: 刻录调速 -position: 728,79 ---- - -你拉动拉绳，转速逐渐提高，引擎的声音和石头的拍子逐渐重合。 -你松开绳子，石头开始唱起歌来。 -shitou: He says Son can you play me a memory?
（他说，小伙子，你能为我弹一段回忆吗?） -shitou: I'm not really sure how it goes.
（它的旋律，我已然忘记） -歌声和引擎的声音保持在同一个节奏上，让它成为了天然的节拍器。 -shitou: 呼…现在加速！ -石头打起了新的拍子。 - -->拉绳 - -你拉动拉绳，转速逐渐提高，引擎的声音和石头的拍子逐渐重合。 -你松开绳子，石头接着唱。 -shitou: 医生，到你了！ -你接着石头的部分往后唱，唱得其实还不错。 -me: But it's sad and it's sweet and I knew it complete
（这首歌忧伤而甜蜜，我记得每一句歌词…） -me When I wore a younger man's clothes.
（…在我更年轻一些的时候） -shitou: 太好啦！医生，你唱的真好！ -shitou: 如果你不是在这个诊所里，一定会成为一个大明星的！ -shitou: 下一段！ -你记得下一段并没有加速。但你可以这么做。或者… -me: 我有一种感觉…接下来这段把拍子降下来也会不错。 - -//似乎不需要用“选择速度”来代表要做出的选择……用对话似乎更好 - -->遵循原曲，保持原速 - me: 不，这里不是这样的。 - 你把速度小心保持在原位，然后继续唱。你仔细地回忆着昨天的旋律。 - shitou: 太好了，太美了！ - me: 我有点不太记得了！ - shitou: 没关系，医生！你是我听过唱得最好的！
往后的每一天，都会是唱得最好的！ -->按照石头的想法加速 - 你拉动拉绳，转速逐渐提高，引擎的声音和石头的拍子逐渐重合。 - 你松开绳子，继续唱。由于它变得太快，旋律变得有些狂野。 - shitou: 太好了，太美了！ - me: 太快了，我有点跟不上！ - shitou: 没关系，医生！你是我听过唱得最好的！
往后的每一天，都会是唱得最好的！ -->加入个人风格，减速 - me: 不，听听这个！ - 你打起了一个新的拍子，并松开绳子让速度向下掉，直到和你的拍子重合。 - 你继续唱了起来。 - shitou: 太好了，太美了！ - me: 你会喜欢这个的！ - shitou: 我会喜欢这个的！往后的每一天！ - -me: Sing us a song, you're the piano man
(为我们唱一曲吧，钢琴师) -me: Sing us a song tonight
(唱一曲吧,就在今晚) -me: Well we're all in the mood for a melody
(没有什么比一首歌更适合现在) -me: And you've got us feelin' alright
(没有什么更能彼此慰藉) - -<> -<> - -歌曲结束了。你们意犹未尽地喘着气。 -me: 呼…我从来没有尝试过这个。 -shitou: 呼！医生…这比原曲还要好！ -me: 你又没有听过原曲。 -shitou: 这一定比原曲还要好！想象一下，这首歌的歌手…就在我的身边！天哪！ -me: 哈哈。别取笑我了。 -me: 结束了，让我们出去听听吧。 - -<> -<> - -=== - - - - - -title: 进入阶段7 -position: 213,321 ---- - -<> -<> - -=== - diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage7_结束对话.yarn b/Assets/Resources/Yarn/FP_Shitou2/Stage7_结束对话.yarn deleted file mode 100644 index 1f87be997..000000000 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage7_结束对话.yarn +++ /dev/null @@ -1,77 +0,0 @@ -title: Stage7 -tags: -position: 210,-342 ---- -<> -=== - - - - -title: 结束对话 -position: 210,-129 ---- -<> -<> -<> -<> - -<> -<> - -shitou: 医生……趁着我还记得，我要很认真地和你说一件事情。 -me: 怎么了？ -shitou: 你应该考虑一下，改行成为一个歌手！ -me: 哈哈。谢谢你的建议！ -me: …… -me: 但是……
抱有这种想法只会让你的“原型”给你带来更多痛苦。 -me: 我有点明白你为什么那么做了。 -shitou: 怎么做？ -me: 那些“低能耗模式”…并不代表你一定要削减记忆力。你可以选择去掉一些信息的记忆能力，或者其他的功能…… -me: 你选择了去掉短期记忆，选择了更少的回忆。 -shitou: 是我自己做的吗？哈哈！我不太记得了~ -me: 我想是的。 -me: 这样你就会忘记你的过去，让你的“原型”带来的影响变得更小。 -me: 你可以享受更纯粹的现在……享受音乐…… -shitou: 听起来…确实是我会做的事情！ -<> -<> -他忽然提起了自己的“原型”。这是他距离自己的过去最近的一次…… -尽管他的记忆已经不能读取了。但他似乎还是“看见”了一些东西。 -他看见他在接吻，在草原上奔跑…在下着雨的夏天的窗台边打瞌睡…… -shitou: 我…是谁？ -他忽然问，像是已经不记得了自己在哪里。 -->石头 - me: 你是石头。幸福集团罐装物料生产区货务部货运机体，一个爱唱歌的，热爱…生活的机体。 - me: 这么说也不太准确…我很难形容你…… - me: 你能听到自己脑袋里面那个声音吗？你就是它，它就是石头。 -->货运机体 - me: 不管怎样…你是一个货运机体。尽管你是一个特殊的货运机体。 - me: 这个机体产生了一些奇怪的想法，它想要知道装载着自己的这个身体内部是什么东西…… - me: 里面只有电流罢了。你和我都一样。我们都只是一些机器。 -->音乐家 - me: 我想不管受到怎样的影响…反正你明天都会忘掉。所以…管他呢。 - me: 你是一个音乐家。或者说，一个艺术家……如果一个人类艺术家能够看到我们现在的未来，他会希望成为你。 -->一个人类 - me: 我想不管受到怎样的影响…反正你明天都会忘掉。所以…管他呢。 - me: 你是一个幸运的人类，只不过现在住在一个金属的身体里。 -石头沉默了许久，理解着你说的话。 -shitou: 我觉得你说的没错！管他呢，我想这一点都不重要。 -shitou: 只要能继续过这样的日子，每天都能第一次听到最爱的音乐…… -shitou: 更何况…这是我和我的朋友一起唱的！天哪…这也…太美好了…… -石头沉醉在这个想法中，许久才离开。 - -<> - -=== - - - - - -title: HE -position: 213,321 ---- -<> -<> -=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/FP_Shitou2_2.meta b/Assets/Resources/Yarn/FP_Shitou2_2.meta new file mode 100644 index 000000000..ad0af5d7c --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2da8465b80ed4c44bb23e9c337d4a1bc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/EventNode.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/EventNode.yarn new file mode 100644 index 000000000..805f6a0d3 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_2/EventNode.yarn @@ -0,0 +1,117 @@ +title: LungPlugIn +position: -1094,-98 +--- +<> +=== + + + + +title: HeartPlugIn +position: -816,-97 +--- +<> +=== + + + + +title: LiverPlugIn +position: -533,-97 +--- +<> +=== + + + + +title: StomachPlugIn +position: -267,-102 +--- +<> +=== + + + + +title: EmoPlugIn +tags: 待编辑 +colorID: 8 +position: -2,-3039 +--- +<> +=== + + + + +title: SpeakPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-2640 +--- +<> +=== +title: LogicPlugIn +tags: 待编辑 +colorID: 8 +position: 480,-3040 +--- +<> +=== + + + + +title: ColorPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-2840 +--- +<> +=== + + + + +title: MemoryPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-3040 +--- +<> +=== + + + + +title: UFPlugIn +tags: 待编辑 +colorID: 8 +position: 0,-2840 +--- +<> +=== + + + + +title: EyePlugIn +tags: 待编辑 +colorID: 8 +position: 480,-2840 +--- +<> +=== + + + + +title: EngineSuccess +position: -1092,115 +--- +<> + <> +<> +=== + diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage5_提出刻录.yarn.meta b/Assets/Resources/Yarn/FP_Shitou2_2/EventNode.yarn.meta similarity index 86% rename from Assets/Resources/Yarn/FP_Shitou2/Stage5_提出刻录.yarn.meta rename to Assets/Resources/Yarn/FP_Shitou2_2/EventNode.yarn.meta index 1f50638fc..f0ffa562d 100644 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage5_提出刻录.yarn.meta +++ b/Assets/Resources/Yarn/FP_Shitou2_2/EventNode.yarn.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 076f3e3c4eb53754bbd6adbbff3f3e6d +guid: 8c03cf1f1e29e4f40b51d192a094b95c ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarn new file mode 100644 index 000000000..414b44a3d --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarn @@ -0,0 +1,118 @@ +title: Start +tags: +colorID: 8 +position: 205,-53 +--- +<> +=== + + + + +title: VarsInit +tags: +colorID: 4 +position: 205,199 +--- +///在这里决定这次诊疗的目标是什么，以及目标判断相关的数值 + +//【流程相关】 +//gamestage:1-引入对话；2-检查；3-检查后对话；4-调速；5-调速后对话（冷却液） +<> +///【流程逻辑】 +//如果线索板都答对了，就自动触发这个为true，这是主目标 +<> +//冷却液处理完成次数。每次处理完成就往下推进一步 +<> + +//一次性对白标记，需要播时设为true，在检查点检查到true播放一次性对白，播放完设回false +<> + +//掉速次数 +<> +//是否知道可以换滤板 +<> +//是否知道可以换燃料 +<> +//是否知道可以调压力 +<> +//是否知道冷却液浑浊 +<> +//是否完成了引擎自检 +<> +//是否知道冷却液换过 +<> +//是否对冷却液换过却很脏提过疑惑 +<> + +//选择的透析剂 +<> + +<> +<> +<> +<> +<> +<> +<> + + +//【功能相关】 +//clueboard相关 +<> +<> + +//插线 +<> +<> +<> + +<> +=== + + + + +title: Center +description: 脚本跳转中心，GameStage在此处处理，理论上不在其他地方读取GameStage +position: 205,446 +colorID: 1 +--- +// 每次进入维修界面就自动保存 +<> + +//gamestage:1-引入对话；2-头部检查；3-头部检查后对话；4-刻录；5-结束对话；0-BE对话 +// 引入对话 +<> + <> +<> + +<> + <> +<> + +<> + <> +<> + +<> + <> +<> + +<> + <> +<> + +<> + <> +<> + +<> + <> +<> + +=== + + + + diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage6_刻录.yarn.meta b/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarn.meta similarity index 86% rename from Assets/Resources/Yarn/FP_Shitou2/Stage6_刻录.yarn.meta rename to Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarn.meta index 72e799760..efe116370 100644 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage6_刻录.yarn.meta +++ b/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarn.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e073b28ef995ee64e8fcccd67466ba7a +guid: b30dca0a7523c39459a2509c2dd3cfe9 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarnproject b/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarnproject new file mode 100644 index 000000000..016b7ab29 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarnproject @@ -0,0 +1,12 @@ +{ + "projectFileVersion": 2, + "sourceFiles": [ + "*.yarn" + ], + "excludeFiles": [ + "**/*~/*" + ], + "localisation": {}, + "baseLanguage": "zh-CHS", + "compilerOptions": {} +} \ No newline at end of file diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarnproject.meta b/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarnproject.meta new file mode 100644 index 000000000..e34d04bb4 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_2/FP_Shitou2_2.yarnproject.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: b254008a450f4c242b25311130c2592a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3} + useAddressableAssets: 0 + UseUnityLocalisationSystem: 0 + unityLocalisationStringTableCollection: {instanceID: 0} diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/Stage3_中间对话.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/Stage3_中间对话.yarn new file mode 100644 index 000000000..fe09ab8eb --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage3_中间对话.yarn @@ -0,0 +1,108 @@ +title: Stage3 +tags: +position: 210,-342 +--- +<> +=== + + +title: 被忘掉的烦恼 +position: 210,-129 +--- +<> +<> +<> +<> +<> +<> +<> +<> +shitou: 【尝试哼歌，卡住】 +<> +<> +shitou: 【尝试哼歌，卡住】 +<> +<> +me: 那是谁？那个…只剩半截的机体。 +shitou: 嘿嘿…那是我的歌友！也是我的同事~ +shitou: 自从他有一次跑货从桥上掉下去之后~就变得有点笨笨的，总是记不住歌词。 +shitou: 可惜…我自己也要记不住了…… +<> +shitou: 我不会…连他…也忘掉吧？ +me: 不会。但你不会再记得他的声音了。还有那些歌…… +me: 你只能记得你记得过这些声音，但不再能听到它们了。 +<> +<> +shitou: 医生…真的一点办法也没有了吗？一点也没有吗？ +me: 这种受损是不可逆的。而记忆模块又太复杂…… +me: 你记忆里的所有声音都会被慢慢忘掉…被最近听到的声音所取代。 +<> +<> +shitou: 这个感觉好奇怪…就像是，我的回忆还是回忆…但是里面只有喇叭和引擎声了？ +me: 差不多这个意思。除非你最近就在听音乐。只可惜……这些齿轮容不下别的声音了。 +<> +<> +shitou: 哈哈！ +<> +<> +shitou: 不管怎样~至少我还能跑，还能拉货！ +shitou: 看来我们都得向前看…对吧！ +shitou: 仔细想想，音乐其实也没有那么重要……只是我一直没有来得及拿掉罢了。 +shitou: 那么…就请你帮我~把这个记忆，也去掉吧！#auto_next +me: 等一下！ +me: 好像…还有一个办法。 +me: 虽然记忆模块我处理不了，但是…… +me: 唱片的原理…就是把胶盘上的划痕转化成歌声的震动…对吧？ +me: 我想我们也可以反过来，把歌声变刻录成划痕…在这些镍铬齿轮上。 + +//shitou: 我想我应该明白了。 +//shitou: 音乐…真的很神奇，不是吗？ +//shitou: 虽然我没有机会停下来，也没有机会记住更多的音乐…… +//shitou: 但是，如果我能每天都像第一次一样听到最喜欢的音乐…
那岂不是比能继续听音乐更好？ +//shitou: 只可惜… +//shitou: 医生，这块齿轮…还有可能复原吗？ +//me: …… +//me: 就算粘好，它也不可能承受住现在的转速了。 +//shitou: …… +//me: 倒是还有一个办法。 +//你提出了一个方案，这个方案虽然比不上原本的唱片，但是也足够好了。 +//你提出了一个可能性：仿照之前那张唱片，在原有的齿轮上重新刻录一次。 +<> +<> +shitou: 真的吗…也就是说…我还可以继续听到这首歌…像之前那样？ + +me: 不过这可能不如原来刻在塑胶层上的效果那么好，但应该也能听。 +me: 唯一麻烦的是…原来的声音已经遗失。只能凭记忆再唱一遍了…… +shitou: 啊…我来唱么？……
一直五音不全的我…没有唱片机的帮助……
能行么……？ +me: 事实上…唱歌跑不跑调，
和有没有唱片机、有没有记忆没有关系。
这只取决于你的语言模块。 +me: 而在我看来你的语言模块非常健康……
而且我一点也听不出，你到底哪里五音不全了。 +shitou: 真的吗？ +shitou: …… +shitou: 好~医生，你是医生~我相信你！ +shitou: 可是歌词…怎么办呢？医生，你还记得吗？ +me: 我…… +->记得 + me: 我想我听过一两遍，应该记得吧…… +->不记得 + me: 对不起，但记歌词确实是…有点难度。 +shitou: 没关系~医生！有音乐，总好过没有~ +shitou: 就算歌词错了，也完全就够咯！
我还是可以吹着风穿梭在园区的街道，哼着喜欢的歌…… +shitou: 什么也没变！反正我也不记得原来的内容啦~ +me: 这倒是…… +me: 好的…那么，最后确认下。
确认要这么做吗？尽管音质会比原来差很多…
还有可能忘词。 +shitou: 确认！医生，趁着我们都还记得，快开始吧~！ +me: 来吧。 + +<> + +=== + + + + +title: 进入阶段4 +position: 213,321 +--- +<> +<> +=== diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage7_结束对话.yarn.meta b/Assets/Resources/Yarn/FP_Shitou2_2/Stage3_中间对话.yarn.meta similarity index 86% rename from Assets/Resources/Yarn/FP_Shitou2/Stage7_结束对话.yarn.meta rename to Assets/Resources/Yarn/FP_Shitou2_2/Stage3_中间对话.yarn.meta index 9db6dac99..d6529fa89 100644 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage7_结束对话.yarn.meta +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage3_中间对话.yarn.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 519a2ee5f993d6043a0e29a2b4f02f30 +guid: 4d1d34102d162fd4986fc5ed48f13a51 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn new file mode 100644 index 000000000..3079dc38a --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn @@ -0,0 +1,488 @@ +title: Stage4 +group: 入口 +tags: +position: 378,-540 +--- + +<> + +<> + +<> +<> +<> + +<> +<> + +<> +<> + +=== + + + + + + + + +// 事件节点 + +title: 检查_肺 +tags: +group: 插入触发 +colorID: 8 +position: -161,-190 +--- +<> +<> +<> +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + me: 嗯…通气量非常大，看起来运动非常充足…
应该说有点过于频繁了。 + shitou: 没问题的~医生~我甚至可以边跑边唱嘞！ + <> + <> + me: 通气量非常大，看起来运动非常频繁。 + <> +->结束 +<> +=== + + + + +title: 检查_心 +tags: +group: 插入触发 +colorID: 8 +position: -158,-3 +--- +<> +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + me: 没有受损…太好了。 + <> + ->开始刻录 + <> + <> + ->开始刻录 + <> + <> +->开始刻录 + <> +->结束 +<> +=== + + + + +title: 检查_胃 +tags: +colorID: 8 +group: 插入触发 +position: -160,191 +--- +<> +<> +<> +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + me: 没有受损 + <> + <> + me: 没有受损 + <> +->结束 +<> +=== + + + + +title: 检查_肝 +tags: +colorID: 8 +group: 插入触发 +position: -158,370 +--- +<> +<> +<> +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + me: 循环模块看起来没什么问题。 + <> + <> + me: 循环模块没什么问题。 + <> +->结束 +<> +=== + + + + +title: 刻录 +position: 728,79 +--- + +<> +<> + +//？？如果玩家在这里拉绳，是不是就听到音乐了？ + +me: 如果我没有理解错这套东西的原理…
我应该可以把这个读取声音的探头，改造成一个刻出声音的钻头。 +shitou: 哇！医生，你太厉害了~什么都会！ +->改造钻头 + +你将探头小心地取下，换成一个坚硬的钻头。 +me: 然后…让我把它接在你的播放模块上。这样你唱的声音就会被传输到这里…… +shitou: 我好紧张，感觉~像演唱会一样！ +<> +<> +me: 好了…接下来，只需要唱出来，声音就会被这个齿轮记录下来。 +shitou: …… + +<> +<> + +=== + + + + +title: 刻录调速 +position: 728,79 +--- + +齿轮开始转动#auto_next +<> +me: …… +<> +<> +me: (小声)已经在录了… +<> +<> +me: 石头！已经在录了。 +shitou: 给我一些伴奏。 +me: 什么？哪来的伴奏…… +<> +<> +你用脚打起拍子。 +<> +<> +<> +shitou: 听众朋友们，晚上好！
.这里是石头！ +me: (还整这出……) +shitou: 还有医生—— +<> +<> +me: 啊…杰克。 +shitou: 为大家献上…不知名…音乐家的歌曲——
《自由的小锡鸟》！ + +<> +【~音乐~】#auto_next +<> + +<> +<> + +shitou: (医生！第一句是啥？) + +<> +<> + +-> 自由的小机体，在大大的城市里 +<> +<> +shitou: ~自.由..的小.机体~..~在大.大..的城.市里~.. +<> +<> +-> 跑呀，跑呀，再多烦恼，统统忘掉 + <> +<> + shitou: ~跑呀..跑呀~..~再多.烦恼..统统.忘掉~.. + me: 很好…… + shitou: 医生~这是真的！只要跑起来…烦恼就追不上我~ +-> 唱呀，唱呀，再多烦恼，统统忘掉 + <> + <> + <> + shitou: ~唱呀..唱呀~..~再多.烦恼..统统.忘掉~.. + me: 很好…… + shitou: 医生~这是真的！只要有音乐…再多烦恼也不怕~ +-> 工作，工作，再多烦恼，统统忘掉 + <> + <> + <> + shitou: ~工作..工作~..~再多.烦恼..统统.忘掉~.. + me: 很好…… + shitou: 医生~这是真的！只要工作起来~烦恼就会变少！ + +<> +<> + +【~音乐~】#auto_next +<> + +shitou: 然后呢？医生！ + +<> +<> + +-> 小鸟，小鸟，越飞越高 +<> +<> +shitou: ~小.鸟..小.鸟~..~越.飞..越.高~.. +<> +<> +-> 飞跃水泥的森林，银灰色的树梢 + <> + <> + shitou: ~飞跃水泥.的森.林~..~银灰色..的树.梢~.. + shitou: 太厉害了~医生！你竟然全记下来了！ + <> + <> + shitou: 这首歌比我以为我记得的…还要积极呢！ +-> 钻进水泥的森林，霓虹灯的树梢 + <> + <> + <> + shitou: ~钻进水泥.的森.林~..~霓虹灯..的树.梢~.. + shitou: 太厉害了~医生！你竟然全记下来了！ + <> + <> + shitou: 这个城市真的太大了~还有好多我没去过的有意思的地方呢！ +-> 飞不出水泥的森林，黑色的树梢 + <> + <> + <> + shitou: ~逃不出.水泥.的森.林~..~黑色的..树.梢~.. + shitou: 太厉害了~医生！你竟然全记下来了！ + <> + <> + shitou: 这个城市真的太大了~不知道它的尽头到底在哪里？ + +<> +<> + +【~音乐~】#auto_next +<> + +<> +<> + +-> 小机体追呀追，可惜他不会飞 +<> +<> +shitou: ~小.机体..呀.追.呀追~..~可惜他..不.会飞~.. +<> +<> +-> 长长的大道，十字路口，小鸟一去不回头 + <> + <> + <> + shitou: ~长长.的大.道..十字.路口~..小.鸟.一去.不.回.头~.. + <> + <> + shitou: 这歌和我想的一样！我也想~要是我会飞就好了！ + shitou: 我就可以直接飞到目的地~再也不怕撞到任何东西了！ +-> 高高的天空，长长的街，小鸟何时会回来 + <> + <> + shitou: ~高高.的天.空..长长.的街~..小.鸟.何时.会.回.来?.. + <> + <> + shitou: 这歌和我想的一样！我也想~要是我会飞就好了！ + shitou: 我要跟着去看看，这些鸟儿冬天都去哪里了？听说那边很暖和，那里的树一整年都是绿的！ +-> 红黄的灯流，不停歇，小鸟，小鸟迷了眼 + <> + <> + <> + shitou: ~红黄.的灯.流..不.停歇~..小鸟.小鸟..不.回.头~.. + <> + <> + shitou: 这歌和我想的一样！我也想~要是我会飞就好了！ + shitou: 我要从天上看一看~这个一直我一直工作的城市，到底长啥样！ + +<> +<> + +【~音乐~】#auto_next +<> + +<> +<> + +shitou: 医生~快！ +<> +<> +me: 最后一句…我好像从来没听过完整的啊…… +<> +<> +shitou: 要唱了，医生！ +<> +<> +->春天不会再回来，但我一定会回来看你 + shitou: ~春天..不.会再.回来~..~但.我一.定会.回来..看.你~.. +->春天春天快回来，我怕我会忘记你 + shitou: ~春天.春天..快回.来~..~我.怕我..会忘.记.你~.. +->春天一定会回来，我会在这等着你 + shitou: ~春天.一..定会.回来~..~我.会在..这等.着.你~.. + +<> +<> + +//你拉动拉绳，转速逐渐提高，引擎的声音和石头的拍子逐渐重合。 +//你松开绳子，石头开始唱起歌来。 +//shitou: He says Son can you play me a memory?
（他说，小伙子，你能为我弹一段回忆吗?） +//shitou: I'm not really sure how it goes.
（它的旋律，我已然忘记） +//歌声和引擎的声音保持在同一个节奏上，让它成为了天然的节拍器。 +//shitou: 呼…现在加速！ +//石头打起了新的拍子。 +//->拉绳 +//你拉动拉绳，转速逐渐提高，引擎的声音和石头的拍子逐渐重合。 +//你松开绳子，石头接着唱。 +//shitou: 医生，到你了！ +//你接着石头的部分往后唱，唱得其实还不错。 +//me: But it's sad and it's sweet and I knew it complete
（这首歌忧伤而甜蜜，我记得每一句歌词…） +//me When I wore a younger man's clothes.
（…在我更年轻一些的时候） +//shitou: 太好啦！医生，你唱的真好！ +//shitou: 如果你不是在这个诊所里，一定会成为一个大明星的！ +//shitou: 下一段！ +//你记得下一段并没有加速。但你可以这么做。或者… +//me: 我有一种感觉…接下来这段把拍子降下来也会不错。 +//似乎不需要用“选择速度”来代表要做出的选择……用对话似乎更好 +//->遵循原曲，保持原速 +// me: 不，这里不是这样的。 +// 你把速度小心保持在原位，然后继续唱。你仔细地回忆着昨天的旋律。 +// shitou: 太好了，太美了！ +// me: 我有点不太记得了！ +// shitou: 没关系，医生！你是我听过唱得最好的！
往后的每一天，都会是唱得最好的！ +//->按照石头的想法加速 +// 你拉动拉绳，转速逐渐提高，引擎的声音和石头的拍子逐渐重合。 +// 你松开绳子，继续唱。由于它变得太快，旋律变得有些狂野。 +// shitou: 太好了，太美了！ +// me: 太快了，我有点跟不上！ +// shitou: 没关系，医生！你是我听过唱得最好的！
往后的每一天，都会是唱得最好的！ +//->加入个人风格，减速 +// me: 不，听听这个！ +// 你打起了一个新的拍子，并松开绳子让速度向下掉，直到和你的拍子重合。 +// 你继续唱了起来。 +// shitou: 太好了，太美了！ +// me: 你会喜欢这个的！ +// shitou: 我会喜欢这个的！往后的每一天！ +//me: Sing us a song, you're the piano man
(为我们唱一曲吧，钢琴师) +//me: Sing us a song tonight
(唱一曲吧,就在今晚) +//me: Well we're all in the mood for a melody
(没有什么比一首歌更适合现在) +//me: And you've got us feelin' alright
(没有什么更能彼此慰藉) +//<> +//<> + +<> +<> +<> + +歌曲结束了 + +<> + me: 呼…我从来没有尝试过这个……但总之，能用了。 + shitou: 天哪，医生！这简直就是原曲！ +<> + me: 呼…我即兴发挥了下……但总之，能用了。 + shitou:太棒啦！医生！这简直比原曲还好。 +<> +me: 你又没有听过原曲。 +shitou: 这一定比原曲还要好！毕竟这是我和医生共同演奏和演唱的…天哪！ +me: 哈哈。别取笑我了。 +me: 结束了，让我们出去听听吧。 + +<> +<> + +=== + + + + + +title: 进入阶段5 +position: 213,321 +--- + +<> +<> + +=== + diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage4_头部检查.yarn.meta b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn.meta similarity index 86% rename from Assets/Resources/Yarn/FP_Shitou2/Stage4_头部检查.yarn.meta rename to Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn.meta index 0b399abe0..fa2d6026e 100644 --- a/Assets/Resources/Yarn/FP_Shitou2/Stage4_头部检查.yarn.meta +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 26f620725196cf04f90724680d448eeb +guid: a876d48d07c887b4cbb147d702e086fc ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/Stage5_结束对话.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/Stage5_结束对话.yarn new file mode 100644 index 000000000..ddd218fc5 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage5_结束对话.yarn @@ -0,0 +1,138 @@ +title: Stage5 +tags: +position: 210,-342 +--- +<> +=== + + + + +title: 结束对话 +position: 210,-129 +--- +<> +<> +<> +<> + +<> +<> + +shitou: 嗯~仔细听~我好喜欢啊！不愧是我最爱的歌！ +shitou: 医生~它的最后一句…真的很特别喔！ +me: 啊…对不起。其实是我瞎编的…
…我好像根本没听你唱到过这里。 +<> +<> +shitou: 听起来~后面确实有点忧伤的味道~！怪不得我平常也不爱往后面唱~哈哈！ +<> +<> +me: 你不喜欢忧伤吗？ +shitou: 也不是不喜欢~就是…… +<> +<> +shitou: 我也不记得了。 +me: 不记得？ +shitou: 我好像记得一种忧伤的感觉~在我听到这首歌的时候…… +shitou: 但我只是记得~现在再听，已经没有这种感觉啦~ +me: …… +me: 情绪模块我记得是正常的…应该不会出什么问题才对。 +me: 或许是你忘记的那些歌？ +shitou: 哈哈，医生~我们永远不会知道啦！ +shitou: 我感觉！我现在~才是真正的~石头！啦！ +shitou: 谢谢你~医生！让我真正地~找到了自己！ +me: …… +me: 我只是按照指令把所有来这儿的机体修好。 +shitou: 我们都是按照指令工作的机体~但医生！你的这次工作~已经变成我永远的回忆啦！ +<> +<> +shitou: 好啦！我也要回去送货咯~ +shitou: 我会好好珍惜~你给我的音乐~再见啦！！医生~ + +<> +<> +<> + +me: 再见… + +<> +<> +<> + +me: 你怎么又回来了？ + +<> + +shitou: 忘了说~谢谢你啦！亲爱的医生朋友~ +<> +shitou: ~春天.会.回来~..~我会.回来.看你~.. + +<> +<> + +<> +<> + +me: 跑呀.~跑呀..~再多.烦恼..统统.忘掉..~ + +<> +<> + + + +//shitou: 医生……趁着我还记得，我要很认真地和你说一件事情。 +//me: 怎么了？ +//shitou: 你应该考虑一下，改行成为一个歌手！ +//me: 哈哈。谢谢你的建议！ +//me: …… +//me: 但是……
抱有这种想法只会让你的“原型”给你带来更多痛苦。 +//me: 我有点明白你为什么那么做了。 +//shitou: 怎么做？ +//me: 那些“低能耗模式”…并不代表你一定要削减记忆力。你可以选择去掉一些信息的记忆能力，或者其他的功能…… +//me: 你选择了去掉短期记忆，选择了更少的回忆。 +//shitou: 是我自己做的吗？哈哈！我不太记得了~ +//me: 我想是的。 +//me: 这样你就会忘记你的过去，让你的“原型”带来的影响变得更小。 +//me: 你可以享受更纯粹的现在……享受音乐…… +//shitou: 听起来…确实是我会做的事情！ +//<> +//<> +//他忽然提起了自己的“原型”。这是他距离自己的过去最近的一次…… +//尽管他的记忆已经不能读取了。但他似乎还是“看见”了一些东西。 +//他看见他在接吻，在草原上奔跑…在下着雨的夏天的窗台边打瞌睡…… +//shitou: 我…是谁？ +//他忽然问，像是已经不记得了自己在哪里。 +//->石头 +// me: 你是石头。幸福集团罐装物料生产区货务部货运机体，一个爱唱歌的，热爱…生活的机体。 +// me: 这么说也不太准确…我很难形容你…… +// me: 你能听到自己脑袋里面那个声音吗？你就是它，它就是石头。 +//->货运机体 +// me: 不管怎样…你是一个货运机体。尽管你是一个特殊的货运机体。 +// me: 这个机体产生了一些奇怪的想法，它想要知道装载着自己的这个身体内部是什么东西…… +// me: 里面只有电流罢了。你和我都一样。我们都只是一些机器。 +//->音乐家 +// me: 我想不管受到怎样的影响…反正你明天都会忘掉。所以…管他呢。 +// me: 你是一个音乐家。或者说，一个艺术家……如果一个人类艺术家能够看到我们现在的未来，他会希望成为你。 +//->一个人类 +// me: 我想不管受到怎样的影响…反正你明天都会忘掉。所以…管他呢。 +// me: 你是一个幸运的人类，只不过现在住在一个金属的身体里。 +//石头沉默了许久，理解着你说的话。 +//shitou: 我觉得你说的没错！管他呢，我想这一点都不重要。 +//shitou: 只要能继续过这样的日子，每天都能第一次听到最爱的音乐…… +//shitou: 更何况…这是我和我的朋友一起唱的！天哪…这也…太美好了…… +//石头沉醉在这个想法中，许久才离开。 + +<> + +=== + + + + + +title: HE +position: 213,321 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/Stage5_结束对话.yarn.meta b/Assets/Resources/Yarn/FP_Shitou2_2/Stage5_结束对话.yarn.meta new file mode 100644 index 000000000..25eb0b905 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage5_结束对话.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ae4097465cef1ee4f927cca23df38097 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/FP_Shitou2_head.meta b/Assets/Resources/Yarn/FP_Shitou2_head.meta new file mode 100644 index 000000000..35736c94d --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_head.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f1227e6ba97ca54459633fe0a8545e02 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/EventNode.yarn b/Assets/Resources/Yarn/FP_Shitou2_head/EventNode.yarn new file mode 100644 index 000000000..d93e244ec --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_head/EventNode.yarn @@ -0,0 +1,129 @@ +title: LungPlugIn +position: -1094,-98 +--- +<> + <> +<> + <> +<> +=== + + + + +title: HeartPlugIn +position: -816,-97 +--- +<> +=== + + + + +title: LiverPlugIn +position: -533,-97 +--- +<> + <> +<> + <> +<> +=== + + + + +title: StomachPlugIn +position: -267,-102 +--- z +<> + <> +<> + <> +<> +=== + + + + +title: EmoPlugIn +tags: 待编辑 +colorID: 8 +position: -2,-3039 +--- +<> +=== + + + + +title: SpeakPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-2640 +--- +<> +=== +title: LogicPlugIn +tags: 待编辑 +colorID: 8 +position: 480,-3040 +--- +<> +=== + + + + +title: ColorPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-2840 +--- +<> +=== + + + + +title: MemoryPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-3040 +--- +<> +=== + + + + +title: UFPlugIn +tags: 待编辑 +colorID: 8 +position: 0,-2840 +--- +<> +=== + + + + +title: EyePlugIn +tags: 待编辑 +colorID: 8 +position: 480,-2840 +--- +<> +=== + + + + +title: EngineSuccess +position: -1092,115 +--- +<> + <> +<> +=== + diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/EventNode.yarn.meta b/Assets/Resources/Yarn/FP_Shitou2_head/EventNode.yarn.meta new file mode 100644 index 000000000..8ca659c38 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_head/EventNode.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7cc382aa15e3a224c8f6e2e17c1c7d60 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarn b/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarn new file mode 100644 index 000000000..1361cf7d2 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarn @@ -0,0 +1,118 @@ +title: Start +tags: +colorID: 8 +position: 205,-53 +--- +<> +=== + + + + +title: VarsInit +tags: +colorID: 4 +position: 205,199 +--- +///在这里决定这次诊疗的目标是什么，以及目标判断相关的数值 + +//【流程相关】 +//gamestage:1-引入对话；2-检查；3-检查后对话；4-调速；5-调速后对话（冷却液） +<> +///【流程逻辑】 +//如果线索板都答对了，就自动触发这个为true，这是主目标 +<> +//冷却液处理完成次数。每次处理完成就往下推进一步 +<> + +//一次性对白标记，需要播时设为true，在检查点检查到true播放一次性对白，播放完设回false +<> + +//掉速次数 +<> +//是否知道可以换滤板 +<> +//是否知道可以换燃料 +<> +//是否知道可以调压力 +<> +//是否知道冷却液浑浊 +<> +//是否完成了引擎自检 +<> +//是否知道冷却液换过 +<> +//是否对冷却液换过却很脏提过疑惑 +<> + +//选择的透析剂 +<> + +<> +<> +<> +<> +<> +<> +<> + + +//【功能相关】 +//clueboard相关 +<> +<> + +//插线 +<> +<> +<> + +<> +=== + + + + +title: Center +description: 脚本跳转中心，GameStage在此处处理，理论上不在其他地方读取GameStage +position: 205,446 +colorID: 1 +--- +// 每次进入维修界面就自动保存 +<> + +//gamestage:1-引入对话；2-头部检查；3-头部检查后对话；4-刻录；5-结束对话；0-BE对话 +// 引入对话 +<> + <> +<> + +<> + <> +<> + +<> + <> +<> + +<> + <> +<> + +<> + <> +<> + +<> + <> +<> + +<> + <> +<> + +=== + + + + diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarn.meta b/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarn.meta new file mode 100644 index 000000000..bcc904d0d --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 70434527bc1e003458a73d41873fbce1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarnproject b/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarnproject new file mode 100644 index 000000000..016b7ab29 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarnproject @@ -0,0 +1,12 @@ +{ + "projectFileVersion": 2, + "sourceFiles": [ + "*.yarn" + ], + "excludeFiles": [ + "**/*~/*" + ], + "localisation": {}, + "baseLanguage": "zh-CHS", + "compilerOptions": {} +} \ No newline at end of file diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarnproject.meta b/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarnproject.meta new file mode 100644 index 000000000..f170147f5 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_head/FP_Shitou2_head.yarnproject.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: b7787a998da53b74c854f2e09dccec52 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3} + useAddressableAssets: 0 + UseUnityLocalisationSystem: 0 + unityLocalisationStringTableCollection: {instanceID: 0} diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn new file mode 100644 index 000000000..7d494f861 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn @@ -0,0 +1,434 @@ +title: Stage2 +tags: +position: 210,-342 +--- +<> +<> +<> +<> +<> +=== + + + + +title: 检查初始化_头部 +position: 380,-239 +--- + +<> + +me: 你是怎么撞的？ +shitou: 不是我撞它啦~是它撞的我…… +shitou: 它逆行过来~我来不及刹住嘛。 +shitou: 谁知道它连喇叭都不按喔！
不过也可能是我唱歌太大声了~没听到~ +shitou: 它反应好快，轻轻一歪就绕开了~
我就惨咯！没控制住姿态，直接飞起来啦！ +me: …… + +<> +<> +<> +<> + +<> +<> + +me: 来吧。检查一下所有头部模块…
确认各模块的受损情况。 +【注：此为占位，石头头部无UF模块和色觉】 + +<> +<> + +<> +<> +<> +<> +<> + +me: 检测到了72分钟前的撞击事件…
…已经过去一段时间了，希望没造成永久性的影响。 + +<> +=== + + + + +title: 主维修界面_头部 +position: 384,81 +--- + +// 未全部插入就进入等待插入事件状态 +<> +<> +<> + +<> + me:都检查完了，看起来偏偏是记忆受到了损害。
万幸的是其他部分似乎都没事…… + <> +<> + +=== + + + + + +title: 检查UF +tags: 待删除 +colorID: 8 +group:插线检查 +position: -449,-3574 +--- +【待删除，石头无此模块】 +<> +=== + + + + +title: 检查色觉 +tags: 待删除 +colorID: 8 +group:插线检查 +position: 195,-3043 +--- +【待删除，石头无此模块】 +<> +=== + + + + +title: 检查情绪 +tags: +colorID: 8 +group:插线检查 +position: -47,-3242 +--- +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + me: 还好…看起来没有受到很严重的伤害。 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + me: 恐惧的情绪正占主导…
…但似乎不是由于撞击导致的。 +->结束 +<> +=== + + + + +title: 检查语言 +tags: +colorID: 8 +group:插线检查 +position: 194,-2880 +--- +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + shitou: 自由的小机体~……在…大大的…烦恼…里？
好像错了…… + <> + me: 虽然唱起歌来结结巴巴的…但语言模块本身是正常的。 +->结束 +<> +=== + + + + +title: 检查逻辑 +tags: +colorID: 8 +group:插线检查 +position: 428,-3246 +--- +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + me: 逻辑模块受到影响了么…… + <> + <> + <> + <> + <> + <> + <> + shitou: 啊！忽然想起~我还有货没送…… + me: 还好……只是经历了一段时间的宕机，但是现在恢复了。 + <> + me: 逻辑模块经历了一段时间的宕机，但是现在恢复了。 +->结束 +<> +=== + + + + +title: 检查记忆 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 195,-3243 +--- +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + shitou: 医生！我好像忘了…大大的城市…前面是什么？ + me: 嗯…嗯？ + shitou: 啊……医生！怎么前面得我也不记得了……怎么回事！ + me: 坏了，怎么越忘越多了？… + me: 记忆模块好像受到了严重的损坏。 + <> + <> + me: 你的记忆音频分区受到了很严重的损坏…
只剩下原来的10%可用了。 + me: 所以记忆模块为了能写入新的记忆音频数据，
就得覆盖掉旧的记忆数据…… + shitou: 覆盖记忆数据…是什么意思？医生…… + <> + <> + me: 这个正在被覆盖数据的记忆应该可以被读取…
…看到你应该就明白了。 + <> + <> + <> + <> + <> + <> + <> + ->放入收藏夹 + <> + <> + <> + me: 好…让我们来看看吧。 + <> + <> + me: 碰撞导致石头的视觉有重影，但过段时间就会恢复。 + <> + <> + ->深入 + <> + <> + +->结束 +<> +=== + + + +title: 检查视觉 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 435,-3043 +--- +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + me: 眼睛有觉得不舒服吗？ + <> + shitou: 我感觉撞了一下之后，看到的红绿灯好像变多了~ + <> + shitou: 我来的路上，好像看到的红绿灯好像变多了。 + <> + me: 那是重影，一段时间就会好的。 + <> + me: 碰撞导致视觉有重影，但过段时间就会恢复。 + <> +->结束 +<> +=== + + + +title: 记忆深入 +position: 48,-156 +--- +<> +<> + me: 把打孔带放进插槽里，读取记忆吧。 +<> +=== + + + + + +title: 天空 +position: 80,48 +--- + +石头和一个受损的机体坐在一个小棚屋的门口，阳光穿过门口垂挂的许多盆小植物，洒在老旧开裂的木制家具上，破旧但整洁舒适。屋外望出去，是一座高高的垃圾山的阴影。 +<> +【风铃声】 +???: 自由的小机体~在大̻̄͂大̹̅的城市里̛͙~ +???: 跑͈͂呀̛͖̬̊~跑呀~再多烦恼~统统忘̡̋͐掉̦̈~͈̜̈ +<> +<> +【风铃͇̏声，汽车鸣笛声】 +???: 石头！ +shitou: 嗯？我在呢。 +???: 这个排异抑制药，我要吃到什͇̄̕么̱͊时̬̙̽候͍̹͝呀？ +shitou: 等公͔̏司͇͔̋́把̱̯̑工̦͐ͅ伤̳̰̒̚批̢̘̄下̯̎̆来̡̩̇，就可以啦。 +【风铃͇̏声͈̞̀̄，汽车鸣笛声，广告声】 +<> +<> +???: 小鸟~小̠̊鸟͇̅͌~̙̈̊越̪̄̏飞̨̩̓̂~越高~ +???: 飞跃水̙̫̀̓泥̙̈的̣̀森̟͋林~银灰色͎͌͜的̢̛͚̿~̡̳̂树͍͋͑͜梢~ +<> +<> +提示音: *叮!*
您有一条幸福订单即将超时，请及时处理~ +<> +<> +???: 石头！ +shitou: 没关系~我͚̱͛一͈̤͊会̯̟̂跑快点就好了~ +???: 石̯̍头͈͋̒，͈̾我͕͞说͎͆̕…你明天别来了。
我̭͛知̖̑道̬̄̑…̡͓̾这͔̔ͅ个̳͓̂͒抑制药很贵的，要花好多积分！ +<> +<> +shitou: 说啥呢。我不来，谁陪我听歌呀！ +【风̘̥̑͠铃͇̏声͈̞̀̄，汽车鸣笛声，广告声，引擎声】 +<> +<> +???: 小机体呀~追呀̳̫̀追̪̿~̡̕只͔͊̒可惜他~不会飞~ +???: 高高的̈́̌͜͜天͓̻̂空̟̹̏͛~̰͚̑长̦̓͌长͆̚͜的街~小鸟何̖͚̎̋时͓̥̐͐~̨̡̔̾会̬̫̕回来~ +<> +<> +提示音: *叮!*
您有一条幸福订单即将超时，请及时处理~ +提示音: *叮!*
幸福小助手提示~道路情况复杂，请勿疲劳驾驶~ +<> +<> +【风̘̥̑͠声͈̞̀̄，汽车鸣笛声，广告声，巨大的引擎声】 +<> +<> +???: 小̧̠̃͞机͓́体͎̃~别͍̳͂着̡̈́急͓̔͊~̭̲̄͋春͓̂ͅ天̧̬̐……我就̳̃͠会̜͇̐... +???: 春̠̔͘天̭͈́…̣̿̉我̤̙̎就͈͑̃会̮̣̉̈́... +<> +<> +???: 石̮̠̈́͞头̮͍̂͌！̹̦̍̃ +???: 我忘了！͚͔̏后̨͆边̙̗̈́…̻͙̽̀怎͕̘̆么̮͔̉唱̯̠̃͐来͚͛̕着͓̄̾？͚͋ +shitou: 春̨̼̑�̥̅́ͅ묈̪̏갚鴉싧썮�계퓳�뚳 ̥́펽̞͌̒瓦̹́̔숅̢̊뇤̢̖̈�̮̩̓̉됬풆訝썹쉪鸚㎩램̰̳̎�̰̬̆귨̰͔͠펽̟̲͗̿瓦̠̃섉̹͇͂̎쐣̨̥̐�͕͑덅̤̂퓵�꾣̢́̐뼭̉͜�̯͈͛̍뷴̨̈́솳̜̋ #auto_next +警告: 无法读取的记忆音频数据！ +【汽车鸣笛声】#auto_next +提示音: *叮!*
您有一条幸福订单即将超时，请及时处理~#auto_next +【巨大的引擎声】#auto_next +提示音: *叮!*
幸福小助手提醒您~道路情况复杂，请勿疲劳驾驶~*叮!*#auto_next +【广告声】#auto_next +提示音: *叮!*
幸福一下，马上出发！*叮!*现在换食幸福牌七合一罐头~可享员工九折优惠~！*叮!*#auto_next +【记忆中断】 +<> +<> +shitou: 春天…我会... +me: 音频数据已经被完全覆盖了…… +<> +<> + +//音频相关记忆受损了，可用的分区变得很小，新的音频记忆会很快覆盖掉旧的音频记忆 +<> +<> + +=== + + + + +title: toStage3 +position: 213,321 +--- +<> +<> +<> +=== diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn.meta b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn.meta new file mode 100644 index 000000000..7061b8838 --- /dev/null +++ b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fe0bce32b122d1145ac4074a514977f4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn b/Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn index 03c1e704a..aaa6bdd44 100644 --- a/Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn +++ b/Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn @@ -117,7 +117,7 @@ position: 239,-1813 <> ->需求C //////图片上是一个阴暗的旧房间，但画面上有很多个电视机屏幕 -<> +<> <> <> <> diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 8b8f71cee..028178b66 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -8109,8 +8109,8 @@ MonoBehaviour: - {fileID: 11400000, guid: ada4bdc2db5594e4f860c90b3a4b9da8, type: 2} - {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2} - {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} - runMode: 2 - firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} + runMode: 0 + firstTalkSo: {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2} testTalkSo: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} saveFileName: "PeipeiDay3_\u770B\u753B" --- !u!4 &719228339 From 8640e9b905822e3e3ca6e659405da4b3423d9f16 Mon Sep 17 00:00:00 2001 From: Yuntien <37355031+Yuntien@users.noreply.github.com> Date: Fri, 24 Jan 2025 11:05:51 +0800 Subject: [PATCH 5/5] Update CursorManager.cs --- Assets/Scripts/UI/Cursor/CursorManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/UI/Cursor/CursorManager.cs b/Assets/Scripts/UI/Cursor/CursorManager.cs index ab095737d..e04084fd3 100644 --- a/Assets/Scripts/UI/Cursor/CursorManager.cs +++ b/Assets/Scripts/UI/Cursor/CursorManager.cs @@ -107,7 +107,7 @@ namespace AibisDream { if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space)) { - if (_isTalking && !isInMenu) + if (!isInMenu) { DialogController.Instance.JumpLine(); }