diff --git a/Assets/NewScreenTest.unity b/Assets/NewScreenTest.unity new file mode 100644 index 000000000..f681f4fe0 --- /dev/null +++ b/Assets/NewScreenTest.unity @@ -0,0 +1,438 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &516881017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 516881021} + - component: {fileID: 516881020} + - component: {fileID: 516881019} + - component: {fileID: 516881018} + m_Layer: 5 + m_Name: Screen Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &516881018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516881017} + 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 &516881019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516881017} + 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 &516881020 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516881017} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 1118544095} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 1 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &516881021 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516881017} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 960, y: 540} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &520191458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 520191461} + - component: {fileID: 520191460} + - component: {fileID: 520191459} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &520191459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520191458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &520191460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520191458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &520191461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520191458} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1118544093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1118544096} + - component: {fileID: 1118544095} + - component: {fileID: 1118544094} + - component: {fileID: 1118544097} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1118544094 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118544093} + m_Enabled: 1 +--- !u!20 &1118544095 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118544093} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1118544096 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118544093} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + 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!114 &1118544097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118544093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1118544096} + - {fileID: 516881021} + - {fileID: 520191461} diff --git a/Assets/NewScreenTest.unity.meta b/Assets/NewScreenTest.unity.meta new file mode 100644 index 000000000..757b6d324 --- /dev/null +++ b/Assets/NewScreenTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 21b363830c54467459415a8f001d30a4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Art/维修界面UI.psd b/Assets/RawResources/Art/维修界面UI.psd new file mode 100644 index 000000000..446376b97 --- /dev/null +++ b/Assets/RawResources/Art/维修界面UI.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e0418035da775d71b8ad03bca96d9e9aeddcc13b3d222acb4ca12e913868fd0 +size 7915850 diff --git a/Assets/RawResources/Art/维修界面UI.psd.meta b/Assets/RawResources/Art/维修界面UI.psd.meta new file mode 100644 index 000000000..2fd8b70c8 --- /dev/null +++ b/Assets/RawResources/Art/维修界面UI.psd.meta @@ -0,0 +1,453 @@ +fileFormatVersion: 2 +guid: dc5b3bd78140ade4c8350f61e6b6b4e0 +importerOverride: + nativeImporterType: 2089858483 + scriptedImporterType: + serializedVersion: 2 + Hash: b10b55a1aa6a1aa32521bc0cab59632e +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: 215 + 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\u50CF\u5C4F\u5E55" + 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: 5022 + width: 1004 + height: 930 + spriteID: ce2217142cd572e4bab9a2187f094ed3 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 5022} + spritePosition: {x: 2569, y: 988} + - name: "\u56FE\u50CF\u9762\u677F" + 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: 2172 + width: 1539 + height: 1417 + spriteID: 4063b4528a43d694aa07546adfef049d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 2172} + spritePosition: {x: 2301, y: 743} + - name: "\u8F74\u627F\u5916\u58F3" + 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: 6898 + width: 531 + height: 635 + spriteID: 2b79b23e22bec4e43bc5bb20cff130f2 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 6898} + spritePosition: {x: 2096, y: 531} + - name: "\u8F74" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1016 + y: 5022 + width: 396 + height: 397 + spriteID: 58d37c257f17ef0468d4723d46e07ab9 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1016, y: 5022} + spritePosition: {x: 2161, y: 611} + - name: "\u6587\u5B57\u5C4F\u5E55 " + 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: 5960 + width: 1004 + height: 930 + spriteID: f1f6b7aa86735064babc8ffbc63c6a52 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 5960} + spritePosition: {x: 1030, y: 988} + - name: "\u6587\u5B57\u9762\u677F" + 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: 3597 + width: 1539 + height: 1417 + spriteID: 794f4c3d9e6226244866d694f3e9e472 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 3597} + spritePosition: {x: 762, y: 743} + - name: "\u5E95\u677F" + 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: 3840 + height: 2160 + spriteID: 9e1fa80d0772d09498bfe5a3d0894080 + 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: 0 + importHiddenLayers: 0 + layerMappingOption: 2 + generatePhysicsShape: 0 + paperDollMode: 0 + keepDupilcateSpriteName: 1 + skeletonAssetReferenceID: + padding: 4 + spriteSizeExpand: 0 + spriteCategoryList: + categories: [] + spritePackingTag: + resliceFromLayer: 1 + mosaicPSDLayers: [] + rigPSDLayers: + - name: "\u56FA\u5B9A\u5C4F\u5E55" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 5518190fe98f1264eac3d47edf9745cf + layerID: 21 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u56FE\u50CF\u5C4F\u5E55" + spriteName: "\u56FE\u50CF\u5C4F\u5E55" + isGroup: 0 + parentIndex: 0 + spriteID: ce2217142cd572e4bab9a2187f094ed3 + layerID: 10 + mosaicPosition: {x: 4, y: 5022} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u56FE\u50CF\u9762\u677F" + spriteName: "\u56FE\u50CF\u9762\u677F" + isGroup: 0 + parentIndex: 0 + spriteID: 4063b4528a43d694aa07546adfef049d + layerID: 9 + mosaicPosition: {x: 4, y: 2172} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8F74" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 0c041d008d3122c47854be6dc8abf5d2 + layerID: 8 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u8F74\u627F\u5916\u58F3" + spriteName: "\u8F74\u627F\u5916\u58F3" + isGroup: 0 + parentIndex: 3 + spriteID: 2b79b23e22bec4e43bc5bb20cff130f2 + layerID: 6 + mosaicPosition: {x: 4, y: 6898} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8F74" + spriteName: "\u8F74" + isGroup: 0 + parentIndex: 3 + spriteID: 58d37c257f17ef0468d4723d46e07ab9 + layerID: 5 + mosaicPosition: {x: 1016, y: 5022} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u65CB\u8F6C\u5C4F\u5E55" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 4bbf1d07209327648a1e53788cdae7d6 + layerID: 23 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u6587\u5B57\u5C4F\u5E55 " + spriteName: "\u6587\u5B57\u5C4F\u5E55 " + isGroup: 0 + parentIndex: 6 + spriteID: f1f6b7aa86735064babc8ffbc63c6a52 + layerID: 19 + mosaicPosition: {x: 4, y: 5960} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6587\u5B57\u9762\u677F" + spriteName: "\u6587\u5B57\u9762\u677F" + isGroup: 0 + parentIndex: 6 + spriteID: 794f4c3d9e6226244866d694f3e9e472 + layerID: 14 + mosaicPosition: {x: 4, y: 3597} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u5E95\u677F" + spriteName: "\u5E95\u677F" + isGroup: 0 + parentIndex: -1 + spriteID: 9e1fa80d0772d09498bfe5a3d0894080 + layerID: 4 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + sharedRigPSDLayers: [] + pSDLayerImportSetting: [] + importFileNodeState: 1 + platformSettingsDirtyTick: 0 + spriteSizeExpandChanged: 0 + generateGOHierarchy: 1 + textureAssetName: + prefabAssetName: + spriteLibAssetName: + skeletonAssetName: + secondarySpriteTextures: [] diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 9567890c3..789a77197 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -1053,18 +1053,15 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 0.004854369 - - 0.021177985 - - 0.06010355 - - 0.106563106 - - 0.14548868 - - 0.1618123 - - 0.1618123 - - 0.14548868 - - 0.106563106 - - 0.06010355 - - 0.021177985 - - 0.004854369 + - 0.007228916 + - 0.043749984 + - 0.12409639 + - 0.20444278 + - 0.24096388 + - 0.20444278 + - 0.12409639 + - 0.043749984 + - 0.007228916 --- !u!114 &-6086986437317696584 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Resources/Materials/LinkScreenMaterial.mat b/Assets/Resources/Materials/LinkScreenMaterial.mat new file mode 100644 index 000000000..3796fa3fa --- /dev/null +++ b/Assets/Resources/Materials/LinkScreenMaterial.mat @@ -0,0 +1,631 @@ +%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: LinkScreenMaterial + m_Shader: {fileID: 4800000, guid: da8efd605fdd20949a21be6242000625, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLEDIRECTIONALALPHAFADE_ON + - _ENABLEHOLOGRAM_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: _ShaderFading + 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} + - _CustomFadeFadeMask: + m_Texture: {fileID: 0} + 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} + - _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} + - _MaskMap: + 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} + - _MetalMask: + 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} + - _OuterOutlineTintTexture: + m_Texture: {fileID: 2800000, guid: 5af9a397a8643994c829e696a24a7845, 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} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddColorContrast: 0.5 + - _AddColorContrastToggle: 0 + - _AddColorFade: 1 + - _AddColorMaskToggle: 0 + - _AddHueBrightness: 2 + - _AddHueContrast: 0.5 + - _AddHueFade: 1 + - _AddHueMaskToggle: 0 + - _AddHueSaturation: 1 + - _AddHueSpeed: 1 + - _AlphaCutoff: 0.5 + - _AlphaTintFade: 1 + - _AlphaTintMinAlpha: 0.02 + - _BakedMaterial: 0 + - _BlackTintFade: 1 + - _BlackTintPower: 4 + - _Brightness: 1 + - _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 + - _ColorReplaceContrast: 1 + - _ColorReplaceFade: 1 + - _ColorReplaceRange: 0.05 + - _ColorReplaceSmoothness: 0.1 + - _Contrast: 1 + - _CustomFadeAlpha: 1 + - _CustomFadeNoiseFactor: 0 + - _CustomFadeSmoothness: 2 + - _DirectionalAlphaFadeFade: 0 + - _DirectionalAlphaFadeInvert: 0 + - _DirectionalAlphaFadeNoiseFactor: 0.2 + - _DirectionalAlphaFadeRotation: 180 + - _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 + - _EnableAddColor: 0 + - _EnableAddHue: 0 + - _EnableAlphaTint: 0 + - _EnableBlackTint: 0 + - _EnableBrightness: 0 + - _EnableBurn: 0 + - _EnableCamouflage: 0 + - _EnableCheckerboard: 0 + - _EnableColorReplace: 0 + - _EnableContrast: 0 + - _EnableCustomFade: 0 + - _EnableDirectionalAlphaFade: 1 + - _EnableDirectionalDistortion: 0 + - _EnableDirectionalGlowFade: 0 + - _EnableEnchanted: 0 + - _EnableExternalAlpha: 0 + - _EnableFlame: 0 + - _EnableFrozen: 0 + - _EnableFullAlphaDissolve: 0 + - _EnableFullDistortion: 0 + - _EnableFullGlowDissolve: 0 + - _EnableGaussianBlur: 0 + - _EnableGlitch: 0 + - _EnableHalftone: 0 + - _EnableHologram: 1 + - _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: 0 + - _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 + - _FadingFade: 0.5 + - _FadingNoiseFactor: 0.2 + - _FadingWidth: 0.3 + - _FlameBrightness: 10 + - _FlameNoiseFactor: 2.5 + - _FlameNoiseHeightFactor: 1.5 + - _FlameRadius: 0.2 + - _FlameSmooth: 2 + - _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 + - _GlitchBrightness: 4 + - _GlitchFade: 1 + - _GlitchHueSpeed: 1 + - _GlitchMaskMin: 0.4 + - _HalftoneFade: 1 + - _HalftoneFadeWidth: 1.5 + - _HalftoneInvert: 0 + - _HalftoneTiling: 4 + - _HologramContrast: 1 + - _HologramDistortionDensity: 0.5 + - _HologramDistortionOffset: 0.5 + - _HologramDistortionScale: 10 + - _HologramDistortionSpeed: 2 + - _HologramFade: 1 + - _HologramLineFrequency: 500 + - _HologramLineGap: 3 + - _HologramLineSpeed: 0.01 + - _HologramMinAlpha: 0.2 + - _Hue: 0 + - _InkSpreadContrast: 2 + - _InkSpreadDistance: 3 + - _InkSpreadFade: 1 + - _InkSpreadNoiseFactor: 0.5 + - _InkSpreadWidth: 0.2 + - _InnerOutlineDistortionToggle: 0 + - _InnerOutlineFade: 1 + - _InnerOutlineOutlineOnlyToggle: 0 + - _InnerOutlineTextureToggle: 0 + - _InnerOutlineWidth: 0.02 + - _MetalContrast: 2 + - _MetalFade: 1 + - _MetalHighlightContrast: 2 + - _MetalHighlightDensity: 1 + - _MetalMaskToggle: 0 + - _NegativeFade: 1 + - _NormalIntensity: 1 + - _OuterOutlineDistortionToggle: 0 + - _OuterOutlineFade: 1 + - _OuterOutlineOutlineOnlyToggle: 0 + - _OuterOutlineTextureToggle: 0 + - _OuterOutlineWidth: 0.04 + - _PingPongGlowContrast: 1 + - _PingPongGlowFade: 1 + - _PingPongGlowFrequency: 3 + - _PixelOutlineFade: 1 + - _PixelOutlineOutlineOnlyToggle: 0 + - _PixelOutlineTextureToggle: 0 + - _PixelOutlineWidth: 1 + - _PixelPerfectSpace: 0 + - _PixelPerfectUV: 0 + - _PixelateFade: 1 + - _PixelatePixelDensity: 16 + - _PixelatePixelsPerUnit: 100 + - _PixelsPerUnit: 100 + - _PoisonDensity: 3 + - _PoisonFade: 1 + - _PoisonNoiseBrightness: 2 + - _PoisonRecolorFactor: 0.5 + - _PoisonShiftSpeed: 0.2 + - _RainbowBrightness: 2 + - _RainbowContrast: 1 + - _RainbowDensity: 0.5 + - _RainbowFade: 1 + - _RainbowNoiseFactor: 0.2 + - _RainbowSaturation: 1 + - _RainbowSpeed: 1 + - _RecolorRGBFade: 1 + - _RecolorRGBTextureToggle: 0 + - _RecolorRGBYCPFade: 1 + - _RecolorRGBYCPTextureToggle: 0 + - _RectHeight: 100 + - _RectWidth: 100 + - _Saturation: 1 + - _ScreenTilingPixelsPerUnit: 100 + - _ScreenWidthUnits: 10 + - _ShaderFading: 0 + - _ShaderSpace: 0 + - _ShadowFade: 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 + - _ShineMaskToggle: 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: 0 + - _SmokeNoiseFactor: 0.4 + - _SmokeNoiseScale: 0.5 + - _SmokeSmoothness: 1 + - _SmokeVertexSeed: 0 + - _SourceAlphaDissolveFade: 0.5 + - _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 + - _TilingFix: 0 + - _TimeFPS: 5 + - _TimeFrequency: 2 + - _TimeRange: 0.5 + - _TimeSpeed: 1 + - _TimeValue: 0 + - _ToggleCustomTime: 0 + - _ToggleTimeFPS: 0 + - _ToggleTimeFrequency: 0 + - _ToggleTimeSpeed: 0 + - _ToggleUnscaledTime: 0 + - _UVDistortFade: 1 + - _UVDistortMaskToggle: 0 + - _UVRotateSpeed: 1 + - _VertexTintFirst: 0 + - _VibrateFade: 1 + - _VibrateFrequency: 100 + - _VibrateOffset: 0.04 + - _VibrateRotation: 4 + - _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 + m_Colors: + - _AddColorColor: {r: 2.996078, g: 0, b: 0, a: 0} + - _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} + - _ColorReplaceFromColor: {r: 0, g: 0, b: 0, a: 0} + - _ColorReplaceToColor: {r: 0, g: 0, b: 0.2, a: 0} + - _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} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _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} + - _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} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _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} + - _HalftonePosition: {r: 0, g: 0, b: 0, a: 0} + - _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: 11.98431, g: 1.254902, b: 1.254902, 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} + - _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} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + - _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: 0} + - _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: 11.98431, g: 11.98431, b: 11.98431, a: 0} + - _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.773582, g: 2.2954772, b: 2.2954772, 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: [] diff --git a/Assets/Resources/Materials/LinkScreenMaterial.mat.meta b/Assets/Resources/Materials/LinkScreenMaterial.mat.meta new file mode 100644 index 000000000..e1d378a40 --- /dev/null +++ b/Assets/Resources/Materials/LinkScreenMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0661c328058b5e94ea7d04cd56b70b25 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Box.prefab b/Assets/Resources/Prefabs/UI/Box.prefab index 2ab81a759..b0732059d 100644 --- a/Assets/Resources/Prefabs/UI/Box.prefab +++ b/Assets/Resources/Prefabs/UI/Box.prefab @@ -195,7 +195,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7131956091114956203 RectTransform: m_ObjectHideFlags: 0 @@ -472,7 +472,7 @@ MonoBehaviour: onMessage: m_PersistentCalls: m_Calls: [] - waitForNormalChars: 0.1 + waitForNormalChars: 0.033333335 waitLong: 0.6 waitMiddle: 0.2 avoidMultiplePunctuactionWait: 0 diff --git a/Assets/Resources/SceneSO/TestSO.asset b/Assets/Resources/SceneSO/TestSO.asset index 8fb240a60..c6d65dbf8 100644 --- a/Assets/Resources/SceneSO/TestSO.asset +++ b/Assets/Resources/SceneSO/TestSO.asset @@ -13,6 +13,6 @@ MonoBehaviour: m_Name: TestSO m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} - yarnProject: {fileID: 7545569452688597077, guid: a15a58edccf56b044bf90e5e4eec6661, type: 3} + yarnProject: {fileID: 7545569452688597077, guid: fa27b0d9a05721b4d8c3253ca36b4d29, type: 3} firstSceneName: ExpressFixScene isEndOfDay: 1 diff --git a/Assets/Resources/Yarn/View/View1.yarn b/Assets/Resources/Yarn/View/View1.yarn index 609758e51..659ab6282 100644 --- a/Assets/Resources/Yarn/View/View1.yarn +++ b/Assets/Resources/Yarn/View/View1.yarn @@ -1,25 +1,25 @@ title: Start tags: --- -<> -<> -<> +<> +<> +aaa: 不答应这也行 === -title: Choice +title: LungPlugIn tags: --- - <> -->进入视觉 - <> - 我: 返回 - <> -->进入记忆 - <> - 我: 返回 - <> -->进入UF - <> - 我: 返回 - <> + +<> +LungModule: 肺部模块已连接 +LungModule: 等待下一步指令 +-> 分析 + <> + <> + Analysing: A部分正常 + Analysing: B部分异常 + Analysing: C部分分析中 + <> +-> 返回 + <> === diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 9bc4de2b8..521787ac9 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -367,6 +367,26 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 217458048812719857, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_LocalPosition.x + value: -0.33 + objectReference: {fileID: 0} + - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_LocalPosition.y + value: -4.6 + objectReference: {fileID: 0} + - target: {fileID: 2117906688623379083, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_LocalPosition.x + value: 4.95 + objectReference: {fileID: 0} + - target: {fileID: 2117906688623379083, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_LocalPosition.y + value: -2.21 + objectReference: {fileID: 0} - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_LocalPosition.x value: 30 @@ -2258,6 +2278,90 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxDistance: 0.8 +--- !u!1 &518267366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 518267367} + - component: {fileID: 518267368} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &518267367 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518267366} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.353488, y: 1.652, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8044979284700793453} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &518267368 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518267366} + 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: 0661c328058b5e94ea7d04cd56b70b25, 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: 105 + m_Sprite: {fileID: 21300000, guid: eccbf2467d281894bafba3ef467f0875, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.4, y: 2.4} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &536896723 GameObject: m_ObjectHideFlags: 0 @@ -5165,6 +5269,59 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1275786631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275786632} + - component: {fileID: 1275786633} + m_Layer: 0 + m_Name: Screen System + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1275786632 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275786631} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 30, y: 0.25, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8044979284700793453} + - {fileID: 4647754273203520516} + - {fileID: 6346080245638691296} + - {fileID: 3592053695096856673} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1275786633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275786631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 238cb3d3aad51b84e93ef35bdd1c5536, type: 3} + m_Name: + m_EditorClassIdentifier: + rotateDuration: 0.5 + title: {fileID: 2144726594} + text: {fileID: 1506508221} + textTypewriter: {fileID: 1506508223} + screenImage: {fileID: 518267368} --- !u!1 &1279241653 GameObject: m_ObjectHideFlags: 0 @@ -5447,6 +5604,253 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1502187942} m_CullTransparentMesh: 1 +--- !u!1 &1506508219 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1506508220} + - component: {fileID: 1506508222} + - component: {fileID: 1506508221} + - component: {fileID: 1506508224} + - component: {fileID: 1506508223} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1506508220 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506508219} + 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: 6346080245638691296} + 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: -3.7237, y: 2.6639} + m_SizeDelta: {x: 4.2783, y: 2.7153} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1506508221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506508219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 3 + m_fontSizeBase: 3 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + 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 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1506508222} + m_maskType: 0 +--- !u!23 &1506508222 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506508219} + 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: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 102 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &1506508223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506508219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57a6945b90dcd0c4b81619c0d8b5c283, type: 3} + m_Name: + m_EditorClassIdentifier: + useTypeWriter: 1 + startTypewriterMode: 2 + hideAppearancesOnSkip: 0 + hideDisappearancesOnSkip: 0 + triggerEventsOnSkip: 0 + resetTypingSpeedAtStartup: 1 + disappearanceOrientation: 0 + onTextShowed: + m_PersistentCalls: + m_Calls: [] + onTypewriterStart: + m_PersistentCalls: + m_Calls: [] + onTextDisappeared: + m_PersistentCalls: + m_Calls: [] + onCharacterVisible: + m_PersistentCalls: + m_Calls: [] + onMessage: + m_PersistentCalls: + m_Calls: [] + waitForNormalChars: 0.02 + waitLong: 0.6 + waitMiddle: 0.2 + avoidMultiplePunctuactionWait: 0 + waitForNewLines: 1 + waitForLastCharacter: 1 + useTypewriterWaitForDisappearances: 1 + disappearanceWaitTime: 0.015 + disappearanceSpeedMultiplier: 1 +--- !u!114 &1506508224 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506508219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e8ace8ced0e81c847968cdca0aeda757, type: 3} + m_Name: + m_EditorClassIdentifier: + typewriterStartsAutomatically: 0 + animationLoop: 0 + timeScale: 0 + _text: + useDynamicScaling: 1 + referenceFontSize: 10 + isResettingTimeOnNewText: 1 + useDefaultDatabases: 1 + databaseBehaviors: {fileID: 11400000, guid: ab7e07cba198f4345b19d351e6a3034f, type: 2} + databaseAppearances: {fileID: 11400000, guid: 71ecf6147756deb4ca20570628f94f96, type: 2} + useDefaultStyleSheet: 1 + styleSheet: {fileID: 0} + databaseActions: {fileID: 11400000, guid: de78232a60d74f6459e57e5606304209, type: 2} + defaultAppearancesTags: + - fade + defaultDisappearancesTags: + - fade + defaultBehaviorsTags: [] + defaultTagsMode: 0 --- !u!1001 &1538548679 PrefabInstance: m_ObjectHideFlags: 0 @@ -7617,6 +8021,177 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 +--- !u!1 &2144726592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2144726593} + - component: {fileID: 2144726595} + - component: {fileID: 2144726594} + m_Layer: 0 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2144726593 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144726592} + 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: 6346080245638691296} + 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: -3.72, y: 4.61} + m_SizeDelta: {x: 3, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2144726594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144726592} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 4 + m_fontSizeBase: 4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + 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.75768495, y: 0, z: -0.71616983, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2144726595} + m_maskType: 0 +--- !u!23 &2144726595 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144726592} + 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: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 102 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &55461965490791556 GameObject: m_ObjectHideFlags: 0 @@ -7665,6 +8240,21 @@ Transform: m_Children: [] m_Father: {fileID: 1760232666527291266} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &207886292716026205 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8935449623678119629} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.0418596, y: -1.2581396, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4647754273203520516} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &231674060242171562 Transform: m_ObjectHideFlags: 0 @@ -8125,6 +8715,58 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!212 &853208699950786089 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8935449623678119629} + 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: 102 + m_Sprite: {fileID: 8191467703491282694, guid: dc5b3bd78140ade4c8350f61e6b6b4e0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.8418604, y: 1.8465116} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!4 &882063250679083737 Transform: m_ObjectHideFlags: 0 @@ -8529,6 +9171,23 @@ Transform: m_Children: [] m_Father: {fileID: 1760232666527291266} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1529028193742794830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3592053695096856673} + - component: {fileID: 2617378710933391080} + m_Layer: 0 + m_Name: "\u5E95\u677F" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 --- !u!4 &1537135417389927140 Transform: m_ObjectHideFlags: 0 @@ -8577,6 +9236,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 +--- !u!4 &1615249797575380277 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4559607557635429966} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 5.351162, y: 1.7279067, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8044979284700793453} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1631418437387841332 GameObject: m_ObjectHideFlags: 0 @@ -8937,6 +9611,58 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!212 &2116494159051849458 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471111196735930273} + 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: 104 + m_Sprite: {fileID: -7585156889466155634, guid: dc5b3bd78140ade4c8350f61e6b6b4e0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.6697674, y: 4.3255816} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!4 &2184597719426019460 Transform: m_ObjectHideFlags: 0 @@ -9187,6 +9913,58 @@ Transform: m_Children: [] m_Father: {fileID: 721921677827369965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2617378710933391080 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1529028193742794830} + 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: 100 + m_Sprite: {fileID: 8913323107438206284, guid: dc5b3bd78140ade4c8350f61e6b6b4e0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 17.860466, y: 10.046512} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!4 &2637407694422089600 Transform: m_ObjectHideFlags: 0 @@ -9701,6 +10479,23 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3471111196735930273 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8225078347174378357} + - component: {fileID: 2116494159051849458} + m_Layer: 0 + m_Name: "\u56FE\u50CF\u5C4F\u5E55" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &3511838069384901363 GameObject: m_ObjectHideFlags: 0 @@ -9788,6 +10583,21 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!4 &3592053695096856673 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1529028193742794830} + serializedVersion: 2 + 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: 1275786632} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3626140236426593434 SpriteRenderer: m_ObjectHideFlags: 0 @@ -9991,6 +10801,22 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3871364976972691815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4647754273203520516} + m_Layer: 0 + m_Name: "\u8F74" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &3932714935044234095 Transform: m_ObjectHideFlags: 0 @@ -10070,6 +10896,58 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!212 &4092418459181601306 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5717309813958647893} + 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: 100 + m_Sprite: {fileID: -2231106560155430294, guid: dc5b3bd78140ade4c8350f61e6b6b4e0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.1581397, y: 6.590698} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &4112260238635059984 GameObject: m_ObjectHideFlags: 0 @@ -10102,6 +10980,21 @@ Transform: m_Children: [] m_Father: {fileID: 1279241654} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4168663335839130174 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8152891942134427369} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.0534878, y: -1.0767443, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4647754273203520516} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4172303922151227798 SpriteRenderer: m_ObjectHideFlags: 0 @@ -10290,6 +11183,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &4559607557635429966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1615249797575380277} + - component: {fileID: 5962738970958368106} + m_Layer: 0 + m_Name: "\u56FE\u50CF\u9762\u677F" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4647754273203520516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3871364976972691815} + serializedVersion: 2 + 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: 4168663335839130174} + - {fileID: 207886292716026205} + m_Father: {fileID: 1275786632} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4723618132295095337 Transform: m_ObjectHideFlags: 0 @@ -10762,6 +11689,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isLocked: 0 +--- !u!1 &5123627217804063905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8044979284700793453} + m_Layer: 0 + m_Name: "\u56FA\u5B9A\u5C4F\u5E55" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!212 &5151870970371662267 SpriteRenderer: m_ObjectHideFlags: 0 @@ -10966,6 +11909,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &5717309813958647893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8540459444026652505} + - component: {fileID: 4092418459181601306} + m_Layer: 0 + m_Name: "\u6587\u5B57\u9762\u677F" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &5792355823134197463 GameObject: m_ObjectHideFlags: 0 @@ -11087,6 +12047,58 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!212 &5962738970958368106 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4559607557635429966} + 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: 103 + m_Sprite: {fileID: -8529539506362632371, guid: dc5b3bd78140ade4c8350f61e6b6b4e0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.1581397, y: 6.590698} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!4 &6037308689912436240 Transform: m_ObjectHideFlags: 0 @@ -11132,6 +12144,40 @@ Transform: m_Children: [] m_Father: {fileID: 730666228317276112} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &6190279293657846274 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8504695645809415527} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.74, y: 3.12, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6346080245638691296} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &6346080245638691296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7884106507706204346} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 1.96, y: -1.41, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6190279293657846274} + - {fileID: 8540459444026652505} + - {fileID: 1506508220} + - {fileID: 2144726593} + m_Father: {fileID: 1275786632} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} --- !u!1 &6463706167068524102 GameObject: m_ObjectHideFlags: 0 @@ -11683,6 +12729,58 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!212 &7289234463556531342 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8152891942134427369} + 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: 101 + m_Sprite: {fileID: 927354814899462971, guid: dc5b3bd78140ade4c8350f61e6b6b4e0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.4697673, y: 2.9534883} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!212 &7291201496032329637 SpriteRenderer: m_ObjectHideFlags: 0 @@ -12024,6 +13122,74 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!212 &7786218961281991659 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8504695645809415527} + 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: 101 + m_Sprite: {fileID: -2291909674519663594, guid: dc5b3bd78140ade4c8350f61e6b6b4e0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.6697674, y: 4.3255816} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7884106507706204346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6346080245638691296} + m_Layer: 0 + m_Name: "\u65CB\u8F6C\u5C4F\u5E55" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &7965346325976393555 Transform: m_ObjectHideFlags: 0 @@ -12088,6 +13254,24 @@ MonoBehaviour: showPos: {x: 0, y: 0, z: 0} hidePos: {x: -7.1, y: 0, z: 0} showDuration: 1 +--- !u!4 &8044979284700793453 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5123627217804063905} + serializedVersion: 2 + 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: 8225078347174378357} + - {fileID: 1615249797575380277} + - {fileID: 518267367} + m_Father: {fileID: 1275786632} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &8090610914013374239 Transform: m_ObjectHideFlags: 0 @@ -12170,6 +13354,23 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8152891942134427369 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4168663335839130174} + - component: {fileID: 7289234463556531342} + m_Layer: 0 + m_Name: "\u8F74\u627F\u5916\u58F3" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &8173701869803289800 Transform: m_ObjectHideFlags: 0 @@ -12240,6 +13441,21 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 2 m_SpriteSortPoint: 0 +--- !u!4 &8225078347174378357 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471111196735930273} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 5.353488, y: 1.7348838, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8044979284700793453} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8239509622042514909 SpriteRenderer: m_ObjectHideFlags: 0 @@ -12420,6 +13636,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: initSpeed: 0.1 +--- !u!1 &8504695645809415527 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6190279293657846274} + - component: {fileID: 7786218961281991659} + m_Layer: 0 + m_Name: "\u6587\u5B57\u5C4F\u5E55 " + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &8507733278955807665 GameObject: m_ObjectHideFlags: 0 @@ -12489,6 +13722,21 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!4 &8540459444026652505 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5717309813958647893} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.7423255, y: 3.1130228, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6346080245638691296} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8546384084041873483 GameObject: m_ObjectHideFlags: 0 @@ -12658,6 +13906,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &8935449623678119629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 207886292716026205} + - component: {fileID: 853208699950786089} + m_Layer: 0 + m_Name: "\u8F74_1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &8937395913662806829 GameObject: m_ObjectHideFlags: 0 @@ -12889,6 +14154,7 @@ SceneRoots: m_Roots: - {fileID: 7026926953013077400} - {fileID: 1272342139116525773} + - {fileID: 1275786632} - {fileID: 154381820} - {fileID: 657112469} - {fileID: 1112213369} diff --git a/Assets/Scenes/OutSideSceneTemp.unity b/Assets/Scenes/OutSideSceneTemp.unity index 10b4fe577..dcc18cdc7 100644 --- a/Assets/Scenes/OutSideSceneTemp.unity +++ b/Assets/Scenes/OutSideSceneTemp.unity @@ -141,7 +141,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!81 &519420029 AudioListener: m_ObjectHideFlags: 0 @@ -276,7 +276,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &619394801 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index ed7cffac3..b5ba618b4 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1037,11 +1037,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &62394964 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - m_PrefabInstance: {fileID: 1886390393148784126} - m_PrefabAsset: {fileID: 0} --- !u!114 &68232401 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -1914,108 +1909,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 145702194} m_CullTransparentMesh: 1 ---- !u!1001 &152335402 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1990871919} - m_Modifications: - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_SizeDelta.x - value: 501.22534 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_SizeDelta.y - value: 329.3753 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 164.68765 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8518890624210964847, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - propertyPath: m_Name - value: Player Bubble - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} ---- !u!224 &152335403 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2114528386511579871, guid: c6c82e5d3b6ca4c4f902f55c8c0f4a6a, type: 3} - m_PrefabInstance: {fileID: 152335402} - m_PrefabAsset: {fileID: 0} --- !u!1001 &188420210 PrefabInstance: m_ObjectHideFlags: 0 @@ -4501,7 +4394,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8677370814205024500, guid: 55eac30d86443354ebfe3cc06c7b00e8, type: 3} propertyPath: m_LocalPosition.z - value: 1.0196009 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8677370814205024500, guid: 55eac30d86443354ebfe3cc06c7b00e8, type: 3} propertyPath: m_LocalRotation.w @@ -7937,9 +7830,9 @@ MonoBehaviour: - {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2} - {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} - {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - runMode: 2 + runMode: 1 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} + testTalkSo: {fileID: 11400000, guid: bd44f6c25aa17a4408e172d16b903176, type: 2} saveFileName: "PeipeiDay1_\u7ED3\u675F\u5BF9\u8BDD" --- !u!4 &719228339 Transform: @@ -12841,17 +12734,13 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1604842429} m_Modifications: - - target: {fileID: 1810538208425271595, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: waitForNormalChars - value: 0.033333335 - objectReference: {fileID: 0} - target: {fileID: 6059188073131988442, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_Name value: Dialog Box objectReference: {fileID: 0} - target: {fileID: 6059188073131988442, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} propertyPath: m_Pivot.x @@ -15552,7 +15441,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1794129319} - - {fileID: 1990871919} - {fileID: 1302630844} - {fileID: 50234111} - {fileID: 1108164746} @@ -17484,11 +17372,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1794129318} m_CullTransparentMesh: 1 ---- !u!224 &1797173830 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - m_PrefabInstance: {fileID: 7847025846205992388} - m_PrefabAsset: {fileID: 0} --- !u!1 &1804770167 GameObject: m_ObjectHideFlags: 0 @@ -18846,57 +18729,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 1989818781} m_PrefabAsset: {fileID: 0} ---- !u!1 &1990871918 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1990871919} - - component: {fileID: 1990871920} - m_Layer: 5 - m_Name: Dialog Bubble View - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1990871919 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1990871918} - 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: 1797173830} - - {fileID: 62394964} - - {fileID: 152335403} - m_Father: {fileID: 1604842429} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1990871920 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1990871918} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 98b5d94e03211a94bba6de692a1d405a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &2001435037 PrefabInstance: m_ObjectHideFlags: 0 @@ -27011,107 +26843,6 @@ MonoBehaviour: _enableHover: 1 _disableClick: 0 lastFoundPort: {fileID: 0} ---- !u!1001 &1886390393148784126 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1990871919} - m_Modifications: - - target: {fileID: 1810538208425271595, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: waitForNormalChars - value: 0.033333335 - objectReference: {fileID: 0} - - target: {fileID: 6059188073131988442, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_Name - value: Normal Box - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_SizeDelta.x - value: 1200 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_SizeDelta.y - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e2211373480d40243a377721316dd8f7, type: 3} --- !u!222 &1891081495419510369 CanvasRenderer: m_ObjectHideFlags: 0 @@ -49492,103 +49223,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8601494769108736537} m_CullTransparentMesh: 1 ---- !u!1001 &7847025846205992388 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1990871919} - m_Modifications: - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_SizeDelta.x - value: 586.1448 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_SizeDelta.y - value: 293.1278 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_AnchoredPosition.x - value: 45 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_AnchoredPosition.y - value: -44 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2114528386511579871, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8518890624210964847, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} - propertyPath: m_Name - value: Actor Bubble - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d6fa45bd310bc946b5628e62986e494, type: 3} --- !u!224 &7847641493143640870 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Dialog System/BaseYarnCommand.cs b/Assets/Scripts/Dialog System/BaseYarnCommand.cs new file mode 100644 index 000000000..5c8583e91 --- /dev/null +++ b/Assets/Scripts/Dialog System/BaseYarnCommand.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections; +using AibisDream.Framework; +using Yarn.Unity; + +namespace AibisDream +{ + public static class BaseYarnCommand + { + #region 命令名 + + [YarnCommand("NextYarn")] + public static void NextYarn() + { + EnumEventSystem.Global.Send(EventEnum.NextYarn); + DialogController.Instance.ClearVariables(); + DialogController.Instance.StartCoroutine(GameLoopManager.Instance.NextSceneSo()); + } + + [YarnCommand("switch_tv")] + public static void SwitchTV(string picName) + { + MainUIController.Instance.SwitchTV(picName); + } + + [YarnCommand("show_tv_scene")] + public static void ShowTVScene(float duration) + { + MainUIController.Instance.TVFadeIn(duration); + } + + [YarnCommand("load_scene")] + public static IEnumerator LoadScene(string sceneName, float duration = 1) + { + HideDialog(); + yield return SceneLoader.Instance.LoadSceneAsync(sceneName); + AudioManager.PlayAmb2Audio("amb_general"); + } + + [YarnCommand("unload_scene")] + public static IEnumerator UnloadScene(string sceneName) + { + yield return SceneLoader.Instance.UnloadSceneAsync(sceneName); + } + + [YarnCommand("hide_dialog")] + public static void HideDialog() + { + DialogCanvasManager.Instance.HideDialog(); + } + + [YarnCommand("fade_in")] + public static IEnumerator FadeIn(float duration) + { + return MainUIController.Instance.FadeInSync(duration); + } + + [YarnCommand("fade_out")] + public static IEnumerator FadeOut(float duration) + { + return MainUIController.Instance.FadeOutSync(duration); + } + + [YarnCommand("show_obj")] + public static IEnumerator ShowObj(string picName) + { + return MainUIController.Instance.ShowObj(picName); + } + + [YarnCommand("hide_obj")] + public static IEnumerator HideObj() + { + return MainUIController.Instance.HideObj(); + } + + [YarnCommand("switch_dialog_viewer")] + public static void SwitchDialogViewer(string viewerTypeStr) + { + var viewType = Enum.Parse(viewerTypeStr); + DialogCanvasManager.Instance.SwitchDialogView(viewType); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/Dialog System/BaseYarnCommand.cs.meta b/Assets/Scripts/Dialog System/BaseYarnCommand.cs.meta new file mode 100644 index 000000000..8fa6735cb --- /dev/null +++ b/Assets/Scripts/Dialog System/BaseYarnCommand.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 84356e44c7a2458e89a26f5539c34587 +timeCreated: 1739095555 \ No newline at end of file diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs index 09f60ec37..29172c863 100644 --- a/Assets/Scripts/Dialog System/DialogController.cs +++ b/Assets/Scripts/Dialog System/DialogController.cs @@ -141,89 +141,11 @@ namespace AibisDream /// public void JumpLine() { - if (!DialogCanvasManager.GetCurView().TrySkipLine()) + if (!DialogCanvasManager.Instance.TrySkipLine()) { AudioManager.Instance.StopVoice(); - DialogCanvasManager.GetCurView().NextStep(); + DialogCanvasManager.Instance.NextStep(); } } - - #region 命令名 - - [YarnCommand("NextYarn")] - public static void NextYarn() - { - EnumEventSystem.Global.Send(EventEnum.NextYarn); - Instance.ClearVariables(); - Instance.StartCoroutine(GameLoopManager.Instance.NextSceneSo()); - } - - [YarnCommand("switch_tv")] - public static void SwitchTV(string picName) - { - MainUIController.Instance.SwitchTV(picName); - } - - [YarnCommand("show_tv_scene")] - public static void ShowTVScene(float duration) - { - MainUIController.Instance.TVFadeIn(duration); - } - - [YarnCommand("load_scene")] - public static IEnumerator LoadScene(string sceneName, float duration = 1) - { - HideDialog(); - yield return SceneLoader.Instance.LoadSceneAsync(sceneName); - DialogCanvasManager.Instance.SwitchDialogView(sceneName == "ClinicScene" - ? DialogViewType.Bubble - : DialogViewType.OldBox); - - AudioManager.PlayAmb2Audio("amb_general"); - } - - [YarnCommand("unload_scene")] - public static IEnumerator UnloadScene(string sceneName) - { - yield return SceneLoader.Instance.UnloadSceneAsync(sceneName); - } - - [YarnCommand("hide_dialog")] - public static void HideDialog() - { - DialogCanvasManager.GetCurView().HideDialog(); - } - - [YarnCommand("fade_in")] - public static IEnumerator FadeIn(float duration) - { - return MainUIController.Instance.FadeInSync(duration); - } - - [YarnCommand("fade_out")] - public static IEnumerator FadeOut(float duration) - { - return MainUIController.Instance.FadeOutSync(duration); - } - - [YarnCommand("show_obj")] - public static IEnumerator ShowObj(string picName) - { - return MainUIController.Instance.ShowObj(picName); - } - - [YarnCommand("hide_obj")] - public static IEnumerator HideObj() - { - return MainUIController.Instance.HideObj(); - } - - [YarnCommand("switch_dialog_view")] - public static void SwitchDialogView(string viewName) - { - DialogCanvasManager.Instance.SwitchDialogView(Enum.Parse(viewName)); - } - - #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/Dialog System/LineView.cs b/Assets/Scripts/Dialog System/LineView.cs index 56701b942..40e17044f 100644 --- a/Assets/Scripts/Dialog System/LineView.cs +++ b/Assets/Scripts/Dialog System/LineView.cs @@ -1,7 +1,6 @@ using System; using AibisDream.Framework; using AibisDream.Utility; -using UnityEngine; using Yarn.Unity; namespace AibisDream @@ -17,12 +16,12 @@ namespace AibisDream if (_isInCommand) { - DialogCanvasManager.GetCurView().HideDialog(); + DialogCanvasManager.Instance.HideDialog(); base.RunLine(dialogueLine, onDialogueLineFinished); return; } - EnumEventSystem.Global.Send(DialogEventEnum.LineStart, DialogLine.GetLine(dialogueLine)); + EnumEventSystem.Global.Send(DialogEventEnum.LineStart, DialogText.GetLine(dialogueLine)); Action jumpVoice = SkipVoice; HandleLineOutput(dialogueLine, jumpVoice, onDialogueLineFinished); @@ -36,7 +35,7 @@ namespace AibisDream private void HandleLineOutput(LocalizedLine dialogueLine, Action onTextShowed, Action onDialogueLineFinished) { - DialogCanvasManager.GetCurView().ShowLine(dialogueLine.TextWithoutCharacterName.Text, + DialogCanvasManager.Instance.ShowLine(dialogueLine.TextWithoutCharacterName.Text, dialogueLine.GetCharacterVo(), onDialogueLineFinished, onTextShowed, dialogueLine.IsAutoSkipLine()); } @@ -59,14 +58,14 @@ namespace AibisDream { if (_isInCommand) { - DialogCanvasManager.GetCurView().HideDialog(); + DialogCanvasManager.Instance.HideDialog(); base.RunOptions(dialogueOptions, onOptionSelected); return; } - + EnumEventSystem.Global.Send(DialogEventEnum.OptionShow); var options = DialogOption.GeneOptions(dialogueOptions, onOptionSelected); - DialogCanvasManager.GetCurView().ShowOptions(options); + DialogCanvasManager.Instance.ShowOptions(options); } } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Screen System.meta b/Assets/Scripts/FixSystemNew/Screen System.meta new file mode 100644 index 000000000..5fa6d6b48 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Screen System.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83fe8dca776a36745b37708facb03b40 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs new file mode 100644 index 000000000..328c1efce --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs @@ -0,0 +1,229 @@ +using System; +using System.Collections; +using AibisDream.Framework; +using AibisDream.Kit; +using DG.Tweening; +using Febucci.UI; +using TMPro; +using UnityEngine; + +namespace AibisDream.FixSystem +{ + public class ScreenSystem : MonoBehaviour, IScreen, IDialogView + { + private static readonly int DirectionalAlphaFadeFade = Shader.PropertyToID("_DirectionalAlphaFadeFade"); + + #region 效果参数 + + public float rotateDuration = 0.5f; + + #endregion + + #region 索引 + + private Transform _textScreen; + [SerializeField] private TMP_Text title; + [SerializeField] private TMP_Text text; + [SerializeField] private TypewriterByCharacter textTypewriter; + [SerializeField] private SpriteRenderer screenImage; + private Material _imageMaterial; + + private IUnRegister _plugOutRmv; + private Action _nextStep; + + #endregion + + private void Awake() + { + InitComponentRefs(); + Register(); + } + + private void InitComponentRefs() + { + _textScreen = transform.Find("旋转屏幕"); + _imageMaterial = screenImage.material; + } + + private void Register() + { + FixSystemCenter.SystemDic.Register(this); + DialogCanvasManager.Instance.RegisterDialogView(DialogViewType.Screen, this); + + textTypewriter.onTextShowed.AddListener(() => StartCoroutine(AutoNextStep())); + } + + private void OnDestroy() + { + FixSystemCenter.SystemDic.Unregister(); + DialogCanvasManager.Instance.UnregisterDialogView(DialogViewType.Screen); + } + + #region 基础功能 + + public void OpenTextScreen() + { + // 旋转 + _textScreen.DORotate(new Vector3(0, 0, 0), rotateDuration); + } + + public void ShowTitle(string targetTitle) + { + title.text = targetTitle; + } + + public void ShowText(string targetText) + { + // 获取旧文字 + var oldText = text.text; + // if (!string.IsNullOrWhiteSpace(oldText)) + // { + // // 去掉notype标签，并且加上新的 + // var rawOldText = oldText.Replace("", "").Replace("", ""); + // oldText = " " + rawOldText + " "; + // } + + // 显示文字 + textTypewriter.ShowText(oldText + targetText); + } + + public Tween ShowImage(Sprite sprite) + { + // 先回归隐藏状态 + _imageMaterial.SetFloat(DirectionalAlphaFadeFade, 0); + // 切换图片 + screenImage.sprite = sprite; + // 逐渐展示 + return DOTween.To(() => _imageMaterial.GetFloat(DirectionalAlphaFadeFade), + value => _imageMaterial.SetFloat(DirectionalAlphaFadeFade, value), 10f, 1f); + } + + public void ClearImage() + { + _imageMaterial.SetFloat(DirectionalAlphaFadeFade, 0); + screenImage.sprite = null; + } + + public void ClearTextScreen() + { + title.text = ""; + text.SetText(""); + } + + public void CloseTextScreen() + { + // 先清除文字 + ClearTextScreen(); + // 旋转隐藏 + _textScreen.DORotate(new Vector3(0, 0, -90), rotateDuration, RotateMode.FastBeyond360); + } + + #endregion + + #region 状态切换 + + /// + /// 插头链接时播放内容 + /// + /// 需要播放的图片 + /// + public IEnumerator OnLink(Sprite sprite) + { + EnumEventSystem.Global.Send(EventEnum.OpenScreen); + // 右侧加载图片 + var tween = ShowImage(sprite); + yield return tween.WaitForCompletion(); + + // 左侧打开副屏 + OpenTextScreen(); + yield return new WaitForSeconds(rotateDuration + 0.2f); + } + + /// + /// 收回屏幕时触发 + /// + /// + public IEnumerator OnUnlink() + { + // 隐藏图片 + ClearImage(); + yield return new WaitForSeconds(0.3f); + // 左侧回收屏幕 + CloseTextScreen(); + yield return new WaitForSeconds(rotateDuration + 0.2f); + + EnumEventSystem.Global.Send(EventEnum.CloseScreen); + } + + #endregion + + #region 对话框功能实现 + + public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed = null, + bool isAutoSkip = false) + { + ShowTitle(character.GetActorName()); + ShowText(dialogLine); + + // 每行自动跳过 + _nextStep = nextStep; + } + + public void ShowOptions(DialogOption[] dialogueOptions) + { + Debug.Log("不能在显示屏显示对话"); + } + + public void HideDialog() + { + // HideDialog应该由其他函数控制 + } + + public bool TrySkipLine() + { + // 这里不能跳过对话 + return true; + } + + public void NextStep() + { + // 这里不能手动跳到下一行 + } + + private IEnumerator AutoNextStep() + { + yield return new WaitForSeconds(0.2f); + _nextStep?.Invoke(); + _nextStep = null; + } + + #endregion + } + + /// + /// 屏幕接口 + /// + public interface IScreen + { + // 打开副屏 + void OpenTextScreen(); + + // 显示标题文字 + void ShowTitle(string title); + + // 显示正文 + void ShowText(string text); + + // 显示图片 + Tween ShowImage(Sprite sprite); + + // 清除图片 + void ClearImage(); + + // 清空屏幕 + void ClearTextScreen(); + + // 关闭副屏 + void CloseTextScreen(); + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs.meta b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs.meta new file mode 100644 index 000000000..ed883b9ec --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 238cb3d3aad51b84e93ef35bdd1c5536 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs b/Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs new file mode 100644 index 000000000..73553a911 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs @@ -0,0 +1,30 @@ +using System.Collections; +using UnityEngine; +using Yarn.Unity; + +namespace AibisDream.FixSystem +{ + public static class ScreenYarnCommand + { + private static ScreenSystem ScreenSystem => FixSystemCenter.SystemDic.Get(); + + [YarnCommand("open_screen")] + public static IEnumerator OpenScreen() + { + Sprite sprite = Resources.Load("Art/Obj/gear"); + return ScreenSystem.OnLink(sprite); + } + + [YarnCommand("close_screen")] + public static IEnumerator CloseScreen() + { + return ScreenSystem.OnUnlink(); + } + + [YarnCommand("clear_screen")] + public static void ClearTextScreen() + { + ScreenSystem.ClearTextScreen(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs.meta b/Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs.meta new file mode 100644 index 000000000..cd54b9d40 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ae94b7febe6b4b6a96f2f45939d77ed2 +timeCreated: 1739105298 \ No newline at end of file diff --git a/Assets/Scripts/Framework/Config/Character.cs b/Assets/Scripts/Framework/Config/Character.cs index de7b33180..ff24c0224 100644 --- a/Assets/Scripts/Framework/Config/Character.cs +++ b/Assets/Scripts/Framework/Config/Character.cs @@ -8,6 +8,7 @@ namespace AibisDream.Kit public string HeadPicPath { get; set; } public string VoicePath { get; set; } public ActorRole Role { get; set; } + public DialogViewType DialogViewType { get; set; } /// /// 避免干扰，复制结构体出来使用 @@ -22,6 +23,7 @@ namespace AibisDream.Kit vo.headPicPath = HeadPicPath; vo.voicePath = VoicePath; vo.role = Role; + vo.dialogViewType = DialogViewType; return vo; } } @@ -34,6 +36,7 @@ namespace AibisDream.Kit public string headPicPath; public string voicePath; public ActorRole role; + public DialogViewType dialogViewType; /// /// 获取角色应该显示的名字 diff --git a/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs b/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs index dfe962fff..578ab2359 100644 --- a/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs +++ b/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs @@ -5,6 +5,12 @@ namespace AibisDream.Framework { public class EventSystemEx : SingletonBase { + #region 状态 + + public bool isLocked; + + #endregion + public GameObject pointerOverObj; public GameObject draggingObj; public GameObject holdingObj; @@ -41,6 +47,16 @@ namespace AibisDream.Framework } } + #endregion + + #region 事件注册 + + public override void OnSingletonInit() + { + EnumEventSystem.Global.Register(EventEnum.OpenScreen, () => isLocked = true); + EnumEventSystem.Global.Register(EventEnum.CloseScreen, () => isLocked = false); + } + #endregion #region 单例必须的代码 @@ -48,10 +64,6 @@ namespace AibisDream.Framework private EventSystemEx() { } - - public override void OnSingletonInit() - { - } #endregion } diff --git a/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs b/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs index d7cf16741..93b761c97 100644 --- a/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs +++ b/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs @@ -87,7 +87,7 @@ namespace AibisDream.Framework public override void OnPointerDown(PointerEventData eventData) { - if (_interaction.IsAvailable) + if (_interaction.IsAvailable && !EventSystemEx.Instance.isLocked) { EventSystemEx.Instance.OnPointerDown(_interaction); base.OnPointerDown(eventData); @@ -96,7 +96,7 @@ namespace AibisDream.Framework public override void OnPointerUp(PointerEventData eventData) { - if (_interaction.IsAvailable) + if (_interaction.IsAvailable && !EventSystemEx.Instance.isLocked) { EventSystemEx.Instance.OnPointerUp(_interaction); base.OnPointerUp(eventData); diff --git a/Assets/Scripts/Game Loop/EventEnums.cs b/Assets/Scripts/Game Loop/EventEnums.cs index cae81e375..400c77b55 100644 --- a/Assets/Scripts/Game Loop/EventEnums.cs +++ b/Assets/Scripts/Game Loop/EventEnums.cs @@ -9,6 +9,8 @@ namespace AibisDream NextYarn, PlugIn, PlugOut, + OpenScreen, + CloseScreen, Menu } @@ -27,7 +29,7 @@ namespace AibisDream End } - public struct DialogLine + public struct DialogText { public bool isOption; public string line; @@ -55,9 +57,9 @@ namespace AibisDream } } - public static DialogLine GetLine(LocalizedLine dialogueLine) + public static DialogText GetLine(LocalizedLine dialogueLine) { - return new DialogLine() + return new DialogText() { isOption = false, line = dialogueLine.TextWithoutCharacterName.Text, diff --git a/Assets/Scripts/MiniGame/Engine/CordPull.cs b/Assets/Scripts/MiniGame/Engine/CordPull.cs index d36cf2e16..dbca5cec9 100644 --- a/Assets/Scripts/MiniGame/Engine/CordPull.cs +++ b/Assets/Scripts/MiniGame/Engine/CordPull.cs @@ -106,6 +106,8 @@ namespace AibisDream _dragPoint = new Vector3(transform.position.x, dragY, transform.position.z); } + #region 交互限制相关 + public bool IsActive => _engineSystem.isPullActive; public bool IsAvailable => _engineSystem.isAvailable; @@ -114,5 +116,7 @@ namespace AibisDream { return gameObject; } + + #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Cursor/CursorManager.cs b/Assets/Scripts/UI/Cursor/CursorManager.cs index 3bee41327..6205d7c09 100644 --- a/Assets/Scripts/UI/Cursor/CursorManager.cs +++ b/Assets/Scripts/UI/Cursor/CursorManager.cs @@ -72,13 +72,13 @@ namespace AibisDream private void RegisterDialogEvent() { // 对话相关 - _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.LineStart, + _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.LineStart, OnLineStart)); _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.LineShowed, () => SwitchCursor(nextTalk))); _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.LineEnd, OnLineEnd)); _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.OptionShow, OnOptionShow)); _unRegisters.Add( - EnumEventSystem.Global.Register(DialogEventEnum.OptionSelected, + EnumEventSystem.Global.Register(DialogEventEnum.OptionSelected, OnOptionSelect)); } @@ -127,7 +127,7 @@ namespace AibisDream #region 对话相关 - private void OnLineStart(DialogLine line) + private void OnLineStart(DialogText line) { _isTalking = true; SwitchCursor(talking); @@ -149,7 +149,7 @@ namespace AibisDream SwitchCursor(option); } - private void OnOptionSelect(DialogLine line) + private void OnOptionSelect(DialogText line) { StopDelayCursor(); _switchCoroutine = StartCoroutine(DelayAction(() => @@ -212,6 +212,8 @@ namespace AibisDream SwitchCursor(EventSystemEx.Instance.holdingObj == target.GetGameObject() ? interactive : defaultCursor); } } + + #endregion diff --git a/Assets/Scripts/UI/DialogUI/DialogBox.cs b/Assets/Scripts/UI/DialogUI/DialogBox.cs index f72a34882..059709b00 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBox.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBox.cs @@ -6,9 +6,19 @@ namespace AibisDream { [SerializeField] protected GameObject choiceButton; - protected override void LoadChoiceButton() + private void Start() { + // 初始化选择按钮 choiceButtonPrefab = choiceButton; + // 注册Viewer + DialogCanvasManager.Instance.RegisterDialogView(DialogViewType.OldBox, this); + + gameObject.SetActive(false); + } + + protected override void OnDialogViewerDestroy() + { + DialogCanvasManager.Instance.UnregisterDialogView(DialogViewType.OldBox); } } } diff --git a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs index db8f3f90a..f09e29898 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs @@ -22,13 +22,13 @@ namespace AibisDream #region box组件 - protected TypewriterByCharacter dialogText; - protected TextMeshProUGUI actorName; - protected GameObject nextArray; - protected GameObject choiceBox; + private TypewriterByCharacter _dialogText; + private TextMeshProUGUI _actorName; + private GameObject _nextArray; + private GameObject _choiceBox; #endregion - + private bool _skipLineDelay; private Action _nextStep; @@ -37,17 +37,21 @@ namespace AibisDream protected GameObject choiceButtonPrefab; - protected virtual void Awake() + private void Awake() { - LoadChoiceButton(); InitComponents(); AddSomeListener(); } + private void OnDestroy() + { + OnDialogViewerDestroy(); + } + private void AddSomeListener() { // 对话显示后有一段延时不可跳过 - dialogText.onTypewriterStart.AddListener(() => + _dialogText.onTypewriterStart.AddListener(() => { _skipLineDelay = true; _ = CommonUtil.Delay(delayTime, () => { _skipLineDelay = false; }); @@ -56,17 +60,16 @@ namespace AibisDream #region 初始化 - protected virtual void LoadChoiceButton() - { - Debug.Log("无选项对话框"); - } - private void InitComponents() { - actorName = transform.Find(ActorName)?.gameObject.GetComponent(); - dialogText = transform.Find(DialogText)?.gameObject.GetComponent(); - nextArray = transform.Find(NextArray)?.gameObject; - choiceBox = transform.Find(ChoiceBox)?.gameObject; + _actorName = transform.Find(ActorName)?.gameObject.GetComponent(); + _dialogText = transform.Find(DialogText)?.gameObject.GetComponent(); + _nextArray = transform.Find(NextArray)?.gameObject; + _choiceBox = transform.Find(ChoiceBox)?.gameObject; + } + + protected virtual void OnDialogViewerDestroy() + { } #endregion @@ -91,33 +94,28 @@ namespace AibisDream bool isAutoSkip = false) { gameObject.SetActive(true); - // // 没有dialogText说明不能显示对话，直接跳过 - // if (!dialogText) - // { - // return; - // } // 把原有对话清掉 ClearBox(); - dialogText.gameObject.SetActive(true); - choiceBox?.SetActive(false); + _dialogText.gameObject.SetActive(true); + _choiceBox?.SetActive(false); // 显示内容 ShowActorName(character); - dialogText.ShowText(dialogLine); + _dialogText.ShowText(dialogLine); // 自动跳过的回调很难独立Remove，只能全部清空再注册，下策 - dialogText.onTextShowed.RemoveAllListeners(); - dialogText.onTextShowed.AddListener(() => nextArray.gameObject.SetActive(true)); - dialogText.onTextShowed.AddListener(() => onTextShowed?.Invoke()); - dialogText.onTextShowed.AddListener(() => EnumEventSystem.Global.Send(DialogEventEnum.LineShowed)); + _dialogText.onTextShowed.RemoveAllListeners(); + _dialogText.onTextShowed.AddListener(() => _nextArray.gameObject.SetActive(true)); + _dialogText.onTextShowed.AddListener(() => onTextShowed?.Invoke()); + _dialogText.onTextShowed.AddListener(() => EnumEventSystem.Global.Send(DialogEventEnum.LineShowed)); _nextStep = nextStep; // 执行自动跳过结局 if (isAutoSkip) { - dialogText.onTextShowed.AddListener(() => _ = CommonUtil.Delay(200, NextStep)); + _dialogText.onTextShowed.AddListener(() => _ = CommonUtil.Delay(200, NextStep)); } } @@ -139,18 +137,18 @@ namespace AibisDream { gameObject.SetActive(true); // 没有选择框直接不显示选项 - if (!choiceBox) + if (!_choiceBox) { return; } // 把原有对话清掉 ClearBox(); - choiceBox.SetActive(true); - dialogText.gameObject.SetActive(false); + _choiceBox.SetActive(true); + _dialogText.gameObject.SetActive(false); // 销毁原来的按钮 - foreach (Transform child in choiceBox.transform) + foreach (Transform child in _choiceBox.transform) { Destroy(child.gameObject); } @@ -160,7 +158,7 @@ namespace AibisDream { if (!option.IsAvailable) continue; - var choiceInstance = Instantiate(choiceButtonPrefab, choiceBox.transform); + var choiceInstance = Instantiate(choiceButtonPrefab, _choiceBox.transform); choiceInstance.GetComponentInChildren().text = option.Line; choiceInstance.GetComponent /// 对话 - private void AddDialogueLine(DialogLine line) + private void AddDialogueLine(DialogText line) { logText.text += line.GetDialogText(); } @@ -170,7 +202,9 @@ namespace AibisDream public enum DialogViewType { + Default, Bubble, - OldBox + OldBox, + Screen } } \ No newline at end of file diff --git a/Assets/Scripts/UI/DialogUI/IDialogView.cs b/Assets/Scripts/UI/DialogUI/IDialogView.cs index 0081d8899..096add999 100644 --- a/Assets/Scripts/UI/DialogUI/IDialogView.cs +++ b/Assets/Scripts/UI/DialogUI/IDialogView.cs @@ -45,9 +45,9 @@ namespace AibisDream _onOptionSelected.Invoke(_option.DialogueOptionID); } - private DialogLine TransToLine() + private DialogText TransToLine() { - return new DialogLine + return new DialogText { isOption = true, lineId = _option.TextID, @@ -62,4 +62,15 @@ namespace AibisDream .Select(item => new DialogOption { _option = item, _onOptionSelected = onOptionSelected }).ToArray(); } } + + public struct DialogTextLine + { + public string lineId; + public string line; + public CharacterVo character; + public Action onTextShowed; + + public bool isAutoSkip; + public bool isClearScreen; + } } \ No newline at end of file diff --git a/Assets/StreamingAssets/Config/character.csv b/Assets/StreamingAssets/Config/character.csv index dae7620ec..57e3f6d8c 100644 --- a/Assets/StreamingAssets/Config/character.csv +++ b/Assets/StreamingAssets/Config/character.csv @@ -1,14 +1,19 @@ -通过key索引配置,中文名,人物角色（Player/MainActor/Aside）,名称显示时的颜色,头像Pic路径,语音资源路径 -Key,Cn,Role,NameColor,HeadPicPath,VoicePath -peipei,佩佩,Aside,#00FFFF,peipei_head,voice_peipei -me,我,Aside,,me_head,voice_me -peipei_novoice,胆怯女声,Aside,#00FFFF,,voice_peipei -yingli_novoice,严厉女声,Aside,#FFCC00,,voice_yingli -tutorial,教学,Aside,,, -docter,儿科医生,Aside,#FFCC00,, -peipei_child,童年佩佩,Aside,#00FFFF,,voice_peipei -unknown,？？？,Aside,#FFCC00,, -shitou,石头,Aside,,,voice_shitou -Descent,Descent,Aside,#FFCC00,,voice_me -e-assistant,电子助手,Aside,#FFCC00,,voice_me -Gotashi_unknow,戴纯金雕塑头的男人,Aside,#FFCC00,,voice_me +通过key索引配置,中文名,"显示位置，Default使用默认，Screen插线屏幕，OldBox基本对话框",人物角色（Player/MainActor/Aside）,名称显示时的颜色,头像Pic路径,语音资源路径 +Key,Cn,DialogViewType,Role,NameColor,HeadPicPath,VoicePath +peipei,佩佩,Default,Aside,#00FFFF,peipei_head,voice_peipei +me,我,Default,Aside,,me_head,voice_me +peipei_novoice,胆怯女声,Default,Aside,#00FFFF,,voice_peipei +yingli_novoice,严厉女声,Default,Aside,#FFCC00,,voice_yingli +tutorial,教学,Default,Aside,,, +docter,儿科医生,Default,Aside,#FFCC00,, +peipei_child,童年佩佩,Default,Aside,#00FFFF,,voice_peipei +unknown,？？？,Default,Aside,#FFCC00,, +shitou,石头,Default,Aside,,,voice_shitou +Descent,Descent,Default,Aside,#FFCC00,,voice_me +e-assistant,电子助手,Default,Aside,#FFCC00,,voice_me +Gotashi_unknow,戴纯金雕塑头的男人,Default,Aside,#FFCC00,,voice_me +Linking,连接中……,Screen,Aside,#E6A23C,, +Analysing,分析中,Screen,Aside,#E6A23C,, +Error,错误警告,Screen,Aside,#E6A23C,, +EyeModule,视觉模块,Screen,Aside,#F56C6C,, +LungModule,肺部模块,Screen,Aside,#E6A23C,,