diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity index 7328dd327..e05a3a4ab 100644 --- a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity @@ -3840,43 +3840,6 @@ MonoBehaviour: isOccupied: 0 ID: 0 instruct: {fileID: 826621976} ---- !u!1 &34101880 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 34101881} - m_Layer: 0 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &34101881 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 34101880} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 837336048} - m_Father: {fileID: 1931891395} - 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: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &34225845 GameObject: m_ObjectHideFlags: 0 @@ -23520,7 +23483,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2, y: 16} m_Pivot: {x: 0.5, y: 1} @@ -36489,8 +36452,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: -9, y: -164} - m_SizeDelta: {x: 248, y: 209} + m_AnchoredPosition: {x: -13.1212, y: -160.5269} + m_SizeDelta: {x: 317.0578, y: 267.198} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &372301367 MonoBehaviour: @@ -44156,6 +44119,10 @@ PrefabInstance: propertyPath: m_Color.r value: 1 objectReference: {fileID: 0} + - target: {fileID: 7739985174831531093, guid: 070de2f9549561342b884fdf110beaea, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7739985174831531094, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: _icon value: @@ -44234,11 +44201,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739985174831531095, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_AnchoredPosition.x - value: 390.4 + value: 708.3 objectReference: {fileID: 0} - target: {fileID: 7739985174831531095, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_AnchoredPosition.y - value: 54.9 + value: -113 objectReference: {fileID: 0} - target: {fileID: 7739985174831531095, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -44258,7 +44225,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739985174831531096, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 070de2f9549561342b884fdf110beaea, type: 3} @@ -52648,7 +52615,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -0.000016868114} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 164} m_Pivot: {x: 0, y: 1} --- !u!114 &527098298 MonoBehaviour: @@ -74848,7 +74815,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1931891395} - {fileID: 747111684} - {fileID: 1797850746} m_Father: {fileID: 1782824201} @@ -74856,8 +74822,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: -4.9546, y: -62.75} - m_SizeDelta: {x: 207.09, y: 407.5} + m_AnchoredPosition: {x: -4.9546, y: 40.75} + m_SizeDelta: {x: 207.09, y: 200.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &733108992 MonoBehaviour: @@ -74880,7 +74846,7 @@ MonoBehaviour: m_DecelerationRate: 0.135 m_ScrollSensitivity: 20 m_Viewport: {fileID: 1797850746} - m_HorizontalScrollbar: {fileID: 1931891396} + m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 747111685} m_HorizontalScrollbarVisibility: 2 m_VerticalScrollbarVisibility: 2 @@ -76497,12 +76463,12 @@ RectTransform: m_Children: - {fileID: 1625438125} m_Father: {fileID: 733108991} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 125, y: 0} - m_SizeDelta: {x: 19.614, y: 0} + m_SizeDelta: {x: 19.614, y: 3} m_Pivot: {x: 1, y: 1} --- !u!114 &747111685 MonoBehaviour: @@ -85364,82 +85330,6 @@ MonoBehaviour: isOccupied: 0 ID: 0 instruct: {fileID: 1803376871} ---- !u!1 &837336047 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 837336048} - - component: {fileID: 837336050} - - component: {fileID: 837336049} - m_Layer: 0 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &837336048 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837336047} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 34101881} - 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: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &837336049 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837336047} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &837336050 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837336047} - m_CullTransparentMesh: 1 --- !u!1 &838043734 GameObject: m_ObjectHideFlags: 0 @@ -180056,7 +179946,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1782824201 RectTransform: m_ObjectHideFlags: 0 @@ -182080,12 +181970,12 @@ RectTransform: m_Children: - {fileID: 527098297} m_Father: {fileID: 733108991} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -16.614, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1797850747 MonoBehaviour: @@ -196813,133 +196703,6 @@ MonoBehaviour: isOccupied: 0 ID: 0 instruct: {fileID: 348049749} ---- !u!1 &1931891394 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1931891395} - - component: {fileID: 1931891398} - - component: {fileID: 1931891397} - - component: {fileID: 1931891396} - m_Layer: 0 - m_Name: Scrollbar Horizontal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1931891395 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1931891394} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 34101881} - m_Father: {fileID: 733108991} - 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!114 &1931891396 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1931891394} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 0 - m_TargetGraphic: {fileID: 837336049} - m_HandleRect: {fileID: 837336048} - m_Direction: 0 - m_Value: 0 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1931891397 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1931891394} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &1931891398 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1931891394} - m_CullTransparentMesh: 1 --- !u!1 &1931953302 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7698401479437999879, guid: c8f09218a803c944e84c2336104ca2f9, type: 3} @@ -197628,7 +197391,7 @@ RectTransform: 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_SizeDelta: {x: 256, y: 122} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1939337835 MonoBehaviour: diff --git a/GQ_TongXin/Assets/script/点击/ClickEvent.cs b/GQ_TongXin/Assets/script/点击/ClickEvent.cs index eee03a4e2..55cf1ec1d 100644 --- a/GQ_TongXin/Assets/script/点击/ClickEvent.cs +++ b/GQ_TongXin/Assets/script/点击/ClickEvent.cs @@ -138,7 +138,7 @@ public class ClickEvent : MonoBehaviour { drag.uPosManger = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsFindParent_UPosManger).GetComponent(); GameManager.Inst.gameObject.GetComponent().uposManger = drag.uPosManger; - drag.oriObjectPrefab = gameObject.GetComponent(); + //drag.oriObjectPrefab = gameObject.GetComponent(); gameObject.GetComponent().OnselfClick(); } //PatternChoose.Inst.transform.Find("É豸Àà/É豸ÅäÖÃ").gameObject.SetActive(true);//¡Ì