diff --git a/xiaofang/Assets/NatureManufacture Assets/Fire and Smoke Particles/Prefabs/Free Fire VFX/Particles/VFX_Fire_01_Big.prefab b/xiaofang/Assets/NatureManufacture Assets/Fire and Smoke Particles/Prefabs/Free Fire VFX/Particles/VFX_Fire_01_Big.prefab index ca2692a3..7bf155f0 100644 --- a/xiaofang/Assets/NatureManufacture Assets/Fire and Smoke Particles/Prefabs/Free Fire VFX/Particles/VFX_Fire_01_Big.prefab +++ b/xiaofang/Assets/NatureManufacture Assets/Fire and Smoke Particles/Prefabs/Free Fire VFX/Particles/VFX_Fire_01_Big.prefab @@ -38847,7 +38847,9 @@ MonoBehaviour: maxfiredis: 2 firedis: 4 ps: {fileID: 0} - us: {fileID: 0} + UseSkill: {fileID: 0} + characterControl: {fileID: 0} + TimeText: {fileID: 0} --- !u!135 &5825030608256766515 SphereCollider: m_ObjectHideFlags: 0 @@ -38956,6 +38958,10 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: b5a68c3e8dd1ff548917e167adcedc24, type: 3} + - target: {fileID: 5396330232717131061, guid: 2198aa810c39f1547a3e2c252636f6b7, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5396330232717131061, guid: 2198aa810c39f1547a3e2c252636f6b7, type: 3} propertyPath: m_IsActive value: 1 diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity index c82b3c21..cc1554c7 100644 --- a/xiaofang/Assets/Scenes/Tmap 1.unity +++ b/xiaofang/Assets/Scenes/Tmap 1.unity @@ -7589,6 +7589,90 @@ Transform: m_CorrespondingSourceObject: {fileID: 431690, guid: bce898477b2413c47ae1edc6849902ec, type: 3} m_PrefabInstance: {fileID: 292656409} m_PrefabAsset: {fileID: 0} +--- !u!1 &292708806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 292708808} + - component: {fileID: 292708807} + m_Layer: 0 + m_Name: icn_lightbox@2x (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &292708807 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 292708806} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 1f1229dd7ee07a54da50996443aebbc8, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.72, y: 0.84} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &292708808 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 292708806} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 32.112274, y: 0.010272195, z: 23.279827} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 40 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &295391225 MeshCollider: m_ObjectHideFlags: 0 @@ -7840,9 +7924,8 @@ GameObject: m_Component: - component: {fileID: 326349320} - component: {fileID: 326349322} - - component: {fileID: 326349323} - component: {fileID: 326349321} - m_Layer: 5 + m_Layer: 3 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -7856,18 +7939,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 326349319} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 335603113} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 90, y: 90, 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: 0.1, y: 0.1} + m_AnchoredPosition: {x: 0, y: 0.144} + m_SizeDelta: {x: 0.2, y: 0.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &326349321 MonoBehaviour: @@ -7889,7 +7972,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 1f1229dd7ee07a54da50996443aebbc8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7907,19 +7990,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 326349319} m_CullTransparentMesh: 1 ---- !u!114 &326349323 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 326349319} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 692cd466f0426de4cb2ddd7c523e5ddc, type: 3} - m_Name: - m_EditorClassIdentifier: - player: {fileID: 382802812} --- !u!1 &327522858 GameObject: m_ObjectHideFlags: 0 @@ -8019,13 +8089,13 @@ GameObject: - component: {fileID: 335603116} - component: {fileID: 335603115} - component: {fileID: 335603114} - m_Layer: 5 + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &335603113 RectTransform: m_ObjectHideFlags: 0 @@ -8044,7 +8114,7 @@ RectTransform: 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.347} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0.1, y: 0.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &335603114 @@ -11003,6 +11073,90 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 5.194641, y: 2.6415303, z: 6.9111176} m_Center: {x: -0.6857853, y: 0.82076514, z: -0.19250488} +--- !u!1 &515757681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 515757683} + - component: {fileID: 515757682} + m_Layer: 0 + m_Name: icn_lightbox@2x + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &515757682 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515757681} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 1f1229dd7ee07a54da50996443aebbc8, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.72, y: 0.84} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &515757683 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515757681} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 31.92298, y: 0.010272155, z: 23.610954} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 39 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &526829806 GameObject: m_ObjectHideFlags: 0 @@ -16211,6 +16365,108 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 5.194641, y: 2.6415303, z: 11.821529} m_Center: {x: -0.6857853, y: 0.82076514, z: -2.6477108} +--- !u!1 &967445505 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 967445506} + - component: {fileID: 967445509} + - component: {fileID: 967445508} + - component: {fileID: 967445507} + m_Layer: 3 + m_Name: Canvas (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &967445506 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967445505} + m_LocalRotation: {x: 0.7069509, y: 0.014847585, z: 0.014847585, w: 0.7069509} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 19.199997, y: 19.199995, z: 19.199995} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1151846669} + m_Father: {fileID: 1855712068} + m_RootOrder: 3 + 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.1, y: 0.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &967445507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967445505} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &967445508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967445505} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 100, y: 100} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!223 &967445509 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967445505} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &970761542 GameObject: m_ObjectHideFlags: 0 @@ -17909,7 +18165,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 55 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -19577,6 +19833,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 408712, guid: 075ca8682686eb348b6f5c616fa9fd37, type: 3} m_PrefabInstance: {fileID: 1150757134} m_PrefabAsset: {fileID: 0} +--- !u!1 &1151846668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1151846669} + - component: {fileID: 1151846672} + - component: {fileID: 1151846670} + m_Layer: 3 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1151846669 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1151846668} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 967445506} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: -90, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0.144} + m_SizeDelta: {x: 0.15, y: 0.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1151846670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1151846668} + 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: 7507f24c4cc7b604cbcc56eb0ed94dd9, 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 &1151846672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1151846668} + m_CullTransparentMesh: 1 --- !u!1001 &1153932766 PrefabInstance: m_ObjectHideFlags: 0 @@ -25372,7 +25704,7 @@ GameObject: - component: {fileID: 1490008727} - component: {fileID: 1490008726} - component: {fileID: 1490008725} - m_Layer: 5 + m_Layer: 3 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -28411,7 +28743,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 55 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -38151,7 +38483,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fe210d5f58accb24dadebc01f56dffd6, type: 3} + m_Sprite: {fileID: 21300000, guid: dfd3976c69b997443b185d5cc96ef76f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -38179,7 +38511,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 488, y: 74} + m_SizeDelta: {x: 238.89, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2613237551480729983 CanvasRenderer: diff --git a/xiaofang/Assets/Scenes/Tmap 3.unity b/xiaofang/Assets/Scenes/Tmap 3.unity index 661098f5..96bb651e 100644 --- a/xiaofang/Assets/Scenes/Tmap 3.unity +++ b/xiaofang/Assets/Scenes/Tmap 3.unity @@ -7270,7 +7270,7 @@ MonoBehaviour: joystick: {fileID: 1221713539} cameraTransform: {fileID: 1068997307} moveSpeed: 5 - characterControl: {fileID: 382802815} + DragTheScreen: {fileID: 0} mainCamera: {fileID: 1068997306} rb: {fileID: 382802811} normalFOV: 60 @@ -7295,6 +7295,7 @@ MonoBehaviour: _skill_Pick: {fileID: 0} _skill_Jump: {fileID: 0} _skill_Watering: {fileID: 0} + WaterButton: {fileID: 0} IsWater: 0 --- !u!114 &382802818 MonoBehaviour: @@ -27891,7 +27892,6 @@ MonoBehaviour: maxfiredis: 0 firedis: 4 ps: {fileID: 0} - us: {fileID: 0} UseSkill: {fileID: 0} characterControl: {fileID: 0} TimeText: {fileID: 0}