diff --git a/xiaofang/Assets/Prefabs/YHJ/新建材质.mat b/xiaofang/Assets/Prefabs/YHJ/red.mat similarity index 98% rename from xiaofang/Assets/Prefabs/YHJ/新建材质.mat rename to xiaofang/Assets/Prefabs/YHJ/red.mat index 6b1477f9..cdde4c4a 100644 --- a/xiaofang/Assets/Prefabs/YHJ/新建材质.mat +++ b/xiaofang/Assets/Prefabs/YHJ/red.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u65B0\u5EFA\u6750\u8D28" + m_Name: red m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: [] m_InvalidKeywords: [] diff --git a/xiaofang/Assets/Prefabs/YHJ/新建材质.mat.meta b/xiaofang/Assets/Prefabs/YHJ/red.mat.meta similarity index 100% rename from xiaofang/Assets/Prefabs/YHJ/新建材质.mat.meta rename to xiaofang/Assets/Prefabs/YHJ/red.mat.meta diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity index 66d99559..c82b3c21 100644 --- a/xiaofang/Assets/Scenes/Tmap 1.unity +++ b/xiaofang/Assets/Scenes/Tmap 1.unity @@ -159,43 +159,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalPosition.x - value: -27.32 + value: -27.56 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalPosition.y - value: -2.28 + value: -2.4 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalPosition.z - value: -17.27 + value: -17.915 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalRotation.w - value: 0.71520156 + value: 0.71317947 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.052518964 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalRotation.y - value: -0.69891834 + value: -0.6969423 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.053742543 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -8.617 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -88.681 + value: -88.666 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -0.2 objectReference: {fileID: 0} - target: {fileID: 7256832922758735079, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: tar @@ -8776,6 +8776,7 @@ MonoBehaviour: _skill_Pick: {fileID: 0} _skill_Jump: {fileID: 0} _skill_Watering: {fileID: 0} + WaterButton: {fileID: 930371661} IsWater: 0 --- !u!114 &382802818 MonoBehaviour: @@ -10401,7 +10402,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 466450965} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -17.191, y: -3.282, z: -0.369} + m_LocalPosition: {x: 0.856, y: -16.888, z: -0.601} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -15171,6 +15172,52 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -4065182513467256702, guid: 00003e04dc9a2534eb207f108c7b0cd3, type: 3} +--- !u!1 &908900261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 908900263} + - component: {fileID: 908900262} + m_Layer: 0 + m_Name: BurstCollisionWorld + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &908900262 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908900261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3} + m_Name: + m_EditorClassIdentifier: + cellSpans: + m_AlignBytes: 16 +--- !u!4 &908900263 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908900261} + 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: 0} + m_RootOrder: 38 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &909474842 PrefabInstance: m_ObjectHideFlags: 0 @@ -15527,6 +15574,128 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4105602893859884100, guid: 00003e04dc9a2534eb207f108c7b0cd3, type: 3} +--- !u!1 &930371659 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 930371660} + - component: {fileID: 930371663} + - component: {fileID: 930371662} + - component: {fileID: 930371661} + m_Layer: 5 + m_Name: water + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &930371660 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930371659} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.51109433, y: 0.51109433, z: 0.51109433} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1474431326} + m_Father: {fileID: 1375880035} + m_RootOrder: 2 + 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: -284, y: -53.0614} + m_SizeDelta: {x: 312, y: 312} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &930371661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930371659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1 + m_TargetGraphic: {fileID: 930371662} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &930371662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930371659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e4731754326a55d4da9a347ff96831d3, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &930371663 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930371659} + m_CullTransparentMesh: 1 --- !u!64 &935755364 MeshCollider: m_ObjectHideFlags: 0 @@ -18799,6 +18968,103 @@ Transform: m_CorrespondingSourceObject: {fileID: 468050, guid: 3211dc59d8bba6047a913bfe2d85c913, type: 3} m_PrefabInstance: {fileID: 1133311637} m_PrefabAsset: {fileID: 0} +--- !u!1 &1136641013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1136641014} + - component: {fileID: 1136641017} + - component: {fileID: 1136641016} + - component: {fileID: 1136641015} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1136641014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136641013} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0, z: 0.216} + m_LocalScale: {x: 0.10727, y: 0.10727, z: 0.10727} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1528375185} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!135 &1136641015 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136641013} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1136641016 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136641013} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fc2433cf1854ce540bed03bfea6c3e55, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1136641017 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136641013} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1139961813 PrefabInstance: m_ObjectHideFlags: 0 @@ -21820,6 +22086,7 @@ RectTransform: m_Children: - {fileID: 1644132867} - {fileID: 451355455} + - {fileID: 930371660} m_Father: {fileID: 1039624185} m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -24489,6 +24756,86 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1474431325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1474431326} + - component: {fileID: 1474431328} + - component: {fileID: 1474431327} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1474431326 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1474431325} + 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: 930371660} + 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.00012207031, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1474431327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1474431325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 97 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 97 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6C34" +--- !u!222 &1474431328 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1474431325} + m_CullTransparentMesh: 1 --- !u!1001 &1480398099 PrefabInstance: m_ObjectHideFlags: 0 @@ -25665,52 +26012,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 434342, guid: dae965d9ed8802048877e54ec2f0be78, type: 3} m_PrefabInstance: {fileID: 1517804048} m_PrefabAsset: {fileID: 0} ---- !u!1 &1518257098 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1518257100} - - component: {fileID: 1518257099} - m_Layer: 0 - m_Name: BurstCollisionWorld - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1518257099 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1518257098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3} - m_Name: - m_EditorClassIdentifier: - cellSpans: - m_AlignBytes: 16 ---- !u!4 &1518257100 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1518257098} - 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: 0} - m_RootOrder: 38 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1521737075 GameObject: m_ObjectHideFlags: 0 @@ -25875,6 +26176,11 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.18731062, y: 0.18804662, z: 0.486349} m_Center: {x: -0.0000009536743, y: 0.0000018291175, z: 0.0000000074505793} +--- !u!4 &1528375185 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} + m_PrefabInstance: {fileID: 1893189251} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1542437476 PrefabInstance: m_ObjectHideFlags: 0 @@ -26832,7 +27138,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604673291} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.247, y: 0.275, z: -0.57} + m_LocalPosition: {x: -0.25, y: 0.335, z: -0.57} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -27246,7 +27552,6 @@ MonoBehaviour: maxfiredis: 0 firedis: 4 ps: {fileID: 0} - us: {fileID: 0} UseSkill: {fileID: 0} characterControl: {fileID: 0} TimeText: {fileID: 0} @@ -30227,31 +30532,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalPosition.y - value: 0.93 + value: 0.935 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalPosition.z - value: -18.509998 + value: -18.536 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalRotation.w - value: 0.54537386 + value: 0.7069509 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalRotation.x - value: -0.54537386 + value: -0.7069509 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalRotation.y - value: 0.45007482 + value: -0.014847585 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalRotation.z - value: 0.45007482 + value: -0.014847585 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -89.98 + value: -90 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -30259,7 +30564,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 79.063 + value: -2.406 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_Materials.Array.data[0] @@ -30831,19 +31136,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} propertyPath: m_LocalPosition.x - value: -0.338 + value: -0.314 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} propertyPath: m_LocalPosition.y - value: 0.447 + value: 0.404 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} propertyPath: m_LocalPosition.z - value: -0.099 + value: 0.305 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} propertyPath: m_LocalRotation.x @@ -30851,7 +31156,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} propertyPath: m_LocalRotation.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} propertyPath: m_LocalRotation.z @@ -30863,7 +31168,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 180 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -35022,7 +35327,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9179503025658400806} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -10.276262, y: 0.15234268, z: -12.9737215} + m_LocalPosition: {x: -10.276262, y: 0.02, z: -12.9737215} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs b/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs index c729b375..62f86994 100644 --- a/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs +++ b/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs @@ -32,11 +32,18 @@ public class Skill_watering : MonoBehaviour public void StopWatering(GameObject currentItem) { CharacterAin.SetSkillAin(CharacterSkill.NoSkill); + if (currentItem.GetComponent() != null) { currentItem.GetComponent().StopFire(); } } + public void StopWateringAnim( ) + { + CharacterAin.SetSkillAin(CharacterSkill.NoSkill); + + + } /// /// ΧĻԴýɫĻԴ @@ -82,7 +89,7 @@ public class Skill_watering : MonoBehaviour transform.forward = directionToFire; if (currentItem.gameObject.name == "gun") { - currentItem.transform.rotation = new Quaternion(61.7036781f, 186.325302f, 348.049622f, 0); + currentItem.transform.rotation = new Quaternion(0, 186.325302f, 0, 0); } } } diff --git a/xiaofang/Assets/Script/Character/Skills/UseSkill.cs b/xiaofang/Assets/Script/Character/Skills/UseSkill.cs index df34996a..81ca60ee 100644 --- a/xiaofang/Assets/Script/Character/Skills/UseSkill.cs +++ b/xiaofang/Assets/Script/Character/Skills/UseSkill.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using Unity.VisualScripting; using UnityEngine; using UnityEngine.EventSystems; +using UnityEngine.UI; /* * ʹüܣҪжƽű @@ -22,6 +23,7 @@ public class UseSkill : MonoBehaviour public Skill_Jump _skill_Jump; public Skill_watering _skill_Watering; //Fire fire = new Fire(); + public Button WaterButton; public bool IsWater = false; // Start is called before the first frame update void Start() @@ -29,14 +31,15 @@ public class UseSkill : MonoBehaviour _skill_Pick = transform.GetComponent(); _skill_Jump = transform.GetComponent(); _skill_Watering = transform.GetComponent(); + WaterButton.onClick.AddListener(Skill_Watering); //Debug.LogError(_skill_Pick.Pick()); } // Update is called once per frame void Update() { - Skill_Watering(); - Skill_Pick(); + //Skill_Watering(); + //Skill_Pick(); if (currentItem != null) { if(currentItem.gameObject.name=="gun") @@ -97,27 +100,17 @@ public class UseSkill : MonoBehaviour //ʰȡ void Skill_Pick() { - if (Input.GetKeyDown(KeyCode.F)) - { - Debug.LogError("F"); - + //Debug.LogError(skill_Pick.Pick()); - if (currentItem != null) - { - currentItem = _skill_Pick.Drop(currentItem); - currentItem=null; - } - currentItem = _skill_Pick.Pick(); - - if(currentItem.transform.name == "NoFire") - { - currentItem.transform.Rotate(180f, -80f, -30f); - } - if (currentItem.transform.name == "gun") - { - currentItem.transform.rotation = new Quaternion(61.7036781f, 186.325302f, 348.049622f, 0); - } + if (currentItem != null) { currentItem = _skill_Pick.Drop(currentItem); currentItem=null; } + currentItem = _skill_Pick.Pick(); + + if(currentItem.transform.name == "NoFire") { currentItem.transform.Rotate(180f, -80f, -30f); + } + if (currentItem.transform.name == "gun") { currentItem.transform.rotation = new Quaternion(61.7036781f, 186.325302f, 348.049622f, 0); + } + if (Input.GetKeyDown(KeyCode.Q)) { currentItem = _skill_Pick.Drop(currentItem); @@ -133,38 +126,37 @@ public class UseSkill : MonoBehaviour { return; } - if (Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject()) - { - if (currentItem == null) - { - return; - } - Debug.Log(00000000000000000); - IsWater=true; - _skill_Watering.StartWatering(currentItem); + + Debug.Log(00000000000000000); + IsWater=true; + _skill_Watering.StartWatering(currentItem); - } - if (Input.GetMouseButtonUp(0) &&! EventSystem.current.IsPointerOverGameObject()) - { - IsWater = false; - _skill_Watering.StopWatering(currentItem); - if (currentItem.gameObject.name == "gun") - { - if (XFS.instance.IShavewater) - { - XFS.instance.water.SetActive(false); - } + + //if (Input.GetMouseButtonUp(0) &&! EventSystem.current.IsPointerOverGameObject()) + //{ + // IsWater = false; + // _skill_Watering.StopWatering(currentItem); + // if (currentItem.gameObject.name == "gun") + // { + // if (XFS.instance.IShavewater) + // { + // XFS.instance.water.SetActive(false); + // } - //currentItem.transform.rotation = new Quaternion(0, 180f,0, 0); + // //currentItem.transform.rotation = new Quaternion(0, 180f,0, 0); - } - } + // } + //} } public void FireOUt() - { - _skill_Watering.StopWatering(currentItem); + {IsWater=false; + if (currentItem != null) + { + _skill_Watering.StopWatering(currentItem); + } + _skill_Watering.StopWateringAnim(); } } diff --git a/xiaofang/Assets/Script/Item/Fire.cs b/xiaofang/Assets/Script/Item/Fire.cs index 70d4e348..95e2099b 100644 --- a/xiaofang/Assets/Script/Item/Fire.cs +++ b/xiaofang/Assets/Script/Item/Fire.cs @@ -25,7 +25,7 @@ public class Fire : MonoBehaviour public PlayerState ps; - public UseSkill us; + float timer = 0; //private Firestate firestate = Firestate.NotExtinguishFire; @@ -34,7 +34,7 @@ public class Fire : MonoBehaviour public Text TimeText; void Start() { - us = GameObject.Find("player").GetComponent(); + ps = GameObject.Find("player").GetComponent(); TimeText.gameObject.SetActive(false); } @@ -49,11 +49,16 @@ public class Fire : MonoBehaviour { MieFire(); } - if (us.currentItem == null) + + if (UseSkill == null) { return; } - else if(us.currentItem.transform.name != "NoFire") + if (UseSkill.currentItem == null) + { + return; + } + else if(UseSkill.currentItem.transform.name != "NoFire") { return; } @@ -134,7 +139,7 @@ public class Fire : MonoBehaviour { XFS.instance.water.SetActive(false); } - TimeText.gameObject.SetActive(false); + } } } @@ -143,9 +148,9 @@ public class Fire : MonoBehaviour // ɿ뿪Χüʱ holdTime = 0f; isExtinguishing = false; - TimeText.gameObject.SetActive(false); + //TimeText.gameObject.SetActive(false); // ָҿ - if (!Input.GetMouseButton(0)) EnablePlayerControl(); + } } @@ -166,11 +171,11 @@ public class Fire : MonoBehaviour this.characterControl.DragTheScreen.enabled=true; this.gameObject.SetActive(false); Debug.Log("ѱϨ"); - UseSkill = null; isPlayerInRange = false; // 뿪Χ - characterControl = null; - us.FireOUt(); - TimeText.gameObject.SetActive(false); + + UseSkill.FireOUt(); + TimeText.gameObject.SetActive(false); + } // ҽ淶Χʱ @@ -212,11 +217,12 @@ public class Fire : MonoBehaviour if (other.CompareTag("Player")) { isPlayerInRange = false; // 뿪Χ - characterControl = null; + characterControl.DragTheScreen.enabled = true; - UseSkill = null; - us.FireOUt(); - TimeText.gameObject.SetActive(false); + + UseSkill.FireOUt(); + // TimeText.gameObject.SetActive(false); + } } diff --git a/xiaofang/Assets/Script/XFS.cs b/xiaofang/Assets/Script/XFS.cs index a4c8026c..4b5cac9b 100644 --- a/xiaofang/Assets/Script/XFS.cs +++ b/xiaofang/Assets/Script/XFS.cs @@ -55,7 +55,7 @@ public class XFS : MonoBehaviour public void connectFa() { Solver solver = ShuiguanGameObject.GetComponent(); - solver.INit(Gun.transform); + solver.INit(Gun.transform.GetChild(0).transform); CharacterControl.DragTheScreen.enabled = true; } diff --git a/xiaofang/Assets/Script/hylScripts/JoystickController.cs b/xiaofang/Assets/Script/hylScripts/JoystickController.cs index 748ab0d5..ceb8cc3c 100644 --- a/xiaofang/Assets/Script/hylScripts/JoystickController.cs +++ b/xiaofang/Assets/Script/hylScripts/JoystickController.cs @@ -48,17 +48,25 @@ public class JoystickController : MonoBehaviour, IDragHandler, IEndDragHandler targetXRotation = joystickInput.x * rotationSpeed * Time.deltaTime; targetYRotation = joystickInput.y * rotationSpeed * Time.deltaTime; - Vector3 currentRotation = playerCamera.transform.eulerAngles; - Debug.Log(currentRotation); + // if (playerCamera.transform.eulerAngles.x<-30) return; + if (playerCamera.transform.eulerAngles.x <330&& playerCamera.transform.eulerAngles.x > 30) + { + return; + } + if (playerCamera.transform.eulerAngles.y < 315 && playerCamera.transform.eulerAngles.y > 45) + { + return; + } - float yRotation = currentRotation.y; - if (yRotation > 90f) targetYRotation = 0f; - if (yRotation < -90f) targetYRotation = 0f; + + //float yRotation = currentRotation.y; + //if (yRotation > 45f) targetYRotation = 0f; + //if (yRotation <45f) targetYRotation = 0f; //// ˮƽתΧֹתͷ //targetXRotation = Mathf.Clamp(targetXRotation, horizontalMinRotation, horizontalMaxRotation); //// ƴֱתΧֹת - //targetYRotation = Mathf.Clamp(targetYRotation, verticalMinRotation, verticalMaxRotation); + playerCamera.transform.RotateAround(target.transform.position, playerCamera.transform.right, targetYRotation); playerCamera.transform.RotateAround(target.transform.position, Vector3.up, targetXRotation);