diff --git a/Assets/Resources/AOT.meta b/Assets/Common/Plugin/JsonDotNet/Assemblies/AOT.meta similarity index 100% rename from Assets/Resources/AOT.meta rename to Assets/Common/Plugin/JsonDotNet/Assemblies/AOT.meta diff --git a/Assets/Resources/AOT/Newtonsoft.Json.XML b/Assets/Common/Plugin/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.XML similarity index 100% rename from Assets/Resources/AOT/Newtonsoft.Json.XML rename to Assets/Common/Plugin/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.XML diff --git a/Assets/Resources/AOT/Newtonsoft.Json.XML.meta b/Assets/Common/Plugin/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.XML.meta similarity index 100% rename from Assets/Resources/AOT/Newtonsoft.Json.XML.meta rename to Assets/Common/Plugin/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.XML.meta diff --git a/Assets/Resources/AOT/Newtonsoft.Json.dll b/Assets/Common/Plugin/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.dll similarity index 100% rename from Assets/Resources/AOT/Newtonsoft.Json.dll rename to Assets/Common/Plugin/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.dll diff --git a/Assets/Resources/AOT/Newtonsoft.Json.dll.meta b/Assets/Common/Plugin/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.dll.meta similarity index 100% rename from Assets/Resources/AOT/Newtonsoft.Json.dll.meta rename to Assets/Common/Plugin/JsonDotNet/Assemblies/AOT/Newtonsoft.Json.dll.meta diff --git a/Assets/Mesh/NPC.controller b/Assets/Mesh/NPC.controller index b1d44ed..83472ea 100644 --- a/Assets/Mesh/NPC.controller +++ b/Assets/Mesh/NPC.controller @@ -2,7 +2,11 @@ %TAG !u! tag:unity3d.com,2011: --- !u!1102 &-9068569697077069658 AnimatorState: +<<<<<<< HEAD serializedVersion: 5 +======= + serializedVersion: 6 +>>>>>>> 6dadace (游戏结束提示优化) m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -21,8 +25,12 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 +<<<<<<< HEAD m_Motion: {fileID: 1827226128182048838, guid: faad58a3df0562d44967a48bf3ae62dc, type: 3} +======= + m_Motion: {fileID: 1827226128182048838, guid: faad58a3df0562d44967a48bf3ae62dc, type: 3} +>>>>>>> 6dadace (游戏结束提示优化) m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -30,7 +38,11 @@ AnimatorState: m_TimeParameter: --- !u!1107 &-7155772280476875541 AnimatorStateMachine: +<<<<<<< HEAD serializedVersion: 5 +======= + serializedVersion: 6 +>>>>>>> 6dadace (游戏结束提示优化) m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -45,7 +57,11 @@ AnimatorStateMachine: m_Position: {x: 110, y: 90, z: 0} - serializedVersion: 1 m_State: {fileID: -6531731146847969896} +<<<<<<< HEAD m_Position: {x: 110, y: -120, z: 0} +======= + m_Position: {x: 440, y: 10, z: 0} +>>>>>>> 6dadace (游戏结束提示优化) - serializedVersion: 1 m_State: {fileID: 7802149682489576577} m_Position: {x: -39.964172, y: 316.8243, z: 0} @@ -54,14 +70,22 @@ AnimatorStateMachine: m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] +<<<<<<< HEAD m_AnyStatePosition: {x: -110, y: 30, z: 0} +======= + m_AnyStatePosition: {x: 50, y: 20, z: 0} +>>>>>>> 6dadace (游戏结束提示优化) m_EntryPosition: {x: -110, y: 100, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 6136116136866434829} --- !u!1102 &-6531731146847969896 AnimatorState: +<<<<<<< HEAD serializedVersion: 5 +======= + serializedVersion: 6 +>>>>>>> 6dadace (游戏结束提示优化) m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -79,8 +103,12 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 +<<<<<<< HEAD m_Motion: {fileID: 7637981878267065282, guid: faad58a3df0562d44967a48bf3ae62dc, type: 3} +======= + m_Motion: {fileID: 7637981878267065282, guid: faad58a3df0562d44967a48bf3ae62dc, type: 3} +>>>>>>> 6dadace (游戏结束提示优化) m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -125,13 +153,21 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 +<<<<<<< HEAD m_Controller: {fileID: 9100000} +======= + m_Controller: {fileID: 0} +>>>>>>> 6dadace (游戏结束提示优化) - m_Name: Squat m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 +<<<<<<< HEAD m_Controller: {fileID: 9100000} +======= + m_Controller: {fileID: 0} +>>>>>>> 6dadace (游戏结束提示优化) m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -147,7 +183,11 @@ AnimatorController: m_Controller: {fileID: 9100000} --- !u!1102 &6136116136866434829 AnimatorState: +<<<<<<< HEAD serializedVersion: 5 +======= + serializedVersion: 6 +>>>>>>> 6dadace (游戏结束提示优化) m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -200,7 +240,11 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1102 &7802149682489576577 AnimatorState: +<<<<<<< HEAD serializedVersion: 5 +======= + serializedVersion: 6 +>>>>>>> 6dadace (游戏结束提示优化) m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -218,8 +262,12 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 +<<<<<<< HEAD m_Motion: {fileID: 1827226128182048838, guid: edda6d24ad24efd4f8111b709188e239, type: 3} +======= + m_Motion: {fileID: 1827226128182048838, guid: edda6d24ad24efd4f8111b709188e239, type: 3} +>>>>>>> 6dadace (游戏结束提示优化) m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Mesh/call.anim b/Assets/Mesh/ani/call.anim similarity index 100% rename from Assets/Mesh/call.anim rename to Assets/Mesh/ani/call.anim diff --git a/Assets/Mesh/call.anim.meta b/Assets/Mesh/ani/call.anim.meta similarity index 100% rename from Assets/Mesh/call.anim.meta rename to Assets/Mesh/ani/call.anim.meta diff --git a/Assets/Plugins/LitJson.dll.meta b/Assets/Plugins/LitJson.dll.meta new file mode 100644 index 0000000..2d75672 --- /dev/null +++ b/Assets/Plugins/LitJson.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 99e1fb30f6198a14eb6fdf589a3d7c8e +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/operate.prefab b/Assets/Resources/operate.prefab index 1db6f3c..5fec93f 100644 --- a/Assets/Resources/operate.prefab +++ b/Assets/Resources/operate.prefab @@ -29,7 +29,10 @@ 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} +<<<<<<< HEAD m_ConstrainProportionsScale: 0 +======= +>>>>>>> 6dadace (游戏结束提示优化) m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -62,7 +65,10 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 +<<<<<<< HEAD m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} +======= +>>>>>>> 6dadace (游戏结束提示优化) m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -71,9 +77,15 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} m_FontSize: 25 m_FontStyle: 0 +<<<<<<< HEAD m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 +======= + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 25 +>>>>>>> 6dadace (游戏结束提示优化) m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index 85a56d3..bbace1e 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -1176,7 +1176,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} m_Name: m_EditorClassIdentifier: +<<<<<<< HEAD m_BindingMode: 5 +======= + m_BindingMode: 0 +>>>>>>> 6dadace (游戏结束提示优化) m_FollowOffset: {x: 0, y: 1.63, z: -5.1} m_XDamping: 1 m_YDamping: 1 @@ -5123,8 +5127,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 210506936} +<<<<<<< HEAD m_LocalRotation: {x: -0.00096266397, y: 0.99067587, z: -0.13605641, w: -0.0070095025} m_LocalPosition: {x: -40.797832, y: 3.896194, z: 149.5205} +======= + m_LocalRotation: {x: -0.0000000052348437, y: 0.99070066, z: -0.1360596, w: -0.00000003811685} + m_LocalPosition: {x: -40.87, y: 3.896194, z: 149.52101} +>>>>>>> 6dadace (游戏结束提示优化) m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -5146,8 +5155,8 @@ MonoBehaviour: m_ShowCameraFrustum: 1 m_IgnoreTimeScale: 0 m_WorldUpOverride: {fileID: 0} - m_UpdateMethod: 2 - m_BlendUpdateMethod: 1 + m_UpdateMethod: 0 + m_BlendUpdateMethod: 0 m_DefaultBlend: m_Style: 1 m_Time: 2 @@ -5771,7 +5780,7 @@ PrefabInstance: - target: {fileID: 1831962327460470430, guid: 5ab091549df78bc4a8319695e5f4f045, type: 3} propertyPath: m_LocalPosition.x - value: -47.296 + value: -47.829 objectReference: {fileID: 0} - target: {fileID: 1831962327460470430, guid: 5ab091549df78bc4a8319695e5f4f045, type: 3} @@ -5781,7 +5790,7 @@ PrefabInstance: - target: {fileID: 1831962327460470430, guid: 5ab091549df78bc4a8319695e5f4f045, type: 3} propertyPath: m_LocalPosition.z - value: 127.145 + value: 127.046 objectReference: {fileID: 0} - target: {fileID: 1831962327460470430, guid: 5ab091549df78bc4a8319695e5f4f045, type: 3} @@ -8154,7 +8163,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 860, y: 0} + m_AnchoredPosition: {x: 755, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &322675974 @@ -19123,6 +19132,7 @@ RectTransform: - {fileID: 348330224} - {fileID: 1727596679} - {fileID: 794437339} + - {fileID: 1230274895} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19153,6 +19163,7 @@ MonoBehaviour: moveTip: {fileID: 0} person1: {fileID: 919132148872285612} person2: {fileID: 7493206022991812764} + GameEndTip: {fileID: 1230274894} --- !u!1001 &759954415 PrefabInstance: m_ObjectHideFlags: 0 @@ -20394,7 +20405,7 @@ MonoBehaviour: m_RecenteringTime: 2 m_LegacyHeadingDefinition: -1 m_LegacyVelocityFilterStrength: -1 - m_BindingMode: 5 + m_BindingMode: 0 m_SplineCurvature: 0.2 m_Orbits: - m_Height: 4.5 @@ -20416,7 +20427,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 801163505} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} +<<<<<<< HEAD m_LocalPosition: {x: -40.797832, y: 3.896194, z: 149.5205} +======= + m_LocalPosition: {x: -40.87, y: 3.896194, z: 149.52101} +>>>>>>> 6dadace (游戏结束提示优化) m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1552527552} @@ -21529,7 +21544,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} m_Name: m_EditorClassIdentifier: +<<<<<<< HEAD m_BindingMode: 5 +======= + m_BindingMode: 0 +>>>>>>> 6dadace (游戏结束提示优化) m_FollowOffset: {x: 0, y: 1.63, z: -5.1} m_XDamping: 1 m_YDamping: 1 @@ -23062,7 +23081,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 917659941} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -47.296, y: 0.49, z: 127.145} + m_LocalPosition: {x: -47.41, y: 0.49, z: 127.145} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 884815397} @@ -23644,6 +23663,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fc62637c6246ccc428064df41cb5be1d, type: 3} m_Name: m_EditorClassIdentifier: + GameEndTip: {fileID: 1230274894} greenPerson: {fileID: 820062967} person2: {fileID: 7493206022991812764} needRemoveObjs: @@ -23652,6 +23672,12 @@ MonoBehaviour: needTransferObjs: - {fileID: 219856779182228589} - {fileID: 1965418836} +<<<<<<< HEAD +======= + - {fileID: 1944500207} + - {fileID: 820062967} + - {fileID: 1292127611} +>>>>>>> 6dadace (游戏结束提示优化) errorTip: {fileID: 794437338} remove: 0 safeOperate: 0 @@ -28088,7 +28114,11 @@ MonoBehaviour: m_TargetGraphic: {fileID: 468386141} m_HandleRect: {fileID: 468386140} m_Direction: 2 +<<<<<<< HEAD m_Value: 0.99999964 +======= + m_Value: 1.0000004 +>>>>>>> 6dadace (游戏结束提示优化) m_Size: 0.7244993 m_NumberOfSteps: 0 m_OnValueChanged: @@ -30200,6 +30230,81 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1228839408} m_PrefabAsset: {fileID: 0} +--- !u!1 &1230274894 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1230274895} + - component: {fileID: 1230274897} + - component: {fileID: 1230274896} + m_Layer: 5 + m_Name: pangbai + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1230274895 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1230274894} + 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: 1304876435} + m_Father: {fileID: 759704841} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -211.2, y: -276} + m_SizeDelta: {x: 390.8281, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1230274896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1230274894} + 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: 0.8} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7e8a59cb19af3ef478eca43f3a652f49, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1230274897 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1230274894} + m_CullTransparentMesh: 1 --- !u!1001 &1233773357 PrefabInstance: m_ObjectHideFlags: 0 @@ -31859,6 +31964,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1290531102} m_CullTransparentMesh: 1 +--- !u!1 &1292127611 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7737337876611161169, guid: aee117b013b767045935b79d139e6a9b, + type: 3} + m_PrefabInstance: {fileID: 1417476315} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1296487107 PrefabInstance: m_ObjectHideFlags: 0 @@ -32015,6 +32126,84 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1300306931} m_Mesh: {fileID: 4300000, guid: 0eff4fc429dcac64eadd6244bef1582f, type: 3} +--- !u!1 &1304876434 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1304876435} + - component: {fileID: 1304876437} + - component: {fileID: 1304876436} + m_Layer: 5 + m_Name: content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1304876435 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1304876434} + 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: 1230274895} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 4, y: -11} + m_SizeDelta: {x: -56.09632, y: 0.0005187988} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1304876436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1304876434} + 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: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 32 + m_MaxSize: 38 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1304876437 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1304876434} + m_CullTransparentMesh: 1 --- !u!1 &1306502216 GameObject: m_ObjectHideFlags: 0 @@ -33284,7 +33473,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -860, y: 0} + m_AnchoredPosition: {x: -749, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1361850295 @@ -35012,7 +35201,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1419425040} +<<<<<<< HEAD m_LocalRotation: {x: -0.0008353458, y: 0.9929811, z: -0.11806173, w: -0.007025837} +======= + m_LocalRotation: {x: 0.0000000020314623, y: 0.99300593, z: -0.118064456, w: 0.00000001708604} +>>>>>>> 6dadace (游戏结束提示优化) m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -38450,7 +38643,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1552527550} +<<<<<<< HEAD m_LocalRotation: {x: -0.0010900075, y: 0.98803717, z: -0.15405379, w: -0.006990856} +======= + m_LocalRotation: {x: 5.4732193e-16, y: 0.9880619, z: -0.15405743, w: 3.510301e-15} +>>>>>>> 6dadace (游戏结束提示优化) m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -38674,7 +38871,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} m_Name: m_EditorClassIdentifier: +<<<<<<< HEAD m_BindingMode: 5 +======= + m_BindingMode: 0 +>>>>>>> 6dadace (游戏结束提示优化) m_FollowOffset: {x: 0, y: 1.63, z: -5.1} m_XDamping: 1 m_YDamping: 1 @@ -40304,7 +40505,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1644663018} +<<<<<<< HEAD m_LocalRotation: {x: -0.0009626648, y: 0.99067587, z: -0.13605642, w: -0.007009509} +======= + m_LocalRotation: {x: -0.0000000026174218, y: 0.99070066, z: -0.1360596, w: -0.000000019058424} +>>>>>>> 6dadace (游戏结束提示优化) m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -46632,7 +46837,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 932370272} m_HandleRect: {fileID: 932370271} m_Direction: 0 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -47070,6 +47275,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1941338099} m_PrefabAsset: {fileID: 0} +--- !u!1 &1944500207 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7737337876611161169, guid: aee117b013b767045935b79d139e6a9b, + type: 3} + m_PrefabInstance: {fileID: 1790531826} + m_PrefabAsset: {fileID: 0} --- !u!1 &1949362478 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity index 76091f4..c6aea77 100644 --- a/Assets/Scenes/Level2.unity +++ b/Assets/Scenes/Level2.unity @@ -4477,7 +4477,11 @@ MonoBehaviour: m_HandleRect: {fileID: 109739735} m_Direction: 2 m_Value: 1 +<<<<<<< HEAD m_Size: 0.7244992 +======= + m_Size: 0.7244993 +>>>>>>> 6dadace (游戏结束提示优化) m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -15523,6 +15527,87 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 561483070} m_CullTransparentMesh: 1 +<<<<<<< HEAD +======= +--- !u!1 &565177946 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 565177947} + - component: {fileID: 565177949} + - component: {fileID: 565177948} + m_Layer: 5 + m_Name: content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &565177947 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565177946} + 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: 1225014652} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 4, y: -11} + m_SizeDelta: {x: -56.09632, y: 0.0005187988} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &565177948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565177946} + 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: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 32 + m_MaxSize: 38 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6210\u529F\u786E\u8BA4\u88AB\u6551\u8005\u7684\u5B9E\u65BD\u60C5\u51B5" +--- !u!222 &565177949 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565177946} + m_CullTransparentMesh: 1 +>>>>>>> 6dadace (游戏结束提示优化) --- !u!1 &568831605 GameObject: m_ObjectHideFlags: 0 @@ -20097,6 +20182,10 @@ RectTransform: - {fileID: 2094399789} - {fileID: 1148684816} - {fileID: 1148200631} +<<<<<<< HEAD +======= + - {fileID: 1225014652} +>>>>>>> 6dadace (游戏结束提示优化) m_Father: {fileID: 0} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -23182,9 +23271,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0c5580831ee54cd49a54e578647a809d, type: 3} m_Name: m_EditorClassIdentifier: +<<<<<<< HEAD yishi: {fileID: 0} yifu: {fileID: 0} errorTip: {fileID: 0} +======= + yishi: {fileID: 224519137} + tip: {fileID: 1225014651} + errorTip: {fileID: 1148200630} +>>>>>>> 6dadace (游戏结束提示优化) --- !u!1001 &881170073 PrefabInstance: m_ObjectHideFlags: 0 @@ -24136,7 +24231,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} +<<<<<<< HEAD m_Color: {r: 0.9811321, g: 0.03147021, b: 0.03147021, a: 1} +======= + m_Color: {r: 0, g: 0, b: 0, a: 1} +>>>>>>> 6dadace (游戏结束提示优化) m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -31983,6 +32082,84 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD +======= +--- !u!1 &1225014651 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1225014652} + - component: {fileID: 1225014654} + - component: {fileID: 1225014653} + m_Layer: 5 + m_Name: pangbai + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1225014652 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1225014651} + 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: 565177947} + m_Father: {fileID: 758956101} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -211.19995, y: -231} + m_SizeDelta: {x: 390.8281, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1225014653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1225014651} + 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: 0.8} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7e8a59cb19af3ef478eca43f3a652f49, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1225014654 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1225014651} + m_CullTransparentMesh: 1 +>>>>>>> 6dadace (游戏结束提示优化) --- !u!1001 &1225543692 PrefabInstance: m_ObjectHideFlags: 0 @@ -49710,7 +49887,11 @@ MonoBehaviour: m_TargetGraphic: {fileID: 868723960} m_HandleRect: {fileID: 868723959} m_Direction: 0 +<<<<<<< HEAD m_Value: 1 +======= + m_Value: 0 +>>>>>>> 6dadace (游戏结束提示优化) m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -53374,7 +53555,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: yishi: {fileID: 224519137} +<<<<<<< HEAD yifu: {fileID: 2059532709431411459} +======= + tip: {fileID: 0} +>>>>>>> 6dadace (游戏结束提示优化) errorTip: {fileID: 1148200630} --- !u!23 &628529072576343314 MeshRenderer: diff --git a/Assets/Scripts/Level1.meta b/Assets/Scripts/Level1.meta index bc8944d..453aa9e 100644 --- a/Assets/Scripts/Level1.meta +++ b/Assets/Scripts/Level1.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 322a055d2a29c5346b096b7134d487f9 +======= +guid: 6449c929ad0ae9e438d70a44587bd66a +>>>>>>> 6dadace (游戏结束提示优化) folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Level1/Canvas.cs b/Assets/Scripts/Level1/Canvas.cs index cffcf68..e9eb57c 100644 --- a/Assets/Scripts/Level1/Canvas.cs +++ b/Assets/Scripts/Level1/Canvas.cs @@ -18,6 +18,7 @@ public class Canvas : MonoBehaviour public GameObject moveTip; public GameObject person1; public GameObject person2; + public GameObject GameEndTip; private void Awake() { @@ -75,6 +76,11 @@ public class Canvas : MonoBehaviour step1_2.SetActive(false); errorTip.SetActive(true); errorTip.GetComponentInChildren().InitThis("ϲͨ",60); +<<<<<<< HEAD +======= + GameEndTip.SetActive(true); + GameEndTip.GetComponentInChildren().text = "Ѿɹܱ߻"; +>>>>>>> 6dadace (游戏结束提示优化) EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); } diff --git a/Assets/Scripts/Level1/Operate.cs b/Assets/Scripts/Level1/Operate.cs index 9cc3f66..2fb7015 100644 --- a/Assets/Scripts/Level1/Operate.cs +++ b/Assets/Scripts/Level1/Operate.cs @@ -15,5 +15,6 @@ public class Operate : MonoBehaviour private void Update() { text.text = str; + transform.localScale = Vector3.one; } } diff --git a/Assets/Scripts/Level2.meta b/Assets/Scripts/Level2.meta index 1674b99..d7180d3 100644 --- a/Assets/Scripts/Level2.meta +++ b/Assets/Scripts/Level2.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 76ecc1afd5277334f8e2b25834d2aabf +======= +guid: b8adc2ec26ab6254eab2ae61b4e5ac9e +>>>>>>> 6dadace (游戏结束提示优化) folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Level2/AniEnd.cs b/Assets/Scripts/Level2/AniEnd.cs index b7b40b6..f6649d6 100644 --- a/Assets/Scripts/Level2/AniEnd.cs +++ b/Assets/Scripts/Level2/AniEnd.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; public class AniEnd : MonoBehaviour { public Text yishi; - public GameObject yifu; + public GameObject tip; Animator animator; public GameObject errorTip; private void Awake() @@ -31,6 +31,10 @@ public class AniEnd : MonoBehaviour public void E_GameEnd() { +<<<<<<< HEAD +======= + tip.SetActive(true); +>>>>>>> 6dadace (游戏结束提示优化) errorTip.SetActive(true); errorTip.GetComponentInChildren().InitThis("ϲͨ", 60); EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); diff --git a/Assets/Tools.meta b/Assets/Tools.meta index 2bf2871..7f69304 100644 --- a/Assets/Tools.meta +++ b/Assets/Tools.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 9372cdb126e017d4399bd80ade0f4a23 +======= +guid: 8638b60753c0f964691d4353263c7908 +>>>>>>> 6dadace (游戏结束提示优化) folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Tools/GameManager.cs b/Assets/Tools/GameManager.cs index b8b956e..c5bdb5b 100644 --- a/Assets/Tools/GameManager.cs +++ b/Assets/Tools/GameManager.cs @@ -2,8 +2,10 @@ 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; @@ -17,7 +19,7 @@ public class GameManager : MonoSingleton { base.Awake(); DontDestroyOnLoad(gameObject); - safe = Random.value > 0.5 ? true : false; + safe = Random.Range(0,1f) > 0.5 ? true : false; InitScene(safe); } private void Start() @@ -74,16 +76,32 @@ public class GameManager : MonoSingleton 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, -40); + obj.transform.position += new Vector3(2, 0, -35); } GameObject obj2 = Instantiate(Resources.Load("operate")); obj2.GetComponent().str = "2-תƵȫλ"; +<<<<<<< HEAD errorTip.SetActive(true); errorTip.GetComponentInChildren().InitThis("ϲͨ",60); +======= + Invoke("ZhuanyiEnd",2); + + + } + + void ZhuanyiEnd() { + errorTip.SetActive(true); + errorTip.GetComponentInChildren().InitThis("ϲͨ", 60); + GameEndTip.SetActive(true); + GameEndTip.GetComponentInChildren().text="ѳɹתƵȫλ"; +>>>>>>> 6dadace (游戏结束提示优化) EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); } } diff --git a/Packages/manifest.json b/Packages/manifest.json index 6026f1e..597894d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,9 @@ { "dependencies": { +<<<<<<< HEAD +======= + "com.unity.2d.sprite": "1.0.0", +>>>>>>> 6dadace (游戏结束提示优化) "com.unity.cinemachine": "2.6.17", "com.unity.collab-proxy": "1.2.16", "com.unity.ide.rider": "1.1.4", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 90c3f03..1aadb8b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,14 @@ { "dependencies": { +<<<<<<< HEAD +======= + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, +>>>>>>> 6dadace (游戏结束提示优化) "com.unity.cinemachine": { "version": "2.6.17", "depth": 0, diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..f07dc2f 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,10 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - ZAW + - Grid + - TargetPos layers: - Default - TransparentFX