diff --git a/Assets/Mesh/NPC2.controller b/Assets/Mesh/NPC2.controller index 56c7cb7..af05675 100644 --- a/Assets/Mesh/NPC2.controller +++ b/Assets/Mesh/NPC2.controller @@ -1,33 +1,8 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-8920059899407206413 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Guancha - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -5578467915566614854} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-7001275014385532491 AnimatorState: - serializedVersion: 6 + serializedVersion: 5 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -36,7 +11,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 1460423622356012210} + - {fileID: -204961516986953154} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -54,7 +29,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &-5578467915566614854 AnimatorState: - serializedVersion: 6 + serializedVersion: 5 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -62,8 +37,7 @@ AnimatorState: m_Name: guancha m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 6340796733518631124} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -103,7 +77,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1107 &-1340138183305457468 AnimatorStateMachine: - serializedVersion: 6 + serializedVersion: 5 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -115,13 +89,13 @@ AnimatorStateMachine: m_Position: {x: 240, y: 100, z: 0} - serializedVersion: 1 m_State: {fileID: -5578467915566614854} - m_Position: {x: 480, y: 40, z: 0} + m_Position: {x: 430, y: 270, z: 0} - serializedVersion: 1 m_State: {fileID: 3468741695885961152} m_Position: {x: 470, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: -7001275014385532491} - m_Position: {x: 290, y: 240, z: 0} + m_Position: {x: 160, y: 270, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -132,6 +106,31 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 145590554168387005} +--- !u!1101 &-204961516986953154 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Guancha + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5578467915566614854} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.89436626 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -146,19 +145,19 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Huhuan m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Tuoyi m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -174,7 +173,7 @@ AnimatorController: m_Controller: {fileID: 9100000} --- !u!1102 &145590554168387005 AnimatorState: - serializedVersion: 6 + serializedVersion: 5 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -184,7 +183,6 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 8198922897633135112} - - {fileID: -8920059899407206413} - {fileID: 4634509248977071993} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} @@ -201,31 +199,9 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &1460423622356012210 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 145590554168387005} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &3468741695885961152 AnimatorState: - serializedVersion: 6 + serializedVersion: 5 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -275,28 +251,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &6340796733518631124 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 145590554168387005} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &8198922897633135112 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index 2517eb7..3d700dc 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -8147,7 +8147,7 @@ RectTransform: m_GameObject: {fileID: 322675972} 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_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 404922848} m_RootOrder: 1 @@ -10432,7 +10432,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1286804867} + - {fileID: 1204323464} - {fileID: 322675973} - {fileID: 1361850294} - {fileID: 1540219666} @@ -19155,6 +19155,7 @@ MonoBehaviour: person1: {fileID: 919132148872285612} person2: {fileID: 7493206022991812764} GameEndTip: {fileID: 1230274894} + tip2: {fileID: 1204323463} --- !u!1001 &759954415 PrefabInstance: m_ObjectHideFlags: 0 @@ -28094,7 +28095,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 468386141} m_HandleRect: {fileID: 468386140} m_Direction: 2 - m_Value: 1.0000004 + m_Value: 1 m_Size: 0.7244993 m_NumberOfSteps: 0 m_OnValueChanged: @@ -29902,6 +29903,81 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: 1dfa25fe697ec1946a12c493e98eddce, type: 3} +--- !u!1 &1204323463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1204323464} + - component: {fileID: 1204323466} + - component: {fileID: 1204323465} + m_Layer: 5 + m_Name: tipimg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1204323464 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204323463} + 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: 1286804867} + m_Father: {fileID: 404922848} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -493, y: -275} + m_SizeDelta: {x: 800, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1204323465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204323463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 04ddbed653948b64db4b5fdca49946c2, 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 &1204323466 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204323463} + m_CullTransparentMesh: 0 --- !u!1001 &1212956046 PrefabInstance: m_ObjectHideFlags: 0 @@ -31798,13 +31874,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 404922848} + m_Father: {fileID: 1204323464} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -493, y: -275} - m_SizeDelta: {x: 800, y: 400} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 2.5, y: 0} + m_SizeDelta: {x: -55, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1286804869 CanvasRenderer: @@ -33442,7 +33518,7 @@ RectTransform: m_GameObject: {fileID: 1361850293} 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_LocalScale: {x: -1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 404922848} m_RootOrder: 2 @@ -46797,7 +46873,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 932370272} m_HandleRect: {fileID: 932370271} m_Direction: 0 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity index dbd49e8..675baa3 100644 --- a/Assets/Scenes/Level2.unity +++ b/Assets/Scenes/Level2.unity @@ -48436,7 +48436,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4722231454401898, guid: fca9b57a24b846e42abf4421e0822d70, type: 3} propertyPath: m_LocalPosition.x - value: 33.070007 + value: 33.05 objectReference: {fileID: 0} - target: {fileID: 4722231454401898, guid: fca9b57a24b846e42abf4421e0822d70, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/Scripts/Level1/Canvas.cs b/Assets/Scripts/Level1/Canvas.cs index 7d68ba6..916c5dc 100644 --- a/Assets/Scripts/Level1/Canvas.cs +++ b/Assets/Scripts/Level1/Canvas.cs @@ -19,6 +19,7 @@ public class Canvas : MonoBehaviour public GameObject person1; public GameObject person2; public GameObject GameEndTip; + public GameObject tip2; private void Awake() { @@ -96,6 +97,7 @@ public class Canvas : MonoBehaviour { errorTip.SetActive(true); errorTip.GetComponentInChildren().InitThis("¹§Ï²Í¨¹Ø",60); + tip2.SetActive(false); EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); } else {