From d498e5cc115c16ea573bcf126afdf90dcc016656 Mon Sep 17 00:00:00 2001 From: Roman <1325980292@qq.com> Date: Thu, 8 Jul 2021 00:10:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E4=BA=86=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E5=86=85=E4=BA=A4=E4=BA=92=E7=89=A9=E5=93=81=202.=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E7=88=B6=E5=AD=90=E5=AF=B9=E8=AF=9D=EF=BC=8C?= =?UTF-8?q?=E5=85=B6=E5=90=8E=E7=9A=84=E4=BA=8B=E4=BB=B6=E8=BF=98=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=90=8E=E7=BB=AD=E6=94=A5=E5=86=99=203.=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=B7=BB=E5=8A=A0Stage=E6=BC=94=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=AF=B9=E8=AF=9D=E7=9A=84=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E3=80=82=E6=98=8E=E5=A4=A9=E5=86=8D=E7=A0=94=E7=A9=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/序章-回忆.unity | 385 +++++++++++++++--- Assets/Scripts/Father.cs | 25 ++ Assets/Scripts/Father.cs.meta | 11 + Assets/Scripts/NormalInvestableItems.cs | 3 +- .../Sprites/@FM55BCPPU)2U%5X90~@$EQ.png.meta | 2 +- UserSettings/EditorUserSettings.asset | 5 +- 6 files changed, 370 insertions(+), 61 deletions(-) create mode 100644 Assets/Scripts/Father.cs create mode 100644 Assets/Scripts/Father.cs.meta diff --git a/Assets/Scenes/序章-回忆.unity b/Assets/Scenes/序章-回忆.unity index 2f131e1..1f63c9b 100644 --- a/Assets/Scenes/序章-回忆.unity +++ b/Assets/Scenes/序章-回忆.unity @@ -134,7 +134,7 @@ GameObject: - component: {fileID: 9289701} - component: {fileID: 9289702} m_Layer: 0 - m_Name: "\u7B2C\u56DB\u5C42\u3002\u95E8" + m_Name: "\u95E8" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -148,11 +148,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9289700} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.77, y: 0.25, z: 0} + m_LocalPosition: {x: -2.8000007, y: 0.25, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1856939521} - m_RootOrder: 0 + m_Father: {fileID: 0} + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &9289702 SpriteRenderer: @@ -218,7 +218,7 @@ GameObject: - component: {fileID: 37275491} - component: {fileID: 37275492} m_Layer: 0 - m_Name: "\u955C\u5B50" + m_Name: "\u955C\u5B50\u7684\u5BF9\u8BDD\u89E6\u53D1\u88C5\u7F6E" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -265,7 +265,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 0.509434, g: 0.09804199, b: 0.09804199, a: 1} + m_Color: {r: 0.509434, g: 0.09804199, b: 0.09804199, a: 0} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -282,12 +282,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 37275488} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.48, y: -2.48, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.08999999, y: -1.97, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 18 + m_Father: {fileID: 1170258148} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &37275491 BoxCollider2D: @@ -328,6 +328,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_interface: {fileID: 0} + itemName: "\u955C\u5B50" --- !u!1 &74982409 GameObject: m_ObjectHideFlags: 3 @@ -372,7 +373,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 3, y: 0.2, z: 0} + m_TrackedObjectOffset: {x: 3, y: 0.8, z: 0} m_LookaheadTime: 0 m_LookaheadSmoothing: 0 m_LookaheadIgnoreY: 0 @@ -451,7 +452,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.61048114, y: 0.20600002} m_AnchorMax: {x: 0.86200005, y: 0.572} - m_AnchoredPosition: {x: 2.199997, y: -3.899994} + m_AnchoredPosition: {x: 2.199997, y: -3.9000092} m_SizeDelta: {x: 297, y: 142} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &181444957 @@ -521,7 +522,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1856939521} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &204256634 SpriteRenderer: @@ -562,7 +563,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: 21300000, guid: d2dc62837af8d234997caa1502ff011d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1094,8 +1095,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1584681279} - m_Father: {fileID: 2039349954} - m_RootOrder: 0 + m_Father: {fileID: 0} + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1163,7 +1164,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 642174518} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.9299998, y: -0.79, z: -10} + m_LocalPosition: {x: -1.9299998, y: -1.3, z: -10} m_LocalScale: {x: 40.825, y: 10.626138, z: 1} m_Children: - {fileID: 74982410} @@ -1285,7 +1286,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &644217702 MonoBehaviour: @@ -1372,12 +1373,12 @@ GameObject: - component: {fileID: 742864121} - component: {fileID: 742864120} m_Layer: 0 - m_Name: "\u7535\u62A5\u673A" + m_Name: "\u7535\u62A5\u673A\u7684\u89E6\u53D1\u88C5\u7F6E" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &742864120 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1475,12 +1476,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 742864119} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 19.63, y: 0.27, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.02999878, y: 0.85, z: 0} m_LocalScale: {x: 1, y: 2.575, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 13 + m_Father: {fileID: 2006339806} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &751638227 GameObject: @@ -1625,6 +1626,8 @@ GameObject: m_Component: - component: {fileID: 764281729} - component: {fileID: 764281728} + - component: {fileID: 764281730} + - component: {fileID: 764281731} m_Layer: 0 m_Name: "\u4ED6\u7238" m_TagString: Untagged @@ -1671,7 +1674,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 6582be7064fb9d543a4d591e162f5327, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1691,12 +1694,52 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 764281727} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 21.09, y: -2.26, z: 0} + m_LocalPosition: {x: 20.99, y: -2.19, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &764281730 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764281727} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0.9} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 5.2466664, y: 6.74} + newSize: {x: 15.74, y: 20.22} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2.91, y: 4.82} + m_EdgeRadius: 0 +--- !u!114 &764281731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764281727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 719a8ac4002097e4a8227d8cf97e3fbc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_interface: {fileID: 0} + itemName: "\u4ED6\u7238" --- !u!1 &817315566 GameObject: m_ObjectHideFlags: 0 @@ -1776,6 +1819,177 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 817315566} m_CullTransparentMesh: 1 +--- !u!1 &866289584 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 866289587} + - component: {fileID: 866289586} + - component: {fileID: 866289585} + - component: {fileID: 866289588} + - component: {fileID: 866289589} + - component: {fileID: 866289590} + m_Layer: 0 + m_Name: "\u4E0E\u7236\u4EB2\u5BF9\u8BDD" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &866289585 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866289584} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 68 + y: 69 + width: 122 + height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 + itemId: 0 + blockName: "\u4E0E\u7236\u4EB2\u7684\u5BF9\u8BDD" + description: + eventHandler: {fileID: 866289588} + commandList: + - {fileID: 866289589} + - {fileID: 866289590} + suppressAllAutoSelections: 0 +--- !u!114 &866289586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866289584} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 9.4928665, y: 22.784025} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 200 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlocks: + - {fileID: 866289585} + selectedCommands: + - {fileID: 866289589} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] + luaEnvironment: {fileID: 0} + luaBindingName: flowchart +--- !u!4 &866289587 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866289584} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 27 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &866289588 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866289584} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d7d417659cd54a6787f70f763950c34, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 866289585} + suppressBlockAutoSelect: 0 + message: "\u4E0E\u7236\u4EB2\u5BF9\u8BDD" +--- !u!114 &866289589 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866289584} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + indentLevel: 0 + storyText: "\u7239\uFF0C\u6559\u6211\u6253\u7535\u7801\u5427" + description: + character: {fileID: 995089250} + portrait: {fileID: 21300000, guid: 29e56f162a0374b44a23437dd6e68ca6, type: 3} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 582064879} +--- !u!114 &866289590 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866289584} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + indentLevel: 0 + storyText: "\u543C\u5440\uFF0C\u4ED4\u7EC6\u770B\uFF0C\u4ED4\u7EC6\u542C" + description: + character: {fileID: 1851675996} + portrait: {fileID: 21300000, guid: 6582be7064fb9d543a4d591e162f5327, type: 3} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 582064879} --- !u!1 &899940056 GameObject: m_ObjectHideFlags: 0 @@ -1856,7 +2070,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &913332108 GameObject: @@ -1938,7 +2152,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2732673, y: 0.23600002} m_AnchorMax: {x: 0.72315717, y: 0.80067426} - m_AnchoredPosition: {x: 0.5, y: -3.9999847} + m_AnchoredPosition: {x: 0.5, y: -3.9999695} m_SizeDelta: {x: -79, y: -26} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &917003919 @@ -2107,7 +2321,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1070038164 GameObject: @@ -2263,7 +2477,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 - blockViewHeight: 400 + blockViewHeight: 200 zoom: 1 scrollViewRect: serializedVersion: 2 @@ -2271,8 +2485,10 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlocks: [] - selectedCommands: [] + selectedBlocks: + - {fileID: 1132274498} + selectedCommands: + - {fileID: 1132274501} variables: [] description: stepPause: 0 @@ -2296,7 +2512,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1132274501 MonoBehaviour: @@ -2403,7 +2619,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.2, y: 0.87, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 37275490} m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2510,8 +2727,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1195339597} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -4.83, z: 0} - m_LocalScale: {x: 37.209187, y: 3.9575, z: 1} + m_LocalPosition: {x: 6.9569, y: -5.35, z: 0} + m_LocalScale: {x: 51.121704, y: 3.9575, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -2684,7 +2901,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1256971098 GameObject: @@ -2762,9 +2979,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1256971098} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 11.38, y: -2.71, z: 0} + m_LocalPosition: {x: 11.38, y: -2.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1728238377} m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2919,7 +3137,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1500782587 GameObject: @@ -3395,7 +3613,7 @@ GameObject: - component: {fileID: 1728238378} - component: {fileID: 1728238379} m_Layer: 0 - m_Name: "\u6C34\u7F38" + m_Name: "\u6C34\u7F38\u7684\u5BF9\u8BDD\u89E6\u53D1\u88C5\u7F6E" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3459,12 +3677,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1728238375} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.19, y: -2.48, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.07999992, y: 0.23000002, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 17 + m_Father: {fileID: 1256971100} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1728238378 BoxCollider2D: @@ -3505,6 +3723,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_interface: {fileID: 0} + itemName: "\u6C34\u7F38" --- !u!1 &1773029877 GameObject: m_ObjectHideFlags: 0 @@ -3814,12 +4033,63 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1811221464} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.93, y: -0.99, z: 0} + m_LocalPosition: {x: -4.93, y: -2.1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1851675995 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1851675997} + - component: {fileID: 1851675996} + m_Layer: 0 + m_Name: "\u7236\u4EB2\u7684\u5BF9\u8BDD\u53C2\u6570" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1851675996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851675995} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25fb867d2049d41f597aefdd6b19f598, type: 3} + m_Name: + m_EditorClassIdentifier: + nameText: Father + nameColor: {r: 1, g: 1, b: 1, a: 1} + soundEffect: {fileID: 0} + portraits: + - {fileID: 21300000, guid: 6582be7064fb9d543a4d591e162f5327, type: 3} + portraitsFace: 0 + setSayDialog: {fileID: 0} + description: +--- !u!4 &1851675997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851675995} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 23 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1856939520 GameObject: m_ObjectHideFlags: 0 @@ -3848,11 +4118,10 @@ Transform: m_LocalPosition: {x: 7.97, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9289701} - {fileID: 204256633} - {fileID: 1857058323} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1856939522 SpriteRenderer: @@ -3934,7 +4203,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1856939521} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1857058324 SpriteRenderer: @@ -4015,7 +4284,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1861856986 GameObject: @@ -4128,7 +4397,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1861856986} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.8662686, y: -0.79078513, z: -10} + m_LocalPosition: {x: -1.8748164, y: -1.3006797, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -4246,7 +4515,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 19.6, y: -0.58, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 742864123} m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4295,10 +4565,9 @@ Transform: 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_Children: - - {fileID: 582064884} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2052706941 GameObject: @@ -4394,7 +4663,7 @@ RectTransform: - {fileID: 1500782588} - {fileID: 181444956} m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4435,7 +4704,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2732673, y: 0.23600002} m_AnchorMax: {x: 0.72315717, y: 0.80067426} - m_AnchoredPosition: {x: 0.5, y: -3.9999847} + m_AnchoredPosition: {x: 0.5, y: -3.9999695} m_SizeDelta: {x: -79, y: -26} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2057909280 @@ -4583,7 +4852,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2142910795 GameObject: diff --git a/Assets/Scripts/Father.cs b/Assets/Scripts/Father.cs new file mode 100644 index 0000000..c63debc --- /dev/null +++ b/Assets/Scripts/Father.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Fungus; + +public class Father : NormalInvestableItems +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + public override void OnCall() + { + Debug.Log("我触发了和父亲的对话"); + Flowchart.BroadcastFungusMessage("与父亲对话"); + } +} diff --git a/Assets/Scripts/Father.cs.meta b/Assets/Scripts/Father.cs.meta new file mode 100644 index 0000000..af7dd96 --- /dev/null +++ b/Assets/Scripts/Father.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 719a8ac4002097e4a8227d8cf97e3fbc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NormalInvestableItems.cs b/Assets/Scripts/NormalInvestableItems.cs index 4d70302..4194126 100644 --- a/Assets/Scripts/NormalInvestableItems.cs +++ b/Assets/Scripts/NormalInvestableItems.cs @@ -6,6 +6,7 @@ using Fungus; public class NormalInvestableItems : Interactive { // Start is called before the first frame update + public string itemName; void Start() { @@ -20,6 +21,6 @@ public class NormalInvestableItems : Interactive public override void OnCall() { Debug.Log("我触发了"+ gameObject.name +"的对话"); - Flowchart.BroadcastFungusMessage("谈论" + gameObject.name); + Flowchart.BroadcastFungusMessage("谈论" + itemName); } } diff --git a/Assets/Sprites/@FM55BCPPU)2U%5X90~@$EQ.png.meta b/Assets/Sprites/@FM55BCPPU)2U%5X90~@$EQ.png.meta index 8113faa..19c0195 100644 --- a/Assets/Sprites/@FM55BCPPU)2U%5X90~@$EQ.png.meta +++ b/Assets/Sprites/@FM55BCPPU)2U%5X90~@$EQ.png.meta @@ -46,7 +46,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 250 + spritePixelsToUnits: 300 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 939fef3..ca5d1e5 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,9 +9,12 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + value: 22424703114646680e0b0227036c721f04041d09232c2304283a097df7ee3d2cfb flags: 0 RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb7df7ee3d2cfb flags: 0 UnityEditor.ShaderGraph.Blackboard: