diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 9f476d982..6b597c93e 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -37,6 +37,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 8220a2f6b45b8dd4e8dab6e1aaefb073 + m_Address: ExpressFixScene + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/Font/常用简体汉字5000个.txt b/Assets/Font/常用简体汉字5000个.txt index f5730d37d..fa10dbc0c 100644 --- a/Assets/Font/常用简体汉字5000个.txt +++ b/Assets/Font/常用简体汉字5000个.txt @@ -5080,4 +5080,5 @@ M （ ） ！ -~ \ No newline at end of file +~ +🎵 \ No newline at end of file diff --git a/Assets/Resources/Art/Character/Stone.meta b/Assets/Resources/Art/Character/Stone.meta new file mode 100644 index 000000000..15dd6afa8 --- /dev/null +++ b/Assets/Resources/Art/Character/Stone.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7d7ce3ec83a178469a9e076196ce852 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Art/Character/Stone/石头（佩佩饰）.psb b/Assets/Resources/Art/Character/Stone/石头（佩佩饰）.psb new file mode 100644 index 000000000..34d10f855 --- /dev/null +++ b/Assets/Resources/Art/Character/Stone/石头（佩佩饰）.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66531b912ad3920b715995923d87f84ea71cd1a4635c09c177d2ff7b6f2b7253 +size 124079477 diff --git a/Assets/Resources/Art/Character/Stone/石头（佩佩饰）.psb.meta b/Assets/Resources/Art/Character/Stone/石头（佩佩饰）.psb.meta new file mode 100644 index 000000000..0788028c0 --- /dev/null +++ b/Assets/Resources/Art/Character/Stone/石头（佩佩饰）.psb.meta @@ -0,0 +1,547 @@ +fileFormatVersion: 2 +guid: b9434df7da7b989459705969539a9baa +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: 333 + 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: "\u95ED\u773C\u773C\u6CEA" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1180 + y: 2994 + width: 363 + height: 170 + spriteID: 47e3c9d09fe4280479a774a8942041e7 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1180, y: 2994} + spritePosition: {x: 3836, y: 2056} + - name: "\u7741\u773C\u773C\u6CEA" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1617 + y: 2830 + width: 320 + height: 153 + spriteID: 89baaf6ffbce98548b5c863bbd4f0782 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1617, y: 2830} + spritePosition: {x: 3847, y: 2063} + - name: "\u7741\u773C" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1180 + y: 2830 + width: 429 + height: 156 + spriteID: eeace4d2a35f65a4ca0308f6bf2339df + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1180, y: 2830} + spritePosition: {x: 3791, y: 2163} + - name: "\u95ED\u773C\u7B11" + 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: 2830 + width: 650 + height: 545 + spriteID: db629e0f53424d248b3ef1c32e99be17 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 2830} + spritePosition: {x: 3742, y: 1873} + - name: "\u95ED\u773C\u76B1\u7709" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 662 + y: 2830 + width: 510 + height: 395 + spriteID: f0cbdb8dada74114ea2910a4847c291f + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 662, y: 2830} + spritePosition: {x: 3733, y: 2027} + - name: "\u56FE\u5C42 350" + 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: 2029 + height: 2818 + spriteID: d05ce020d14314a48acd018c77e3794b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + spritePosition: {x: 3128, y: 33} + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 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 + - 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 + mosaicLayers: 1 + characterMode: 1 + documentPivot: {x: 0, y: 0} + documentAlignment: 7 + importHiddenLayers: 0 + layerMappingOption: 2 + generatePhysicsShape: 0 + paperDollMode: 0 + keepDupilcateSpriteName: 1 + skeletonAssetReferenceID: + padding: 4 + spriteSizeExpand: 0 + spriteCategoryList: + categories: [] + spritePackingTag: + resliceFromLayer: 0 + mosaicPSDLayers: [] + rigPSDLayers: + - name: "\u6B63\u56FE" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: e7d2b05a98ad6434a895d1f7dcf7677c + layerID: 431 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u8FD1\u666F" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: 8adae25114b038e4caec52ce98134e34 + layerID: 1484 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u56FE\u5C42 347" + spriteName: + isGroup: 0 + parentIndex: 1 + spriteID: 62e24602b4e42f04e9480d7c01e9790e + layerID: 1495 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u4F69\u4F69\u5DE5\u4F5C\u670D" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: e8ffda4b65eb2e84fbc09b368b980f35 + layerID: 1447 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u95ED\u773C\u773C\u6CEA" + spriteName: "\u95ED\u773C\u773C\u6CEA" + isGroup: 0 + parentIndex: 3 + spriteID: 47e3c9d09fe4280479a774a8942041e7 + layerID: 1509 + mosaicPosition: {x: 1180, y: 2994} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u7741\u773C\u773C\u6CEA" + spriteName: "\u7741\u773C\u773C\u6CEA" + isGroup: 0 + parentIndex: 3 + spriteID: 89baaf6ffbce98548b5c863bbd4f0782 + layerID: 1508 + mosaicPosition: {x: 1617, y: 2830} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u7741\u773C" + spriteName: "\u7741\u773C" + isGroup: 0 + parentIndex: 3 + spriteID: eeace4d2a35f65a4ca0308f6bf2339df + layerID: 1505 + mosaicPosition: {x: 1180, y: 2830} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u95ED\u773C\u7B11" + spriteName: "\u95ED\u773C\u7B11" + isGroup: 0 + parentIndex: 3 + spriteID: db629e0f53424d248b3ef1c32e99be17 + layerID: 1502 + mosaicPosition: {x: 4, y: 2830} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u95ED\u773C\u76B1\u7709" + spriteName: "\u95ED\u773C\u76B1\u7709" + isGroup: 0 + parentIndex: 3 + spriteID: f0cbdb8dada74114ea2910a4847c291f + layerID: 1504 + mosaicPosition: {x: 662, y: 2830} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u56FE\u5C42 350" + spriteName: "\u56FE\u5C42 350" + isGroup: 0 + parentIndex: 3 + spriteID: d05ce020d14314a48acd018c77e3794b + layerID: 1503 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4F69\u4F69\u597D\u770B\u7248" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: ef785875ae907bc46aff8cfc5e34eeff + layerID: 1303 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u66F2\u7EBF 1 \u62F7\u8D1D" + spriteName: + isGroup: 0 + parentIndex: 10 + spriteID: 3bba153d1701f154bb60bbd410e70820 + layerID: 1481 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u66F2\u7EBF 1" + spriteName: + isGroup: 0 + parentIndex: 10 + spriteID: 9196bcd6a843024428b630c4e6810f50 + layerID: 1480 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u82F1\u7406" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: d91416946940a264a86d8031d616608a + layerID: 171 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u56FE\u5C42 33" + spriteName: + isGroup: 0 + parentIndex: 13 + spriteID: 5280b878be5dc6c4482ebbec1545a268 + layerID: 46 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u56FE\u5C42 63" + spriteName: + isGroup: 0 + parentIndex: 13 + spriteID: b11af67e39f87c343a2bbc6d8e8f3478 + layerID: 191 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u591C\u665A" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: cdcd8229d8dddc34aa8e7eab74ab6da7 + layerID: 1568 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u7A97\u6237" + spriteName: + isGroup: 0 + parentIndex: 16 + spriteID: f28b9b8d995649b43ad325d7769167db + layerID: 1559 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u95E8\u5E18" + spriteName: + isGroup: 0 + parentIndex: 16 + spriteID: 461a3619bb761294b853a4f08382aa52 + layerID: 1595 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u56FE\u5C42 353" + spriteName: + isGroup: 0 + parentIndex: 16 + spriteID: 7d66647be16ce9247ab281e3bf836be4 + layerID: 1601 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u7A97\u5E18" + spriteName: + isGroup: 0 + parentIndex: 0 + spriteID: 0a5c067ce3410b44d974ef9f0029df46 + layerID: 1228 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u767D\u5929\u80CC\u666F\u53EF\u5408\u5E76" + spriteName: + isGroup: 0 + parentIndex: 0 + spriteID: ac2f6ee006b76a24fa00de3177dda3e3 + layerID: 1482 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + sharedRigPSDLayers: [] + pSDLayerImportSetting: [] + importFileNodeState: 1 + platformSettingsDirtyTick: 638622518801678860 + spriteSizeExpandChanged: 0 + generateGOHierarchy: 0 + textureAssetName: + prefabAssetName: + spriteLibAssetName: + skeletonAssetName: + secondarySpriteTextures: [] diff --git a/Assets/Resources/Characters/Stone.prefab b/Assets/Resources/Characters/Stone.prefab new file mode 100644 index 000000000..ea6b3118b --- /dev/null +++ b/Assets/Resources/Characters/Stone.prefab @@ -0,0 +1,543 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &987494477678172233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5923261405662663629} + - component: {fileID: 3679875214247228857} + m_Layer: 0 + m_Name: EyeLayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5923261405662663629 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 987494477678172233} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.32432365, y: 2.3994, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3371895964951565487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3679875214247228857 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 987494477678172233} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 23 + m_Sprite: {fileID: -1719375440118595776, guid: b9434df7da7b989459705969539a9baa, 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.2882882, y: 0.46846846} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2645987672679907015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2875729554455935939} + - component: {fileID: 4958944941280832445} + m_Layer: 0 + m_Name: FrownLayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2875729554455935939 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2645987672679907015} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.37687683, y: 2.349851, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3371895964951565487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4958944941280832445 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2645987672679907015} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 21 + m_Sprite: {fileID: -127186478872215751, guid: b9434df7da7b989459705969539a9baa, 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.5315316, y: 1.1861862} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4839356956712968344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3371895964951565487} + m_Layer: 0 + m_Name: Stone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3371895964951565487 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4839356956712968344} + 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: 4176969131706027894} + - {fileID: 2328494562268345684} + - {fileID: 5923261405662663629} + - {fileID: 3523377169701102278} + - {fileID: 2875729554455935939} + - {fileID: 885790978123508292} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6161794619201934838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2328494562268345684} + - component: {fileID: 6961632748357027737} + m_Layer: 0 + m_Name: OpenEyesTearsLayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2328494562268345684 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6161794619201934838} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.31981945, y: 2.094595, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3371895964951565487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6961632748357027737 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6161794619201934838} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 24 + m_Sprite: {fileID: 8155891261552906671, guid: b9434df7da7b989459705969539a9baa, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.960961, y: 0.45945945} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6909624354213278777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4176969131706027894} + - component: {fileID: 3885117098936740626} + m_Layer: 0 + m_Name: ClosedEyesTearsLayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4176969131706027894 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6909624354213278777} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.28828812, y: 2.0991, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3371895964951565487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3885117098936740626 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6909624354213278777} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 25 + m_Sprite: {fileID: 5659941764955725163, guid: b9434df7da7b989459705969539a9baa, 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.09009, y: 0.5105105} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7489355556501784623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 885790978123508292} + - component: {fileID: 1148848803253470279} + m_Layer: 0 + m_Name: "\u56FE\u5C42 350" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &885790978123508292 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7489355556501784623} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.08708763, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3371895964951565487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1148848803253470279 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7489355556501784623} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 20 + m_Sprite: {fileID: -1955302081873597703, guid: b9434df7da7b989459705969539a9baa, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 6.093093, y: 8.462462} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &9021317488953216933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3523377169701102278} + - component: {fileID: 3268657904200681314} + m_Layer: 0 + m_Name: SmileLayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3523377169701102278 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9021317488953216933} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.1396389, y: 2.112613, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3371895964951565487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3268657904200681314 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9021317488953216933} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 22 + m_Sprite: {fileID: 6146239727221693287, guid: b9434df7da7b989459705969539a9baa, 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.951952, y: 1.6366366} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Characters/Stone.prefab.meta b/Assets/Resources/Characters/Stone.prefab.meta new file mode 100644 index 000000000..2a36d2e53 --- /dev/null +++ b/Assets/Resources/Characters/Stone.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b5e36f67deebd704798f21f690554ca5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset b/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset index d3e333615..01e41ec3c 100644 --- a/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset +++ b/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a4239c60be5b5782b38e76e44e5656f8c370173d68ba76120595feaf097a95a -size 70545617 +oid sha256:017c375e228776476f87629635e314357f4bdfc8e6a6070190e49ebc291b4958 +size 70545627 diff --git a/Assets/Resources/Prefabs/FontAsset/word_set.txt b/Assets/Resources/Prefabs/FontAsset/word_set.txt index 3487c263f..5de39fc56 100644 --- a/Assets/Resources/Prefabs/FontAsset/word_set.txt +++ b/Assets/Resources/Prefabs/FontAsset/word_set.txt @@ -1,2 +1,2 @@ -"#$%&'()*+,-_./0123456789:<=>@ABCDEFGHIJKLMNOPQRSTUVWYZ[]^abcdefghijklmnopqrstuvwxyz—“”…→①②、。「」【】一丁七万丈三上下不与丐丑专且丕世丘丙业丛东丝丞丟丢两严並丧个丫中丰串临丸丹为主丽举乃久么义之乌乍乎乏乐乒乓乔乖乘乙九乞也习乡书乩买乱乳乾亂了予争事二于亏云互亓五井亘亙亚些亞亟亡亢交亥亦产亨亩享京亭亮亲亳亵人亿什仁仃仄仅仆仇今介仍从仑仓仔仕他仗付仙仞仟代令以仨仪仫们仰仲仳件价任份仿企伉伊伋伍伎伏伐休伕众优伙会伞伟传伤伥伦伧伪伫伯估伴伶伸伺似伽佃但佇佈位低住佐佑体佔何佗余佚佛作佝佞佟你佣佥佩佬佯佰佳併佺佻佼佾使侃侄來侈例侍侏侑侖供依侠侣侥侦侧侨侩侮侯侵侶侷便係促俄俊俎俏俐俑俗俘俚保俞俟俠信俨俩俪俭修俯俱俳俶俸俺俾倀倆倉個倌倍倏們倒倔倖倘候倚倜借倡倣倥倦倨倩倪倫倭债值倾偃假偈偉偌偎偏偕做停健偬偭偯側偵偶偷偺偻偽偿傀傅傈傍傑傖傘備傚傢傥傧储傩催傭傯傲傳債傷傻傾僅僇僎像僑僕僖僚僥僧僩僭僮僱僳僵價僻儀儂億儅儆儈儉儋儐儒儔儕儘儛償儡優儲儳儿兀允元兄充兆兇先光克兌免兑兒兔兕兗党兜兢入內全兩八公六兮兰共关兴兵其具典兹养兼兽冀内冈冉冊册再冑冒冕冗写军农冠冢冤冥冪冬冯冰冲决况冶冷冻冽净凄准凉凋凌凍减凑凛凜凝几凡凤凭凯凰凱凳凶凸凹出击函凿刀刁刃分切刈刊刎刑划刖列刘则刚创初删判別刨利刪别刮到刳制刷券刹刺刻刽剁剂剃則削剋剌前剎剐剑剔剖剛剜剝剡剥剧剩剪副割剴創剷剽剿劂劃劇劈劉劊劍劑劓力劝办功加务劣动助努劫劬励劲劳劻劾势勁勃勇勉勋勒動勗勘務勛勝勞募勢勣勤勦勰勳勵勸勺勻勾勿匀包匆匈匍匏匐匕化北匙匝匠匡匣匪匮匯匱匹区医匾匿區十千卅升午卉半华协卑卒卓協单卖南博卜卞占卡卢卤卦卧卫卮卯印危即却卵卷卸卹卻卿厂厄厅历厉压厌厕厘厚厝原厢厥厦厨厩厭厮厲去县叁参參又叉及友双反发叔取受变叙叛叟叠叢口古句另叨叩只叫召叭叮可台叱史右叵叶号司叹叻叼叽吁吃各吆合吉吊吋同名后吏吐向吒吓吕吗吙君吝吞吟吠否吧吨吩含听吭吮启吱吳吴吵吶吸吹吻吼吾呀呂呃呆呈告呎呐呕呗员呛呜呢呦周呱呲味呵呶呷呸呻呼命咀咂咄咆咋和咎咏咐咒咔咕咖咙咚咛咝咣咤咦咧咨咩咪咫咬咯咱咳咸咻咽咿哀品哂哄哆哇哈哉响哎哐哑哒哓哗哝哟員哥哦哧哨哩哪哭哮哱哲哺哼哽唁唆唇唉唏唐唔唠唤唧唬售唯唰唱唳唷唸唾啁啃啄商啊問啕啖啗啜啞啟啡啣啤啥啦啧啪啬啰啷啸啻啼啾喀喂喃善喆喇喉喊喋喑喔喘喙喚喜喝喟喧喪喫喬單喱喲喳喷喻喽嗅嗆嗇嗉嗎嗐嗑嗒嗓嗔嗖嗙嗚嗜嗝嗟嗡嗣嗤嗥嗦嗨嗫嗬嗯嗶嗷嗽嗾嘀嘁嘆嘈嘉嘍嘎嘐嘔嘖嘗嘘嘚嘛嘟嘡嘩嘫嘭嘮嘯嘰嘱嘲嘴嘶嘹嘻嘿噌噎噓噔噗噘噙噜噢噤噥器噩噪噫噬噯噱噴噶噸噹噻噼嚀嚅嚇嚎嚏嚐嚓嚕嚣嚥嚮嚷嚼囊囔囚四囝回因团囤囪囫园困囱围囵固国图囿圃圄圆圈圉國圍園圓圖團土圣在圩圬圭圯地圳场圻圾址坂均坊坍坎坏坐坑块坚坛坝坞坟坠坡坤坦坨坩坪坳坷坼垂垃垄垆型垒垓垕垛垠垢垣垦垫垭垮埂埃埋城埔埚埜域埠埤執培基堂堅堆堉堊堑堕堙堝堠堡堤堪堯堰報場堵塊塋塌塑塒塔塗塘塚塞塢填塭塵塹塽塾墀境墅墉墊墓墙墜增墟墡墦墨墩墮墳墾壁壅壇壎壑壓壕壘壙壞壢壤士壬壮壯声壳壶壹壺壽处备复夏夔夕外夙多夜够夠夢夤夥大天太夫夭央夯失头夷夸夹夺夾奄奇奈奉奋奎奏奐契奔奕奖套奘奚奠奢奥奧奩奪奭奮女奴奶奸她好妁如妃妄妆妇妈妊妍妒妓妖妙妝妞妣妤妥妨妪妮妯妳妹妻妾姅姆姊始姍姐姑姒姓委姗姘姚姜姣姥姦姨姪姬姹姻姿威娃娄娅娇娉娌娑娓娘娛娜娟娠娣娥娩娱娴娶娼婀婁婆婉婊婚婢婦婪婴婶婷婺婿媒媚媛媧媲媳媼媽媾嫁嫂嫉嫌嫔嫖嫗嫘嫡嫣嫦嫩嫵嫻嬈嬉嬋嬌嬝嬤嬪嬰嬴嬸子孑孓孔孕字存孙孚孛孜孝孟季孤学孩孪孫孬孰孱孳孵學孺孽宁它宅宇守安宋完宏宕宗官宙定宛宜宝实宠审客宣室宥宦宪宫宮宰害宴宵家宸容宽宾宿寀寂寄寅密寇富寐寒寓寘寝寞察寡寢寤寥實寧寨審寫寬寮寰寸对寺寻导寿封射将將專尉尊尋對導小少尔尖尘尚尛尝尢尤尧尬就尴尷尸尹尺尼尽尾尿局屁层居屆屈屉届屋屌屍屎屏屐屑展屘屜屝属屠屡屢層履屨屯山屹屿岁岂岌岐岑岔岖岗岙岚岛岡岧岩岫岬岭岱岳岷岸岿峋峒峙峡峣峥峦峨峪峭峰峴島峻峽崁崆崇崎崑崔崖崗崙崛崢崤崧崩崭崮崴崽嵇嵌嵐嵘嵩嵯嶂嶄嶇嶔嶙嶝嶸嶺嶼嶽巅巍川州巡巢工左巧巨巩巫差己已巳巴巷巽巾币市布帅帆师希帐帑帕帖帘帙帚帛帜帝帟帥带帧師席帮帳帶帷常帼帽幀幃幄幅幌幔幕幗幛幟幡幢幣幫干平年并幸幹幺幻幼幽幾广庄庆庇床序庐库应底庖店庙庚府庞废庠度座庫庭庵庶康庸庾廁廂廄廈廉廊廓廖廚廛廝廟廠廢廣廬延廷建廾廿开弁异弃弄弈弊弋式弑弒弓弔引弗弘弛弟张弥弦弧弩弭弯弱張強弹强弼彀彆彈彊彌归当录彗彙彝形彤彥彦彩彪彫彬彭彰影彷役彻彼彿往征径待徇很徉徊律後徐徑徒得徘徙徜從徠御徨復循徬徭微徴徵德徹徽心必忆忌忍忏忐忑忖志忘忙忝忠忡忧忪快忬忱念忸忻忽忾忿怀态怂怃怅怆怎怏怒怔怕怖怛怜思怠怡急怦性怨怩怪怫怯怵总恂恃恆恋恍恐恒恕恙恢恣恤恥恨恩恪恫恬恭息恰恳恶恹恺恻恼恿悄悅悉悌悍悔悖悚悟悠患悦您悫悬悯悲悴悵悶悸悻悼悽情惆惇惊惋惑惕惘惚惜惟惠惡惦惧惨惩惫惬惭惮惯惰惱想惴惶惹惺惻愀愁愆愈愉愍愎意愒愕愚愛愜感愣愤愧愫愬愴愷愾愿慄慇慈態慌慍慎慑慕慘慚慝慟慢慣慧慨慫慮慰慵慶慷慼慾憂憊憋憎憐憑憔憚憤憧憨憩憫憬憮憲憶憾懂懇懈應懊懋懍懑懒懣懦懲懵懶懷懿戈戊戌戍戎戏成我戒戕或战戚戛戟戡戢截戮戰戲戳戴戶户戾房所扁扇扈扉手才扎扑扒打扔托扛扣执扩扪扫扬扭扮扯扰扳扶批扼找承技抄抆抉把抑抒抓抔投抖抗折抚抛抠抡抢护报抨披抬抱抵抹抻押抽抿拂拄担拆拇拈拉拊拋拌拍拎拐拒拓拔拖拗拘拙拚招拜拟拢拣拥拦拧拨择括拭拮拯拱拳拴拷拼拽拾拿持挂指挈按挎挑挖挚挛挞挟挠挡挣挤挥挨挪挫振挲挺挽挾捂捅捆捉捋捌捍捎捏捐捕捞损捡换捣捧捨捩捫捭据捯捱捲捶捷捺捻掀掂掃掄授掉掌掏掐排掖掘掙掛掠採探掣接控推掩措掬掰掳掴掷掸掺揀揄揆揉揍描提插揖揚換握揣揩揪揭揮援揹揽搀搁搂搅搆損搏搐搓搔搖搗搜搞搡搪搬搭搴搶携搽搾摁摄摆摇摈摊摑摒摔摘摞摟摧摩摭摯摸摹摺摻撂撅撇撈撐撑撒撓撕撙撚撞撢撤撥撩撫撬播撮撰撲撳撵撷撸撻撼撾撿擁擂擄擅擇擊擋操擎擒擔擘據擞擠擢擤擦擬擭擰擱擲擴擷擺擻擾攀攆攒攘攢攥攫支收攸改攻放政故效敉敌敏救敔敕敖敗敘教敛敝敞敢散敦敬数敲整敵敷數斂斃文斋斌斐斑斓斗料斛斜斟斡斤斥斧斩斫斬断斯新斷方於施旁旅旋旌旎族旖旗无既日旦旧旨早旬旭旱时旷旺昀昂昆昇昊昌明昏易昔昕昖昙星映昤春昧昨昭是昱昶昺昼显晁時晃晅晉晋晌晏晒晓晔晕晖晗晚晝晞晟晤晦晨普景晰晴晶晷智晾暂暄暇暈暉暍暑暖暗暘暝暢暧暨暫暮暱暴暸暹曄曆曇曉曌曖曙曜曝曠曦曰曲曳更曷書曹曼曾替最會月有朋服朐朔朕朗望朝期朦木未末本札朮术朱朴朵机朽杀杂权杆杉李杏材村杓杖杗杜杞束杠条来杨杪杭杯杰東杲杳杵杷杼松板极构枇枉枋析枓枕林枚果枝枢枣枪枫枭枯枰枴架枷枸柄柏某柑柒染柔柙柚柜柝柞柠柢查柩柬柯柱柳柴柵柿栅标栈栉栋栏树栓栖栗栘校栩株样核根格栽栾桀桁桂桃桅框案桌桎桐桑桓桔桢档桥桧桨桩桶桿梁梂梃梅梆梏梓梔梗條梟梡梢梦梧梨梭梯械梱梳梵检棂棄棉棋棍棒棕棗棘棚棟棠棣棧森棱棲棵棹棺棻椁椅植椎椒椟椰楂楄楊楓楔楚楛楝楞楠楣楨楫業楮楯極楷楹楼概榆榉榊榑榔榕榛榜榣榦榨榫榭榮榴榷榻槁槃構槌槍槐槓槛槟槨槭槳槽樁樂樅樊樑樓樘標樞樟模樣横樯樱樵樸樹樺樽樾橄橇橈橋橓橘橙橚橞機橡橢橫橱橹橾檀檄檐檔檗檜檠檢檣檬檮檯檳檸檻櫂櫃櫓櫚櫛櫝櫥欠次欢欣欤欧欲欸欺欽款歆歇歉歌歎歐歙歜歟止正此步武歧歪歲歷歸歹死歼歿殃殄殆殇殉殊残殍殒殖殘殡殤殮殯殴段殷殺殼殿毀毁毂毅毆毋母每毒毓比毕毖毗毙毚毛毡毫毬毯毽氅氈氏氐民氓气氖氛氟氣氤氦氧氨氫氬氮氯氳水永氾汀汁求汇汉汍汎汐汕汗汙汛汝汞江池污汤汨汩汪汰汲汴汶汹決汽汾沁沂沃沅沆沈沉沌沍沏沐沒沓沔沖沘沙沛沟没沥沦沧沪沫沬沮沱河沸油治沼沽沾沿況泄泅泉泊泌泓法泖泗泛泜泞泠泡波泣泥注泪泯泰泱泳泵泸泻泼泽泾洁洋洌洎洒洗洛洞津洧洩洪洫洮洱洲洵洶洸洹活洼洽派流浃浅浆浇浊测济浏浑浒浓浙浚浠浣浥浦浩浪浬浮浴海浸浹涂涅涇消涉涊涌涎涓涔涕涛涝涟涠涡涣涤润涧涨涩涪涮涯液涵涸涼涿淀淄淅淆淇淋淌淑淒淖淘淙淚淝淞淡淤淦淨淪淫淬淮深淳淵混淹淺添淼清渊渌渍渎渐渔渗渙渚減渝渠渡渣渤渥渦温測渭港渲渴游渺渾湃湄湊湍湎湔湖湘湛湟湣湧湩湮湯湲湾湿溃溅溉源準溘溜溝溢溥溧溪溫溯溴溶溺溼滁滂滄滅滇滉滋滌滑滓滔滕滚滞满滢滤滥滦滨滩滬滯滲滴滷滹滾滿漁漂漆漉漏漓演漕漠漢漣漩漪漫漬漱漲漳漶漸漾漿潇潑潔潘潛潜潟潠潢潤潦潭潮潯潰潴潸潺潼澀澄澆澈澎澗澜澠澡澤澦澧澱澳澴澶澹激濁濂濃濒濕濘濙濛濟濠濡濤濩濫濬濮濯濰濱濺濾瀆瀉瀋瀏瀑瀕瀘瀚瀝瀨灌火灭灯灰灵灶灸灼災灾灿炀炆炉炊炎炒炕炖炙炜炝炤炫炬炭炮炯炳炷炸点為炼炽烁烂烈烊烏烘烙烛烟烤烦烧烨烩烫烬热烯烹烽焉焊焐焕焖焘焙焚焜無焦焰然煅煆煉煌煎煖煙煜煞煤煥煦照煨煩煬煮煲煳煸煽熄熊熏熒熔熙熜熟熠熨熬熱熹熾燃燄燈燉燎燐燒燕燙燜營燠燥燦燧燬燭燮燴燸燹燻燼燾爆爌爍爪爬爭爰爱爵父爷爸爹爺爻爽爾爿牆片版牌牍牒牖牘牙牛牝牟牠牡牢牤牦牧物牯牲牴牵特牺牽牾犀犁犄犊犒犖犛犟犢犬犯状犷犹狀狂狄狈狎狐狗狙狞狠狡狩独狭狮狰狱狲狷狸狹狼狽猁猎猓猕猖猗猙猛猜猝猞猢猥猩猪猫猬献猴猶猷猾猿獄獅獎獐獒獗獠獨獭獰獲獵獷獸獺獾玄玆率玉王玖玘玛玟玠玥玨玩玫环现玲玳玷玺玻珀珅珊珍珏珑珙珞珠珣珥珪班珮珲珵珽現球琅理琉琊琍琏琐琛琢琥琦琨琪琮琯琳琴琵琶琺琼琿瑁瑄瑕瑗瑙瑚瑛瑜瑞瑟瑣瑤瑩瑪瑭瑯瑰瑶瑾璀璁璃璋璐璘璜璞璟璣璦璧璨璩環璽璿瓊瓛瓜瓠瓢瓣瓤瓦瓮瓶瓷甄甌甍甕甘甚甜生甡產甥甦用甩甫甬甭田由甲申电男甸画甽畅畋界畎畏畔留畚畜畝畢略畦番畫異畴當畸畿疆疇疋疏疑疗疙疚疝疡疢疣疤疥疫疮疯疱疲疳疴疵疸疹疼疽疾痂病症痈痉痊痍痒痔痕痘痙痛痞痠痢痣痤痨痪痰痱痲痳痴痹痺痿瘀瘁瘉瘋瘍瘓瘟瘠瘡瘢瘤瘦瘧瘩瘪瘫瘴瘸瘺瘾療癆癌癒癖癘癞癟癡癢癫癯癸登發白百皂的皆皇皈皋皎皑皓皖皙皚皞皦皮皰皱皴皺皿盂盃盅盆盈益盍盎盏盐监盒盔盖盗盘盛盜盞盟盡監盤盥盧盪目盯盲直相盹盼盾省眇眈眉看真眠眨眩眬眯眶眷眸眺眼眾眿着睁睃睏睑睛睜睞睡睢督睥睦睨睪睫睬睹睽睿瞄瞅瞇瞋瞌瞎瞑瞒瞞瞟瞠瞥瞧瞩瞪瞬瞭瞰瞳瞻瞼瞽瞿矇矗矛矜矢矣知矩矫短矮矯石矶矻矽矾矿码砂砌砍砒研砖砚砝砟砠砣砥砧砭砰砲破砷砸砺砾础硃硌硎硕硝硫硬确硯硼硿碉碌碍碎碑碓碗碘碜碟碣碧碩碰碳碴確碼碽碾磁磅磊磋磐磕磚磧磨磬磯磴磷磺礁礎礙礦礪示礼社祀祁祆祇祈祉祐祕祖祗祚祝神祟祠祥票祭祯祷祸祺祿禀禁禄禅禍禎福禛禦禧禪禮禱禹禺离禽禾禿秀私秃秈秉秋种科秒秘租秣秤秦秧秩积称秸移秽稀稅稈程稍税稔稗稚稜稞稟稠稣種稱稳稷稻稼稽稿穀穆穋穌積穎穗穠穡穢穩穫穴究穷穹空穿突窃窄窈窍窑窒窕窖窗窘窜窝窟窠窥窦窩窪窮窯窺窿竄竅立竑竖站竞竟章竣童竭端竹竺竽竿笃笆笈笊笋笏笑笔笙笛笞笠符笨第笮笳笼筅筆等筋筍筏筐筑筒答策筛筝筠筧筮筱筵筷筹签简箄箇箋箍箏箓箔箕算箝箠管箧箩箪箫箭箱箴箸節篁範篆篇築篌篑篓篙篛篝篠篡篤篦篩篮篱篷篾簇簌簍簏簑簞簡簣簧簪簸簽簾簿籁籍米类籽粉粑粒粕粗粘粝粟粤粥粪粮粱粲粳粵粹粼粽精糅糊糌糕糖糙糜糝糞糟糠糢糧糨糯糸系糾紀紂約紅紆紇紉紊紋納紐純紕紗紙級紛紜素紡索紧紫紮累細紱紲紳紹紼絀終絃組絆結絕絛絞絡絢給絨絮絰統絲絳絹綁綎綏綑經綜綞綠綢綬維綰綱網綴綵綸綺綻綽綾綿緇緊緒緘緙線緝緞締緣編緩緬緯緲練緹緻縈縉縊縐縑縛縝縞縣縫縮縯縱縲縴縵縷縹總績縿繁繃繅繆繇繈繒織繕繙繚繞繩繪繫繭繳繹纂纛纠红纣纤纥约级纨纪纬纭纮纯纰纱纲纳纵纶纷纸纹纺纽线练组绅细织终绉绊绌绍绎经绐绑绒结绔绕绘给绚络绝绞统绢绣绥继绩绪续绮绯绰绳维绵绷绸综绽绾绿缀缁缄缅缆缇缈缉缎缓缔缕编缘缙缚缛缜缝缟缠缢缤缥缨缩缪缭缮缰缴缶缸缺缽罄罈罐网罔罕罗罚罟罡罢罩罪置罰署罵罷罹羁羅羊羋羌美羔羚羞羡群羨義羯羲羶羸羹羼羽羿翀翁翅翊翌翎習翔翕翘翟翠翡翦翩翮翰翱翳翹翻翼耀老考耄者耆耋而耍耐耑耒耕耗耘耙耜耦耨耳耶耷耸耻耽耿聂聆聊聋职聒联聖聘聚聞聩聪聯聰聱聲聳聶職聿肃肄肅肆肇肉肋肌肓肖肘肚肛肝肠股肢肤肥肩肪肫肮肯肱育肴肺肾肿胀胁胃胄胆背胎胖胚胛胜胝胞胡胤胥胧胪胫胭胯胰胱胳胴胶胸胺胼能脂脅脆脈脉脊脍脏脐脑脓脖脚脣脤脩脫脯脰脱脸脹脾腆腊腋腌腎腐腑腓腔腕腥腦腫腮腰腱腳腴腸腹腺腻腼腾腿膀膂膈膊膏膚膛膜膝膠膨膩膳膺膻膽膾膿臀臂臃臆臉臊臍臏臘臜臣臥臧臨自臬臭至致臺臻臼臾舀舂舅舆與興舉舊舌舍舐舒舔舛舜舞舟舢舨航舫般舰舱舵舶舷船艇艋艘艙艮良艰艱色艳艺艽艾节芋芍芒芙芜芝芟芣芥芦芬芭芯芰花芳芷芸芹芻芽芾苇苋苍苎苏苑苒苓苔苗苛苜苞苟苣若苦苧苯英苹茁茂范茄茅茆茉茎茏茔茕茗茜茧茨茫茬茱茲茴茵茶茸茹荀荃荆草荊荏荐荒荔荚荟荡荣荤荥荧荨荫药荷荸荻荼莅莆莉莊莎莒莓莖莘莞莠莢莧莫莱莲获莹莼莽菁菂菅菇菊菌菔菜菟菠菩華菰菱菲菴菸菽萃萄萇萊萋萌萍萎萝营萦萧萨萬萱萵萸萼落葆葉葑著葛葡董葦葩葫葬葭葱葵葷葺蒂蒋蒐蒗蒙蒜蒞蒯蒲蒸蒼蒿蓀蓄蓆蓉蓊蓋蓑蓓蓝蓟蓦蓬蓮蓿蔆蔑蔓蔔蔗蔚蔡蔣蔥蔬蔭蔼蔽蕃蕈蕉蕊蕙蕞蕨蕩蕪蕭蕲蕴蕾薄薇薊薑薔薛薜薦薨薩薪薮薯薰薺藉藍藏藐藓藕藝藤藥藩藪藷藹藺藻蘆蘇蘊蘋蘑蘸虎虏虐虑虔處虚虛虜虞號虧虫虬虱虹虺虻虽虾蚀蚁蚂蚊蚓蚕蚜蚣蚤蚩蚪蚯蚱蚵蚶蛀蛄蛆蛇蛉蛊蛋蛎蛐蛔蛙蛛蛞蛟蛤蛩蛭蛮蛰蛴蛹蛻蛾蜀蜂蜃蜆蜇蜈蜉蜊蜒蜓蜕蜗蜘蜚蜜蜡蜢蜥蜩蜴蜷蜻蜿蝇蝉蝌蝎蝓蝕蝗蝙蝠蝣蝦蝨蝴蝶蝸螂螃融螞螟螢螫螬螳螺螻蟀蟆蟈蟋蟑蟒蟠蟬蟯蟲蟹蟻蟾蠅蠕蠡蠢蠹血衅行衍術衔街衙衛衝衡衢衣补表衫衬衮衰衷衹衽衾袁袂袄袅袈袋袍袒袖袜袝袞袤被袭袱裁裂装裆裊裎裒裔裕裘裙補裝裟裡裤裨裯裱裳裴裸裹製裾褂複褊褐褒褓褕褚褛褡褥褪褫褲褴褶褸褻褽襁襄襖襞襟襠襤西要覃覆見規覓視覜覦親覬覲见观规觅视览觉觊觋觍觎觐觑角觔解触觴言訂訃計訊訌討訏訐訑訓訕訖託記訛訝訟訢訣訥訪設許訴訶診註証訾詁詆詐詔評詖詛詞詠詢詣試詨詩詫詬詭詮詰話該詳詹詻詼誅誇誉誌認誑誓誕誘誚語誠誡誣誤誥誦誧誨說誰課誶誹誼調諂諄談諉請諍諒論諛諜諦諧諫諭諮諱諳諶諷諸諺諼諾謀謁謂謄謇謊謎謐謗謙講謝謠謨謫謬謹譁譆譎譏識譙譚譜警譬计订讣认讥讦讧讨让讪训议讯记讲讳讴讶讷许讹论讼讽设访诀证诂诃评诅识诈诉诊诋词诏译试诗诘诚诛诜话诞诠诡询诣诤该详诧诨诩诫诬语误诰诱诲诳说诵请诸诺读诽课谀谁调谄谅谆谈谊谋谍谎谏谐谑谒谓谕谗谙谚谛谜谟谢谣谤谥谦谧谨谩谪谬谭谱谲谴谶谷谿豁豆豈豉豌豎豐豕豚象豢豪豫豬豭豳豹豺貂貉貊貌貍貓貝貞負財貢貧貨販貪貫責貯貲貳貴貶買貸費貼貽貿賀賁賂賃賄賅資賈賊賑賒賓賜賞賠賡賢賣賤賦質賬賭賴賸賺賻購賽贅贝贞负贡财责贤败账货质贩贪贫贬购贮贯贰贱贲贴贵贷贸费贺贻贼贽贾贿赂赃资赅赈赊赋赌赍赎赏赐赓赔赖赘赚赛赝赞赠赡赢赣赤赦赧赫赭走赳赴赵赶起趁趄超越趋趔趕趙趟趣趨趱足趴趸趺趾趿跃跄跆跋跌跎跏跑跚跛距跟跡跤跦跨跪路跳践跶跷跺跻跼踉踊踌踏踐踝踞踟踡踢踩踪踫踮踱踴踵踹踽蹂蹄蹇蹈蹉蹊蹋蹑蹒蹕蹙蹚蹟蹣蹤蹦蹩蹬蹭蹰蹲蹴蹶蹺蹼蹿躁躂躇躉躏身躬躯躲躺軀車軋軌軍軏軒軔軛軟軸軻軼軾較載輊輒輓輔輕輛輜輝輞輟輥輦輩輪輯輳輸輻輾輿轂轄轅轉轎轔车轧轨轩转轮软轰轱轲轴轶轻载轿辂较辄辅辆辈辉辍辎辐辑输辔辕辖辗辘辙辛辜辞辟辣辦辨辩辫辭辰辱農边辽达迁迂迄迅迆过迈迎运近返还这进远违连迟迢迤迥迦迨迩迪迫迭述迴迷迸迹迺追退送适逃逅逆选逊逍透逐递途逕逖逗這通逛逝逞速造逡逢連逦逮逯週進逵逶逸逻逼逾遁遂遇遊運遍過遏遐遑遒道達違遗遘遙遛遜遝遞遠遢遣遥遨適遭遮遲遴遵遷選遺遼遽避邀邁邂邃還邇邈邊邋邑邓邕邝邢那邦邪邮邱邵邶邸邹邻郁郃郊郎郑郝郡郢郦郧部郭郵都郾鄂鄉鄒鄗鄘鄙鄞鄢鄧鄭鄰鄱鄴酉酊酋酌配酒酗酝酡酣酥酩酪酬酱酴酵酷酸酽酿醃醇醉醋醍醐醒醜醞醣醪醫醬醮醱醺釆采釉释里重野量釐金釗釘釙釜針釣釦釧釩釭釵鈇鈉鈍鈐鈑鈔鈕鈞鈣鈴鈷鈸鈹鈽鈾鈿鉀鉅鉉鉋鉍鉑鉗鉚鉛鉤鉴鉸鉻鉼銀銅銑銓銖銘銜銨銬銮銲銳銷銻銼鋁鋅鋇鋐鋒鋤鋪鋰鋸鋼錄錐錕錘錙錚錠錡錢錦錨錫錮錯錳錶鍊鍋鍍鍔鍚鍛鍥鍬鍰鍵鍾鎂鎊鎔鎖鎗鎘鎚鎡鎢鎬鎮鎰鎳鎸鏃鏈鏍鏑鏖鏗鏘鏜鏝鏟鏡鏢鏤鐇鑨鑫针钉钓钗钙钛钜钝钞钟钢钥钦钧钩钮钰钱钳钵钹钺钻钿铁铃铄铅铆铉铎铐铖铛铜铠铢铣铤铨铩铭铮铰铲铳银铸铺链铿销锁锃锄锅锈锉锋锏锐错锚锡锢锣锤锥锦锨锭键锯锲锵锸锹锻镀镂镆镇镌镍镐镔镖镗镚镜镢镣镰镳镶長长門閂閃閉開閎閏閑閒間閔閘閡閣閤閥閨閩閭閱閻闆闈闊闋闌闐闔闕闖關门闩闪闭问闯闲闳间闵闷闸闹闺闻闽闾阀阁阂阄阅阈阉阊阋阎阐阑阒阔阕阖阗阙阜队阡阪阬阮阱防阳阴阵阶阻阿陀陂附际陆陈陋陌降限陕陘陛陝陞陡院陣除陨险陪陬陰陲陳陴陵陶陷陸陽隄隅隆隊隋隍階随隐隔隕隘隙際障隧隨險隱隴隶隸隹隻难雀雁雄雅集雇雉雊雋雌雍雏雒雕雖雙雛雜雞離難雨雩雪雯雲雳零雷雹電雾需霄霆震霉霍霎霏霑霓霖霜霞霤霧霭霰露霸霹霾青靓靖静靛靜非靠靡面靦革靳靴靶靼鞅鞋鞍鞏鞑鞘鞠鞣鞦鞭韋韌韓韜韦韧韩韬韭音韵韶韹頁頂頃項順須頊頌預頑頒頓頗領頜頡頤頫頭頰頷頸頹頻顆題額顎顏顓願顛類页顶顷项顺须顽顾顿颀颁颂预颅领颇颈颉颊颌颍颐频颓颔颖颗题颛颜额颠颤風颯颱颳颶颺颼风飒飓飕飘飙飚飛飞食飢飧飩飪飭飯飲飴飼飽飾餃餅餉養餌餐餒餓餘餚餛餞餡館餮餵餽餾餿饅饉饕饥饨饪饬饭饮饯饰饱饲饵饶饷饺饼饿馁馄馅馆馈馊馋馍馏馐馑馒首香馥馨馬馭馮馱馳馴駁駐駑駒駕駙駛駝駟駢駭駱駿騁騎騖马驭驮驯驰驱驳驴驶驸驹驻驼驽驾驿骁骂骄骆骇骈骋验骏骐骑骗骚骜骞骟骠骡骢骤骥骧骨骯骰骷骸骼髁髅髓高髡髦髭髮髯髻鬃鬆鬍鬥鬧鬨鬲鬼魁魂魄魅魆魇魍魎魏魔魚魯魷鮑鮪鮫鮭鮮鯀鯈鯉鯊鯖鯛鯧鯨鯽鱼鱿鲁鲈鲍鲑鲜鲤鲨鳄鳅鳌鳖鳞鳥鳩鳳鳴鳶鴃鴆鴉鴒鴕鴛鴣鴦鴨鴻鴿鵑鵝鵠鵡鵪鵬鵲鶉鶣鸟鸠鸡鸢鸣鸥鸦鸭鸮鸯鸳鸽鸾鸿鹃鹄鹅鹊鹏鹜鹞鹤鹫鹭鹰鹳鹵鹿麂麈麋麒麓麗麟麥麦麩麴麻麼麾黃黄黍黎黏黑黔默黛黜黝點黠黩黯鼎鼓鼕鼠鼬鼻鼾齊齋齐齑齒齿龄龇龊龌龍龙龚龛龜龟！（），：；？ \ No newline at end of file +🎵"#$%&'()*+,-_./0123456789:<=>@ABCDEFGHIJKLMNOPQRSTUVWYZ[]^abcdefghijklmnopqrstuvwxyz—“”…→①②、。「」【】一丁七万丈三上下不与丐丑专且丕世丘丙业丛东丝丞丟丢两严並丧个丫中丰串临丸丹为主丽举乃久么义之乌乍乎乏乐乒乓乔乖乘乙九乞也习乡书乩买乱乳乾亂了予争事二于亏云互亓五井亘亙亚些亞亟亡亢交亥亦产亨亩享京亭亮亲亳亵人亿什仁仃仄仅仆仇今介仍从仑仓仔仕他仗付仙仞仟代令以仨仪仫们仰仲仳件价任份仿企伉伊伋伍伎伏伐休伕众优伙会伞伟传伤伥伦伧伪伫伯估伴伶伸伺似伽佃但佇佈位低住佐佑体佔何佗余佚佛作佝佞佟你佣佥佩佬佯佰佳併佺佻佼佾使侃侄來侈例侍侏侑侖供依侠侣侥侦侧侨侩侮侯侵侶侷便係促俄俊俎俏俐俑俗俘俚保俞俟俠信俨俩俪俭修俯俱俳俶俸俺俾倀倆倉個倌倍倏們倒倔倖倘候倚倜借倡倣倥倦倨倩倪倫倭债值倾偃假偈偉偌偎偏偕做停健偬偭偯側偵偶偷偺偻偽偿傀傅傈傍傑傖傘備傚傢傥傧储傩催傭傯傲傳債傷傻傾僅僇僎像僑僕僖僚僥僧僩僭僮僱僳僵價僻儀儂億儅儆儈儉儋儐儒儔儕儘儛償儡優儲儳儿兀允元兄充兆兇先光克兌免兑兒兔兕兗党兜兢入內全兩八公六兮兰共关兴兵其具典兹养兼兽冀内冈冉冊册再冑冒冕冗写军农冠冢冤冥冪冬冯冰冲决况冶冷冻冽净凄准凉凋凌凍减凑凛凜凝几凡凤凭凯凰凱凳凶凸凹出击函凿刀刁刃分切刈刊刎刑划刖列刘则刚创初删判別刨利刪别刮到刳制刷券刹刺刻刽剁剂剃則削剋剌前剎剐剑剔剖剛剜剝剡剥剧剩剪副割剴創剷剽剿劂劃劇劈劉劊劍劑劓力劝办功加务劣动助努劫劬励劲劳劻劾势勁勃勇勉勋勒動勗勘務勛勝勞募勢勣勤勦勰勳勵勸勺勻勾勿匀包匆匈匍匏匐匕化北匙匝匠匡匣匪匮匯匱匹区医匾匿區十千卅升午卉半华协卑卒卓協单卖南博卜卞占卡卢卤卦卧卫卮卯印危即却卵卷卸卹卻卿厂厄厅历厉压厌厕厘厚厝原厢厥厦厨厩厭厮厲去县叁参參又叉及友双反发叔取受变叙叛叟叠叢口古句另叨叩只叫召叭叮可台叱史右叵叶号司叹叻叼叽吁吃各吆合吉吊吋同名后吏吐向吒吓吕吗吙君吝吞吟吠否吧吨吩含听吭吮启吱吳吴吵吶吸吹吻吼吾呀呂呃呆呈告呎呐呕呗员呛呜呢呦周呱呲味呵呶呷呸呻呼命咀咂咄咆咋和咎咏咐咒咔咕咖咙咚咛咝咣咤咦咧咨咩咪咫咬咯咱咳咸咻咽咿哀品哂哄哆哇哈哉响哎哐哑哒哓哗哝哟員哥哦哧哨哩哪哭哮哱哲哺哼哽唁唆唇唉唏唐唔唠唤唧唬售唯唰唱唳唷唸唾啁啃啄商啊問啕啖啗啜啞啟啡啣啤啥啦啧啪啬啰啷啸啻啼啾喀喂喃善喆喇喉喊喋喑喔喘喙喚喜喝喟喧喪喫喬單喱喲喳喷喻喽嗅嗆嗇嗉嗎嗐嗑嗒嗓嗔嗖嗙嗚嗜嗝嗟嗡嗣嗤嗥嗦嗨嗫嗬嗯嗶嗷嗽嗾嘀嘁嘆嘈嘉嘍嘎嘐嘔嘖嘗嘘嘚嘛嘟嘡嘩嘫嘭嘮嘯嘰嘱嘲嘴嘶嘹嘻嘿噌噎噓噔噗噘噙噜噢噤噥器噩噪噫噬噯噱噴噶噸噹噻噼嚀嚅嚇嚎嚏嚐嚓嚕嚣嚥嚮嚷嚼囊囔囚四囝回因团囤囪囫园困囱围囵固国图囿圃圄圆圈圉國圍園圓圖團土圣在圩圬圭圯地圳场圻圾址坂均坊坍坎坏坐坑块坚坛坝坞坟坠坡坤坦坨坩坪坳坷坼垂垃垄垆型垒垓垕垛垠垢垣垦垫垭垮埂埃埋城埔埚埜域埠埤執培基堂堅堆堉堊堑堕堙堝堠堡堤堪堯堰報場堵塊塋塌塑塒塔塗塘塚塞塢填塭塵塹塽塾墀境墅墉墊墓墙墜增墟墡墦墨墩墮墳墾壁壅壇壎壑壓壕壘壙壞壢壤士壬壮壯声壳壶壹壺壽处备复夏夔夕外夙多夜够夠夢夤夥大天太夫夭央夯失头夷夸夹夺夾奄奇奈奉奋奎奏奐契奔奕奖套奘奚奠奢奥奧奩奪奭奮女奴奶奸她好妁如妃妄妆妇妈妊妍妒妓妖妙妝妞妣妤妥妨妪妮妯妳妹妻妾姅姆姊始姍姐姑姒姓委姗姘姚姜姣姥姦姨姪姬姹姻姿威娃娄娅娇娉娌娑娓娘娛娜娟娠娣娥娩娱娴娶娼婀婁婆婉婊婚婢婦婪婴婶婷婺婿媒媚媛媧媲媳媼媽媾嫁嫂嫉嫌嫔嫖嫗嫘嫡嫣嫦嫩嫵嫻嬈嬉嬋嬌嬝嬤嬪嬰嬴嬸子孑孓孔孕字存孙孚孛孜孝孟季孤学孩孪孫孬孰孱孳孵學孺孽宁它宅宇守安宋完宏宕宗官宙定宛宜宝实宠审客宣室宥宦宪宫宮宰害宴宵家宸容宽宾宿寀寂寄寅密寇富寐寒寓寘寝寞察寡寢寤寥實寧寨審寫寬寮寰寸对寺寻导寿封射将將專尉尊尋對導小少尔尖尘尚尛尝尢尤尧尬就尴尷尸尹尺尼尽尾尿局屁层居屆屈屉届屋屌屍屎屏屐屑展屘屜屝属屠屡屢層履屨屯山屹屿岁岂岌岐岑岔岖岗岙岚岛岡岧岩岫岬岭岱岳岷岸岿峋峒峙峡峣峥峦峨峪峭峰峴島峻峽崁崆崇崎崑崔崖崗崙崛崢崤崧崩崭崮崴崽嵇嵌嵐嵘嵩嵯嶂嶄嶇嶔嶙嶝嶸嶺嶼嶽巅巍川州巡巢工左巧巨巩巫差己已巳巴巷巽巾币市布帅帆师希帐帑帕帖帘帙帚帛帜帝帟帥带帧師席帮帳帶帷常帼帽幀幃幄幅幌幔幕幗幛幟幡幢幣幫干平年并幸幹幺幻幼幽幾广庄庆庇床序庐库应底庖店庙庚府庞废庠度座庫庭庵庶康庸庾廁廂廄廈廉廊廓廖廚廛廝廟廠廢廣廬延廷建廾廿开弁异弃弄弈弊弋式弑弒弓弔引弗弘弛弟张弥弦弧弩弭弯弱張強弹强弼彀彆彈彊彌归当录彗彙彝形彤彥彦彩彪彫彬彭彰影彷役彻彼彿往征径待徇很徉徊律後徐徑徒得徘徙徜從徠御徨復循徬徭微徴徵德徹徽心必忆忌忍忏忐忑忖志忘忙忝忠忡忧忪快忬忱念忸忻忽忾忿怀态怂怃怅怆怎怏怒怔怕怖怛怜思怠怡急怦性怨怩怪怫怯怵总恂恃恆恋恍恐恒恕恙恢恣恤恥恨恩恪恫恬恭息恰恳恶恹恺恻恼恿悄悅悉悌悍悔悖悚悟悠患悦您悫悬悯悲悴悵悶悸悻悼悽情惆惇惊惋惑惕惘惚惜惟惠惡惦惧惨惩惫惬惭惮惯惰惱想惴惶惹惺惻愀愁愆愈愉愍愎意愒愕愚愛愜感愣愤愧愫愬愴愷愾愿慄慇慈態慌慍慎慑慕慘慚慝慟慢慣慧慨慫慮慰慵慶慷慼慾憂憊憋憎憐憑憔憚憤憧憨憩憫憬憮憲憶憾懂懇懈應懊懋懍懑懒懣懦懲懵懶懷懿戈戊戌戍戎戏成我戒戕或战戚戛戟戡戢截戮戰戲戳戴戶户戾房所扁扇扈扉手才扎扑扒打扔托扛扣执扩扪扫扬扭扮扯扰扳扶批扼找承技抄抆抉把抑抒抓抔投抖抗折抚抛抠抡抢护报抨披抬抱抵抹抻押抽抿拂拄担拆拇拈拉拊拋拌拍拎拐拒拓拔拖拗拘拙拚招拜拟拢拣拥拦拧拨择括拭拮拯拱拳拴拷拼拽拾拿持挂指挈按挎挑挖挚挛挞挟挠挡挣挤挥挨挪挫振挲挺挽挾捂捅捆捉捋捌捍捎捏捐捕捞损捡换捣捧捨捩捫捭据捯捱捲捶捷捺捻掀掂掃掄授掉掌掏掐排掖掘掙掛掠採探掣接控推掩措掬掰掳掴掷掸掺揀揄揆揉揍描提插揖揚換握揣揩揪揭揮援揹揽搀搁搂搅搆損搏搐搓搔搖搗搜搞搡搪搬搭搴搶携搽搾摁摄摆摇摈摊摑摒摔摘摞摟摧摩摭摯摸摹摺摻撂撅撇撈撐撑撒撓撕撙撚撞撢撤撥撩撫撬播撮撰撲撳撵撷撸撻撼撾撿擁擂擄擅擇擊擋操擎擒擔擘據擞擠擢擤擦擬擭擰擱擲擴擷擺擻擾攀攆攒攘攢攥攫支收攸改攻放政故效敉敌敏救敔敕敖敗敘教敛敝敞敢散敦敬数敲整敵敷數斂斃文斋斌斐斑斓斗料斛斜斟斡斤斥斧斩斫斬断斯新斷方於施旁旅旋旌旎族旖旗无既日旦旧旨早旬旭旱时旷旺昀昂昆昇昊昌明昏易昔昕昖昙星映昤春昧昨昭是昱昶昺昼显晁時晃晅晉晋晌晏晒晓晔晕晖晗晚晝晞晟晤晦晨普景晰晴晶晷智晾暂暄暇暈暉暍暑暖暗暘暝暢暧暨暫暮暱暴暸暹曄曆曇曉曌曖曙曜曝曠曦曰曲曳更曷書曹曼曾替最會月有朋服朐朔朕朗望朝期朦木未末本札朮术朱朴朵机朽杀杂权杆杉李杏材村杓杖杗杜杞束杠条来杨杪杭杯杰東杲杳杵杷杼松板极构枇枉枋析枓枕林枚果枝枢枣枪枫枭枯枰枴架枷枸柄柏某柑柒染柔柙柚柜柝柞柠柢查柩柬柯柱柳柴柵柿栅标栈栉栋栏树栓栖栗栘校栩株样核根格栽栾桀桁桂桃桅框案桌桎桐桑桓桔桢档桥桧桨桩桶桿梁梂梃梅梆梏梓梔梗條梟梡梢梦梧梨梭梯械梱梳梵检棂棄棉棋棍棒棕棗棘棚棟棠棣棧森棱棲棵棹棺棻椁椅植椎椒椟椰楂楄楊楓楔楚楛楝楞楠楣楨楫業楮楯極楷楹楼概榆榉榊榑榔榕榛榜榣榦榨榫榭榮榴榷榻槁槃構槌槍槐槓槛槟槨槭槳槽樁樂樅樊樑樓樘標樞樟模樣横樯樱樵樸樹樺樽樾橄橇橈橋橓橘橙橚橞機橡橢橫橱橹橾檀檄檐檔檗檜檠檢檣檬檮檯檳檸檻櫂櫃櫓櫚櫛櫝櫥欠次欢欣欤欧欲欸欺欽款歆歇歉歌歎歐歙歜歟止正此步武歧歪歲歷歸歹死歼歿殃殄殆殇殉殊残殍殒殖殘殡殤殮殯殴段殷殺殼殿毀毁毂毅毆毋母每毒毓比毕毖毗毙毚毛毡毫毬毯毽氅氈氏氐民氓气氖氛氟氣氤氦氧氨氫氬氮氯氳水永氾汀汁求汇汉汍汎汐汕汗汙汛汝汞江池污汤汨汩汪汰汲汴汶汹決汽汾沁沂沃沅沆沈沉沌沍沏沐沒沓沔沖沘沙沛沟没沥沦沧沪沫沬沮沱河沸油治沼沽沾沿況泄泅泉泊泌泓法泖泗泛泜泞泠泡波泣泥注泪泯泰泱泳泵泸泻泼泽泾洁洋洌洎洒洗洛洞津洧洩洪洫洮洱洲洵洶洸洹活洼洽派流浃浅浆浇浊测济浏浑浒浓浙浚浠浣浥浦浩浪浬浮浴海浸浹涂涅涇消涉涊涌涎涓涔涕涛涝涟涠涡涣涤润涧涨涩涪涮涯液涵涸涼涿淀淄淅淆淇淋淌淑淒淖淘淙淚淝淞淡淤淦淨淪淫淬淮深淳淵混淹淺添淼清渊渌渍渎渐渔渗渙渚減渝渠渡渣渤渥渦温測渭港渲渴游渺渾湃湄湊湍湎湔湖湘湛湟湣湧湩湮湯湲湾湿溃溅溉源準溘溜溝溢溥溧溪溫溯溴溶溺溼滁滂滄滅滇滉滋滌滑滓滔滕滚滞满滢滤滥滦滨滩滬滯滲滴滷滹滾滿漁漂漆漉漏漓演漕漠漢漣漩漪漫漬漱漲漳漶漸漾漿潇潑潔潘潛潜潟潠潢潤潦潭潮潯潰潴潸潺潼澀澄澆澈澎澗澜澠澡澤澦澧澱澳澴澶澹激濁濂濃濒濕濘濙濛濟濠濡濤濩濫濬濮濯濰濱濺濾瀆瀉瀋瀏瀑瀕瀘瀚瀝瀨灌火灭灯灰灵灶灸灼災灾灿炀炆炉炊炎炒炕炖炙炜炝炤炫炬炭炮炯炳炷炸点為炼炽烁烂烈烊烏烘烙烛烟烤烦烧烨烩烫烬热烯烹烽焉焊焐焕焖焘焙焚焜無焦焰然煅煆煉煌煎煖煙煜煞煤煥煦照煨煩煬煮煲煳煸煽熄熊熏熒熔熙熜熟熠熨熬熱熹熾燃燄燈燉燎燐燒燕燙燜營燠燥燦燧燬燭燮燴燸燹燻燼燾爆爌爍爪爬爭爰爱爵父爷爸爹爺爻爽爾爿牆片版牌牍牒牖牘牙牛牝牟牠牡牢牤牦牧物牯牲牴牵特牺牽牾犀犁犄犊犒犖犛犟犢犬犯状犷犹狀狂狄狈狎狐狗狙狞狠狡狩独狭狮狰狱狲狷狸狹狼狽猁猎猓猕猖猗猙猛猜猝猞猢猥猩猪猫猬献猴猶猷猾猿獄獅獎獐獒獗獠獨獭獰獲獵獷獸獺獾玄玆率玉王玖玘玛玟玠玥玨玩玫环现玲玳玷玺玻珀珅珊珍珏珑珙珞珠珣珥珪班珮珲珵珽現球琅理琉琊琍琏琐琛琢琥琦琨琪琮琯琳琴琵琶琺琼琿瑁瑄瑕瑗瑙瑚瑛瑜瑞瑟瑣瑤瑩瑪瑭瑯瑰瑶瑾璀璁璃璋璐璘璜璞璟璣璦璧璨璩環璽璿瓊瓛瓜瓠瓢瓣瓤瓦瓮瓶瓷甄甌甍甕甘甚甜生甡產甥甦用甩甫甬甭田由甲申电男甸画甽畅畋界畎畏畔留畚畜畝畢略畦番畫異畴當畸畿疆疇疋疏疑疗疙疚疝疡疢疣疤疥疫疮疯疱疲疳疴疵疸疹疼疽疾痂病症痈痉痊痍痒痔痕痘痙痛痞痠痢痣痤痨痪痰痱痲痳痴痹痺痿瘀瘁瘉瘋瘍瘓瘟瘠瘡瘢瘤瘦瘧瘩瘪瘫瘴瘸瘺瘾療癆癌癒癖癘癞癟癡癢癫癯癸登發白百皂的皆皇皈皋皎皑皓皖皙皚皞皦皮皰皱皴皺皿盂盃盅盆盈益盍盎盏盐监盒盔盖盗盘盛盜盞盟盡監盤盥盧盪目盯盲直相盹盼盾省眇眈眉看真眠眨眩眬眯眶眷眸眺眼眾眿着睁睃睏睑睛睜睞睡睢督睥睦睨睪睫睬睹睽睿瞄瞅瞇瞋瞌瞎瞑瞒瞞瞟瞠瞥瞧瞩瞪瞬瞭瞰瞳瞻瞼瞽瞿矇矗矛矜矢矣知矩矫短矮矯石矶矻矽矾矿码砂砌砍砒研砖砚砝砟砠砣砥砧砭砰砲破砷砸砺砾础硃硌硎硕硝硫硬确硯硼硿碉碌碍碎碑碓碗碘碜碟碣碧碩碰碳碴確碼碽碾磁磅磊磋磐磕磚磧磨磬磯磴磷磺礁礎礙礦礪示礼社祀祁祆祇祈祉祐祕祖祗祚祝神祟祠祥票祭祯祷祸祺祿禀禁禄禅禍禎福禛禦禧禪禮禱禹禺离禽禾禿秀私秃秈秉秋种科秒秘租秣秤秦秧秩积称秸移秽稀稅稈程稍税稔稗稚稜稞稟稠稣種稱稳稷稻稼稽稿穀穆穋穌積穎穗穠穡穢穩穫穴究穷穹空穿突窃窄窈窍窑窒窕窖窗窘窜窝窟窠窥窦窩窪窮窯窺窿竄竅立竑竖站竞竟章竣童竭端竹竺竽竿笃笆笈笊笋笏笑笔笙笛笞笠符笨第笮笳笼筅筆等筋筍筏筐筑筒答策筛筝筠筧筮筱筵筷筹签简箄箇箋箍箏箓箔箕算箝箠管箧箩箪箫箭箱箴箸節篁範篆篇築篌篑篓篙篛篝篠篡篤篦篩篮篱篷篾簇簌簍簏簑簞簡簣簧簪簸簽簾簿籁籍米类籽粉粑粒粕粗粘粝粟粤粥粪粮粱粲粳粵粹粼粽精糅糊糌糕糖糙糜糝糞糟糠糢糧糨糯糸系糾紀紂約紅紆紇紉紊紋納紐純紕紗紙級紛紜素紡索紧紫紮累細紱紲紳紹紼絀終絃組絆結絕絛絞絡絢給絨絮絰統絲絳絹綁綎綏綑經綜綞綠綢綬維綰綱網綴綵綸綺綻綽綾綿緇緊緒緘緙線緝緞締緣編緩緬緯緲練緹緻縈縉縊縐縑縛縝縞縣縫縮縯縱縲縴縵縷縹總績縿繁繃繅繆繇繈繒織繕繙繚繞繩繪繫繭繳繹纂纛纠红纣纤纥约级纨纪纬纭纮纯纰纱纲纳纵纶纷纸纹纺纽线练组绅细织终绉绊绌绍绎经绐绑绒结绔绕绘给绚络绝绞统绢绣绥继绩绪续绮绯绰绳维绵绷绸综绽绾绿缀缁缄缅缆缇缈缉缎缓缔缕编缘缙缚缛缜缝缟缠缢缤缥缨缩缪缭缮缰缴缶缸缺缽罄罈罐网罔罕罗罚罟罡罢罩罪置罰署罵罷罹羁羅羊羋羌美羔羚羞羡群羨義羯羲羶羸羹羼羽羿翀翁翅翊翌翎習翔翕翘翟翠翡翦翩翮翰翱翳翹翻翼耀老考耄者耆耋而耍耐耑耒耕耗耘耙耜耦耨耳耶耷耸耻耽耿聂聆聊聋职聒联聖聘聚聞聩聪聯聰聱聲聳聶職聿肃肄肅肆肇肉肋肌肓肖肘肚肛肝肠股肢肤肥肩肪肫肮肯肱育肴肺肾肿胀胁胃胄胆背胎胖胚胛胜胝胞胡胤胥胧胪胫胭胯胰胱胳胴胶胸胺胼能脂脅脆脈脉脊脍脏脐脑脓脖脚脣脤脩脫脯脰脱脸脹脾腆腊腋腌腎腐腑腓腔腕腥腦腫腮腰腱腳腴腸腹腺腻腼腾腿膀膂膈膊膏膚膛膜膝膠膨膩膳膺膻膽膾膿臀臂臃臆臉臊臍臏臘臜臣臥臧臨自臬臭至致臺臻臼臾舀舂舅舆與興舉舊舌舍舐舒舔舛舜舞舟舢舨航舫般舰舱舵舶舷船艇艋艘艙艮良艰艱色艳艺艽艾节芋芍芒芙芜芝芟芣芥芦芬芭芯芰花芳芷芸芹芻芽芾苇苋苍苎苏苑苒苓苔苗苛苜苞苟苣若苦苧苯英苹茁茂范茄茅茆茉茎茏茔茕茗茜茧茨茫茬茱茲茴茵茶茸茹荀荃荆草荊荏荐荒荔荚荟荡荣荤荥荧荨荫药荷荸荻荼莅莆莉莊莎莒莓莖莘莞莠莢莧莫莱莲获莹莼莽菁菂菅菇菊菌菔菜菟菠菩華菰菱菲菴菸菽萃萄萇萊萋萌萍萎萝营萦萧萨萬萱萵萸萼落葆葉葑著葛葡董葦葩葫葬葭葱葵葷葺蒂蒋蒐蒗蒙蒜蒞蒯蒲蒸蒼蒿蓀蓄蓆蓉蓊蓋蓑蓓蓝蓟蓦蓬蓮蓿蔆蔑蔓蔔蔗蔚蔡蔣蔥蔬蔭蔼蔽蕃蕈蕉蕊蕙蕞蕨蕩蕪蕭蕲蕴蕾薄薇薊薑薔薛薜薦薨薩薪薮薯薰薺藉藍藏藐藓藕藝藤藥藩藪藷藹藺藻蘆蘇蘊蘋蘑蘸虎虏虐虑虔處虚虛虜虞號虧虫虬虱虹虺虻虽虾蚀蚁蚂蚊蚓蚕蚜蚣蚤蚩蚪蚯蚱蚵蚶蛀蛄蛆蛇蛉蛊蛋蛎蛐蛔蛙蛛蛞蛟蛤蛩蛭蛮蛰蛴蛹蛻蛾蜀蜂蜃蜆蜇蜈蜉蜊蜒蜓蜕蜗蜘蜚蜜蜡蜢蜥蜩蜴蜷蜻蜿蝇蝉蝌蝎蝓蝕蝗蝙蝠蝣蝦蝨蝴蝶蝸螂螃融螞螟螢螫螬螳螺螻蟀蟆蟈蟋蟑蟒蟠蟬蟯蟲蟹蟻蟾蠅蠕蠡蠢蠹血衅行衍術衔街衙衛衝衡衢衣补表衫衬衮衰衷衹衽衾袁袂袄袅袈袋袍袒袖袜袝袞袤被袭袱裁裂装裆裊裎裒裔裕裘裙補裝裟裡裤裨裯裱裳裴裸裹製裾褂複褊褐褒褓褕褚褛褡褥褪褫褲褴褶褸褻褽襁襄襖襞襟襠襤西要覃覆見規覓視覜覦親覬覲见观规觅视览觉觊觋觍觎觐觑角觔解触觴言訂訃計訊訌討訏訐訑訓訕訖託記訛訝訟訢訣訥訪設許訴訶診註証訾詁詆詐詔評詖詛詞詠詢詣試詨詩詫詬詭詮詰話該詳詹詻詼誅誇誉誌認誑誓誕誘誚語誠誡誣誤誥誦誧誨說誰課誶誹誼調諂諄談諉請諍諒論諛諜諦諧諫諭諮諱諳諶諷諸諺諼諾謀謁謂謄謇謊謎謐謗謙講謝謠謨謫謬謹譁譆譎譏識譙譚譜警譬计订讣认讥讦讧讨让讪训议讯记讲讳讴讶讷许讹论讼讽设访诀证诂诃评诅识诈诉诊诋词诏译试诗诘诚诛诜话诞诠诡询诣诤该详诧诨诩诫诬语误诰诱诲诳说诵请诸诺读诽课谀谁调谄谅谆谈谊谋谍谎谏谐谑谒谓谕谗谙谚谛谜谟谢谣谤谥谦谧谨谩谪谬谭谱谲谴谶谷谿豁豆豈豉豌豎豐豕豚象豢豪豫豬豭豳豹豺貂貉貊貌貍貓貝貞負財貢貧貨販貪貫責貯貲貳貴貶買貸費貼貽貿賀賁賂賃賄賅資賈賊賑賒賓賜賞賠賡賢賣賤賦質賬賭賴賸賺賻購賽贅贝贞负贡财责贤败账货质贩贪贫贬购贮贯贰贱贲贴贵贷贸费贺贻贼贽贾贿赂赃资赅赈赊赋赌赍赎赏赐赓赔赖赘赚赛赝赞赠赡赢赣赤赦赧赫赭走赳赴赵赶起趁趄超越趋趔趕趙趟趣趨趱足趴趸趺趾趿跃跄跆跋跌跎跏跑跚跛距跟跡跤跦跨跪路跳践跶跷跺跻跼踉踊踌踏踐踝踞踟踡踢踩踪踫踮踱踴踵踹踽蹂蹄蹇蹈蹉蹊蹋蹑蹒蹕蹙蹚蹟蹣蹤蹦蹩蹬蹭蹰蹲蹴蹶蹺蹼蹿躁躂躇躉躏身躬躯躲躺軀車軋軌軍軏軒軔軛軟軸軻軼軾較載輊輒輓輔輕輛輜輝輞輟輥輦輩輪輯輳輸輻輾輿轂轄轅轉轎轔车轧轨轩转轮软轰轱轲轴轶轻载轿辂较辄辅辆辈辉辍辎辐辑输辔辕辖辗辘辙辛辜辞辟辣辦辨辩辫辭辰辱農边辽达迁迂迄迅迆过迈迎运近返还这进远违连迟迢迤迥迦迨迩迪迫迭述迴迷迸迹迺追退送适逃逅逆选逊逍透逐递途逕逖逗這通逛逝逞速造逡逢連逦逮逯週進逵逶逸逻逼逾遁遂遇遊運遍過遏遐遑遒道達違遗遘遙遛遜遝遞遠遢遣遥遨適遭遮遲遴遵遷選遺遼遽避邀邁邂邃還邇邈邊邋邑邓邕邝邢那邦邪邮邱邵邶邸邹邻郁郃郊郎郑郝郡郢郦郧部郭郵都郾鄂鄉鄒鄗鄘鄙鄞鄢鄧鄭鄰鄱鄴酉酊酋酌配酒酗酝酡酣酥酩酪酬酱酴酵酷酸酽酿醃醇醉醋醍醐醒醜醞醣醪醫醬醮醱醺釆采釉释里重野量釐金釗釘釙釜針釣釦釧釩釭釵鈇鈉鈍鈐鈑鈔鈕鈞鈣鈴鈷鈸鈹鈽鈾鈿鉀鉅鉉鉋鉍鉑鉗鉚鉛鉤鉴鉸鉻鉼銀銅銑銓銖銘銜銨銬銮銲銳銷銻銼鋁鋅鋇鋐鋒鋤鋪鋰鋸鋼錄錐錕錘錙錚錠錡錢錦錨錫錮錯錳錶鍊鍋鍍鍔鍚鍛鍥鍬鍰鍵鍾鎂鎊鎔鎖鎗鎘鎚鎡鎢鎬鎮鎰鎳鎸鏃鏈鏍鏑鏖鏗鏘鏜鏝鏟鏡鏢鏤鐇鑨鑫针钉钓钗钙钛钜钝钞钟钢钥钦钧钩钮钰钱钳钵钹钺钻钿铁铃铄铅铆铉铎铐铖铛铜铠铢铣铤铨铩铭铮铰铲铳银铸铺链铿销锁锃锄锅锈锉锋锏锐错锚锡锢锣锤锥锦锨锭键锯锲锵锸锹锻镀镂镆镇镌镍镐镔镖镗镚镜镢镣镰镳镶長长門閂閃閉開閎閏閑閒間閔閘閡閣閤閥閨閩閭閱閻闆闈闊闋闌闐闔闕闖關门闩闪闭问闯闲闳间闵闷闸闹闺闻闽闾阀阁阂阄阅阈阉阊阋阎阐阑阒阔阕阖阗阙阜队阡阪阬阮阱防阳阴阵阶阻阿陀陂附际陆陈陋陌降限陕陘陛陝陞陡院陣除陨险陪陬陰陲陳陴陵陶陷陸陽隄隅隆隊隋隍階随隐隔隕隘隙際障隧隨險隱隴隶隸隹隻难雀雁雄雅集雇雉雊雋雌雍雏雒雕雖雙雛雜雞離難雨雩雪雯雲雳零雷雹電雾需霄霆震霉霍霎霏霑霓霖霜霞霤霧霭霰露霸霹霾青靓靖静靛靜非靠靡面靦革靳靴靶靼鞅鞋鞍鞏鞑鞘鞠鞣鞦鞭韋韌韓韜韦韧韩韬韭音韵韶韹頁頂頃項順須頊頌預頑頒頓頗領頜頡頤頫頭頰頷頸頹頻顆題額顎顏顓願顛類页顶顷项顺须顽顾顿颀颁颂预颅领颇颈颉颊颌颍颐频颓颔颖颗题颛颜额颠颤風颯颱颳颶颺颼风飒飓飕飘飙飚飛飞食飢飧飩飪飭飯飲飴飼飽飾餃餅餉養餌餐餒餓餘餚餛餞餡館餮餵餽餾餿饅饉饕饥饨饪饬饭饮饯饰饱饲饵饶饷饺饼饿馁馄馅馆馈馊馋馍馏馐馑馒首香馥馨馬馭馮馱馳馴駁駐駑駒駕駙駛駝駟駢駭駱駿騁騎騖马驭驮驯驰驱驳驴驶驸驹驻驼驽驾驿骁骂骄骆骇骈骋验骏骐骑骗骚骜骞骟骠骡骢骤骥骧骨骯骰骷骸骼髁髅髓高髡髦髭髮髯髻鬃鬆鬍鬥鬧鬨鬲鬼魁魂魄魅魆魇魍魎魏魔魚魯魷鮑鮪鮫鮭鮮鯀鯈鯉鯊鯖鯛鯧鯨鯽鱼鱿鲁鲈鲍鲑鲜鲤鲨鳄鳅鳌鳖鳞鳥鳩鳳鳴鳶鴃鴆鴉鴒鴕鴛鴣鴦鴨鴻鴿鵑鵝鵠鵡鵪鵬鵲鶉鶣鸟鸠鸡鸢鸣鸥鸦鸭鸮鸯鸳鸽鸾鸿鹃鹄鹅鹊鹏鹜鹞鹤鹫鹭鹰鹳鹵鹿麂麈麋麒麓麗麟麥麦麩麴麻麼麾黃黄黍黎黏黑黔默黛黜黝點黠黩黯鼎鼓鼕鼠鼬鼻鼾齊齋齐齑齒齿龄龇龊龌龍龙龚龛龜龟！（），：；？ \ No newline at end of file diff --git a/Assets/Resources/SceneSO/PeipeiDay1.asset b/Assets/Resources/SceneSO/PeipeiDay1.asset index 7b6226dfb..dd324bf3a 100644 --- a/Assets/Resources/SceneSO/PeipeiDay1.asset +++ b/Assets/Resources/SceneSO/PeipeiDay1.asset @@ -14,4 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2} yarnProject: {fileID: 7545569452688597077, guid: 67412ff3e7c7c75488a2dea7d7947f34, type: 3} + firstSceneName: ClinicScene isEndOfDay: 1 diff --git a/Assets/Resources/SceneSO/PeipeiDay2.asset b/Assets/Resources/SceneSO/PeipeiDay2.asset index 882204de5..2b7fa561d 100644 --- a/Assets/Resources/SceneSO/PeipeiDay2.asset +++ b/Assets/Resources/SceneSO/PeipeiDay2.asset @@ -14,4 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} yarnProject: {fileID: 7545569452688597077, guid: d649adb9cae2f6d429d81b069195a491, type: 3} + firstSceneName: ClinicScene isEndOfDay: 1 diff --git a/Assets/Resources/SceneSO/PeipeiDay3.asset b/Assets/Resources/SceneSO/PeipeiDay3.asset index 2d4d5c1c2..cfbc2a552 100644 --- a/Assets/Resources/SceneSO/PeipeiDay3.asset +++ b/Assets/Resources/SceneSO/PeipeiDay3.asset @@ -14,4 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: nextScene: {fileID: 0} yarnProject: {fileID: 7545569452688597077, guid: 7323b53bbb973e2478a09b73bf000bed, type: 3} + firstSceneName: ClinicScene isEndOfDay: 1 diff --git a/Assets/Resources/SceneSO/StoneDay1.asset b/Assets/Resources/SceneSO/StoneDay1.asset new file mode 100644 index 000000000..44486ecb5 --- /dev/null +++ b/Assets/Resources/SceneSO/StoneDay1.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3} + m_Name: StoneDay1 + m_EditorClassIdentifier: + nextScene: {fileID: 0} + yarnProject: {fileID: 7545569452688597077, guid: 23b032aeb7a33db4a94b50b89fc530a7, type: 3} + firstSceneName: ExpressFixScene + isEndOfDay: 0 diff --git a/Assets/Resources/SceneSO/StoneDay1.asset.meta b/Assets/Resources/SceneSO/StoneDay1.asset.meta new file mode 100644 index 000000000..525fd3fd8 --- /dev/null +++ b/Assets/Resources/SceneSO/StoneDay1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d49b124127007b48b6881ce33350263 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/SceneSO/TestSO.asset b/Assets/Resources/SceneSO/TestSO.asset index a26cd6f78..32856a257 100644 --- a/Assets/Resources/SceneSO/TestSO.asset +++ b/Assets/Resources/SceneSO/TestSO.asset @@ -14,4 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: nextScene: {fileID: 0} yarnProject: {fileID: 7545569452688597077, guid: 34379f39eb8152f44bdf9afb5f5191bb, type: 3} + firstSceneName: ClinicScene isEndOfDay: 1 diff --git a/Assets/Resources/Yarn/ShitouFunctional1.meta b/Assets/Resources/Yarn/ShitouFunctional1.meta new file mode 100644 index 000000000..5780e804e --- /dev/null +++ b/Assets/Resources/Yarn/ShitouFunctional1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b3bbc354689b624faaa08961a288812 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn b/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn new file mode 100644 index 000000000..89c8d22f4 --- /dev/null +++ b/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn @@ -0,0 +1,41 @@ +title: LungPlugIn +position: -359,-46 +--- +<> +<> +<> +=== + +title: HeartPlugIn +position: -79,-46 +--- +<> +<> +<> +=== + +title: LiverPlugIn +position: 204,-46 +--- +<> +<> +<> +=== + +title: StomachPlugIn +position: 470,-51 +--- +<> +<> +<> +=== + +title: EngineSuccess +position: -367,189 +--- +引擎玩法成功。 +<> +<> +<> +=== + diff --git a/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn.meta b/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn.meta new file mode 100644 index 000000000..d819c15e2 --- /dev/null +++ b/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 13bd25d068fb490478ec15aae5142649 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn b/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn new file mode 100644 index 000000000..a85d69dc7 --- /dev/null +++ b/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn @@ -0,0 +1,844 @@ +title: Start +tags: +colorID: 8 +position: 242,-2378 +--- +//<> +//<> +<> +本demo为早期验证版本，其中文本，交互，画面,声音均为过程版 +// 本demo存在较多早期功能，如果遇到困惑或BUG等问题我们表示歉意 +// 可以微信联系：15209116298 或QQ群325268983进行反馈 +// 如果您能够在游玩过程中记录反馈，我们将不胜感激 +// 好了！游戏开始~ +// <> +// <> +// 2024已经是遥远的过去。数十年间，社会飞速发展，人体机械化技术已经臻于成熟。 +// 从简单的机械肢体，到脑区的电子模块化，人们竞相改造自身，直到完全机械化，以适应愈发残酷的社会竞争。 +// 纯洁的“人类”已经几乎不复存在。而这些机械化的人们，则被称为“机体”。 +// 这里是幸福罐头园区，你是园区的一名机器人医生。 +// 回到你的工作岗位上，开始你新一天的工作。 +//NOTE：房间界面的对话都单句写短一些（16字以内，参考CoffeeTalk），维修的可以长一些 +////新闻:balabalabala +///<> +<> +//<> +=== + + + + +title: VarsInit +tags: +colorID: 4 +position: 241,-2149 +--- +///在这里决定这次诊疗的目标是什么，以及目标判断相关的数值 + +//【流程相关】 +//gamestage:1-引入对话；2-检查；3-检查后对话；4-调速；5-调速后对话（冷却液） +<> +///【流程逻辑】 +//如果线索板都答对了，就自动触发这个为true，这是主目标 +<> + +//一次性对白标记，需要播时设为true，在检查点检查到true播放一次性对白，播放完设回false +<> + + +//是否检查过心脏 +<> + + +//是否知道可以换滤板 +<> +//是否知道可以换燃料 +<> +//是否知道可以调压力 +<> +//是否知道冷却液浑浊 +<> +//是否知道冷却液换过 +<> +//是否对冷却液换过却很脏提过疑惑 +<> + +//选择的透析剂 +<> + + + +//【功能相关】 +//clueboard相关 +<> +<> + +//插线 +<> +<> +<> + + + <> +=== + + + + +title: PlugInsert +tags: 待编辑 +colorID: 8 +position: -227,-2451 +--- +//> +//<> +//<> +//<> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +//<> + +=== + + + + +title: 引入对话 +tags: +colorID: 8 +position: 250,-1874 +--- +//分支剧情的初始化 +<> +<> + +shitou: 幸福诊所~幸福诊所~来到幸福诊所~病痛都离开我…… +（敲门声） +shitou: 您好！这是咱园区的员工诊所吗？ + +me: 是的。看来我们来了一个音乐家？ + +<> +<> +<> +<> +<> + +shitou: 亲爱的医生~谢谢你夸奖~可我不是艺术家~也没有才华~🎵 +shitou: 音乐是我的爱好~送货是我的工作~🎵~石头是我的名字~幸福园区~我的家~🎵 +shitou: 清晨睁眼他便出门~送货送到傍晚时分~🎵~他不怕辛苦不怕累~只恨没有翅膀~也不能飞~🎵 +shitou: 更快~更快~更快~~再多的烦恼也抛到脑外~只要他的双腿跑的更快~🎵！ +shitou: 医生，听说咱诊所能让我跑得更快？ + +me: 你好~快乐的送货员~我可以~…可以~…… +me: 算了，唱歌真的不是我的强项。 +me: 我可以帮你做一些检查和调整，但我不能保证会“跑得更快”。 + +shitou: 啊！我还以为…可以来这里调理身体嘞！… + +me: 调理？那当然是可以的。 +me: 理论上，我能处理你的“健康”，但不一定能让你“更快”。 +me: 毕竟这里是一个诊所，不是改造车间。 + +shitou: 医生~调理完我的身体~我就能~重新快到飞起~🎵！不是这样么，医生？ + +me: （和病人解释这些…一时半说不明白啊。） +me: 这样吧。我先给你做检查，看怎样能让你跑得更快。 + +shitou: 医生，检查费贵吗？ +shitou: 我，口袋空空~但我，快乐好多~ + +me: 放心，检查不收钱。我们直接开始吧。 +<> + +<> +=== + + + + +title: 诊断初始化 +tags: +colorID: 3 +position: 240,-1440 +--- +<> + +<> + +shitou: 医生~不好意思~每次拆面板我都很害怕！你介意我~放声高歌吗？ + +me: 没关系，其实你一直在唱歌。 + +shitou: 啊！我们活在幸福镇的庇佑下~再多烦恼~只要工作~统统没掉~ + +<> +<> + +me: 检查一下他的身体，评估一下有什么能对他的速度造成影响吧。 +me: 影响速度的…最直接的应该就是动力系统了。除此之外还会有什么呢…… + + + +//<> +//<> +//<> + +<> + + +<> +<> + <> + +=== + + + + +title: 主维修界面 +tags: +colorID: 3 +position: 206,-1006 +--- +//gamestage:1-引入对话；2-检查；3-检查后对话；4-调速；5-调速后对话（冷却液） + +//检查阶段 +<> + <> +<> + +//检查后对话阶段 +<> + <> +<> + +//调速阶段 +<> + <> +<> + +//调速后对话阶段 +<> + <> +<> + +=== + + + + +title: 第一次检查（临时） +tags: +colorID: 8 +position: -237,-1007 +--- +<> + + 好的…该检查的应该已经检查过了。 + <> + <> +<> +// ->检查呼吸系统（肺） +// <> +// ->检查动力系统（心） +// <> +// ->检查循环系统（肝） +// <> +// ->检查消化系统（胃） +// <> +// ->结束检查<> +// <> +// <> +=== + + + + +title: 第一次检查_肺 +tags: +colorID: 8 +position: -595,-1288 +--- +气体循环系统，为动力系统供气。 +->整体状态 + 功能非常健壮，看起来经常运动。 +->检查滤板 + <> + 进气管道内非常浑浊，动力系统需要运转到非常高的速度才能造成这么严重的积碳。 + <> + 进气管道内很浑浊。他的动力系统过于强劲，这套基础的呼吸系统承受了过大的压力…… + <> + me: 滤板脏到这种程度…他的呼吸应该很吃力吧。 + me: 更换滤板应该可以帮助他跑得更快。不过效果比较有限…主要还是会让他呼吸舒服一点。 + <> +->返回 + <> +<> +=== + + + + +title: 第一次检查_心 +tags: +colorID: 8 +position: -609,-1099 +--- +机体的能源模块，将机体的燃料转化为电能/机械能，驱动机体和内部模块运转。 +me: 石头的能源系统是被改造过的…这是为了用于为肢体提供高速动力的型号，非常强劲。 +me: 不过这么强劲的动力系统…也会需要同样高级的各种模块配套。 +->检查进气压力 + 目前压力设置偏低，这意味着石头能跑出的速度上限偏低，但这也让他体感更轻松。 + me: 可以重新调整压力值来提高石头的最高速度…提升会很大。 + me: 不过，这会给他带来更大的机械负担。 + <> +->整体状态 + 模块似乎被经过了很多次拆卸，推测进行了了多次改装。 +->检查外壳上的伤痕 + 外表有明显的伤痕，似乎从内部炸开过，并经过了修复。 +->返回 + <> +<> +=== + + + + +title: 第一次检查_胃 +tags: +colorID: 8 +position: -594,-907 +--- +机体的物质和燃料摄入、储藏模块。 +->检查最近摄入燃料 + 机体体内的燃料纯度很低，能提供的动力较慢。 + me: 如果摄入更高纯度的燃料，他可以跑得快很多……这会是一条有效的建议。 + <> +->检查最近摄入物质 + 机体最近摄入的食物成分非常简单而健康，全是基础款罐头。 +->返回 + <> +<> +=== + + + + +title: 第一次检查_肝 +tags: +colorID: 8 +position: -603,-754 +--- +冷却液循环的处理中枢，让模块保持良好的运行状态。 +->整体状态 + 冷却液过于浑浊，循环系统当前压力很大。 + <> + 原因可能有很多…但如果提高他的速度，循环系统压力只会更大。 + <> + 这可能是因为动力系统过于强劲…也可能是因为别的什么原因。 + 如果提高他的速度，循环系统压力只会更大。 + <> + <> +->检查冷却液 + 冷却液很新，推测不久前彻底换过，通常大修才会换到这种程度。 + <> +->返回 + <> + +<> + me: 有点奇怪…新换的冷却液理应比较干净才对。 + me: 这意味着患者可能最近摄入了大量的药物…… + <> +<> + +<> +=== + + + + +title: 分析准备 +tags: +colorID: 8 +position: 626,-329 +--- +//现在关于切换场景的数据保存还没有完成，建议先不切场景 +<> +me: 来分析一下有什么可以提高他的速度吧…… +//<> +医生对石头的身体指标进行了分析，得出了以下结论： +1. 可以建议患者更换纯度更高的油料 +2. 可以调整患者心脏的数值，但会带来更高的身体负担，需要平常更多休息 +3. 更换肺部滤板，不过效果也比较有限，主要是提高患者生活质量 +另外，患者的冷却液过于浑浊，出于健康考虑，提高速度之后需要进行透析 +<> +=== + +title: 第一次检查后对话 +tags: +colorID: 8 +position: 627,-80 +--- +me: （供患者选择的方案已经列出来了。不过最让我担心的是这个改造过的心脏……） +me: （他的各个身体模块负担都很大，这可能都是这个被改造得过于强劲的心脏带来的。） + +shitou: 医生，怎么样？现在是不是要给我做手术嘞？ + +me: 还没到那一步。有些事情我必须要先和你说明白。 +me: 你是什么时候开始对心脏做改造的？ + +shitou: 啊？…不好意思，我没听明白，医生！心脏…你是说引擎噻？不就是入职的时候送的嘛！ + +me: 送的？ + +shitou: 啊！我第一次到站点报到的时候就说了要改造，要装一个引擎，那就装嘛！ +shitou: 装上了引擎~我跑得飞快~在唱点小曲儿~岂不美哉~🎵 +shitou: 后边我又自己做了一些升级啊什么的。引擎嘛！我吃饭的家伙，肯定要强劲些嘛！ + +me: （免费装？有这回事吗…） +me: 好吧，总之…通俗地说，你的心脏太强劲了，给很多身体模块造成了负担。 + +shitou: 太强劲…反而是负担？…听不懂，医生。 + +me: 这些负担反过来对你的心脏动力造成了阻碍，让你没办法跑得更快了。 + +shitou: 啊？那也就是说…也就是说…… +shitou: 我跑得太快…身体吃不消了？ + +me: 你理解得还是很快嘛。 + +shitou: 那也没得办法嘛… +shitou: 我是来想办法跑得更快的…只有跑得更快，我才能赚积分，才能更健康是不是噻！ +shitou: 我还以为可以好简单…没有吃了就能跑得更快的药吗？ + +me: …没有。 +me: 有三种方法可以让你跑得更快，你也可以全都做。 +me: 最好的方法是，换用更纯的油料。你的燃料提供的动力就会更高。 + +shitou: 更纯的…医生你是说，更贵的？我没得那么多积分嘛……到时候跑一天赚的积分都不够吃油的。 + +me: 是贵，不过这是最健康的方式了。 +me: 第二种是，更换肺部的空气滤板。你的肺部积太多碳了。这些碳让你进气不太充分，引擎动力就打了折扣。 +me: 不过换这个能提升的动力不多，主要是碳太多会让机体不舒服，影响生活质量。 + +shitou: 那不用咯！站点有送3次免费换滤板，我就不在你这里换咯，坚持到后年再到站点换。 + +shitou: 我跑货的，哪有什么不舒服？跑得太慢了~反倒不舒服~ + +me: 那就只有最后一种办法了…你的心脏压力系统目前压力偏低，重新校准一下可以跑出更高的速度上限。 + +shitou: 压力…校准…你老说这些我听不懂嘛！这个不贵吧，医生？ + +me: 不贵…不过这需要你经常休息，不然身体的压力只会更大…… + +shitou: 好！要得，那我就好好休息。那还等什么？医生，我们来吧。 + +<> +<> +<> + +=== + + + + +title: 调速（临时） +tags: +position: -204,339 +--- +<> +医生对引擎压力进行调试，提高了石头的最高速度 +调试期间，石头看起来有些吃力 +=== + + + + +title: 完成调速对话 +tags: +position: 208,775 +--- +me: （他的心脏到底是经历了什么？为什么看起来这么破破烂烂的……） +me: （总之…眼下他的身体负担太重了，必须还要做一次冷却液透析才行。） + +me: 好了，试试吧，走两步。 + +shitou: 感觉好不一样！我觉得浑身~都有力！ + +<> +石头瞬间跑出视野 + +shitou: 喔喔~哈哈！ + +me: 别在诊室里乱跑！ + +<> +石头瞬间跑回来 + +shitou: 不好意思，医生…你让我跑两步，我就一下子没收住…… + +me: …我让你走两步，没让你跑两步。 + +shitou: 是，是，不好意思，医生…… +shitou: 医生…你太厉害咯！只花积分一点点~就跑得快好多~🎵…… +shitou: 我真是来对咯！本来还以为小诊所做不了什么大事情哩！太厉害了，医生！ + +me: 不过你还不能走，还有透析要做。 + +shitou: 透析？干嘛用的…医生？我还急到去跑货…可以先不做吗？ + +me: 你的冷却液已经稠得像泥一样，几乎不再有冷却效果了。透析可以让你的冷却液恢复性状，不同的透析剂还有不同的附带效果… +me: 你自己可以不在乎，但如果不做透析，用这么高的速度跑货，可能今晚引擎就会炸掉。 + +shitou: 炸，炸掉？…那太吓人了！医生，那还是不要炸掉比较好。 +shitou: 来嘛，咋做？我听说像以前人类…打吊桶那样？ + +我 + +你说的是吊瓶……不过确实有点像。 + +只是我们机体需要把身体里的冷却液抽出来，在透析机里和注射透析剂发生反应，再输回去。 + +你的状况…需要打三瓶澄清型才能行。让我看看给你第一瓶打什么… +<> +<> +=== + + + + +title: 冷却液初始化 +tags: +position: 208,775 +--- +【【医生给石头挂上冷却液泵】】 +shitou: 呼，好凉！医生，麻烦调慢点！ +me: 还没开始呢。 +me: （我需要找一瓶透析剂装上……任何一种澄清型的都行。） +<> +<> +<> +=== + + + +title: 透析剂选择 +tags: +position: 208,775 +--- +医生拉出冷却液架，上面摆满了各种颜色的冷却液罐 +->喜达诺透析剂 + 澄清型透析剂。降低模块运转造成的反应，减轻患者痛苦。 + ->装上透析剂 + me: 希望这能让他好受一些。 + <> + <> + <> + ->重新选择 + <> +->可善挺透析剂 + 澄清型透析剂。降低循环系统压力，延长冷却液寿命。 + ->装上透析剂 + me: 希望这些冷却液能撑得更久一些。 + <> + <> + <> + ->重新选择 + <> +->强克透析剂 + 澄清型透析剂。降低动力系统压力，略微提高整体动力。 + ->装上透析剂 + me: 好吧…如果他真的需要跑得再快一些。 + <> + <> + <> + ->重新选择 + <> +->息利康透析剂 + 澄清型透析剂。降低气体系统压力，减轻滤板积碳。 + ->装上透析剂 + me: 希望能让他的滤板多坚持一会。 + <> + <> + <> + ->重新选择 + <> +->曲妥珠透析剂 + 澄清型透析剂。降低消化系统压力，降低摄入物造成的毒性。 + ->装上透析剂 + me: 希望这会有用。 + <> + <> + <> + ->重新选择 + <> +->曲马多透析剂 + 强冷型透析剂。降低机体全局温度。谨慎使用。 + ->装上透析剂 + me: 不…我肯定搞错了，不应该用这个。 + <> + ->重新选择 + <> +=== + + + + +title: 透析对话 +tags: +position: 623,779 +--- +<> + <> +<> + <> +<> + <> +<> +=== + + + + + +title: 透析对话1 +tags: +position: 1053,497 +--- +【【启动透析机】】 +【【透析机开始工作】】 + +shitou: 医生…你说透析让我感觉压力小一些？但我咋没感觉到呢…… + +me: 才刚开始打呢。而且，是让你的身体模块负担小一些，不只是你感受上舒服些。 +me: 等吧。打完三管…你就可以走了。…感觉怎样，透析痛不痛？ + +shitou: 完全不痛~医生，你太厉害啦！你比那些机体医院的医生厉害多咯~ +shitou: 我躺那里，他们只会不停地说什么静养啊…“补液”啊的，整完一通，我反倒更慢了。 + +<> +<> + +me: …… +me: 手术？ + +<> +<> + +shitou: 啊？医生，你说啥，我听不懂。 + +me: 你一直在说机体医院…你去机体医院做了什么？ +me: 你不是一直都嫌贵吗，为什么会跑到机体医院去？ + + +shitou: 啊…医生。 +shitou: 是小问题啦…我前段时间…跟人撞了。 +shitou: 把引擎给撞坏了…修了挺久的。这个他们说只能在机体医院修。 + +me: 为什么一开始不跟我说？ + +shitou: 对不起嘛，医生…我以为这两件事情没有关系。 + +me: 你怎么撞的？ + +shitou: 是他跟我撞了嘛，不是我撞的他。 +shitou: 我从一个岔路口跑上主路，和主路交汇嘛，我肯定就往左观察是不咯。 +shitou: 路口有个好大的广告牌，刚好把视线全部挡住。我就降低速度，一直盯到左边嘛… +shitou: 结果谁想到嘛！他是逆行从右边跑过来的。 +shitou: 我回过头来看到他那一瞬间，我脑袋里面就想，坏咯。 +shitou: 然后一下子我就不知道自己在哪里了。 +shitou: 我跑这么快，从来没飞起来过。这还是我第一次飞上天嘞！ +shitou: 然后我就发现，我怎么忽然躺在地上了嘞？耳朵什么都听不到，能看到的东西全都在转！ +shitou: 哇，我从地上爬起来，满地都是手啊脚的…… +shitou: 我还以为是我的嘞！还好到处一摸，全都在，我竟然一个都没少！不然就贵咯…… +shitou: 我感觉是因为我速度慢，所以撞到力度就没那么大。 +shitou: 我就赶紧到处看，刚才那个人咧？ +shitou: 我转了两圈，满地都是零件和冷却液，找不到人在哪里。 +shitou: 这个时候我耳朵才恢复过来，听到好像有人在说话，不过一会就不说了。 +shitou: 我走过去看，发现是个头！ +shitou: 我就捡起来看…就是刚才那个人，他对到我一直眨眼睛，嘴巴好像还在说话，不过已经没声音了。 +shitou: 我想有个头应该还能修噻，就想去拦车… + +me: 修不了了。 + +shitou: 我当时不知道嘛！我看到车来就想跑去拦，才跑两步就感觉心口好痛好痛！ +shitou: 痛到不行，我停下来也一直痛，腿一软就躺到地上了。 +shitou: 那辆车没看到我，它开过去，把那些零件哗——撞得到处都是！ + +【提示一瓶打完】 + +shitou: 医生，是不是打完啦？还是蛮快的嘛！ + +me: …… +me: 我先给你换第二瓶。 +<> +=== + + + + +title: 透析对话2 +tags: +position: 1047,760 +--- +me: 好了。 + +shitou: 嗯…医生，确实感觉舒服多了嘞！ +shitou: 比在大医院打得好多了。我一睡着那个机器就开始嘀嘀嘀响，烦的不行。 + +me: 那个不是透析机，是心率仪。 +me: 所以，你应该是伤到了心脏？除了心脏呢，医生怎么说？ + +shitou: 哈哈，他说我特别抗造，除了心脏，只有一点皮外伤。 +shitou: 可惜啊…我这个心脏是花了好多功夫改装的…以前可厉害咯！ +shitou: 不过那个兄弟就可惜了…撞成那样，不知道有没有救回来。他要是不贪那点路程…… +shitou: 不过其实那条路我也经常跑，我也晓得他为什么这么跑。 +shitou: 这个路对向是没有机行道的。本来路设计出来就是给大车跑的嘛！ +shitou: 要不逆行的话，从改造路那边绕一大圈上天桥，多花七八分钟，一来一回就是15分钟了。 + +me: 救不回来的。你看到的时候已经死了。那些只是BIOS还没完全断电的反射行为。 + +<> +<> + +me: …… + +shitou: 哎~我们跑货的，都是说不好的噻！ +shitou: 清晨睁眼他便出门~送货送到傍晚时分~🎵~他不怕辛苦不怕累~只恨没有翅膀~也不能飞~🎵 +shitou: 圆圆的大地~方方的天~大道的尽头看不见~🎵~他不觉得辛苦不觉得累~因为有朋友在身边~🎵 +shitou: 医生，现在我们就是朋友啦！ + +<> +<> + +me: ……所以，你的心脏刚刚经过了一场大修。 +me: 这就是为什么心脏上有那么多痕迹…为什么冷却液这么浑浊… + +<> +<> + +me: …和为什么压力调得那么低。 + +<> + +me: …… +me: 那我岂不是… + +【【提示一瓶打完】】 + +shitou: 又打完一瓶了？真快呀！ + +me: 别急，我需要重新评估一下……#auto_next + +shitou: 你不要调回来了，医生。 + +<> +<> + +shitou: 哎呀！你帮我把最后一瓶打上吧，我一会告诉你为什么。 + +me: …… +me: 哎，好吧。 +<> +=== + + + + +title: 透析对话3 +tags: +position: 1041,1033 +--- +me: 好了，这是最后一瓶了。 +me: 你最好能给出一个对你自己负责任的理由。 +me: 你这样子下去…身体肯定扛不住的。 + +<> +<> + +shitou: 医生，我修这个心脏，医保不保的。 + +me: 所以？ + +shitou: 医保只保了我的外伤什么的修复，心脏属于我个人改装的，不在医保范围内… +shitou: 医生说保费范围内，只能帮我换成基础的心脏。 +shitou: 但是我还要跑货的嘛…没有这个高级心脏…我还怎么跑货嘛。 +shitou: 那边有一个医生跟我说我可以签一个协议，借一笔钱，够我修好这个心脏… + +me: 医疗贷款？ + +shitou: 对的，他就是这么说的…… + +me: 你借了多少积分？ + +shitou: 32万积分。 + +me: 利率多少？ + +<> +<> + +shitou: 百分之七。 + +me: …… +me: 这也太高了。你怎么会… +<> +me: 你就不能装那个普通的心脏吗？慢一点又会怎样呢…… + +shitou: 哎呀…医生…还好啦！我不晓得吗？钱没了，可以再赚嘛！ +shitou: 只不过现在跑货实在是越来越难咯！ +shitou: 我们现在跑一天的货，根本就存不下来多少积分。 +shitou: 油料，保养，生活……哪一样不要花积分？ +shitou: 是能省点就省点…但是现在靠省，根本省不下来啊！ +shitou: 我以前刚刚开始跑货的时候，一单能赚差不多十几积分，后来单价一直掉，现在一单只有七八分了。 +shitou: 有的人存一个月下来，不仅没多，去掉吃穿用度，还有倒扣的！ +shitou: 还好我跑得快，跑得多，每个月基本都能存点。 +shitou: 假如说这个心脏没了，要以后像这样下去，每单可能会掉到只有两三分了。 +shitou: 我要是没有这个高级心脏，到时候跑单也不行了，日子才苦嘞…都不知道怎么熬！ +shitou: 我肯定要把这个心脏保住先。多跑点单，等把借的积分赶紧还完，才能轻松嘛。 + +me: …… +me: 也就是说，你保住这个高级心脏是为了应对未来的困难… +me: 而且要是我给你把速度调回去了，反而影响你还款了。 + +shitou: 对嘛！医生就是聪明，哈哈！ +shitou: （唱歌） + +【提示一瓶打完】 + +shitou: 医生，打完啦~哇，感觉确实舒服多了！（甩动双腿） +shitou: 那我就先走咯？ + +me: …你走吧。不过—— +me: 你要明天回来复查。 + +shitou: 好，好……医生，真是太感谢你啦！ + +<> + +me: 不客气…再见。 + + +<> + +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn.meta b/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn.meta new file mode 100644 index 000000000..fb618c801 --- /dev/null +++ b/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 853d79ae9bb136946b0fb7cf028fd2f1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/ShitouFunctional1/StoneFunctional1.yarnproject b/Assets/Resources/Yarn/ShitouFunctional1/StoneFunctional1.yarnproject new file mode 100644 index 000000000..016b7ab29 --- /dev/null +++ b/Assets/Resources/Yarn/ShitouFunctional1/StoneFunctional1.yarnproject @@ -0,0 +1,12 @@ +{ + "projectFileVersion": 2, + "sourceFiles": [ + "*.yarn" + ], + "excludeFiles": [ + "**/*~/*" + ], + "localisation": {}, + "baseLanguage": "zh-CHS", + "compilerOptions": {} +} \ No newline at end of file diff --git a/Assets/Resources/Yarn/ShitouFunctional1/StoneFunctional1.yarnproject.meta b/Assets/Resources/Yarn/ShitouFunctional1/StoneFunctional1.yarnproject.meta new file mode 100644 index 000000000..f9f9dcf10 --- /dev/null +++ b/Assets/Resources/Yarn/ShitouFunctional1/StoneFunctional1.yarnproject.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 23b032aeb7a33db4a94b50b89fc530a7 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3} + useAddressableAssets: 0 + UseUnityLocalisationSystem: 0 + unityLocalisationStringTableCollection: {instanceID: 0} diff --git a/Assets/Resources/Yarn/ShitouTalk1/ShitouTalk1.yarn b/Assets/Resources/Yarn/ShitouTalk1/ShitouTalk1.yarn index b09d02ec6..756c81f65 100644 --- a/Assets/Resources/Yarn/ShitouTalk1/ShitouTalk1.yarn +++ b/Assets/Resources/Yarn/ShitouTalk1/ShitouTalk1.yarn @@ -217,7 +217,7 @@ me: 影响速度的…最直接的应该就是动力系统了。除此之外还 title: 主维修界面 tags: colorID: 3 -position: 206,-1006 +position: 244,-1028 --- //gamestage:1-引入对话；2-检查；3-检查后对话；4-调速；5-调速后对话（冷却液） @@ -377,7 +377,7 @@ position: -603,-754 title: 分析准备 tags: colorID: 8 -position: 626,-329 +position: 821,-912 --- //现在关于切换场景的数据保存还没有完成，建议先不切场景 <> @@ -397,7 +397,7 @@ me: 来分析一下有什么可以提高他的速度吧…… title: 第一次检查后对话 tags: colorID: 8 -position: 627,-80 +position: 828,-1465 --- me: （供患者选择的方案已经列出来了。不过最让我担心的是这个改造过的心脏……） me: （他的各个身体模块负担都很大，这可能都是这个被改造得过于强劲的心脏带来的。） diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index c4f572847..f03de9f9b 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -523,6 +523,14 @@ PrefabInstance: propertyPath: m_Name value: Body Module System objectReference: {fileID: 0} + - target: {fileID: 4878312366005375122, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4878312366005375122, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4911887232694427234, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -1380,7 +1388,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 20 + m_SortingOrder: 19 m_Sprite: {fileID: -938042225230554273, guid: 3aee1fa72f2d3d7409533ba8197f66fc, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1408,7 +1416,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &657112469 Transform: m_ObjectHideFlags: 0 @@ -2020,13 +2028,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1027538763} + - component: {fileID: 1027538764} m_Layer: 0 m_Name: Clinic Scene m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1027538763 Transform: m_ObjectHideFlags: 0 @@ -2041,9 +2050,23 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 564511230} + - {fileID: 1362020082} - {fileID: 2054442378} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1027538764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1027538762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee95229f127bf4c45ab49816cd2ea8c8, type: 3} + m_Name: + m_EditorClassIdentifier: + character: {fileID: 0} --- !u!1 &1081346457 GameObject: m_ObjectHideFlags: 0 @@ -2188,6 +2211,7 @@ MonoBehaviour: airMinRatio: 0.37 baseAirMax: 0.2 maxLevel: 5 + targetSpeed: 0.8 invalidTime: 0.7 engineData: curSpeed: 0 @@ -2197,9 +2221,10 @@ MonoBehaviour: curAirMax: 0 curAirLevel: 0 inAirRange: 0 + reachTargetTime: 0 + isSuccess: 0 coverMoveDuration: 2 coverMoveDistance: 2.8 - isActive: 0 --- !u!1 &1119304932 GameObject: m_ObjectHideFlags: 0 @@ -2571,6 +2596,50 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1362020081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1362020082} + - component: {fileID: 1362020083} + m_Layer: 0 + m_Name: Character + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1362020082 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1362020081} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.63, y: -1.33, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1027538763} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1362020083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1362020081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d109d83a617c845469dcde9ac20246be, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1410382568 GameObject: m_ObjectHideFlags: 0 @@ -2918,7 +2987,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 3 m_Sprite: {fileID: 6738774341365589705, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3932,7 +4001,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 21 + m_SortingOrder: 30 m_Sprite: {fileID: -7311558830570425663, guid: 3aee1fa72f2d3d7409533ba8197f66fc, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -6966,10 +7035,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1299151124194456251, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_Name value: Editor Mode Func objectReference: {fileID: 0} + - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5795012028576405938, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_CameraType value: 0 @@ -7026,6 +7103,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8168536426589423301, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8556345213791081418, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -7044,9 +7125,9 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 7026926953013077400} + - {fileID: 1027538763} - {fileID: 154381820} - {fileID: 1410382569} - {fileID: 657112469} - {fileID: 1112213369} - {fileID: 9210352354887959608} - - {fileID: 1027538763} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 970c5d7e1..d5a04e3df 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1180,7 +1180,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1584263514} - - {fileID: 973075153} - {fileID: 494300779} - {fileID: 1936621685} m_Father: {fileID: 1009826577} @@ -1637,11 +1636,11 @@ PrefabInstance: - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[1] value: - objectReference: {fileID: 99451807} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[2] value: - objectReference: {fileID: 99451806} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[3] value: @@ -1701,17 +1700,6 @@ PrefabInstance: addedObject: {fileID: 835225200} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} ---- !u!114 &99451802 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 99451801} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 99451805} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &99451803 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -1733,28 +1721,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 99451801} m_PrefabAsset: {fileID: 0} ---- !u!114 &99451806 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 99451801} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &99451807 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 99451801} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &114645688 GameObject: m_ObjectHideFlags: 0 @@ -2310,17 +2276,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &149374362 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 149374359} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 149374363} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &149374363 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -2700,17 +2655,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &188420213 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 188420210} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 188420214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &188420214 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -3111,11 +3055,11 @@ PrefabInstance: - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[1] value: - objectReference: {fileID: 216794758} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[2] value: - objectReference: {fileID: 216794757} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[3] value: @@ -3191,44 +3135,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &216794755 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 216794752} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 216794756} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &216794756 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 216794752} m_PrefabAsset: {fileID: 0} ---- !u!114 &216794757 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 216794752} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &216794758 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 216794752} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &237392154 GameObject: m_ObjectHideFlags: 0 @@ -5283,11 +5194,11 @@ PrefabInstance: - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[1] value: - objectReference: {fileID: 475823260} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[2] value: - objectReference: {fileID: 475823259} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[3] value: @@ -5363,44 +5274,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &475823257 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 475823254} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475823258} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &475823258 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 475823254} m_PrefabAsset: {fileID: 0} ---- !u!114 &475823259 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 475823254} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &475823260 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 475823254} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &476337178 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -5659,11 +5537,11 @@ PrefabInstance: - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[1] value: - objectReference: {fileID: 500438205} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[2] value: - objectReference: {fileID: 500438201} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[3] value: @@ -5721,17 +5599,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 500438199} m_PrefabAsset: {fileID: 0} ---- !u!114 &500438201 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 500438199} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &500438202 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -5759,17 +5626,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 500438199} m_PrefabAsset: {fileID: 0} ---- !u!114 &500438205 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 500438199} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &501001141 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -5971,6 +5827,7 @@ GameObject: - component: {fileID: 519420031} - component: {fileID: 519420029} - component: {fileID: 519420030} + - component: {fileID: 519420033} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -6096,6 +5953,22 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56666c5a40171f54783dd416a44f42bf, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EventMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_MaxRayIntersections: 0 --- !u!1 &520475755 GameObject: m_ObjectHideFlags: 0 @@ -6934,11 +6807,11 @@ PrefabInstance: - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[1] value: - objectReference: {fileID: 629580927} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[2] value: - objectReference: {fileID: 629580926} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[3] value: @@ -6998,17 +6871,6 @@ PrefabInstance: addedObject: {fileID: 289184535} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} ---- !u!114 &629580922 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 629580921} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 629580925} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &629580923 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -7030,28 +6892,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 629580921} m_PrefabAsset: {fileID: 0} ---- !u!114 &629580926 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 629580921} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &629580927 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 629580921} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &651726652 GameObject: m_ObjectHideFlags: 0 @@ -7791,7 +7631,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: runMode: 1 - firstTalkSO: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} + firstTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} clinicScene: ClinicScene testYarnProject: Plug --- !u!4 &719228339 @@ -9832,11 +9672,11 @@ PrefabInstance: - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[1] value: - objectReference: {fileID: 852388797} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[2] value: - objectReference: {fileID: 852388796} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[3] value: @@ -9912,44 +9752,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &852388794 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 852388791} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 852388795} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &852388795 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 852388791} m_PrefabAsset: {fileID: 0} ---- !u!114 &852388796 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 852388791} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &852388797 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 852388791} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &855263533 GameObject: m_ObjectHideFlags: 0 @@ -10730,50 +10537,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 948583005} m_CullTransparentMesh: 1 ---- !u!1 &973075152 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 973075153} - - component: {fileID: 973075154} - m_Layer: 0 - m_Name: Audio View - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &973075153 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973075152} - 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: 72512886} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &973075154 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973075152} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d87f76a6ddf0704dae7951db3c76ea0, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &977428573 GameObject: m_ObjectHideFlags: 0 @@ -12112,7 +11875,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1200911921 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14481,11 +14244,11 @@ PrefabInstance: - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[2] value: - objectReference: {fileID: 1437328109} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[3] value: - objectReference: {fileID: 1437328108} + objectReference: {fileID: 0} - target: {fileID: 7102310411669483788, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Enabled value: 0 @@ -14557,39 +14320,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1437328107 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1437328103} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1599989368} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1437328108 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1437328103} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1437328109 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1437328103} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1450136609 GameObject: m_ObjectHideFlags: 0 @@ -15283,11 +15013,11 @@ PrefabInstance: - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[1] value: - objectReference: {fileID: 1556863301} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[2] value: - objectReference: {fileID: 1556863300} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[3] value: @@ -15363,44 +15093,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1556863298 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1556863295} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1556863299} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1556863299 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 1556863295} m_PrefabAsset: {fileID: 0} ---- !u!114 &1556863300 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1556863295} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1556863301 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1556863295} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1560719975 GameObject: m_ObjectHideFlags: 0 @@ -16494,19 +16191,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2f82f623f7c479cb5d1935ee6067484, type: 3} m_Name: m_EditorClassIdentifier: - _nodes: - - {fileID: 1556863298} - - {fileID: 1592246587} - - {fileID: 1989818782} - - {fileID: 475823257} - - {fileID: 1437328107} - - {fileID: 216794755} - - {fileID: 500438203} - - {fileID: 629580922} - - {fileID: 149374362} - - {fileID: 188420213} - - {fileID: 99451802} - - {fileID: 852388794} + _nodes: [] _connections: [] _cacheRaycasters: 1 --- !u!4 &1620453322 @@ -19364,11 +19049,11 @@ PrefabInstance: - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[1] value: - objectReference: {fileID: 1989818787} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[2] value: - objectReference: {fileID: 1989818786} + objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[3] value: @@ -19428,17 +19113,6 @@ PrefabInstance: addedObject: {fileID: 261070808} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} ---- !u!114 &1989818782 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1989818781} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989818785} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &1989818783 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -19460,28 +19134,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 1989818781} m_PrefabAsset: {fileID: 0} ---- !u!114 &1989818786 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 442829669951131826, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1989818781} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1989818787 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7368283137120249392, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1989818781} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1990871918 GameObject: m_ObjectHideFlags: 0 @@ -24008,7 +23660,7 @@ RectTransform: m_Father: {fileID: 265254503306996572} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -30944,7 +30596,7 @@ MonoBehaviour: rectTransform: {fileID: 8007592087727081612} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -32640,7 +32292,7 @@ MonoBehaviour: rectTransform: {fileID: 7282059703919780462} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -34634,19 +34286,7 @@ MonoBehaviour: mainCamera: {fileID: 519420031} lineRenderer: {fileID: 3253743068496567163} contentPanel: {fileID: 243936684424215245} - localNodes: - - {fileID: 1556863298} - - {fileID: 1592246587} - - {fileID: 1989818782} - - {fileID: 475823257} - - {fileID: 1437328107} - - {fileID: 216794755} - - {fileID: 500438203} - - {fileID: 629580922} - - {fileID: 149374362} - - {fileID: 188420213} - - {fileID: 99451802} - - {fileID: 852388794} + localNodes: [] localConnections: [] pointer: customImage: {fileID: 1475193827753151906} @@ -34654,7 +34294,7 @@ MonoBehaviour: iconOnDrag: {fileID: 8895775685280376203, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3} exclusiveOnDragCanvas: {fileID: 0} useLegacyDragMethod: 0 - position: {x: 992.36237, y: 1189.5051, z: 0} + position: {x: 2686.129, y: 882.63367, z: 0} dragSelection: customRenderer: {fileID: 0} line: @@ -35030,7 +34670,7 @@ MonoBehaviour: rectTransform: {fileID: 8980408154347076217} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -35513,7 +35153,7 @@ MonoBehaviour: rectTransform: {fileID: 9150678032829601296} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -36504,7 +36144,7 @@ MonoBehaviour: rectTransform: {fileID: 8305720147907504314} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -43363,7 +43003,7 @@ MonoBehaviour: rectTransform: {fileID: 2041500036121329234} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -47161,7 +46801,7 @@ MonoBehaviour: rectTransform: {fileID: 3037079921269169012} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -49129,7 +48769,7 @@ MonoBehaviour: rectTransform: {fileID: 2592852046776807969} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -50284,7 +49924,7 @@ RectTransform: m_Father: {fileID: 6498488201931268245} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -50558,7 +50198,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7966889870541532172 RectTransform: m_ObjectHideFlags: 0 @@ -52970,7 +52610,7 @@ MonoBehaviour: rectTransform: {fileID: 4596928483061751012} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -53886,7 +53526,7 @@ MonoBehaviour: rectTransform: {fileID: 3538142130825932876} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs index df124bcde..d4997ff75 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs @@ -11,7 +11,7 @@ namespace AibisDream.FixSystem private const string SocketObjName = "Socket"; private const string ModulePicName = "Module Pic"; - private Transform _socketPos; + public Transform _socketPos; private BodyModuleSystem _bodyModuleSystem; #endregion @@ -94,6 +94,8 @@ namespace AibisDream.FixSystem socketPos.localPosition = newData.SocketPos; // 数据同步 data = newData; + + InitReference(); } public BodyModuleData Save() diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs index a905fe38e..615bc778c 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs @@ -176,11 +176,15 @@ namespace AibisDream.FixSystem } // 再加载新的Module - foreach (var newModuleData in systemData.moduleDataArray) + var newModules = new BodyModule[systemData.moduleDataArray.Length]; + for (int i = 0; i < systemData.moduleDataArray.Length; i++) { BodyModule newModule = Instantiate(bodyModulePrefab, bodyModuleGroup).GetComponent(); - newModule.Load(newModuleData); + newModule.Load(systemData.moduleDataArray[i]); + newModules[i] = newModule; } + + BodyModules = newModules; } public override void Save() diff --git a/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs index 523040671..7d6392391 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs @@ -96,13 +96,11 @@ namespace AibisDream.FixSystem isInDialog = false; } - [YarnCommand("Disable_plugInput")] public void Disable_plugInput() { isActive = false; } - [YarnCommand("Enable_plugInput")] public void Enable_plugInput() { isActive = true; diff --git a/Assets/Scripts/FixSystemNew/Clinic.meta b/Assets/Scripts/FixSystemNew/Clinic.meta new file mode 100644 index 000000000..ddeb160d2 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Clinic.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d069b24a2b6ba748b4e2f9b0826a3ef +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs new file mode 100644 index 000000000..13403a188 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs @@ -0,0 +1,32 @@ +using System.Collections; +using AibisDream.FixSystem; +using UnityEngine; + +namespace AibisDream +{ + public class ClinicSystem : MonoBehaviour + { + [HideInInspector] public CharacterManager character; + + private void Awake() + { + FixSystemCenter.SystemDic.Register(this); + character = transform.Find("Character").GetComponent(); + } + + public IEnumerator Indoor(float duration) + { + // 加载诊所场景 + gameObject.SetActive(true); + // 开始界面淡出 + yield return MainUIController.Instance.TVFadeOutSync(duration); + } + + public IEnumerator Quit(float duration) + { + // 黑屏出现 + yield return MainUIController.Instance.FadeInSync(duration); + gameObject.SetActive(false); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs.meta b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs.meta new file mode 100644 index 000000000..82280cff0 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ee95229f127bf4c45ab49816cd2ea8c8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs new file mode 100644 index 000000000..869ef10a9 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs @@ -0,0 +1,74 @@ +using System.Collections; +using AibisDream.FixSystem; +using Yarn.Unity; + +namespace AibisDream +{ + public static class ClinicYarnCommand + { + private static ClinicSystem ClinicSystem => FixSystemCenter.SystemDic.Get(); + private static CharacterManager Character => ClinicSystem.character; + + [YarnCommand("indoor_new")] + public static IEnumerator Indoor(float duration) + { + return ClinicSystem.Indoor(duration); + } + + [YarnCommand("quit_clinic_new")] + public static IEnumerator Quit(float duration) + { + return ClinicSystem.Quit(duration); + } + + #region 角色展示相关 + + [YarnCommand("character_init_new")] + public static IEnumerator CharacterInit(string characterName) + { + return Character.CharacterInit(characterName); + } + + [YarnCommand("character_fade_in_new")] + public static IEnumerator CharacterFadeIn() + { + return Character.CharacterFadeIn(); + } + + [YarnCommand("character_fade_out_new")] + public static IEnumerator CharacterFadeOut() + { + return Character.CharacterFadeOut(); + } + + [YarnCommand("character_show_new")] + public static void CharacterShow(string characterName) + { + Character.CharacterShow(characterName); + } + + #endregion + + #region 角色动作调整 + + [YarnCommand("character_face_new")] + public static void CharacterFace(string state) + { + Character.SetFaceState(state); + } + + [YarnCommand("character_eye_new")] + public static void CharacterEye(string state) + { + Character.SetEyeState(state); + } + + [YarnCommand("character_crying_new")] + public static void CharacterCrying(bool isCrying) + { + Character.SetCrying(isCrying); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs.meta b/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs.meta new file mode 100644 index 000000000..b090a92ee --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a98db7194cd94b56a42e2bb8035cf2e7 +timeCreated: 1734089013 \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index a22d76322..373d9d66c 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -14,7 +14,7 @@ namespace AibisDream.FixSystem InitTransitionDic(); // TODO 这个回头要改 - curState = FixState.BodyModule; + curState = FixState.Clinic; } #region 系统索引 @@ -30,25 +30,29 @@ namespace AibisDream.FixSystem private void InitTransitionDic() { + TransitionDic.Add(FixState.Clinic, FixState.BodyModule, new ClinicToBodyModuleCommand()); + TransitionDic.Add(FixState.BodyModule, FixState.Clinic, new BodyModuleToClinicCommand()); TransitionDic.Add(FixState.BodyModule, FixState.Engine, new BodyModuleToEngineCommand()); + TransitionDic.Add(FixState.Engine, FixState.BodyModule, new EngineToBodyModuleCommand()); + TransitionDic.Add(FixState.Clinic, FixState.Engine, new ClinicToEngineCommand()); + TransitionDic.Add(FixState.Engine, FixState.Clinic, new EngineToClinicCommand()); } /// /// 执行转场 /// /// 需要转换的状态 - public void TransToNextState(FixState nextState) + public ITransitionCommand TransToNextState(FixState nextState) { // 没存过的先打个日志报错 if (!TransitionDic.TryGetValue(curState, nextState, out var command)) { Debug.Log($"源为{curState.ToString()}, 目标为{nextState.ToString()}, 转场命令不存在"); - return; + return null; } - // 存过的执行转场命令 - StartCoroutine(command.Execute()); curState = nextState; + return command; } #endregion diff --git a/Assets/Scripts/FixSystemNew/FixSystemYarnCommand.cs b/Assets/Scripts/FixSystemNew/FixSystemYarnCommand.cs new file mode 100644 index 000000000..95deb9965 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/FixSystemYarnCommand.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections; +using UnityEngine; +using Yarn.Unity; + +namespace AibisDream.FixSystem +{ + public static class FixSystemYarnCommand + { + [YarnCommand("switch_fix_system_to")] + public static IEnumerator SwitchFixSystemTo(string targetStateStr, string extraArg = "") + { + // 字符串转枚举 + if (!Enum.TryParse(targetStateStr, out var targetState)) + { + Debug.Log($"{targetStateStr}不在FixState枚举中"); + yield break; + } + + // 获取命令 + var command = FixSystemCenter.Instance.TransToNextState(targetState); + // 传入参数 + command.SetArgs(extraArg); + + yield return command.Execute(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/FixSystemYarnCommand.cs.meta b/Assets/Scripts/FixSystemNew/FixSystemYarnCommand.cs.meta new file mode 100644 index 000000000..362a00a85 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/FixSystemYarnCommand.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 50bf436a893f4c28882f1b3db847f210 +timeCreated: 1734103287 \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs b/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs deleted file mode 100644 index 348e857bf..000000000 --- a/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs +++ /dev/null @@ -1,45 +0,0 @@ -using UnityEngine; -using Yarn.Unity; - -namespace AibisDream.FixSystem -{ - public static class FixYarnCommandEx - { - [YarnCommand("start_system")] - public static void StartSystem(string systemName, string dataKey) - { - switch (systemName) - { - case "BodyModuleSystem": - StartBodyModuleSystem(dataKey); - break; - case "GearSystem": - StartGearSystem(dataKey); - break; - case "EngineSystem": - StartGearSystem(dataKey); - break; - default: - Debug.Log($"该系统不存在: {systemName}"); - break; - } - } - - private static void StartBodyModuleSystem(string dataKey) - { - var bodySystem = FixSystemCenter.SystemDic.Get(); - bodySystem.CurDataKey = dataKey; - bodySystem.Load(); - } - - private static void StartGearSystem(string dataKey) - { - var gearSystem = FixSystemCenter.SystemDic.Get(); - } - - private static void StartEngineSystem(string dataKey) - { - var engineSystem = FixSystemCenter.SystemDic.Get(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs.meta b/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs.meta deleted file mode 100644 index 9a7d138b4..000000000 --- a/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 03e3e3472f5f40a8a9e93b5c793591d4 -timeCreated: 1732917739 \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs new file mode 100644 index 000000000..ec2d3ecd9 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs @@ -0,0 +1,74 @@ +using System.Collections; +using AibisDream.Framework; +using UnityEngine; + +namespace AibisDream.FixSystem +{ + public struct ClinicToBodyModuleCommand : ITransitionCommand + { + private const float FadeDuration = 1f; + + private string _configName; + + public IEnumerator Execute() + { + var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + var clinicSystem = FixSystemCenter.SystemDic.Get(); + + // 黑屏 + yield return MainUIController.Instance.FadeInSync(FadeDuration); + // 加载BodyModuleSystem + bodyModuleSystem.CurDataKey = _configName; + bodyModuleSystem.Load(); + // 隐藏诊所 + clinicSystem.gameObject.SetActive(false); + // 黑屏淡出 + yield return MainUIController.Instance.FadeOutSync(FadeDuration); + } + + public void SetArgs(string arg) + { + // 添加参数 + _configName = arg; + } + } + + public struct ClinicToEngineCommand : ITransitionCommand + { + private const float FadeDuration = 0.5f; + + // 引擎相机设置 + private static readonly Vector3 CameraPos = new(-2.5f, 2.13f, -10); + private const float OrthographicSize = 2.5f; + private const float Duration = 2f; + + private string _configName; + + public IEnumerator Execute() + { + var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + var clinicSystem = FixSystemCenter.SystemDic.Get(); + var engineSystem = FixSystemCenter.SystemDic.Get(); + + // // 黑屏 + yield return MainUIController.Instance.FadeInSync(FadeDuration); + // 隐藏诊所 + clinicSystem.gameObject.SetActive(false); + // 激活插线系统 + bodyModuleSystem.gameObject.SetActive(true); + // // 黑屏淡出 + yield return MainUIController.Instance.FadeOutSync(FadeDuration); + // 移动相机 + yield return CameraKit.Instance.TransCameraAsync(CameraPos, OrthographicSize, Duration); + // 开启引擎玩法 + engineSystem.CurDataKey = _configName; + engineSystem.Load(); + yield return engineSystem.OpenCoverAsync(); + } + + public void SetArgs(string arg) + { + _configName = arg; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs.meta b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs.meta new file mode 100644 index 000000000..5f0c3e462 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: df122109d96340d2a8525483632bf55d +timeCreated: 1734248940 \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs index faff2503e..4c11c93e9 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; +using System.Collections; using AibisDream.Framework; using DG.Tweening; using UnityEngine; @@ -21,6 +19,32 @@ namespace AibisDream.FixSystem public interface ITransitionCommand { IEnumerator Execute(); + void SetArgs(string arg); + } + + public struct BodyModuleToClinicCommand : ITransitionCommand + { + private const float FadeDuration = 0.5f; + + public IEnumerator Execute() + { + var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + var clinicSystem = FixSystemCenter.SystemDic.Get(); + + // 黑屏 + yield return MainUIController.Instance.FadeInSync(FadeDuration); + // 把线插回去 + bodyModuleSystem.ResetPlug(); + // 诊所显示 + clinicSystem.gameObject.SetActive(true); + // 黑屏淡出 + yield return MainUIController.Instance.FadeOutSync(FadeDuration); + } + + public void SetArgs(string arg) + { + // 暂无参数 + } } public struct BodyModuleToEngineCommand : ITransitionCommand @@ -51,9 +75,14 @@ namespace AibisDream.FixSystem yield return null; } } + + public void SetArgs(string arg) + { + // 添加参数 + } } - public struct EngineToBodyModuleCommand : ITransitionCommand + public partial struct EngineToBodyModuleCommand : ITransitionCommand { private const float Duration = 2f; @@ -75,99 +104,37 @@ namespace AibisDream.FixSystem yield return null; } } - } - public struct EngineToGearCommand : ITransitionCommand - { - private const float Duration = 2f; - private static readonly Vector3 CameraPos = new(-2.5f, 2.13f, -10); - - public IEnumerator Execute() + public void SetArgs(string arg) { - var engineSystem = FixSystemCenter.SystemDic.Get(); - var gearSystem = FixSystemCenter.SystemDic.Get(); - // 关闭一下引擎盖 - var coverSq = engineSystem.CloseCover(); - while (coverSq.active && !coverSq.IsComplete()) - { - yield return null; - } - - // 只需要移动一下相机就好了 - var tween = CameraKit.Instance.TransCamera(CameraPos, Duration); - while (tween.active && !tween.IsComplete()) - { - yield return null; - } - - // 然后可以开启引擎盖 - + // 添加参数 } } - /// - /// 以两个Key为索引的Dic - /// - /// Value类型 - public class StateDictionary + public struct EngineToClinicCommand : ITransitionCommand { - private readonly Dictionary _stateDic = new(); - - public T Get(FixState source, FixState target) + private const float FadeDuration = 0.5f; + + public IEnumerator Execute() { - var key = new StateTransKey(source, target); - return _stateDic[key]; + var clinicSystem = FixSystemCenter.SystemDic.Get(); + var engineSystem = FixSystemCenter.SystemDic.Get(); + + // 盖上盖子 + yield return engineSystem.CloseCoverAsync(); + // 黑屏 + yield return MainUIController.Instance.FadeInSync(FadeDuration); + // 相机归位 + CameraKit.Instance.ResetCamara(); + // 打开诊所 + clinicSystem.gameObject.SetActive(true); + // 黑屏淡出 + yield return MainUIController.Instance.FadeOutSync(FadeDuration); } - public void Add(FixState source, FixState target, T value) + public void SetArgs(string arg) { - var key = new StateTransKey(source, target); - _stateDic[key] = value; - } - - public void Clear() - { - _stateDic.Clear(); - } - - public bool ContainsKey(FixState source, FixState target) - { - var key = new StateTransKey(source, target); - return _stateDic.ContainsKey(key); - } - - public bool TryGetValue(FixState source, FixState target, out T value) - { - var key = new StateTransKey(source, target); - return _stateDic.TryGetValue(key, out value); - } - - /// - /// 用于实现两个Key的Dictionary - /// - private class StateTransKey - { - private readonly FixState _sourceState; - private readonly FixState _targetState; - - public StateTransKey(FixState sourceState, FixState targetState) - { - _sourceState = sourceState; - _targetState = targetState; - } - - public override bool Equals(object obj) - { - // 类型不同肯定不相等 - if (obj is not StateTransKey other) return false; - // 判断两个key相等 - return _sourceState == other._sourceState && _targetState == other._targetState; - } - - public override int GetHashCode() - { - return HashCode.Combine(_sourceState, _targetState); - } + // 无需参数 } } } diff --git a/Assets/Scripts/FixSystemNew/StateTransition/StateDictionary.cs b/Assets/Scripts/FixSystemNew/StateTransition/StateDictionary.cs new file mode 100644 index 000000000..af9dec2e2 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/StateTransition/StateDictionary.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections.Generic; + +namespace AibisDream.FixSystem +{ + /// + /// 以两个Key为索引的Dic + /// + /// Value类型 + public class StateDictionary + { + private readonly Dictionary _stateDic = new(); + + public T Get(FixState source, FixState target) + { + var key = new StateTransKey(source, target); + return _stateDic[key]; + } + + public void Add(FixState source, FixState target, T value) + { + var key = new StateTransKey(source, target); + _stateDic[key] = value; + } + + public void Clear() + { + _stateDic.Clear(); + } + + public bool ContainsKey(FixState source, FixState target) + { + var key = new StateTransKey(source, target); + return _stateDic.ContainsKey(key); + } + + public bool TryGetValue(FixState source, FixState target, out T value) + { + var key = new StateTransKey(source, target); + return _stateDic.TryGetValue(key, out value); + } + + /// + /// 用于实现两个Key的Dictionary + /// + private class StateTransKey + { + private readonly FixState _sourceState; + private readonly FixState _targetState; + + public StateTransKey(FixState sourceState, FixState targetState) + { + _sourceState = sourceState; + _targetState = targetState; + } + + public override bool Equals(object obj) + { + // 类型不同肯定不相等 + if (obj is not StateTransKey other) return false; + // 判断两个key相等 + return _sourceState == other._sourceState && _targetState == other._targetState; + } + + public override int GetHashCode() + { + return HashCode.Combine(_sourceState, _targetState); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/StateTransition/StateDictionary.cs.meta b/Assets/Scripts/FixSystemNew/StateTransition/StateDictionary.cs.meta new file mode 100644 index 000000000..e1d082406 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/StateTransition/StateDictionary.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2ccd2ec5e9984317a57e8d005b0dc61a +timeCreated: 1734236591 \ No newline at end of file diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index 039536c0f..29316ec9b 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -1,4 +1,5 @@ -using AibisDream.Kit; +using System.Collections; +using AibisDream.Kit; using DG.Tweening; using UnityEngine; @@ -44,5 +45,20 @@ namespace AibisDream.Framework { return _mainCamera.transform.DOMove(targetPos, duration); } + + public IEnumerator TransCameraAsync(Vector3 targetPos, float targetOrthographicSize, float duration) + { + var sq = TransCamera(targetPos, targetOrthographicSize, duration); + // 协程 + while (sq.active && !sq.IsComplete()) + { + yield return null; + } + } + + public IEnumerator ReturnInitCameraAsync(float duration) + { + return TransCameraAsync(_initPos, _initOrthographicSize, duration); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs index 21c993e36..7b4dc59d0 100644 --- a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs +++ b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs @@ -39,7 +39,7 @@ namespace AibisDream.Framework var kit = _iocContainer.Unregister(); OnUpdate -= kit.OnUpdate; } - + private void Update() => OnUpdate?.Invoke(); } @@ -58,5 +58,4 @@ namespace AibisDream.Framework { void OnUpdate(); } -} - +} \ No newline at end of file diff --git a/Assets/Scripts/Game Loop/GameLoopManager.cs b/Assets/Scripts/Game Loop/GameLoopManager.cs index d72cca308..020ad4e26 100644 --- a/Assets/Scripts/Game Loop/GameLoopManager.cs +++ b/Assets/Scripts/Game Loop/GameLoopManager.cs @@ -12,9 +12,9 @@ namespace AibisDream private RunMode runMode; [Header("正式环境参数")] - [SerializeField] private TalkSceneSO firstTalkSO; + [SerializeField] private TalkSceneSO firstTalkSo; - private TalkSceneSO currentTalkSceneSO; + private TalkSceneSO _currentTalkSceneSo; [SerializeField] private string clinicScene; @@ -34,27 +34,28 @@ namespace AibisDream public void StartNewGame() { - currentTalkSceneSO = firstTalkSO; + _currentTalkSceneSo = firstTalkSo; StartCoroutine(LoadClinicScene()); } public void StartNewGame(TalkSceneSO sceneSo) { - currentTalkSceneSO = sceneSo; + _currentTalkSceneSo = sceneSo; StartCoroutine(LoadClinicScene()); } private IEnumerator LoadClinicScene() { - yield return SceneLoader.Instance.LoadSceneAsync(clinicScene); + yield return SceneLoader.Instance.LoadSceneAsync(_currentTalkSceneSo.firstSceneName); StartMenu.Instance.HideStartMenu(); - DialogController.Instance.StartDialog(currentTalkSceneSO.yarnProject); + DialogController.Instance.StartDialog(_currentTalkSceneSo.yarnProject); } public IEnumerator StartTestGame() { + // TODO 全部改好之后这里要直接进入FixScene yield return SceneLoader.Instance.LoadSceneAsync(clinicScene); var proj = Resources.Load($"Yarn/{testYarnProject}/{testYarnProject}"); DialogController.Instance.StartDialog(proj); @@ -62,9 +63,9 @@ namespace AibisDream public IEnumerator NextSceneSo() { - if (currentTalkSceneSO && currentTalkSceneSO.nextScene) + if (_currentTalkSceneSo && _currentTalkSceneSo.nextScene) { - currentTalkSceneSO = currentTalkSceneSO.nextScene; + _currentTalkSceneSo = _currentTalkSceneSo.nextScene; yield return MainUIController.Instance.FadeInSync(1); yield return LoadClinicScene(); yield return MainUIController.Instance.FadeOutSync(1); diff --git a/Assets/Scripts/Game Loop/TalkSceneSO.cs b/Assets/Scripts/Game Loop/TalkSceneSO.cs index e28fed0ad..ff103b3df 100644 --- a/Assets/Scripts/Game Loop/TalkSceneSO.cs +++ b/Assets/Scripts/Game Loop/TalkSceneSO.cs @@ -1,7 +1,4 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; -using UnityEngine.AddressableAssets; using Yarn.Unity; namespace AibisDream @@ -13,6 +10,8 @@ namespace AibisDream public YarnProject yarnProject; + public string firstSceneName; + public bool isEndOfDay; } } diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs index 9a4ff3c61..201fbc4ed 100644 --- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Linq; using AibisDream.FixSystem; using AibisDream.Framework; @@ -54,6 +55,11 @@ namespace AibisDream engineData.CalcAir(config.airMaxRatio, config.airMinRatio, config.baseAirMax); // 推算速度 engineData.CalcSpeed(config.acceleratedSpeed, config.resistance); + // 判断是否成功 + if (engineData.CheckSuccess(config.targetSpeed)) + { + DialogController.Instance.StartDialogNode("EngineSuccess"); + } } /// @@ -96,6 +102,15 @@ namespace AibisDream return sq; } + public IEnumerator OpenCoverAsync() + { + var sq = OpenCover(); + if (sq.active && !sq.IsComplete()) + { + yield return null; + } + } + /// /// 关闭盖板 /// @@ -114,6 +129,15 @@ namespace AibisDream return sq; } + public IEnumerator CloseCoverAsync() + { + var sq = CloseCover(); + if (sq.active && !sq.IsComplete()) + { + yield return null; + } + } + public void Lock() { // 禁止油门和气门 @@ -152,6 +176,8 @@ namespace AibisDream } config = data; + // 重置Data + OnEnable(); } public override void Save() @@ -185,12 +211,15 @@ namespace AibisDream public float airMinRatio; public float baseAirMax; public int maxLevel; + public float targetSpeed; public float invalidTime; } [Serializable] public struct EngineData { + private const float SuccessDuration = 3f; + public float curSpeed; public float curOil; public float curAir; @@ -201,6 +230,9 @@ namespace AibisDream public AutoFlipBool isValid; public bool inAirRange; + public float reachTargetTime; + public bool isSuccess; + public EngineData(float flipDelayTime) { isValid = new AutoFlipBool(flipDelayTime, true); @@ -211,11 +243,13 @@ namespace AibisDream curAirMax = 0; curAirLevel = 0; inAirRange = false; + reachTargetTime = 0; + isSuccess = false; } public void OilChange(float oilChangeRatio) { - curOil = CommonUtil.LimitedAdd(curOil, oilChangeRatio * Time.deltaTime, 1f, 0f); + curOil = CommonUtil.Limit(curOil + oilChangeRatio * Time.deltaTime, 1f, 0f); } public void CalcSpeed(float acceleratedSpeed, float resistance) @@ -224,13 +258,13 @@ namespace AibisDream ? (curOil * acceleratedSpeed - curSpeed * resistance) * Time.deltaTime : -curSpeed * resistance * Time.deltaTime; - curSpeed = CommonUtil.LimitedAdd(curSpeed, addNum, 1f, 0f); + curSpeed = CommonUtil.Limit(curSpeed + addNum, 1f, 0f); } public void CalcAir(float airMaxRatio, float airMinRatio, float baseAirMax) { - curAirMax = curSpeed * (curAirLevel + 1) * airMaxRatio + baseAirMax; - curAirMin = curSpeed * (curAirLevel + 1) * airMinRatio; + curAirMax = CommonUtil.Limit(curSpeed * (curAirLevel + 1) * airMaxRatio + baseAirMax, 1f, 0f); + curAirMin = CommonUtil.Limit(curSpeed * (curAirLevel + 1) * airMinRatio, 0.8f, 0f); curAir = curOil; // 如果离开范围且当前在系统有效期，就进入一段失效期 @@ -256,5 +290,26 @@ namespace AibisDream curAirLevel = 0; } } + + public bool CheckSuccess(float targetSpeed) + { + // 已经成功就不用校验了 + if (isSuccess) return false; + + if (curSpeed >= targetSpeed) + { + reachTargetTime += Time.deltaTime; + } + else + { + reachTargetTime = 0; + } + + // 如果速度达标时间足够就判断成功 + if (!(reachTargetTime >= SuccessDuration)) return false; + + isSuccess = true; + return true; + } } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs index e4bd1ef64..689f6f1a0 100644 --- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs +++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs @@ -25,16 +25,6 @@ namespace AibisDream Init(); } - private void OnEnable() - { - Enable(); - } - - private void OnDisable() - { - Disable(); - } - #region 生命周期管理 public void Init() @@ -44,16 +34,11 @@ namespace AibisDream _shafts = GetComponentsInChildren(); } - public void Enable() + public void Start() { _shaftGraph = new ShaftGraph(_shafts); } - public void Disable() - { - _shaftGraph = null; - } - #endregion /// @@ -109,8 +94,6 @@ namespace AibisDream { Debug.Log("达成目标"); } - - #region 数据保存与加载 @@ -165,8 +148,8 @@ namespace AibisDream // 再添加 foreach (var shaftData in gearSystemData.shaftLevelDataArray) { - var newModule = Instantiate(shaftPrefab, shaftRoot).GetComponent(); - newModule.Load(shaftData); + var newShaft = Instantiate(shaftPrefab, shaftRoot).GetComponent(); + newShaft.Load(shaftData); } } diff --git a/Assets/Scripts/Utility/CommonUtil.cs b/Assets/Scripts/Utility/CommonUtil.cs index cb20ad987..bd3102863 100644 --- a/Assets/Scripts/Utility/CommonUtil.cs +++ b/Assets/Scripts/Utility/CommonUtil.cs @@ -44,22 +44,25 @@ namespace AibisDream.Utility } /// - /// 受限加法 + /// 受限数值 /// /// 目标数 - /// 加数 /// 上限 /// 下限 /// 结果 - public static float LimitedAdd(float target, float add, float max, float min) + public static float Limit(float target, float max, float min) { - var targetOil = target + add; - return targetOil switch + if (target <= min) { - <= 0 => min, - >= 1 => max, - _ => targetOil - }; + return min; + } + + if (target >= max) + { + return max; + } + + return target; } /// diff --git a/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json b/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json new file mode 100644 index 000000000..13d07e501 --- /dev/null +++ b/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json @@ -0,0 +1 @@ +{"hasHotErr":false,"moduleDataArray":[]} \ No newline at end of file diff --git a/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json.meta b/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json.meta new file mode 100644 index 000000000..e550b8dfc --- /dev/null +++ b/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e7b9c794c59fbd74b9dd3aab01a4fb27 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/LevelData/EngineSystem/stone1.json b/Assets/StreamingAssets/LevelData/EngineSystem/stone1.json index 6018a1918..ef7735cf8 100644 --- a/Assets/StreamingAssets/LevelData/EngineSystem/stone1.json +++ b/Assets/StreamingAssets/LevelData/EngineSystem/stone1.json @@ -1 +1 @@ -{"oilDownRatio":0.2,"oilUpRatio":0.4,"acceleratedSpeed":1.0,"resistance":1.0,"airMaxRatio":0.45,"airMinRatio":0.37,"baseAirMax":0.2,"maxLevel":5,"invalidTime":0.7} \ No newline at end of file +{"oilDownRatio":0.2,"oilUpRatio":0.4,"acceleratedSpeed":1.0,"resistance":1.0,"airMaxRatio":0.45,"airMinRatio":0.37,"baseAirMax":0.2,"maxLevel":5,"targetSpeed":0.8,"invalidTime":0.7} \ No newline at end of file