diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index 8f57248..00c295f 100644 --- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat +++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat @@ -44,6 +44,6 @@ Material: - WaveIntensity_2: 1 - WaveSpread_Value: 0 m_Colors: - - Center: {r: -0.10834206, g: 0.52211344, b: 0, a: 0} + - Center: {r: 0.08388895, g: 0.3980447, b: 0, a: 0} - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/电话线&电报系统/电报机界面.prefab b/Assets/Prefabs/电话线&电报系统/电报机界面.prefab index fdb2f01..e0fcdab 100644 --- a/Assets/Prefabs/电话线&电报系统/电报机界面.prefab +++ b/Assets/Prefabs/电话线&电报系统/电报机界面.prefab @@ -1,5 +1,155 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &886794388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 886794389} + - component: {fileID: 886794391} + - component: {fileID: 886794390} + m_Layer: 5 + m_Name: "\u628A\u624B-\u6309\u4E0B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &886794389 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886794388} + 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: 5597959264558210042} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.650178, y: 0.0073970146} + m_AnchorMax: {x: 0.7154736, y: 0.18769851} + m_AnchoredPosition: {x: 0.1000061, y: -0.50001526} + m_SizeDelta: {x: -1.6299896, y: -1.7212524} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &886794391 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886794388} + m_CullTransparentMesh: 1 +--- !u!114 &886794390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886794388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e6ccb661992312f469e57a6e80b05204, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1820179493 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1820179494} + - component: {fileID: 1820179496} + - component: {fileID: 1820179495} + m_Layer: 5 + m_Name: "\u628A\u624B-\u62AC\u8D77" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1820179494 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820179493} + 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: 5597959264558210042} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.650178, y: 0.0073970146} + m_AnchorMax: {x: 0.7154736, y: 0.18769851} + m_AnchoredPosition: {x: 0.1000061, y: -0.50001526} + m_SizeDelta: {x: -1.6299896, y: -1.7212524} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1820179496 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820179493} + m_CullTransparentMesh: 1 +--- !u!114 &1820179495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820179493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1d9edeeb24db585488ea09f843108d43, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5597959263764024823 GameObject: m_ObjectHideFlags: 0 @@ -25,7 +175,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5597959263764024823} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: @@ -113,7 +263,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.028, y: 0.8655201} m_AnchorMax: {x: 0.2527861, y: 0.95120806} - m_AnchoredPosition: {x: 1.0003662, y: -0.1533966} + m_AnchoredPosition: {x: 1.0006256, y: -0.1533966} m_SizeDelta: {x: -6.6341, y: -3.6931992} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5597959264214584330 @@ -186,7 +336,9 @@ RectTransform: 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_Children: + - {fileID: 1820179494} + - {fileID: 886794389} m_Father: {fileID: 5597959263764024816} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -216,15 +368,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d214c52e8b686574abfd8ed30551743b, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -267,7 +419,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.019539753, y: 0.6984626} m_AnchorMax: {x: 0.356, y: 0.93500006} - m_AnchoredPosition: {x: 1.2167358, y: 1.6634979} + m_AnchoredPosition: {x: 1.2167664, y: 1.6634979} m_SizeDelta: {x: -9.605, y: -15.7174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5597959264623391402 @@ -349,7 +501,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.52917886, y: 0.031479284} m_AnchorMax: {x: 0.99000007, y: 0.39900002} - m_AnchoredPosition: {x: -2.2779846, y: 1.7250061} + m_AnchoredPosition: {x: -2.2779846, y: 1.7249756} m_SizeDelta: {x: -11.304703, y: -4.6799927} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5597959264636663570 @@ -425,7 +577,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.030000001, y: 0.031479284} m_AnchorMax: {x: 0.52917886, y: 0.39900002} - m_AnchoredPosition: {x: 0.034118652, y: 1.5472717} + m_AnchoredPosition: {x: 0.034118652, y: 1.5473633} m_SizeDelta: {x: -6.344902, y: -5.0294952} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5597959264650514512 @@ -500,7 +652,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.028, y: 0.07770139} m_AnchorMax: {x: 0.934, y: 0.80746245} - m_AnchoredPosition: {x: -1.1623077, y: 6.8636475} + m_AnchoredPosition: {x: -1.1622925, y: 6.8636475} m_SizeDelta: {x: -10.95929, y: -15.4207} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5597959264967419906 @@ -660,7 +812,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.019539753, y: 0.5} m_AnchorMax: {x: 0.47471207, y: 0.73800004} - m_AnchoredPosition: {x: 1.6592102, y: 1.7999992} + m_AnchoredPosition: {x: 1.6591797, y: 1.7999992} m_SizeDelta: {x: -12, y: -10} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5597959265267525095 diff --git a/Assets/Scenes/序章-家中.unity b/Assets/Scenes/序章-家中.unity index dbdd28a..c712c76 100644 --- a/Assets/Scenes/序章-家中.unity +++ b/Assets/Scenes/序章-家中.unity @@ -679,6 +679,196 @@ MonoBehaviour: m_EditorClassIdentifier: Cam: {fileID: 1861856990} moveRate: 0.01 +--- !u!1 &222237386 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 222237387} + - component: {fileID: 222237389} + - component: {fileID: 222237388} + - component: {fileID: 222237390} + - component: {fileID: 222237391} + - component: {fileID: 222237392} + - component: {fileID: 222237393} + m_Layer: 0 + m_Name: "\u51C6\u5907\u51FA\u53D1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &222237387 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 222237386} + 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: 2114539721} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &222237388 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 222237386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 67 + y: 70 + width: 112.4 + height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 + itemId: 0 + blockName: New Block + description: + eventHandler: {fileID: 222237390} + commandList: + - {fileID: 222237391} + - {fileID: 222237392} + - {fileID: 222237393} + suppressAllAutoSelections: 0 +--- !u!114 &222237389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 222237386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlocks: + - {fileID: 222237388} + selectedCommands: + - {fileID: 222237391} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] + luaEnvironment: {fileID: 0} + luaBindingName: flowchart +--- !u!114 &222237390 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 222237386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d7d417659cd54a6787f70f763950c34, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 222237388} + suppressBlockAutoSelect: 0 + message: "\u51C6\u5907\u51FA\u53D1" +--- !u!114 &222237391 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 222237386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + indentLevel: 0 + storyText: "\u7EC8\u4E8E\u8F6E\u5230\u6211\u4E86\u4E48\u2026\u2026" + description: + character: {fileID: 1015270920} + portrait: {fileID: 21300000, guid: 54ea9c1755f00e74bbd58d13f4273867, type: 3} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 0} +--- !u!114 &222237392 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 222237386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + indentLevel: 0 + storyText: "\u53BB\u3010\u90A3\u4E2A\u5730\u65B9\u3011\uFF0C\u5E26\u4E0A\u7535\u62A5\u673A\u51FA\u53D1\u5427\u3002" + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 0} +--- !u!114 &222237393 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 222237386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17a200dbd67304446a3019434503338a, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + indentLevel: 0 + targetObject: {fileID: 1637475280} + methodName: OnCall + delay: 0 --- !u!1 &233312870 GameObject: m_ObjectHideFlags: 0 @@ -840,7 +1030,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &310835680 Transform: m_ObjectHideFlags: 0 @@ -997,7 +1187,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114539721} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &359691902 MonoBehaviour: @@ -1285,6 +1475,38 @@ Transform: m_Father: {fileID: 716192431} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &450798891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 450798892} + m_Layer: 0 + m_Name: "\u73A9\u5BB6-\u957F\u5927\u540E" + m_TagString: Untagged + m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &450798892 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 450798891} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -11.32, y: -0.2, z: 0} + m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_Children: + - {fileID: 798428059} + - {fileID: 859715594} + m_Father: {fileID: 1568214228} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &461284040 GameObject: m_ObjectHideFlags: 0 @@ -1368,11 +1590,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!224 &490086061 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5597959264558210042, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - m_PrefabInstance: {fileID: 5597959265222857228} - m_PrefabAsset: {fileID: 0} --- !u!1 &582064874 GameObject: m_ObjectHideFlags: 0 @@ -1661,7 +1878,7 @@ RectTransform: m_Children: - {fileID: 1584681279} m_Father: {fileID: 2114539721} - m_RootOrder: 9 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1705,7 +1922,7 @@ MonoBehaviour: m_Priority: 10 m_StandbyUpdate: 2 m_LookAt: {fileID: 0} - m_Follow: {fileID: 2048333218} + m_Follow: {fileID: 1620589215} m_Lens: FieldOfView: 60 OrthographicSize: 4 @@ -1729,7 +1946,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 642174518} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.87, y: 0.08661765, z: -10} + m_LocalPosition: {x: -10.87, y: -4.5233827, z: -10} m_LocalScale: {x: 40.825, y: 10.626138, z: 1} m_Children: - {fileID: 74982410} @@ -1853,7 +2070,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114539721} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &644217702 MonoBehaviour: @@ -2262,7 +2479,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114539721} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &775073760 MonoBehaviour: @@ -2446,6 +2663,304 @@ MonoBehaviour: targetObject: {fileID: 21934455} methodName: OnCall delay: 0 +--- !u!1001 &798428058 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 450798892} + m_Modifications: + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalPosition.x + value: -3.46 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalPosition.y + value: -5.99 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4565123580431842046, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_Name + value: "\u73A9\u5BB6" + objectReference: {fileID: 0} + - target: {fileID: -4565123580431842046, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4565123580431842046, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 1109988601706786661, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4600147779519124788, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9089726545814515203, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + propertyPath: m_LocalPosition.y + value: 3.71 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: -1702321563162783781, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} +--- !u!4 &798428059 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -7486259149391206261, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + m_PrefabInstance: {fileID: 798428058} + m_PrefabAsset: {fileID: 0} +--- !u!1 &798428060 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -4565123580431842046, guid: ba4dfb40858e0214a976f9bd79c3207a, type: 3} + m_PrefabInstance: {fileID: 798428058} + m_PrefabAsset: {fileID: 0} +--- !u!114 &798428061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798428060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e2c1a0de69ef6d468a14db32ebf68fe, type: 3} + m_Name: + m_EditorClassIdentifier: + catched: {fileID: 0} + missile: {fileID: 0} + throwOffset: {fileID: 0} +--- !u!50 &798428062 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798428060} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!61 &798428063 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798428060} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 5.45} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2.35, y: 10.14} + m_EdgeRadius: 0 +--- !u!114 &798428064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798428060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 6c1186e0febe48c4e866173c0f39422d, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 798428061} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnMoveHorizons + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 5a93f020-27b4-4cb6-975f-af9ed1ef4ec3 + m_ActionName: PlayerNormal/MoveHorizons[/Keyboard/a,/Keyboard/d] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 798428061} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnRun + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 5c554403-34b9-4a85-a8f5-ac58363cad75 + m_ActionName: PlayerNormal/Run[/Keyboard/shift] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 798428061} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnInteraction + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: a3099043-3ac2-4656-8595-f0c577842621 + m_ActionName: PlayerNormal/Interaction[/Keyboard/f] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 798428061} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnQuit + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 8d490180-d97c-4d4f-836c-a6f7a4392b67 + m_ActionName: PlayerNormal/Quit[/Keyboard/k] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 26b56a36-3d1d-4cb2-9efb-beb11a1d5267 + m_ActionName: NullMap/New action + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 078b3370-2cb6-4574-9156-0146ae814573 + m_ActionName: PlayerInThrowing/Quit[/Keyboard/k] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 6bab4454-55d6-409c-9736-d1640a407628 + m_ActionName: PlayerInThrowing/Throw[/Keyboard/shift] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: fddd4068-5ae8-4c1a-8498-4c8c30327f57 + m_ActionName: PlayerInThrowing/AdjustTheAngle[/Keyboard/s,/Keyboard/w] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 7740a478-a400-40d6-96a6-27525d86c2dc + m_ActionName: PlayerInCoding/Coding[/Keyboard/space] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 43dde524-dc10-473f-b1e8-7ce5297afc88 + m_ActionName: PlayerInReparingTheMachine/Comfirm[/Keyboard/f] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: Player + m_DefaultActionMap: PlayerNormal + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!95 &798428065 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798428060} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 9ef6669e7dd2f764bbb94648bcca8c9b, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1001 &799637149 PrefabInstance: m_ObjectHideFlags: 0 @@ -2651,6 +3166,100 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 817315566} m_CullTransparentMesh: 1 +--- !u!1001 &859715593 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 450798892} + m_Modifications: + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_LocalPosition.x + value: -0.23 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_LocalPosition.y + value: -5.5 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -6239220429838529637, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4565123580431842046, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_Name + value: "\u6211\u519B" + objectReference: {fileID: 0} + - target: {fileID: -4565123580431842046, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4565123580431842046, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: -2430817856828278223, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 797153643321121156, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1240684121953884407, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3524845973014873284, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4415969952395942515, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: -1702321563162783781, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} +--- !u!4 &859715594 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -7486259149391206261, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + m_PrefabInstance: {fileID: 859715593} + m_PrefabAsset: {fileID: 0} --- !u!1 &866289584 GameObject: m_ObjectHideFlags: 0 @@ -2763,7 +3372,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114539721} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &866289588 MonoBehaviour: @@ -3017,81 +3626,6 @@ Transform: m_Father: {fileID: 764281729} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &886794388 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 886794389} - - component: {fileID: 886794391} - - component: {fileID: 886794390} - m_Layer: 5 - m_Name: "\u628A\u624B-\u6309\u4E0B" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &886794389 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 886794388} - 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: 490086061} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.650178, y: 0.0073970146} - m_AnchorMax: {x: 0.7154736, y: 0.18769851} - m_AnchoredPosition: {x: 0.1000061, y: -0.5} - m_SizeDelta: {x: -1.6299896, y: -1.7212524} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &886794390 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 886794388} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e6ccb661992312f469e57a6e80b05204, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &886794391 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 886794388} - m_CullTransparentMesh: 1 --- !u!1 &899940056 GameObject: m_ObjectHideFlags: 0 @@ -3457,7 +3991,7 @@ MonoBehaviour: portraits: - {fileID: 21300000, guid: 29e56f162a0374b44a23437dd6e68ca6, type: 3} portraitsFace: 0 - setSayDialog: {fileID: 0} + setSayDialog: {fileID: 582064879} description: --- !u!4 &995089251 Transform: @@ -3471,8 +4005,59 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114539721} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1015270918 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1015270919} + - component: {fileID: 1015270920} + m_Layer: 0 + m_Name: "\u4E3B\u89D2-\u957F\u5927\u540E" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1015270919 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015270918} + 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: 2114539721} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1015270920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015270918} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25fb867d2049d41f597aefdd6b19f598, type: 3} + m_Name: + m_EditorClassIdentifier: + nameText: "\u4E3B\u89D2" + nameColor: {r: 1, g: 1, b: 1, a: 1} + soundEffect: {fileID: 0} + portraits: + - {fileID: 21300000, guid: 54ea9c1755f00e74bbd58d13f4273867, type: 3} + portraitsFace: 0 + setSayDialog: {fileID: 582064879} + description: --- !u!1 &1037109829 GameObject: m_ObjectHideFlags: 0 @@ -3616,7 +4201,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114539721} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1041575547 MonoBehaviour: @@ -3682,12 +4267,136 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} m_PrefabInstance: {fileID: 2048333217} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1121347157} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e2c1a0de69ef6d468a14db32ebf68fe, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1057822572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1057822573} + - component: {fileID: 1057822574} + - component: {fileID: 1057822575} + - component: {fileID: 1057822576} + m_Layer: 0 + m_Name: "\u5047\u7535\u62A5\u673A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1057822573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057822572} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.1, y: -1.22, z: 0} + m_LocalScale: {x: 10.201862, y: 10.201862, z: 10.201862} + m_Children: [] + m_Father: {fileID: 1258629581} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1057822574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057822572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c78cf8a41c788543affb9913623517e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_interface: {fileID: 0} + m_Collider: {fileID: 0} +--- !u!61 &1057822575 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057822572} + 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} + m_SpriteTilingProperty: + border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.16, y: 0.16} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.13, y: 0.13} + m_EdgeRadius: 0 +--- !u!212 &1057822576 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057822572} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!114 &1071101930 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5597959265267525094, guid: be137567ab5f12047b3a7cb77de43046, type: 3} @@ -3699,6 +4408,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1075508405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1075508406} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1075508406 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075508405} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 11.56, y: -0.81, z: -10.486094} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1121347157 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5563886958839055788, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + m_PrefabInstance: {fileID: 2048333217} + m_PrefabAsset: {fileID: 0} --- !u!1 &1132274496 GameObject: m_ObjectHideFlags: 0 @@ -3813,7 +4557,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114539721} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1132274501 MonoBehaviour: @@ -4407,6 +5151,7 @@ Transform: - {fileID: 1170258148} - {fileID: 913332110} - {fileID: 461284041} + - {fileID: 1057822573} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4496,6 +5241,167 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 296af97ad0e28b5489d86f727888d738, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1366529687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1366529688} + - component: {fileID: 1366529690} + - component: {fileID: 1366529689} + - component: {fileID: 1366529691} + - component: {fileID: 1366529692} + - component: {fileID: 1366529693} + m_Layer: 0 + m_Name: "\u5148\u62FF\u5305\u5427" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1366529688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366529687} + 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: 2114539721} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1366529689 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366529687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 67 + y: 70 + width: 112.4 + height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 + itemId: 0 + blockName: New Block + description: + eventHandler: {fileID: 1366529691} + commandList: + - {fileID: 1366529692} + - {fileID: 1366529693} + suppressAllAutoSelections: 0 +--- !u!114 &1366529690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366529687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 291.25 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlocks: + - {fileID: 1366529689} + selectedCommands: + - {fileID: 1366529693} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] + luaEnvironment: {fileID: 0} + luaBindingName: flowchart +--- !u!114 &1366529691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366529687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d7d417659cd54a6787f70f763950c34, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 1366529689} + suppressBlockAutoSelect: 0 + message: "\u5148\u62FF\u5305\u5427" +--- !u!114 &1366529692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366529687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + indentLevel: 0 + storyText: "\u6211\u8FD8\u6CA1\u62FF\u4E0A\u7535\u62A5\u673A\u2026\u2026\u5728\u3010\u90A3\u4E2A\u5730\u65B9\u3011" + description: + character: {fileID: 1015270920} + portrait: {fileID: 21300000, guid: 54ea9c1755f00e74bbd58d13f4273867, type: 3} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + waitForVO: 0 + setSayDialog: {fileID: 0} +--- !u!114 &1366529693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366529687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17a200dbd67304446a3019434503338a, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + indentLevel: 0 + targetObject: {fileID: 1637475280} + methodName: OnCall + delay: 0 --- !u!1 &1384210878 GameObject: m_ObjectHideFlags: 0 @@ -4776,7 +5682,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 359691898} + selectedFlowchart: {fileID: 1366529690} --- !u!4 &1463945086 Transform: m_ObjectHideFlags: 1 @@ -4846,6 +5752,210 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} m_PrefabInstance: {fileID: 5597959265222857228} m_PrefabAsset: {fileID: 0} +--- !u!1 &1521743312 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -4565123580431842046, guid: 25898fbc1968d644ab72b659d6acc72a, type: 3} + m_PrefabInstance: {fileID: 859715593} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1521743313 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1521743312} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 9ef6669e7dd2f764bbb94648bcca8c9b, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1521743314 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1521743312} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e2c1a0de69ef6d468a14db32ebf68fe, type: 3} + m_Name: + m_EditorClassIdentifier: + catched: {fileID: 0} + missile: {fileID: 0} + throwOffset: {fileID: 0} +--- !u!114 &1521743315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1521743312} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 6c1186e0febe48c4e866173c0f39422d, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1521743314} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnMoveHorizons + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 5a93f020-27b4-4cb6-975f-af9ed1ef4ec3 + m_ActionName: PlayerNormal/MoveHorizons[/Keyboard/a,/Keyboard/d] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1521743314} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnRun + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 5c554403-34b9-4a85-a8f5-ac58363cad75 + m_ActionName: PlayerNormal/Run[/Keyboard/shift] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1521743314} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnInteraction + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: a3099043-3ac2-4656-8595-f0c577842621 + m_ActionName: PlayerNormal/Interaction[/Keyboard/f] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1521743314} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnQuit + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 8d490180-d97c-4d4f-836c-a6f7a4392b67 + m_ActionName: PlayerNormal/Quit[/Keyboard/k] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 26b56a36-3d1d-4cb2-9efb-beb11a1d5267 + m_ActionName: NullMap/New action + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 078b3370-2cb6-4574-9156-0146ae814573 + m_ActionName: PlayerInThrowing/Quit[/Keyboard/k] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 6bab4454-55d6-409c-9736-d1640a407628 + m_ActionName: PlayerInThrowing/Throw[/Keyboard/shift] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: fddd4068-5ae8-4c1a-8498-4c8c30327f57 + m_ActionName: PlayerInThrowing/AdjustTheAngle[/Keyboard/s,/Keyboard/w] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 7740a478-a400-40d6-96a6-27525d86c2dc + m_ActionName: PlayerInCoding/Coding[/Keyboard/space] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 43dde524-dc10-473f-b1e8-7ce5297afc88 + m_ActionName: PlayerInReparingTheMachine/Comfirm[/Keyboard/f] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: Player + m_DefaultActionMap: PlayerNormal + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!61 &1521743316 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1521743312} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 5.31} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 3.33, y: 10.2} + m_EdgeRadius: 0 +--- !u!50 &1521743317 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1521743312} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 --- !u!1 &1568214227 GameObject: m_ObjectHideFlags: 0 @@ -4875,6 +5985,7 @@ Transform: m_Children: - {fileID: 2048333218} - {fileID: 764281729} + - {fileID: 450798892} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4999,6 +6110,11 @@ RectTransform: m_AnchoredPosition: {x: -750.0001, y: 0} m_SizeDelta: {x: 1500, y: 335} m_Pivot: {x: 0, y: 0} +--- !u!4 &1620589215 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 477229684392848094, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + m_PrefabInstance: {fileID: 2048333217} + m_PrefabAsset: {fileID: 0} --- !u!1 &1637475280 GameObject: m_ObjectHideFlags: 0 @@ -5254,81 +6370,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: CGs: [] ---- !u!1 &1820179493 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1820179494} - - component: {fileID: 1820179496} - - component: {fileID: 1820179495} - m_Layer: 5 - m_Name: "\u628A\u624B-\u62AC\u8D77" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1820179494 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1820179493} - 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: 490086061} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.650178, y: 0.0073970146} - m_AnchorMax: {x: 0.7154736, y: 0.18769851} - m_AnchoredPosition: {x: 0.1000061, y: -0.5} - m_SizeDelta: {x: -1.6299896, y: -1.7212524} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1820179495 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1820179493} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1d9edeeb24db585488ea09f843108d43, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1820179496 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1820179493} - m_CullTransparentMesh: 1 --- !u!1 &1851675995 GameObject: m_ObjectHideFlags: 0 @@ -5364,7 +6405,7 @@ MonoBehaviour: portraits: - {fileID: 21300000, guid: 6582be7064fb9d543a4d591e162f5327, type: 3} portraitsFace: 0 - setSayDialog: {fileID: 0} + setSayDialog: {fileID: 582064879} description: --- !u!4 &1851675997 Transform: @@ -5378,7 +6419,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114539721} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1856939520 GameObject: @@ -5692,7 +6733,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1861856986} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.87, y: 0.08661765, z: -10} + m_LocalPosition: {x: -10.870555, y: -0.61863995, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 716192431} @@ -5810,7 +6851,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114539721} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1971227292 MonoBehaviour: @@ -6069,6 +7110,10 @@ PrefabInstance: propertyPath: m_DefaultControlScheme value: Player objectReference: {fileID: 0} + - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_ActionEvents.Array.data[7].m_PersistentCalls.m_Calls.Array.size value: 1 @@ -6308,6 +7353,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9b701ea64b20ba046b1c99013b049034, type: 3} m_Name: m_EditorClassIdentifier: + playerYong: {fileID: 1121347157} + playerOld: {fileID: 450798891} + Vcamera: {fileID: 642174519} --- !u!1 &2114539720 GameObject: m_ObjectHideFlags: 0 @@ -6335,6 +7383,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1015270919} - {fileID: 995089251} - {fileID: 1851675997} - {fileID: 1132274500} @@ -6344,6 +7393,8 @@ Transform: - {fileID: 775073759} - {fileID: 1041575546} - {fileID: 359691901} + - {fileID: 222237387} + - {fileID: 1366529688} - {fileID: 582064884} m_Father: {fileID: 0} m_RootOrder: 4 @@ -6660,50 +7711,6 @@ PrefabInstance: propertyPath: m_Name value: "\u7535\u62A5\u673A\u754C\u9762" objectReference: {fileID: 0} - - target: {fileID: 5597959263764024823, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959264214584328, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchoredPosition.x - value: 1.0006104 - objectReference: {fileID: 0} - - target: {fileID: 5597959264558210041, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5597959264558210043, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959264558210043, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: d214c52e8b686574abfd8ed30551743b, type: 3} - - target: {fileID: 5597959264558210043, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5597959264623391400, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchoredPosition.x - value: 1.2167358 - objectReference: {fileID: 0} - - target: {fileID: 5597959264636663568, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchoredPosition.y - value: 1.7249756 - objectReference: {fileID: 0} - - target: {fileID: 5597959264650514518, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchoredPosition.y - value: 1.5473633 - objectReference: {fileID: 0} - - target: {fileID: 5597959264967419904, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchoredPosition.x - value: -1.1622925 - objectReference: {fileID: 0} - - target: {fileID: 5597959265267525093, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchoredPosition.x - value: 1.6591797 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: be137567ab5f12047b3a7cb77de43046, type: 3} --- !u!1001 &6148935033767695742 @@ -6761,6 +7768,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 6148935033436152201, guid: b034a6d27e737a9438c2164815880846, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6148935034079004064, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: m_RootOrder value: 3 diff --git a/Assets/Scenes/序章-战场.unity b/Assets/Scenes/序章-战场.unity index f8af853..7455953 100644 --- a/Assets/Scenes/序章-战场.unity +++ b/Assets/Scenes/序章-战场.unity @@ -284,7 +284,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 56435766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.8511591, y: -0.04775405, z: -10} + m_LocalPosition: {x: -6.5014315, y: 1.6934682, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1049093360} @@ -1962,7 +1962,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3945938556576538517, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} propertyPath: OKCount - value: 3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} propertyPath: m_RootOrder @@ -2351,7 +2351,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373134508} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.2599998, y: -0.049999952, z: -10} + m_LocalPosition: {x: -7.54, y: 1.6600001, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 963972581} @@ -2464,7 +2464,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1506938804} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.7, y: -1.2, z: 0} + m_LocalPosition: {x: -3.1, y: 0.51, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: - {fileID: 318330976} diff --git a/Assets/Scenes/第一关.unity b/Assets/Scenes/第一关.unity index 71dd6d6..45e0604 100644 --- a/Assets/Scenes/第一关.unity +++ b/Assets/Scenes/第一关.unity @@ -217,6 +217,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &42103620 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5597959263764024823, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + m_PrefabInstance: {fileID: 2035829731} + m_PrefabAsset: {fileID: 0} --- !u!1001 &90261332 PrefabInstance: m_ObjectHideFlags: 0 @@ -1111,7 +1116,7 @@ RectTransform: m_Children: - {fileID: 1846175060} - {fileID: 90261333} - - {fileID: 624259228} + - {fileID: 2035829732} m_Father: {fileID: 1102619305} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1215,144 +1220,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 8083259778992148205, guid: 8c0eff332c2998f4a8fbaf4e2b1171db, type: 3} m_PrefabInstance: {fileID: 578878688} m_PrefabAsset: {fileID: 0} ---- !u!1001 &624259227 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 526267221} - m_Modifications: - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0.000061035156 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024823, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_Name - value: "\u7535\u62A5\u673A\u754C\u9762" - objectReference: {fileID: 0} - - target: {fileID: 5597959263764024823, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: be137567ab5f12047b3a7cb77de43046, type: 3} ---- !u!224 &624259228 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - m_PrefabInstance: {fileID: 624259227} - m_PrefabAsset: {fileID: 0} ---- !u!1 &624259229 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5597959263764024823, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - m_PrefabInstance: {fileID: 624259227} - m_PrefabAsset: {fileID: 0} ---- !u!224 &624259230 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5597959264636663568, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - m_PrefabInstance: {fileID: 624259227} - m_PrefabAsset: {fileID: 0} ---- !u!114 &624259231 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5597959265078829594, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - m_PrefabInstance: {fileID: 624259227} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &624259232 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5597959265267525094, guid: be137567ab5f12047b3a7cb77de43046, type: 3} - m_PrefabInstance: {fileID: 624259227} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &643242559 GameObject: m_ObjectHideFlags: 1 @@ -3318,85 +3185,6 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 2.35, y: 1.58} m_EdgeRadius: 0 ---- !u!1 &1254694219 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1254694220} - - component: {fileID: 1254694222} - - component: {fileID: 1254694221} - m_Layer: 5 - m_Name: "\u53E5\u5B503" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1254694220 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254694219} - 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: 624259230} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.019539753, y: 0} - m_AnchorMax: {x: 0.47471207, y: 0.23600002} - m_AnchoredPosition: {x: 0.119903564, y: -0.50001526} - m_SizeDelta: {x: -15, y: -11} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1254694221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254694219} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ---- !u!222 &1254694222 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254694219} - m_CullTransparentMesh: 1 --- !u!1 &1275295338 GameObject: m_ObjectHideFlags: 0 @@ -4337,7 +4125,7 @@ PrefabInstance: - target: {fileID: 6148935033436152198, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: m_interface value: - objectReference: {fileID: 624259229} + objectReference: {fileID: 42103620} - target: {fileID: 6148935033436152198, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: sentences.Array.size value: 3 @@ -4361,15 +4149,15 @@ PrefabInstance: - target: {fileID: 6148935033436152198, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: sentencesTextView.Array.data[0] value: - objectReference: {fileID: 624259232} + objectReference: {fileID: 0} - target: {fileID: 6148935033436152198, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: sentencesTextView.Array.data[1] value: - objectReference: {fileID: 624259231} + objectReference: {fileID: 0} - target: {fileID: 6148935033436152198, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: sentencesTextView.Array.data[2] value: - objectReference: {fileID: 1254694221} + objectReference: {fileID: 0} - target: {fileID: 6148935033436152199, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: m_Enabled value: 1 @@ -4739,6 +4527,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1846175059} m_CullTransparentMesh: 1 +--- !u!1001 &2035829731 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 526267221} + m_Modifications: + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.000061035156 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5597959263764024823, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + propertyPath: m_Name + value: "\u7535\u62A5\u673A\u754C\u9762" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: be137567ab5f12047b3a7cb77de43046, type: 3} +--- !u!224 &2035829732 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5597959263764024816, guid: be137567ab5f12047b3a7cb77de43046, type: 3} + m_PrefabInstance: {fileID: 2035829731} + m_PrefabAsset: {fileID: 0} --- !u!1 &2053675028 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/M_Player.cs b/Assets/Scripts/M_Player.cs index b701665..3cc52c2 100644 --- a/Assets/Scripts/M_Player.cs +++ b/Assets/Scripts/M_Player.cs @@ -187,7 +187,7 @@ public class M_Player : MonoBehaviour //触发交互函数，在具象物体中重写这个虚拟功能 catched.OnCall(); //如果捕捉对象是电话线 - if(catched.tag == "电话线") + if(catched != null && catched.tag == "电话线") { //获取其电话线组件，如果其未修好，则执行修理动画 if(!catched.GetComponent().HasTheBePrepared()) diff --git a/Assets/Scripts/事件/OpenDoorStage.cs b/Assets/Scripts/事件/OpenDoorStage.cs index 26ce31c..194f30d 100644 --- a/Assets/Scripts/事件/OpenDoorStage.cs +++ b/Assets/Scripts/事件/OpenDoorStage.cs @@ -30,6 +30,8 @@ public class OpenDoorStage : Event player.GetComponent().SwitchCurrentActionMap("NullMap"); //呼出开门演出开幕对话 Flowchart.BroadcastFungusMessage("开门演出开幕"); + //删除那个假电报机 + Destroy(FindObjectOfType().gameObject); } } diff --git a/Assets/Scripts/事件/ReadyToGoStage.cs b/Assets/Scripts/事件/ReadyToGoStage.cs index 66e27df..ce582aa 100644 --- a/Assets/Scripts/事件/ReadyToGoStage.cs +++ b/Assets/Scripts/事件/ReadyToGoStage.cs @@ -2,16 +2,30 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; +using Cinemachine; +using Fungus; public class ReadyToGoStage : Event { + [Tooltip("请拖入年轻的玩家")] + public GameObject playerYong; + [Tooltip("请拖入年长的玩家")] + public GameObject playerOld; + [Tooltip("拖入摄像机")] + public CinemachineVirtualCamera Vcamera; //多态：玩家准备触发前往第一关时候的多态 public override void OnCall() { Debug.Log("正在启动多态【准备出发】"); - M_Player player = FindObjectOfType();//找到玩家 - player.transform.position = new Vector3(10.1999998f,0.936617672f,0);//改变玩家位置 + playerYong.SetActive(false); + playerOld.SetActive(true);//打开年长骨骼、关闭年轻骨骼 + + M_Player player = FindObjectOfType();//找到玩家类 + player.transform.position = new Vector3(11.5600004f,-4f,0);//改变玩家位置 + + //更改摄像机追踪目标 + Vcamera.Follow = player.transform; player.transform.localScale = new Vector3( Mathf.Abs(transform.localScale.x)*-1, @@ -19,8 +33,14 @@ public class ReadyToGoStage : Event transform.localScale.z);//修改玩家面部朝向为左 Destroy(FindObjectOfType().gameObject);//摧毁父亲这个游戏物体 + //删除电报机 + Destroy(GameObject.Find("电报机")); - Debug.Log("此多态下不明确的东西太多，之后再细做"); - //已知与门互动将直接出发到第一关，第一关还没布置，这里的衔接之后再写 + //出发该多态的开局对话 + Flowchart.BroadcastFungusMessage("准备出发"); + + //水缸相关 + GameObject watertank = GameObject.Find("水缸");//找到水缸 + watertank.GetComponentInChildren().itemName = "准备出发时的水缸"; } } diff --git a/Assets/Scripts/信息相关/IndexRecoder.cs b/Assets/Scripts/信息相关/IndexRecoder.cs index b992084..802ce20 100644 --- a/Assets/Scripts/信息相关/IndexRecoder.cs +++ b/Assets/Scripts/信息相关/IndexRecoder.cs @@ -63,7 +63,7 @@ public class IndexRecoder : MonoBehaviour codeBook.Add("----.","9"); codeBook.Add("-----","0"); - stageName = "开门演出"; + stageName = "准备出发"; } // Update is called once per frame diff --git a/Assets/Scripts/具象物体/AReadyMachine.cs b/Assets/Scripts/具象物体/AReadyMachine.cs new file mode 100644 index 0000000..6d570a7 --- /dev/null +++ b/Assets/Scripts/具象物体/AReadyMachine.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AReadyMachine : Interactive +{ + //控制家里移开水缸后的电报机 + public BoxCollider2D m_Collider; + void Start() + { + m_Collider = GetComponent(); + m_Collider.enabled = false; + } + public override void OnCall() + { + //交互后，改变玩家形象 + FindObjectOfType().transform.Find("包").gameObject.SetActive(true); + FindObjectOfType().transform.Find("包带").gameObject.SetActive(true); + + //随后删除自己 + FindObjectOfType().catched = null; + Destroy(gameObject); + } +} diff --git a/Assets/Scripts/具象物体/AReadyMachine.cs.meta b/Assets/Scripts/具象物体/AReadyMachine.cs.meta new file mode 100644 index 0000000..55d9e5b --- /dev/null +++ b/Assets/Scripts/具象物体/AReadyMachine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9c78cf8a41c788543affb9913623517e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/具象物体/Door.cs b/Assets/Scripts/具象物体/Door.cs index b506c6c..824eb1f 100644 --- a/Assets/Scripts/具象物体/Door.cs +++ b/Assets/Scripts/具象物体/Door.cs @@ -1,6 +1,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Fungus; +using UnityEngine.SceneManagement; +using UnityEngine.InputSystem; public class Door : Interactive { @@ -13,5 +16,21 @@ public class Door : Interactive CGAdministrator administrator = FindObjectOfType(); administrator.CallACG("暂用-战友"); } + + //如果是在准备出发这一幕被唤醒，则检查是否捡起背包 + if(FindObjectOfType().stageName == "准备出发") + { + if(FindObjectOfType().transform.Find("包").gameObject.activeSelf)//如果已经捡起背包 + { + //加载第一关场景 + SceneManager.LoadScene("第一关"); + } + else + { + //弹出对话，要先拿包 + Flowchart.BroadcastFungusMessage("先拿包吧"); + FindObjectOfType().GetComponent().SwitchCurrentActionMap("NullMap"); + } + } } } diff --git a/Assets/Scripts/抽象的东西/NormalInvestableItems.cs b/Assets/Scripts/抽象的东西/NormalInvestableItems.cs index b393ec5..2d7e9d7 100644 --- a/Assets/Scripts/抽象的东西/NormalInvestableItems.cs +++ b/Assets/Scripts/抽象的东西/NormalInvestableItems.cs @@ -9,21 +9,48 @@ public class NormalInvestableItems : Interactive // Start is called before the first frame update //普通可调查对象的类，用在按F可以触发调查对话的对象上💬 public string itemName; + private bool isMoving = false; + + //水缸才用得上，基类里写这个，属于屎山代码 + private Transform watertank; + private Vector3 target; + // void Start() { - + target = new Vector3(1.92999995f,-1.37871194f,0); + try + { + watertank = GameObject.Find("水缸").transform; + } + catch(System.Exception){} } // Update is called once per frame void Update() { + if(isMoving) watertank.position += (target - watertank.position)* + Time.deltaTime* + 1f; } public override void OnCall() { - Debug.Log("我触发了"+ gameObject.name +"的对话"); - Flowchart.BroadcastFungusMessage("谈论" + itemName); - //修改玩家操作地图为空，解决玩家在对话时还能移动的问题 - FindObjectOfType().GetComponent().SwitchCurrentActionMap("NullMap"); + if(itemName == "准备出发时的水缸") + { + //这项比较特殊，只能这样单独写了，我有罪，这是屎山代码 + isMoving = true; + FindObjectOfType().m_Collider.enabled = true; + } + else + { + Debug.Log("我触发了"+ gameObject.name +"的对话"); + Flowchart.BroadcastFungusMessage("谈论" + itemName); + //修改玩家操作地图为空，解决玩家在对话时还能移动的问题 + FindObjectOfType().GetComponent().SwitchCurrentActionMap("NullMap"); + } + } + + //返回水缸的运动状态 + public bool CheckMoving(){return isMoving;} } diff --git a/Assets/图/敌人.prefab b/Assets/图/敌人.prefab index a5a3c20..19d42df 100644 --- a/Assets/图/敌人.prefab +++ b/Assets/图/敌人.prefab @@ -40,7 +40,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8781483546630013603, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0007150173 + value: -0.00071525574 objectReference: {fileID: 0} - target: {fileID: -8781483546630013603, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y @@ -48,19 +48,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8781483546630013603, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 0.8362749 + value: 0.83627516 + objectReference: {fileID: 0} + - target: {fileID: -8781483546630013603, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_Bounds.m_Extent.y + value: 1.0710652 objectReference: {fileID: 0} - target: {fileID: -8102717075805799310, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0015751123 + value: 0.0015756488 objectReference: {fileID: 0} - target: {fileID: -8102717075805799310, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.0004580617 + value: -0.00046002865 objectReference: {fileID: 0} - target: {fileID: -8102717075805799310, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 0.68190503 + value: 0.68190515 + objectReference: {fileID: 0} + - target: {fileID: -8102717075805799310, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_Bounds.m_Extent.y + value: 0.9259403 + objectReference: {fileID: 0} + - target: {fileID: -7222746249383097911, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_RootOrder + value: 0 objectReference: {fileID: 0} - target: {fileID: -7222746249383097911, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_LocalPosition.x @@ -74,6 +86,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 64.41312 objectReference: {fileID: 0} + - target: {fileID: -7222746249383097911, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -7222746249383097911, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_LocalRotation.x value: -0 @@ -86,14 +102,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -7222746249383097911, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7222746249383097911, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -7222746249383097911, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -106,29 +114,41 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7131313541457963449, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_Bounds.m_Center.x + value: 0.000000923872 + objectReference: {fileID: 0} + - target: {fileID: -7131313541457963449, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_Bounds.m_Center.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7131313541457963449, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_Bounds.m_Extent.y + value: 0.8350004 + objectReference: {fileID: 0} - target: {fileID: -7049765623844454240, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0077250004 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7049765623844454240, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.000000059604645 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7049765623844454240, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 0.55548495 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7049765623844454240, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.675 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7014676768562944966, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0011398792 + value: 0.0011392832 objectReference: {fileID: 0} - target: {fileID: -7014676768562944966, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.0005018711 + value: 0.00049996376 objectReference: {fileID: 0} - target: {fileID: -7014676768562944966, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -136,11 +156,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7014676768562944966, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.8844999 + value: 0.8845 objectReference: {fileID: 0} - target: {fileID: -6697677910822735815, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.002579689 + value: -0.0025801063 objectReference: {fileID: 0} - target: {fileID: -6697677910822735815, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y @@ -148,31 +168,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -6697677910822735815, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 0.77955014 + value: 0.7795501 objectReference: {fileID: 0} - target: {fileID: -6697677910822735815, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 1.0262052 + value: 1.026205 objectReference: {fileID: 0} - target: {fileID: -5933292191354925109, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.00072038174 + value: 0.00071907043 objectReference: {fileID: 0} - target: {fileID: -5933292191354925109, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.0000019073486 + value: -0.000000059604645 objectReference: {fileID: 0} - target: {fileID: -5933292191354925109, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 0.40928024 + value: 0.4092803 objectReference: {fileID: 0} - target: {fileID: -5933292191354925109, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.5350001 + value: 0.53500015 objectReference: {fileID: 0} - target: {fileID: -5364224727156198491, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.00000023841858 + value: 0 objectReference: {fileID: 0} - target: {fileID: -5364224727156198491, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y @@ -180,43 +200,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -5364224727156198491, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 1.1149999 + value: 1.1150001 objectReference: {fileID: 0} - target: {fileID: -5364224727156198491, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.68052 + value: 0.6805201 objectReference: {fileID: 0} - target: {fileID: -5104009751190865980, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0043744743 + value: 0.0000010430813 objectReference: {fileID: 0} - target: {fileID: -5104009751190865980, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0 + value: 0.0000019073486 objectReference: {fileID: 0} - target: {fileID: -5104009751190865980, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.55500007 + value: 0.5550003 objectReference: {fileID: 0} - target: {fileID: -4926008057088308838, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0022547245 + value: 0.002254963 objectReference: {fileID: 0} - target: {fileID: -4926008057088308838, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.00079506636 + value: -0.0007941127 objectReference: {fileID: 0} - target: {fileID: -4926008057088308838, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 1.027745 + value: 1.0277452 objectReference: {fileID: 0} - target: {fileID: -4926008057088308838, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.85983485 + value: 0.8598351 objectReference: {fileID: 0} - target: {fileID: -3408037499983266762, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0008546114 + value: -0.00085508823 objectReference: {fileID: 0} - target: {fileID: -3408037499983266762, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y @@ -228,7 +248,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -2514835880336483747, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0005197525 + value: -0.0005199909 objectReference: {fileID: 0} - target: {fileID: -2514835880336483747, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y @@ -236,7 +256,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -2514835880336483747, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 1.0627602 + value: 1.06276 + objectReference: {fileID: 0} + - target: {fileID: -2514835880336483747, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_Bounds.m_Extent.y + value: 1.3199999 objectReference: {fileID: 0} - target: {fileID: -1625383079846563511, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x @@ -248,7 +272,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -1390023894694633966, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.00000047683716 + value: -0.000000059604645 objectReference: {fileID: 0} - target: {fileID: -1390023894694633966, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y @@ -256,7 +280,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -1390023894694633966, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 0.7150003 + value: 0.71500015 objectReference: {fileID: 0} - target: {fileID: -1390023894694633966, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y @@ -264,43 +288,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -31108886458889753, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.00012993813 + value: -0.00012999773 objectReference: {fileID: 0} - target: {fileID: -31108886458889753, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.0006350279 + value: -0.00063705444 + objectReference: {fileID: 0} + - target: {fileID: -31108886458889753, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_Bounds.m_Extent.x + value: 0.8551401 objectReference: {fileID: 0} - target: {fileID: 4029707685060060469, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.00018447638 + value: -0.00018489361 objectReference: {fileID: 0} - target: {fileID: 4029707685060060469, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.002254963 + value: -0.0022530556 + objectReference: {fileID: 0} + - target: {fileID: 4029707685060060469, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_Bounds.m_Extent.x + value: 0.6808551 objectReference: {fileID: 0} - target: {fileID: 4029707685060060469, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.41769496 + value: 0.417695 objectReference: {fileID: 0} - target: {fileID: 6168331078206247279, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.000000059604645 + value: 0.00000011920929 objectReference: {fileID: 0} - target: {fileID: 6168331078206247279, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.00017511845 + value: -0.0001732111 objectReference: {fileID: 0} - target: {fileID: 6168331078206247279, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 0.6000001 + value: 0.60000026 objectReference: {fileID: 0} - target: {fileID: 6168331078206247279, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.68982494 + value: 0.6898251 objectReference: {fileID: 0} - target: {fileID: 7907342085941698820, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0035752058 + value: 0.0035751462 objectReference: {fileID: 0} - target: {fileID: 7907342085941698820, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y @@ -308,19 +340,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7907342085941698820, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 0.87142515 + value: 0.871425 objectReference: {fileID: 0} - target: {fileID: 8087134814222937048, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0014697909 + value: 0.0014699101 objectReference: {fileID: 0} - target: {fileID: 8087134814222937048, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Center.y value: 0.0012201071 objectReference: {fileID: 0} + - target: {fileID: 8087134814222937048, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} + propertyPath: m_Bounds.m_Extent.x + value: 0.5778 + objectReference: {fileID: 0} - target: {fileID: 8087134814222937048, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.9226299 + value: 0.92263 objectReference: {fileID: 0} - target: {fileID: 8735070709340255339, guid: 26cb246e3cf08454e8dff22772c40019, type: 3} propertyPath: m_Name diff --git a/Assets/图/暂用主角军服.png b/Assets/图/暂用主角军服.png new file mode 100644 index 0000000..142c683 Binary files /dev/null and b/Assets/图/暂用主角军服.png differ diff --git a/Assets/图/暂用主角军服.png.meta b/Assets/图/暂用主角军服.png.meta new file mode 100644 index 0000000..b29a7f9 --- /dev/null +++ b/Assets/图/暂用主角军服.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 54ea9c1755f00e74bbd58d13f4273867 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 9f54fd8..ae13a2d 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -14,5 +14,11 @@ EditorBuildSettings: - enabled: 1 path: "Assets/Scenes/\u5E8F\u7AE0-\u6218\u573A.unity" guid: e04db980e59faa042977b818fcfb3067 + - enabled: 1 + path: "Assets/Scenes/\u7B2C\u4E00\u5173.unity" + guid: b6c5fd19e3ac6294394822fc06beb7fa + - enabled: 1 + path: "Assets/Scenes/\u7B2C\u4E8C\u5173.unity" + guid: 77d4d4c7b80c95740b0a39551d53303b m_configObjects: com.unity.input.settings: {fileID: 11400000, guid: 5b0ac5f58f6660143aa0c32c9a8b5cd6, type: 2} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index b8c111b..ff1b334 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -33,7 +33,7 @@ EditorUserSettings: value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba85e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7