diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index 8a81366..cc5dddd 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -13163,7 +13163,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5BF9\u88AB\u6551\u8005\u7684\u5386\u53F2\u64CD\u4F5C\uFF1A" + m_Text: "\u5BF9\u88AB\u6551\u8005\u7684\u64CD\u4F5C\uFF1A" --- !u!222 &489538831 CanvasRenderer: m_ObjectHideFlags: 0 @@ -53582,7 +53582,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u8BF7\u9009\u62E9\u65BD\u6551\u65B9\u5F0F" + m_Text: "\u53D1\u73B0\u6709\u4EBA\u6655\u5012\uFF0C\u8BF7\u9009\u62E9\u63AA\u65BD" --- !u!222 &2093920107 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity index f0d9a56..30a9e4b 100644 --- a/Assets/Scenes/Level2.unity +++ b/Assets/Scenes/Level2.unity @@ -1779,6 +1779,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 289090294} + - {fileID: 1477930349} m_Father: {fileID: 2094399789} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2642,6 +2643,84 @@ Transform: type: 3} m_PrefabInstance: {fileID: 112322282} m_PrefabAsset: {fileID: 0} +--- !u!1 &113987336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 113987337} + - component: {fileID: 113987339} + - component: {fileID: 113987338} + m_Layer: 5 + m_Name: Text (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &113987337 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 113987336} + 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: 985865919} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &113987338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 113987336} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u80F8\u90E8" +--- !u!222 &113987339 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 113987336} + m_CullTransparentMesh: 0 --- !u!1001 &115961379 PrefabInstance: m_ObjectHideFlags: 0 @@ -6831,6 +6910,84 @@ Transform: type: 3} m_PrefabInstance: {fileID: 267207143} m_PrefabAsset: {fileID: 0} +--- !u!1 &272466547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 272466548} + - component: {fileID: 272466550} + - component: {fileID: 272466549} + m_Layer: 5 + m_Name: Text (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &272466548 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 272466547} + 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: 518990882} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &272466549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 272466547} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_FontSize: 33 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u80F8\u90E8" +--- !u!222 &272466550 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 272466547} + m_CullTransparentMesh: 0 --- !u!1 &272970077 GameObject: m_ObjectHideFlags: 0 @@ -6900,7 +7057,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5BF9\u88AB\u6551\u8005\u7684\u5386\u53F2\u64CD\u4F5C\uFF1A" + m_Text: "\u5BF9\u88AB\u6551\u8005\u7684\u64CD\u4F5C\uFF1A" --- !u!222 &272970080 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6941,6 +7098,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 384827331} + - {fileID: 1297995125} m_Father: {fileID: 487939551} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9116,6 +9274,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1884934965} + - {fileID: 1084391070} m_Father: {fileID: 2094399789} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11947,6 +12106,84 @@ Transform: type: 3} m_PrefabInstance: {fileID: 424339853} m_PrefabAsset: {fileID: 0} +--- !u!1 &428021857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 428021858} + - component: {fileID: 428021860} + - component: {fileID: 428021859} + m_Layer: 5 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &428021858 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 428021857} + 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: 1873259907} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &428021859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 428021857} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u80A9\u90E8" +--- !u!222 &428021860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 428021857} + m_CullTransparentMesh: 0 --- !u!1001 &429711744 PrefabInstance: m_ObjectHideFlags: 0 @@ -14368,6 +14605,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1165413109} + - {fileID: 272466548} m_Father: {fileID: 487939551} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -24374,6 +24612,84 @@ Transform: type: 3} m_PrefabInstance: {fileID: 915705880} m_PrefabAsset: {fileID: 0} +--- !u!1 &915780787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 915780788} + - component: {fileID: 915780790} + - component: {fileID: 915780789} + m_Layer: 5 + m_Name: Text (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &915780788 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915780787} + 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: 1109878089} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &915780789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915780787} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_FontSize: 33 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8179\u90E8" +--- !u!222 &915780790 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915780787} + m_CullTransparentMesh: 0 --- !u!1001 &916307081 PrefabInstance: m_ObjectHideFlags: 0 @@ -25735,6 +26051,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1077429689} + - {fileID: 113987337} m_Father: {fileID: 2094399789} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -27899,6 +28216,84 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1080815547} m_PrefabAsset: {fileID: 0} +--- !u!1 &1084391069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1084391070} + - component: {fileID: 1084391072} + - component: {fileID: 1084391071} + m_Layer: 5 + m_Name: Text (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1084391070 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084391069} + 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: 325930758} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1084391071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084391069} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u624B\u90E8" +--- !u!222 &1084391072 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084391069} + m_CullTransparentMesh: 0 --- !u!114 &1085111539 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28695,6 +29090,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 326872564} + - {fileID: 915780788} m_Father: {fileID: 487939551} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -33083,6 +33479,84 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1296487107} m_PrefabAsset: {fileID: 0} +--- !u!1 &1297995124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1297995125} + - component: {fileID: 1297995127} + - component: {fileID: 1297995126} + m_Layer: 5 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1297995125 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297995124} + 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: 275092872} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1297995126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297995124} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_FontSize: 33 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u80A9\u90E8" +--- !u!222 &1297995127 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297995124} + m_CullTransparentMesh: 0 --- !u!1 &1300306931 GameObject: m_ObjectHideFlags: 0 @@ -37498,6 +37972,84 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1477035168} m_PrefabAsset: {fileID: 0} +--- !u!1 &1477930348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1477930349} + - component: {fileID: 1477930351} + - component: {fileID: 1477930350} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1477930349 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477930348} + 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: 96105466} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1477930350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477930348} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5934\u90E8" +--- !u!222 &1477930351 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477930348} + m_CullTransparentMesh: 0 --- !u!1001 &1480041099 PrefabInstance: m_ObjectHideFlags: 0 @@ -41447,6 +41999,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1176520311} + - {fileID: 2084703657} m_Father: {fileID: 487939551} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -45354,6 +45907,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1884303398} + - {fileID: 428021858} m_Father: {fileID: 2094399789} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -51394,6 +51948,84 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2084601448} m_PrefabAsset: {fileID: 0} +--- !u!1 &2084703656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2084703657} + - component: {fileID: 2084703659} + - component: {fileID: 2084703658} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2084703657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2084703656} + 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: 1692494128} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2084703658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2084703656} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_FontSize: 33 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5934\u90E8" +--- !u!222 &2084703659 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2084703656} + m_CullTransparentMesh: 0 --- !u!1 &2094399788 GameObject: m_ObjectHideFlags: 0 @@ -55505,7 +56137,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &1889250393123726207 GameObject: m_ObjectHideFlags: 0 @@ -57043,7 +57675,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &3349679988745202080 GameObject: m_ObjectHideFlags: 0 @@ -58297,7 +58929,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &4359293546033808315 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level3.unity b/Assets/Scenes/Level3.unity index cfcc92b..0921429 100644 --- a/Assets/Scenes/Level3.unity +++ b/Assets/Scenes/Level3.unity @@ -4222,8 +4222,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5593,8 +5593,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -25589,8 +25589,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -34405,8 +34405,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -38221,8 +38221,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -38583,8 +38583,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -42853,8 +42853,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -43452,7 +43452,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5BF9\u88AB\u6551\u8005\u7684\u5386\u53F2\u64CD\u4F5C\uFF1A" + m_Text: "\u5BF9\u88AB\u6551\u8005\u7684\u64CD\u4F5C\uFF1A" --- !u!222 &1784343449 CanvasRenderer: m_ObjectHideFlags: 0 @@ -49718,8 +49718,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/Scenes/Level3.unity.meta b/Assets/Scenes/Level3.unity.meta index d18a2ee..a0386e0 100644 --- a/Assets/Scenes/Level3.unity.meta +++ b/Assets/Scenes/Level3.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 81868cf07d3a2254cae6615c4f2c50d5 +guid: 7c83f403f58786645b29009d1d03fc09 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Level4.unity b/Assets/Scenes/Level4.unity index c0dfad3..b18e026 100644 --- a/Assets/Scenes/Level4.unity +++ b/Assets/Scenes/Level4.unity @@ -251,8 +251,7 @@ Transform: m_LocalRotation: {x: 0.003439034, y: -0.9093742, z: 0.4159315, w: 0.0052738613} m_LocalPosition: {x: -43.903, y: 2.933, z: 108.288} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 201040510} + m_Children: [] m_Father: {fileID: 1199883961} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 49.158, y: -179.41, z: -0.164} @@ -1392,7 +1391,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 46953392} - 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: @@ -1400,9 +1399,9 @@ RectTransform: m_Father: {fileID: 1234553259} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -786, y: -358} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -736, y: -308} m_SizeDelta: {x: 176.59546, y: 188.21356} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &46953394 @@ -2242,8 +2241,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6509,11 +6508,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 201040509} - 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: [] - m_Father: {fileID: 5527688} + m_Father: {fileID: 1887588447} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &201040512 @@ -8272,8 +8271,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8441,8 +8440,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -13378,8 +13377,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -14737,8 +14736,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -15632,7 +15631,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 466917112} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1153567590} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!114 &466917112 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16354,8 +16364,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -17030,7 +17040,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 516991601} - 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: @@ -18530,18 +18540,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 565212844} - 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: - {fileID: 1892172567} - m_Father: {fileID: 1208954828} - m_RootOrder: 5 + m_Father: {fileID: 1153567591} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 678.68, y: 23.049} - m_SizeDelta: {x: 79.89893, y: 77.808014} + m_AnchoredPosition: {x: 666.83, y: 33.77} + m_SizeDelta: {x: 57.440865, y: 70.34979} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &565212846 MonoBehaviour: @@ -19942,8 +19952,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.2, y: -26.2} - m_SizeDelta: {x: 328.42517, y: 234.3498} + m_AnchoredPosition: {x: 0.2, y: -23.7} + m_SizeDelta: {x: 328.42517, y: 332.73785} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &606345087 MonoBehaviour: @@ -20687,8 +20697,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 885654089} m_HandleRect: {fileID: 885654088} m_Direction: 2 - m_Value: 1 - m_Size: 0.7244993 + m_Value: 0.99999964 + m_Size: 0.6455316 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -26393,18 +26403,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 815683235} - 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: - {fileID: 339286240} - m_Father: {fileID: 1208954828} - m_RootOrder: 7 + m_Father: {fileID: 1153567591} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 678.68, y: -94.18} - m_SizeDelta: {x: 79.89568, y: 83.15814} + m_AnchoredPosition: {x: 673.25, y: -60.97} + m_SizeDelta: {x: 59.527687, y: 71.06665} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &815683237 MonoBehaviour: @@ -27416,7 +27426,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 849345865} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1153567590} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!114 &849345865 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29246,18 +29267,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 919056441} - 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: - {fileID: 2119148757} - m_Father: {fileID: 1208954828} - m_RootOrder: 6 + m_Father: {fileID: 1153567591} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 563.84, y: -94.18} - m_SizeDelta: {x: 81.15615, y: 83.15848} + m_AnchoredPosition: {x: 558.47, y: -61.11} + m_SizeDelta: {x: 61.441658, y: 74.93942} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &919056443 MonoBehaviour: @@ -31207,8 +31228,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -194, y: -166} - m_SizeDelta: {x: 387.97095, y: 331.94965} + m_AnchoredPosition: {x: -194, y: -218.2} + m_SizeDelta: {x: 387.97095, y: 436.32544} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &980945723 MonoBehaviour: @@ -33567,7 +33588,7 @@ MonoBehaviour: PartTipTxtList: - "\u8BF7\u70B9\u51FB\u8BBE\u5907\u4E0A\u7684\u7535\u6E90\u6309\u94AE\u6253\u5F00\u7535\u6E90" - "\u7535\u6E90\u5DF2\u6253\u5F00\uFF0C\u73B0\u5728\u8BF7\u901A\u8FC7\u9F20\u6807\u70B9\u51FB\uFF0C\u5C06\u7535\u6781\u7247\u8D34\u5728\u6B63\u786E\u7684\u80F8\u8154\u4F4D\u7F6E" - - "\u7535\u6E90\u5DF2\u6253\u5F00\uFF0C\u5373\u5C06\u5F00\u59CB\u5FC3\u5F8B\u5206\u6790" + - "\u7535\u6E90\u5DF2\u6253\u5F00\uFF0C\u5373\u5C06\u5F00\u59CB\u5FC3\u5F8B\u5206\u6790\uFF0C\u8BF7\u70B9\u51FB\u5DE6\u65B9\u5DE5\u5177\u7BB1" - "\u5FC3\u5F8B\u5206\u6790\u5DF2\u5B8C\u6210\uFF0C\u7ED3\u679C\u663E\u793A\u63A5\u4E0B\u9700\u8981\u8FDB\u884C\u9664\u98A4" - "\u9664\u98A4\u5B8C\u6210\uFF0C\u5373\u5C06\u8FDB\u884C30\uFF1A2\u7684\u80F8\u5916\u6309\u538B\u548C\u4EBA\u5DE5\u547C\u5438" errorTip: {fileID: 614602732} @@ -35463,8 +35484,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -36933,6 +36954,45 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1151176759} m_PrefabAsset: {fileID: 0} +--- !u!1 &1153567590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1153567591} + m_Layer: 5 + m_Name: selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1153567591 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153567590} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1974428783} + - {fileID: 565212845} + - {fileID: 919056442} + - {fileID: 815683236} + m_Father: {fileID: 1208954828} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1154574603 GameObject: m_ObjectHideFlags: 0 @@ -38768,10 +38828,7 @@ RectTransform: - {fileID: 1533712812} - {fileID: 466917110} - {fileID: 849345863} - - {fileID: 1974428783} - - {fileID: 565212845} - - {fileID: 919056442} - - {fileID: 815683236} + - {fileID: 1153567591} m_Father: {fileID: 1395498584} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -39371,10 +39428,10 @@ RectTransform: m_Father: {fileID: 1738897404} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1234769611 PrefabInstance: @@ -42450,8 +42507,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -43429,8 +43486,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -43568,8 +43625,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -50139,8 +50196,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -54572,8 +54629,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 300} + m_AnchoredPosition: {x: 0, y: 0.000044392214} + m_SizeDelta: {x: 0, y: 489.1129} m_Pivot: {x: 0, y: 1} --- !u!114 &1704689666 MonoBehaviour: @@ -55518,8 +55575,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -56146,17 +56203,6 @@ MonoBehaviour: m_StringArgument: AnDianYuan m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 1062217259} - m_MethodName: AddHisitoryInfo - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: "\u6253\u5F00AED\u7535\u6E90" - m_BoolArgument: 0 - m_CallState: 2 --- !u!114 &1744031695 MonoBehaviour: m_ObjectHideFlags: 0 @@ -57503,10 +57549,10 @@ RectTransform: m_Father: {fileID: 980945722} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -17, y: 128.47} - m_SizeDelta: {x: 292.71118, y: 75.01478} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -17, y: -38} + m_SizeDelta: {x: 292.71118, y: 75.01477} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1784343448 MonoBehaviour: @@ -57540,7 +57586,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5BF9\u88AB\u6551\u8005\u7684\u5386\u53F2\u64CD\u4F5C\uFF1A" + m_Text: "\u5BF9\u88AB\u6551\u8005\u7684\u64CD\u4F5C\uFF1A" --- !u!222 &1784343449 CanvasRenderer: m_ObjectHideFlags: 0 @@ -59725,7 +59771,8 @@ Transform: m_LocalRotation: {x: 0.0030373838, y: -0.87593114, z: 0.48239514, w: 0.0055149626} m_LocalPosition: {x: -43.90671, y: 2.426836, z: 107.14391} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 201040510} m_Father: {fileID: 1199883961} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -62826,18 +62873,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1974428782} - 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: - {fileID: 1552524461} - m_Father: {fileID: 1208954828} - m_RootOrder: 4 + m_Father: {fileID: 1153567591} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 566.41, y: 23.05} - m_SizeDelta: {x: 76.01844, y: 77.81088} + m_AnchoredPosition: {x: 560.5, y: 33.1} + m_SizeDelta: {x: 59.799202, y: 71.68204} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1974428784 MonoBehaviour: @@ -63356,8 +63403,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -64295,8 +64342,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/Scenes/Level4.unity.meta b/Assets/Scenes/Level4.unity.meta index cf82399..98df75f 100644 --- a/Assets/Scenes/Level4.unity.meta +++ b/Assets/Scenes/Level4.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c6472ae02622c414f85e845c3d5e7d77 +guid: 76cf7488e3eec82448fc3f3162228e60 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scripts/Level1/TextInfo.cs b/Assets/Scripts/Level1/TextInfo.cs deleted file mode 100644 index 2c690ed..0000000 --- a/Assets/Scripts/Level1/TextInfo.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public static class TaskInfo -{ - /// - /// 关卡1 - /// - public static string task1info = "1-请选择解决方式"; - public static string task2info = "2-请确认周围环境是否安全"; - public static string task3info = "3-请选择进行的操作"; - public static Color color1 = new Color32(255, 255, 255, 255);//操作未完成文本颜色 - public static Color color2 = Color.gray;//操作完成文本颜色 - - /// - /// 关卡2 - /// - public static string task4info = "1-判断被救者有无意识"; - public static string task5info = "2-观察被救者部位"; - public static string task6info = "3-选择合适的操作"; - public static Color color3 = new Color32(255, 255, 255, 255);//操作未完成文本颜色 - public static Color color4 = Color.gray;//操作完成文本颜色 -} diff --git a/Assets/Scripts/Level1/TextInfo.cs.meta b/Assets/Scripts/Level1/TextInfo.cs.meta deleted file mode 100644 index f3faad6..0000000 --- a/Assets/Scripts/Level1/TextInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: adbef45866dd9b4438bd1e628c6c819e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Level2/Canvas2.cs b/Assets/Scripts/Level2/Canvas2.cs deleted file mode 100644 index c84ce29..0000000 --- a/Assets/Scripts/Level2/Canvas2.cs +++ /dev/null @@ -1,125 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Cinemachine; -using UnityEngine.SceneManagement; -using UnityEngine.UI; -using DG.Tweening; -using System; - -public class Canvas2 : MonoSingleton -{ - public AudioClip[] ac; - AudioSource audioSource; - public GameObject tip2; - public GameObject step2_1; - public GameObject step2_2; - public Animator animator; - public GameObject errorTip; - public GameObject step2_3; - public bool isHasHX; - public AnimationClip[] huXiClip; - public Operate operates1; - public Operate operates2; - public Operate operates3; - public Transform cmpos; - public Transform cmposq; - - protected override void Awake() - { - base.Awake(); - isHasHX = UnityEngine.Random.value >= 0.5 ? true : false; - } - private void Start() - { - audioSource = GetComponent(); - EventManager.Instance.register("NextAc", NextAc); - EventManager.Instance.register("ActionTwoEnd", ActionTwoEnd); - EventManager.Instance.register("guancha", Guancha); - tip2.SetActive(true); - Invoke("JTTX",3); - GameObject obj = Instantiate(Resources.Load("operate"), GameObject.FindWithTag("Grid").transform); - operates1 = obj.GetComponent(); - operates1.str = TaskInfo.task4info; - operates1.color = TaskInfo.color3; - } - - - - void InitLevel2() - { - tip2.GetComponentInChildren().str = "ѡȷIJλĴѯ"; - tip2.SetActive(false); - step2_1.SetActive(true); - tip2.SetActive(true); - } - - void Guancha(params object[] data) { - audioSource.clip = ac[1]; - audioSource.Play(); - } - public void ActionOne(bool inspect) { - if (inspect) - { - step2_1.SetActive(false); - audioSource.clip = ac[0]; - audioSource.Play(); - animator.SetTrigger("Huhuan"); - } - - - else { - errorTip.SetActive(true); - errorTip.GetComponentInChildren().InitThis("ǰĴλ"); - } - } - void NextAc(params object[] data) { - GameObject obj = Instantiate(Resources.Load("operate"), GameObject.FindWithTag("Grid").transform); - operates2 = obj.GetComponent(); - obj.GetComponent().str = TaskInfo.task5info; - operates2.color = TaskInfo.color3; - - operates1.color = TaskInfo.color4; - tip2.GetComponentInChildren().str = "ѡȷIJλй۲챻ߵĺ"; - tip2.SetActive(false); - tip2.SetActive(true); - step2_2.SetActive(true); - - } - - void ActionTwoEnd(params object[] data) { - step2_3.SetActive(true); - Debug.Log("asdad"); - } - - public void ActionTwo(bool inspect) - { - if (inspect) - { - step2_2.SetActive(false); - animator.SetTrigger("Tuoyi"); - } - else - { - errorTip.SetActive(true); - errorTip.GetComponentInChildren().InitThis("ǰ۲첿λ"); - } - } - - public void JTTX() { - FindObjectOfType().transform.position = cmpos.position; - FindObjectOfType().transform.rotation = cmpos.rotation; - StartCoroutine(WaitExecute(()=> { - FindObjectOfType().transform.position = cmposq.position; - FindObjectOfType().transform.rotation = cmposq.rotation; - animator.SetTrigger("TXEnd"); - }, 5)); - StartCoroutine(WaitExecute(InitLevel2, 6)); - - } - - IEnumerator WaitExecute(Action action,float t) { - yield return new WaitForSeconds(t); - action(); - } -} diff --git a/Assets/Scripts/Level2/Canvas2.cs.meta b/Assets/Scripts/Level2/Canvas2.cs.meta deleted file mode 100644 index f5a62ef..0000000 --- a/Assets/Scripts/Level2/Canvas2.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e546a613bbac3ad44acb0fff81fb0b44 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Level2/DrawLine.cs b/Assets/Scripts/Level2/DrawLine.cs deleted file mode 100644 index a39c2b5..0000000 --- a/Assets/Scripts/Level2/DrawLine.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; -using UnityEngine.EventSystems; -public class DrawLine : MonoBehaviour,IPointerClickHandler -{ - RectTransform rt; - void Start() - { - rt = GetComponent(); - Vector2 point1 = rt.anchoredPosition + new Vector2(-rt.sizeDelta.x / 2, rt.sizeDelta.y / 2); - Vector2 point2 = rt.anchoredPosition + new Vector2(rt.sizeDelta.x / 2, rt.sizeDelta.y / 2); - Vector2 point3 = rt.anchoredPosition + new Vector2(-rt.sizeDelta.x / 2, -rt.sizeDelta.y / 2); - Vector2 point4 = rt.anchoredPosition + new Vector2(rt.sizeDelta.x / 2, -rt.sizeDelta.y / 2); - DrawStraightLine(point1, point2); - DrawStraightLine(point2, point4); - DrawStraightLine(point3, point4); - DrawStraightLine(point3, point1); - } - void DrawStraightLine(Vector2 a, Vector2 b) - { - GameObject img = new GameObject(); - img.AddComponent(); - img.transform.SetParent(transform); - img.GetComponent().raycastTarget = false; - float distance = Vector2.Distance(a, b); - float angle = Vector2.SignedAngle(a - b, Vector2.left); - img.GetComponent().anchoredPosition = (a + b) / 2; - img.GetComponent().sizeDelta = new Vector2(distance, 5); - img.transform.localRotation = Quaternion.AngleAxis(-angle, Vector3.forward); - img.GetComponent().color = Color.red; - } - - public void OnPointerClick(PointerEventData eventData) - { - - } -} diff --git a/Assets/Scripts/Level2/DrawLine.cs.meta b/Assets/Scripts/Level2/DrawLine.cs.meta deleted file mode 100644 index 84f6621..0000000 --- a/Assets/Scripts/Level2/DrawLine.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7f500fe94495be2459997134376a881e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Level2/GuanChaState.cs b/Assets/Scripts/Level2/GuanChaState.cs deleted file mode 100644 index 50a487e..0000000 --- a/Assets/Scripts/Level2/GuanChaState.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class GuanChaState : StateMachineBehaviour -{ - bool one = false; - public override void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) - { - if (stateInfo.normalizedTime>=1 &&!one) { - one = true; - EventManager.Instance.emit("ActionTwoEnd"); - } - } -} diff --git a/Assets/Scripts/Level2/GuanChaState.cs.meta b/Assets/Scripts/Level2/GuanChaState.cs.meta deleted file mode 100644 index a2f888e..0000000 --- a/Assets/Scripts/Level2/GuanChaState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3489c68e206a3f84c9015b3617a91d59 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Level2/Level2Manager.cs b/Assets/Scripts/Level2/Level2Manager.cs index baea4d4..c0588eb 100644 --- a/Assets/Scripts/Level2/Level2Manager.cs +++ b/Assets/Scripts/Level2/Level2Manager.cs @@ -66,8 +66,6 @@ public class Level2Manager : MonoSingleton #region 意识判断 public void YiShi() { - - Debug.Log(allOperate[2].color); yiShi.SetActive(true); DialogueController.Instance.StartDialogue(1); } diff --git a/Assets/Scripts/Level2/Question2.cs b/Assets/Scripts/Level2/Question2.cs deleted file mode 100644 index 06811c6..0000000 --- a/Assets/Scripts/Level2/Question2.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; -public class Question2 : MonoBehaviour -{ - public int index;//ѡĴ𰸼¼ - int rand;//Ľ - public string[] questionInfo; - Toggle tg; - void Start() - { - - tg = GetComponent(); - Debug.Log("Ŀгʼ"); - rand = Step2_3.rand; - transform.GetChild(1).GetComponent().text = questionInfo[rand]; - tg.onValueChanged.AddListener((bool value) => - { - if (value) - { - EventManager.Instance.emit("Question2", index); - } - }); - } - - -} diff --git a/Assets/Scripts/Level2/Question2.cs.meta b/Assets/Scripts/Level2/Question2.cs.meta deleted file mode 100644 index 61e6ecc..0000000 --- a/Assets/Scripts/Level2/Question2.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fd91c0d5a804bf64498ad6c20b35d0fd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Level2/Tip.cs b/Assets/Scripts/Level2/Tip.cs deleted file mode 100644 index 50157b9..0000000 --- a/Assets/Scripts/Level2/Tip.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using DG.Tweening; -using UnityEngine.UI; -public class Tip : MonoBehaviour -{ - public float time; - [TextArea] - public string str; - Text myText; - private void Awake() - { - myText = GetComponent(); - } - private void OnEnable() - { - myText.text = ""; - myText.DOText(str, time); - } -} diff --git a/Assets/Scripts/Level2/Tip.cs.meta b/Assets/Scripts/Level2/Tip.cs.meta deleted file mode 100644 index fd7ffc1..0000000 --- a/Assets/Scripts/Level2/Tip.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4cb08099ae8f90d4890c0319edd1e963 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Level2/TuoYiState.cs b/Assets/Scripts/Level2/TuoYiState.cs deleted file mode 100644 index 9d2233b..0000000 --- a/Assets/Scripts/Level2/TuoYiState.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class TuoYiState : StateMachineBehaviour -{ - public override void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) - { - if (stateInfo.normalizedTime>=1) { - EventManager.Instance.emit("guancha"); - animator.SetTrigger("Guancha"); - } - - } -} diff --git a/Assets/Scripts/Level2/TuoYiState.cs.meta b/Assets/Scripts/Level2/TuoYiState.cs.meta deleted file mode 100644 index 958956a..0000000 --- a/Assets/Scripts/Level2/TuoYiState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 19b190059fc96234bbb7e0c9e11a0091 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Pass3/Pass3AniAction.cs b/Assets/Scripts/Pass3/Pass3AniAction.cs index 6b4255f..3a85c01 100644 --- a/Assets/Scripts/Pass3/Pass3AniAction.cs +++ b/Assets/Scripts/Pass3/Pass3AniAction.cs @@ -7,6 +7,14 @@ public class Pass3AniAction : AniAction public override void InitAniAction() { base.InitAniAction(); + + PassManager.Instance.AddHisitoryInfo("判断意识"); + PassManager.Instance.AddHisitoryInfo("观察呼吸"); + PassManager.Instance.AddHisitoryInfo("拨打呼救"); + PassManager.Instance.AddHisitoryInfo("30比2心肺复苏"); + + + AniActionDict.Add("FuSu", () => { PassManager.Instance. SetCtrlPart(3); diff --git a/Assets/Scripts/Pass3/Tool/Const.cs b/Assets/Scripts/Pass3/Tool/Const.cs deleted file mode 100644 index 455f508..0000000 --- a/Assets/Scripts/Pass3/Tool/Const.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Const:MonoBehaviour -{ - -} diff --git a/Assets/Scripts/Pass3/Tool/Const.cs.meta b/Assets/Scripts/Pass3/Tool/Const.cs.meta deleted file mode 100644 index b1bfc90..0000000 --- a/Assets/Scripts/Pass3/Tool/Const.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2cb7a923ce234c242a10dd106105826f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PassManager.cs b/Assets/Scripts/PassManager.cs index 1e301c9..22a68b4 100644 --- a/Assets/Scripts/PassManager.cs +++ b/Assets/Scripts/PassManager.cs @@ -23,6 +23,7 @@ public class PassManager : MonoBehaviour public Animator[] npcAni; [Header("历史操作")] public Transform hisitoryInfoParent; + private List historyInfoList=new List(); [Header("关卡提示")] public TextWrite PartTipText; public List PartTipTxtList; @@ -91,6 +92,7 @@ public class PassManager : MonoBehaviour npcStateTxt.text = str; } + /// /// 错误提示 /// @@ -101,12 +103,16 @@ public class PassManager : MonoBehaviour errorTip.transform.parent.gameObject.SetActive(true); StartTimeAction(2f, () => { errorTip.transform.parent.gameObject.SetActive(false); }); } + + public void ErrorTip() { errorTip.GetComponent().text = "操作有误，请重新考虑并选择"; errorTip.transform.parent.gameObject.SetActive(true); StartTimeAction(2f, () => { errorTip.transform.parent.gameObject.SetActive(false); }); } + + public void ErrorTip(string str) { errorTip.transform.parent.gameObject.SetActive(true); @@ -196,10 +202,26 @@ public class PassManager : MonoBehaviour public void AddHisitoryInfo(string info) { + for (int i = 0; i < historyInfoList.Count; i++) + { + if (historyInfoList[i].text == info) + { + return; + } + } GameObject go = GameObject.Instantiate(Resources.Load("Prefab/hisitoryText"), hisitoryInfoParent); Text txt = go.GetComponent(); int index = go.transform.GetSiblingIndex() + 1; txt.text = index + "-" + info; + historyInfoList.Add(txt); + + for (int i = 0; i < historyInfoList.Count; i++) + { + historyInfoList[i].color = new Color(0.65f,0.65f,0.65f,1); + } + + txt.color = new Color(255, 255, 255, 255); + } @@ -207,7 +229,7 @@ public class PassManager : MonoBehaviour { AddTip("恭喜通关"); //向平台发送通关 - + EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); } public void LoadScene(string sceneName) diff --git a/Assets/Scripts/pass4/Pass4AniAction.cs b/Assets/Scripts/pass4/Pass4AniAction.cs index ca6236d..feeb184 100644 --- a/Assets/Scripts/pass4/Pass4AniAction.cs +++ b/Assets/Scripts/pass4/Pass4AniAction.cs @@ -18,6 +18,15 @@ public class Pass4AniAction : AniAction public override void InitAniAction() { base.InitAniAction(); + + + PassManager.Instance.AddHisitoryInfo("判断意识"); + PassManager.Instance.AddHisitoryInfo("观察呼吸"); + PassManager.Instance.AddHisitoryInfo("拨打呼救"); + PassManager.Instance.AddHisitoryInfo("30比2心肺复苏"); + PassManager.Instance.AddHisitoryInfo("人工呼吸"); + PassManager.Instance.AddHisitoryInfo("打开AED电源"); + AniActionDict.Add("AnDianYuan", () => { PassManager.Instance.SetTip(2); PassManager.Instance.SetCtrlPart(2); @@ -65,7 +74,7 @@ public class Pass4AniAction : AniAction if (ran > 50) { Part6Btn.SetActive(true); - PassManager.Instance.SetTip("经过30：2的胸外按压和人工呼吸，被救者的意识依然没有恢复"); + PassManager.Instance.SetTip("经过30：2的胸外按压和人工呼吸，被救者的意识依然没有恢复,请点击工具箱"); } else @@ -114,4 +123,7 @@ public class Pass4AniAction : AniAction PassManager.Instance.isEnd = true; } + + + } diff --git a/Assets/Tools/GameManager.cs b/Assets/Tools/GameManager.cs deleted file mode 100644 index f98a2e1..0000000 --- a/Assets/Tools/GameManager.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Cinemachine; -using UnityEngine.UI; -public class GameManager : MonoSingleton -{ - public GameObject GameEndTip; - public GameObject greenPerson; - public GameObject person2; - public GameObject[] needRemoveObjs; - public GameObject[] needTransferObjs; - public GameObject errorTip; - public GameObject clickTip; - public bool mouseMove = false; - bool safe=false; - public bool remove=false; - public int safeOperate;//ѡĶӦ0Ӧתƣ1Ӧ - RaycastHit rh; - public Operate task1; - public Operate task2; - public Operate task3; - protected override void Awake() - { - base.Awake(); - DontDestroyOnLoad(gameObject); - //safe = Random.Range(0,1f) > 0.5 ? true : false; - InitScene(safe); - } - private void Start() - { - - } - - private void Update() - { - if (remove) { - Ray ray=Camera.main.ScreenPointToRay(Input.mousePosition); - if (Physics.Raycast(ray, out rh)) { - if (rh.collider.tag == "ZAW" && Input.GetMouseButtonDown(0)) { - if (rh.collider.GetComponent()) - { - rh.collider.GetComponent().SetTrigger("Sankai"); - } - else { - rh.collider.gameObject.SetActive(false); - clickTip.SetActive(false); - } - rh.collider.tag = "Untagged"; - } - } - } - } - - public void InitScene(bool safe) { - greenPerson.GetComponent().SetPosBySafe(safe); - if (!safe) - { - foreach (GameObject obj in needRemoveObjs) - { - obj.SetActive(true); - } - greenPerson.tag = "ZAW"; - } - } - - public void PanDuanSafe(bool safe) { - mouseMove = false; - EventManager.Instance.emit("PanDuanSafe", this.safe == safe,this.safe); - } - - public void SetSafeOperate(int index) { - safeOperate = index; - if (index == 0) { - EventManager.Instance.emit("SafeOperate",0); - Invoke("TransferObjs", 1); - } else if (index==1) { - greenPerson.tag = "ZAW"; - remove = true; - EventManager.Instance.emit("SafeOperate",1); - } - } - - void TransferObjs() { - person2.SetActive(true); - greenPerson.GetComponent().SetPosBySafe(true); - FindObjectOfType().LookAt = needTransferObjs[0].transform; - FindObjectOfType().Follow = needTransferObjs[0].transform; - FindObjectOfType().m_YAxis.Value = 0.75f; - FindObjectOfType().m_XAxis.Value = 56.27f; - foreach (GameObject obj in needTransferObjs) - { - obj.transform.position += new Vector3(2, 0, -35); - } - //GameObject obj2 = Instantiate(Resources.Load("operate")); - //obj2.GetComponent().str = "2-תƵȫλ"; - GameManager.Instance.task3.color = Color.gray; - Invoke("ZhuanyiEnd",2); - - - } - - void ZhuanyiEnd() { - errorTip.SetActive(true); - errorTip.GetComponentInChildren().InitThis("ϲͨ", 60); - GameEndTip.SetActive(true); - GameEndTip.GetComponentInChildren().text="ѳɹתƵȫλ"; - - EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); - } -} diff --git a/Assets/Tools/GameManager.cs.meta b/Assets/Tools/GameManager.cs.meta deleted file mode 100644 index 03a2ad0..0000000 --- a/Assets/Tools/GameManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fc62637c6246ccc428064df41cb5be1d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tools/LoadManager.cs b/Assets/Tools/LoadManager.cs deleted file mode 100644 index 2b3814a..0000000 --- a/Assets/Tools/LoadManager.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class LoadManager : MonoSingleton -{ - public T Load(string path) where T:class - { - return Resources.Load(path) as T; - } -} diff --git a/Assets/Tools/LoadManager.cs.meta b/Assets/Tools/LoadManager.cs.meta deleted file mode 100644 index 1102fd1..0000000 --- a/Assets/Tools/LoadManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c94f25fee4a4da34bbe263f631e5cd65 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tools/Observer.meta b/Assets/Tools/Observer.meta deleted file mode 100644 index a259f19..0000000 --- a/Assets/Tools/Observer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0f0567f363b89b847b07c63968cf7b33 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tools/Observer/IObserver.cs b/Assets/Tools/Observer/IObserver.cs deleted file mode 100644 index 92b82d8..0000000 --- a/Assets/Tools/Observer/IObserver.cs +++ /dev/null @@ -1,3 +0,0 @@ -public interface IObserver { - void Notify(); -} \ No newline at end of file diff --git a/Assets/Tools/Observer/IObserver.cs.meta b/Assets/Tools/Observer/IObserver.cs.meta deleted file mode 100644 index 2035938..0000000 --- a/Assets/Tools/Observer/IObserver.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 46ec0ffc8508fa24aa92cddc19d59dcc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tools/Observer/MessageCenter.cs b/Assets/Tools/Observer/MessageCenter.cs deleted file mode 100644 index a3bb7bc..0000000 --- a/Assets/Tools/Observer/MessageCenter.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using System; -public class MessageCenter : MonoSingleton -{ - public delegate void Message(); - Dictionary Events=new Dictionary(); - - protected override void Awake() - { - base.Awake(); - DontDestroyOnLoad(gameObject); - Events = new Dictionary(); - } - public void AddListen(string eventName, IObserver observer) { - if (!Events.ContainsKey(eventName)) - { - Message message = new Message(observer.Notify); - Events.Add(eventName, message); - return; - } - Events[eventName]+=observer.Notify; - } - - public void RemoveListen(string eventName, IObserver observer) - { - if (Events.ContainsKey(eventName)) - { - Events[eventName] -= observer.Notify; - } - } - - public void SendEvent(string eventName) { - if (!Events.ContainsKey(eventName)) return; - Events[eventName](); - } - -} \ No newline at end of file diff --git a/Assets/Tools/Observer/MessageCenter.cs.meta b/Assets/Tools/Observer/MessageCenter.cs.meta deleted file mode 100644 index 07c8116..0000000 --- a/Assets/Tools/Observer/MessageCenter.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e86b7a137f0e0fe4baf15cad99c6bcff -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: