diff --git a/Assets/Resources/Yarn/Interactive.meta b/Assets/Resources/Yarn/Interactive.meta new file mode 100644 index 000000000..38a254a52 --- /dev/null +++ b/Assets/Resources/Yarn/Interactive.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99621e64c99c4e844a3eba8ac29085be +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/Interactive/Interactive.yarnproject b/Assets/Resources/Yarn/Interactive/Interactive.yarnproject new file mode 100644 index 000000000..016b7ab29 --- /dev/null +++ b/Assets/Resources/Yarn/Interactive/Interactive.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/Interactive/Interactive.yarnproject.meta b/Assets/Resources/Yarn/Interactive/Interactive.yarnproject.meta new file mode 100644 index 000000000..7fd0e92bf --- /dev/null +++ b/Assets/Resources/Yarn/Interactive/Interactive.yarnproject.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: a614c6a8f31645f45953a56cdb9002b2 +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/Interactive/Peipei.yarn b/Assets/Resources/Yarn/Interactive/Peipei.yarn new file mode 100644 index 000000000..4d0ba095a --- /dev/null +++ b/Assets/Resources/Yarn/Interactive/Peipei.yarn @@ -0,0 +1,13 @@ +// 把需要交互的节点放在这里 +// 不一定是这个yarn文件，在Interactive项目里的Yarn文件都行 + +title: InteractiveDemo +tags: +--- + +me: 这是一个可交互对话的示例。 #line:0b8773b +me: 交互方式与正常对话一致。 #line:0180280 + -> 确认 #line:0c2ad2d +me: 对话完成后会触发结束事件。 #line:09fcc13 + +=== diff --git a/Assets/Resources/Yarn/Interactive/Peipei.yarn.meta b/Assets/Resources/Yarn/Interactive/Peipei.yarn.meta new file mode 100644 index 000000000..c9aa22f9e --- /dev/null +++ b/Assets/Resources/Yarn/Interactive/Peipei.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 32e24a30271bbeb4a82e771518b3605b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/Interactive/Stone.yarn b/Assets/Resources/Yarn/Interactive/Stone.yarn new file mode 100644 index 000000000..b07969aac --- /dev/null +++ b/Assets/Resources/Yarn/Interactive/Stone.yarn @@ -0,0 +1,5 @@ +title: Stone +tags: +--- + +=== diff --git a/Assets/Resources/Yarn/Interactive/Stone.yarn.meta b/Assets/Resources/Yarn/Interactive/Stone.yarn.meta new file mode 100644 index 000000000..9466aed6c --- /dev/null +++ b/Assets/Resources/Yarn/Interactive/Stone.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 52b9c0eba3162a64dabd323717c952b0 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Scenes/GearScene.unity b/Assets/Scenes/GearScene.unity index ea26e5cc8..65e2fa4ac 100644 --- a/Assets/Scenes/GearScene.unity +++ b/Assets/Scenes/GearScene.unity @@ -123,6 +123,90 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &463108913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 463108914} + - component: {fileID: 463108915} + m_Layer: 0 + m_Name: Oil Gate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &463108914 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463108913} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.11, y: -1.72, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1095564999} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &463108915 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463108913} + 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: 1 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &580488880 PrefabInstance: m_ObjectHideFlags: 0 @@ -322,6 +406,40 @@ Transform: m_CorrespondingSourceObject: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3} m_PrefabInstance: {fileID: 875527870} m_PrefabAsset: {fileID: 0} +--- !u!1 &1095564998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1095564999} + m_Layer: 0 + m_Name: Engine System + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1095564999 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1095564998} + 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: 1622914530} + - {fileID: 463108914} + - {fileID: 1805838385} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1332019310 PrefabInstance: m_ObjectHideFlags: 0 @@ -391,6 +509,37 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1711cb9f16070e0488096c259d4eee3d, type: 3} +--- !u!1 &1622914529 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1622914530} + m_Layer: 0 + m_Name: Dashboard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1622914530 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1622914529} + 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: 1095564999} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1689445800 GameObject: m_ObjectHideFlags: 0 @@ -541,6 +690,90 @@ Transform: m_CorrespondingSourceObject: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3} m_PrefabInstance: {fileID: 1718221728} m_PrefabAsset: {fileID: 0} +--- !u!1 &1805838384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1805838385} + - component: {fileID: 1805838386} + m_Layer: 0 + m_Name: Air Gate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1805838385 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805838384} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.15, y: -1.72, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1095564999} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1805838386 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805838384} + 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: 1 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1874284830 GameObject: m_ObjectHideFlags: 0 @@ -589,7 +822,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1877539780 Transform: m_ObjectHideFlags: 0 @@ -626,3 +859,4 @@ SceneRoots: m_Roots: - {fileID: 1689445802} - {fileID: 1877539780} + - {fileID: 1095564999} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 82873f091..cbeb54e6b 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -123,6 +123,73 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &32464540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 32464541} + - component: {fileID: 32464543} + - component: {fileID: 32464542} + m_Layer: 0 + m_Name: Advance Input + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &32464541 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32464540} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -748.1581, y: -442.48004, z: 11.807568} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1777774464} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &32464542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32464540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 097b95c9f69f04f2d8c08a817e7786af, type: 3} + m_Name: + m_EditorClassIdentifier: + dialogueView: {fileID: 515027123} + continueActionType: 1 + continueActionKeyCode: 323 + continueActionButtonName: Jump + continueActionOnButtonRelease: 0 +--- !u!114 &32464543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32464540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 097b95c9f69f04f2d8c08a817e7786af, type: 3} + m_Name: + m_EditorClassIdentifier: + dialogueView: {fileID: 515027123} + continueActionType: 1 + continueActionKeyCode: 32 + continueActionButtonName: Jump + continueActionOnButtonRelease: 0 --- !u!1 &40915749 GameObject: m_ObjectHideFlags: 0 @@ -356,6 +423,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: quickRunMode: 0 + isInPause: 0 --- !u!1001 &152335402 PrefabInstance: m_ObjectHideFlags: 0 @@ -1049,6 +1117,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e61040b961ba1446ad453ee17f4a737, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &515027121 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 515027122} + - component: {fileID: 515027123} + m_Layer: 0 + m_Name: Line View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &515027122 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515027121} + 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: 1649065417} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &515027123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515027121} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 465bacc132ec6ce4e85f8e68354f60ad, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &515480972 GameObject: m_ObjectHideFlags: 0 @@ -1446,6 +1558,52 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &627391104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 627391105} + - component: {fileID: 627391106} + m_Layer: 0 + m_Name: Variable Storage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &627391105 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627391104} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -748.1581, y: -442.48004, z: 11.807568} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1777774464} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &627391106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627391104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 610c541718d694070a21327d1ae62e75, type: 3} + m_Name: + m_EditorClassIdentifier: + showDebug: 0 + debugTextView: {fileID: 0} --- !u!1 &667130561 GameObject: m_ObjectHideFlags: 0 @@ -1492,6 +1650,50 @@ MonoBehaviour: m_EditorClassIdentifier: showDebug: 0 debugTextView: {fileID: 0} +--- !u!1 &691891285 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 691891286} + - component: {fileID: 691891287} + 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 &691891286 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 691891285} + 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: 1649065417} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &691891287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 691891285} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d87f76a6ddf0704dae7951db3c76ea0, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &719228336 GameObject: m_ObjectHideFlags: 0 @@ -2178,6 +2380,50 @@ MonoBehaviour: book: {fileID: 996104069} CloseBookButton: {fileID: 791733126} OepnBookButton: {fileID: 1210536474} +--- !u!1 &896480781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 896480782} + - component: {fileID: 896480783} + m_Layer: 0 + m_Name: Command Option View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &896480782 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896480781} + 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: 1649065417} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &896480783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896480781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e61040b961ba1446ad453ee17f4a737, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &973075152 GameObject: m_ObjectHideFlags: 0 @@ -2585,6 +2831,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1649065417} - {fileID: 72512886} - {fileID: 719228339} - {fileID: 886733272} @@ -4245,6 +4492,54 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1649065416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1649065417} + - component: {fileID: 1649065418} + m_Layer: 0 + m_Name: Interactive Dialog Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1649065417 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649065416} + 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: 1777774464} + - {fileID: 515027122} + - {fileID: 896480782} + - {fileID: 691891286} + m_Father: {fileID: 1009826577} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1649065418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649065416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95c4c05d464ef0e44865bc905143ebb4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1654679520 GameObject: m_ObjectHideFlags: 0 @@ -4480,6 +4775,125 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1744350702 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1744350703} + - component: {fileID: 1744350704} + m_Layer: 0 + m_Name: Line Provider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1744350703 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744350702} + 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: 1777774464} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1744350704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744350702} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b6798449caec4a32a5ad27badb06624, type: 3} + m_Name: + m_EditorClassIdentifier: + textLanguageCode: zh-CN + audioLanguageCode: zh-CN +--- !u!1 &1777774463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1777774464} + - component: {fileID: 1777774465} + m_Layer: 0 + m_Name: Interactive Runner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1777774464 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777774463} + 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: 32464541} + - {fileID: 627391105} + - {fileID: 1744350703} + m_Father: {fileID: 1649065417} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1777774465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1777774463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bec29c0a230741bdac901dba8da47ee, type: 3} + m_Name: + m_EditorClassIdentifier: + yarnProject: {fileID: 0} + _variableStorage: {fileID: 627391106} + dialogueViews: + - {fileID: 515027123} + - {fileID: 896480783} + - {fileID: 691891287} + startNode: Start + startAutomatically: 0 + runSelectedOptionAsLine: 0 + lineProvider: {fileID: 1744350704} + verboseLogging: 1 + onNodeStart: + m_PersistentCalls: + m_Calls: [] + onNodeComplete: + m_PersistentCalls: + m_Calls: [] + onDialogueStart: + m_PersistentCalls: + m_Calls: [] + onDialogueComplete: + m_PersistentCalls: + m_Calls: [] + onCommand: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1788453625 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Dialog System/InteractiveDialogController.cs b/Assets/Scripts/Dialog System/InteractiveDialogController.cs new file mode 100644 index 000000000..c0acfd765 --- /dev/null +++ b/Assets/Scripts/Dialog System/InteractiveDialogController.cs @@ -0,0 +1,30 @@ +using UnityEngine; +using Yarn.Unity; + +namespace AibisDream +{ + public class InteractiveDialogController : MonoBehaviour + { + private const string InteractiveProj = "Interactive"; + private DialogueRunner _interactiveRunner; + + private void Awake() + { + _interactiveRunner = GetComponentInChildren(); + + // 加载交互式对话Yarn项目 + var yarnProject = Resources.Load($"Yarn/{InteractiveProj}/{InteractiveProj}"); + _interactiveRunner.SetProject(yarnProject); + } + + /// + /// 进行交互式对话 + /// + /// 节点名 + public void StartInteractiveTalk(string nodeName) + { + _interactiveRunner.StartDialogue(nodeName); + } + } +} + diff --git a/Assets/Scripts/Dialog System/InteractiveDialogController.cs.meta b/Assets/Scripts/Dialog System/InteractiveDialogController.cs.meta new file mode 100644 index 000000000..ea3ca5477 --- /dev/null +++ b/Assets/Scripts/Dialog System/InteractiveDialogController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 95c4c05d464ef0e44865bc905143ebb4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MiniGame/Engine.meta b/Assets/Scripts/MiniGame/Engine.meta new file mode 100644 index 000000000..aa172b8b2 --- /dev/null +++ b/Assets/Scripts/MiniGame/Engine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5e4e107b3ecf9c547b40caab94412f3c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MiniGame/Engine/EngineData.cs b/Assets/Scripts/MiniGame/Engine/EngineData.cs new file mode 100644 index 000000000..2242edab4 --- /dev/null +++ b/Assets/Scripts/MiniGame/Engine/EngineData.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace AibisDream +{ + public class EngineData + { + public float curSpeed; + public float curOil; + public float curAirMin; + public float curAirMax; + + public int airGateLevel; + + public void UpdateView() + { + // 计算数据对应关系 + + // 把数据同步到界面上 + + } + } +} + diff --git a/Assets/Scripts/MiniGame/Engine/EngineData.cs.meta b/Assets/Scripts/MiniGame/Engine/EngineData.cs.meta new file mode 100644 index 000000000..5ed09fe88 --- /dev/null +++ b/Assets/Scripts/MiniGame/Engine/EngineData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0ad31edf0b29d464e8652c39e6e453ea +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs new file mode 100644 index 000000000..0c9054472 --- /dev/null +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs @@ -0,0 +1,20 @@ +using System; +using UnityEngine; + +namespace AibisDream +{ + public class EngineSystem : MonoBehaviour + { + private readonly EngineData _data = new(); + + private void Update() + { + + // 更新界面显示 + _data.UpdateView(); + } + + + } +} + diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs.meta b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs.meta new file mode 100644 index 000000000..a6e6ba623 --- /dev/null +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 10324e3c30ee1924893a08455ce65e0d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MiniGame/Engine/OilGate.cs b/Assets/Scripts/MiniGame/Engine/OilGate.cs new file mode 100644 index 000000000..3efa6dd6f --- /dev/null +++ b/Assets/Scripts/MiniGame/Engine/OilGate.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace AibisDream +{ + public class OilGate : MonoBehaviour + { + private bool _isHolding; + } +} + diff --git a/Assets/Scripts/MiniGame/Engine/OilGate.cs.meta b/Assets/Scripts/MiniGame/Engine/OilGate.cs.meta new file mode 100644 index 000000000..2207de0c6 --- /dev/null +++ b/Assets/Scripts/MiniGame/Engine/OilGate.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 04beec2ebfad5f642bfb4a7a1716a08a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MiniGame/Engine/SpriteButton.cs b/Assets/Scripts/MiniGame/Engine/SpriteButton.cs new file mode 100644 index 000000000..df7c118ae --- /dev/null +++ b/Assets/Scripts/MiniGame/Engine/SpriteButton.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace AibisDream +{ + public abstract class SpriteButton : MonoBehaviour + { + private bool _isHold; + private bool _isButtonActive; + + private void Update() + { + // 如果按钮未激活就直接返回 + if (!_isButtonActive) return; + + // 发射射线 + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + RaycastHit2D hit = Physics2D.Raycast(ray.origin, ray.direction); + + // 检查射线是否与当前按钮接触 + if (hit.collider.gameObject == gameObject) + { + + } + } + + protected virtual void OnButtonDown() + { + + } + + protected virtual void OnButtonUp() + { + + } + + protected virtual void OnButtonHold() + { + + } + } +} diff --git a/Assets/Scripts/MiniGame/Engine/SpriteButton.cs.meta b/Assets/Scripts/MiniGame/Engine/SpriteButton.cs.meta new file mode 100644 index 000000000..b6168a1e2 --- /dev/null +++ b/Assets/Scripts/MiniGame/Engine/SpriteButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4c75c40ce1dc3f94f9a6e8785b4a56df +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MiniGame/Gear.meta b/Assets/Scripts/MiniGame/Gear.meta new file mode 100644 index 000000000..b79574dc9 --- /dev/null +++ b/Assets/Scripts/MiniGame/Gear.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1154f3a67286c58469e2d89e75b23f39 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MiniGame/Gear.cs b/Assets/Scripts/MiniGame/Gear/Gear.cs similarity index 100% rename from Assets/Scripts/MiniGame/Gear.cs rename to Assets/Scripts/MiniGame/Gear/Gear.cs diff --git a/Assets/Scripts/MiniGame/Gear.cs.meta b/Assets/Scripts/MiniGame/Gear/Gear.cs.meta similarity index 100% rename from Assets/Scripts/MiniGame/Gear.cs.meta rename to Assets/Scripts/MiniGame/Gear/Gear.cs.meta diff --git a/Assets/Scripts/MiniGame/GearController.cs b/Assets/Scripts/MiniGame/Gear/GearController.cs similarity index 97% rename from Assets/Scripts/MiniGame/GearController.cs rename to Assets/Scripts/MiniGame/Gear/GearController.cs index c0ef9948f..b6f8ecfe0 100644 --- a/Assets/Scripts/MiniGame/GearController.cs +++ b/Assets/Scripts/MiniGame/Gear/GearController.cs @@ -69,7 +69,7 @@ namespace AibisDream RaycastHit2D hit = Physics2D.Raycast(ray.origin, ray.direction); // 检测命中的物体 - if (hit.collider != null && hit.collider.CompareTag("Moveable")) + if (!hit.collider && hit.collider.CompareTag("Moveable")) { offset = hit.collider.transform.position - GetMouseAsWorldPoint(); draggingGear = hit.collider.gameObject.GetComponent(); diff --git a/Assets/Scripts/MiniGame/GearController.cs.meta b/Assets/Scripts/MiniGame/Gear/GearController.cs.meta similarity index 100% rename from Assets/Scripts/MiniGame/GearController.cs.meta rename to Assets/Scripts/MiniGame/Gear/GearController.cs.meta diff --git a/Assets/Scripts/MiniGame/GearModel.cs b/Assets/Scripts/MiniGame/Gear/GearModel.cs similarity index 100% rename from Assets/Scripts/MiniGame/GearModel.cs rename to Assets/Scripts/MiniGame/Gear/GearModel.cs diff --git a/Assets/Scripts/MiniGame/GearModel.cs.meta b/Assets/Scripts/MiniGame/Gear/GearModel.cs.meta similarity index 100% rename from Assets/Scripts/MiniGame/GearModel.cs.meta rename to Assets/Scripts/MiniGame/Gear/GearModel.cs.meta diff --git a/Assets/Scripts/MiniGame/IMoveable.cs b/Assets/Scripts/MiniGame/Gear/IMoveable.cs similarity index 100% rename from Assets/Scripts/MiniGame/IMoveable.cs rename to Assets/Scripts/MiniGame/Gear/IMoveable.cs diff --git a/Assets/Scripts/MiniGame/IMoveable.cs.meta b/Assets/Scripts/MiniGame/Gear/IMoveable.cs.meta similarity index 100% rename from Assets/Scripts/MiniGame/IMoveable.cs.meta rename to Assets/Scripts/MiniGame/Gear/IMoveable.cs.meta diff --git a/Assets/Scripts/MiniGame/Shaft.cs b/Assets/Scripts/MiniGame/Gear/Shaft.cs similarity index 100% rename from Assets/Scripts/MiniGame/Shaft.cs rename to Assets/Scripts/MiniGame/Gear/Shaft.cs diff --git a/Assets/Scripts/MiniGame/Shaft.cs.meta b/Assets/Scripts/MiniGame/Gear/Shaft.cs.meta similarity index 100% rename from Assets/Scripts/MiniGame/Shaft.cs.meta rename to Assets/Scripts/MiniGame/Gear/Shaft.cs.meta diff --git a/Assets/Scripts/MiniGame/ShaftGraph.cs b/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs similarity index 100% rename from Assets/Scripts/MiniGame/ShaftGraph.cs rename to Assets/Scripts/MiniGame/Gear/ShaftGraph.cs diff --git a/Assets/Scripts/MiniGame/ShaftGraph.cs.meta b/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs.meta similarity index 100% rename from Assets/Scripts/MiniGame/ShaftGraph.cs.meta rename to Assets/Scripts/MiniGame/Gear/ShaftGraph.cs.meta diff --git a/Assets/Scripts/Test/OptionTest.cs b/Assets/Scripts/Test/OptionTest.cs index d88031752..fb2971d3b 100644 --- a/Assets/Scripts/Test/OptionTest.cs +++ b/Assets/Scripts/Test/OptionTest.cs @@ -1,10 +1,6 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; -using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; -using Yarn.Unity; namespace AibisDream.Test {