diff --git a/Assets/DC/p漂流瓶.meta b/Assets/DC/p漂流瓶.meta new file mode 100644 index 00000000..63cece6c --- /dev/null +++ b/Assets/DC/p漂流瓶.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d7cda362af0b764781b7394e7ad0296 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DC/p漂流瓶/aiStandardSurface1.mat b/Assets/DC/p漂流瓶/aiStandardSurface1.mat new file mode 100644 index 00000000..c1d3ff0d --- /dev/null +++ b/Assets/DC/p漂流瓶/aiStandardSurface1.mat @@ -0,0 +1,170 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3946687211220475933 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: aiStandardSurface1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 6 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BASE_COLOR_MAP: + m_Texture: {fileID: 2800000, guid: 4487a5557bdc06d4ab3f088eb7ff669c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 4487a5557bdc06d4ab3f088eb7ff669c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EMISSION_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _METALNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 4487a5557bdc06d4ab3f088eb7ff669c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NORMAL_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SPECULAR_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SPECULAR_IOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SPECULAR_ROUGHNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.2 + - _GlossyReflections: 1 + - _METALNESS: 0 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SPECULAR_IOR: 1.5 + - _SPECULAR_ROUGHNESS: 0.2 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BASE_COLOR: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SPECULAR_COLOR: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/DC/p漂流瓶/aiStandardSurface1.mat.meta b/Assets/DC/p漂流瓶/aiStandardSurface1.mat.meta new file mode 100644 index 00000000..fdf2659d --- /dev/null +++ b/Assets/DC/p漂流瓶/aiStandardSurface1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4106065fed561648a42deea16a169f6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DC/p漂流瓶/bottle UV.png b/Assets/DC/p漂流瓶/bottle UV.png new file mode 100644 index 00000000..6b71fa63 Binary files /dev/null and b/Assets/DC/p漂流瓶/bottle UV.png differ diff --git a/Assets/DC/p漂流瓶/bottle UV.png.meta b/Assets/DC/p漂流瓶/bottle UV.png.meta new file mode 100644 index 00000000..4541d0eb --- /dev/null +++ b/Assets/DC/p漂流瓶/bottle UV.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 4487a5557bdc06d4ab3f088eb7ff669c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DC/p漂流瓶/漂流瓶.fbx b/Assets/DC/p漂流瓶/漂流瓶.fbx new file mode 100644 index 00000000..1e9b14ba Binary files /dev/null and b/Assets/DC/p漂流瓶/漂流瓶.fbx differ diff --git a/Assets/DC/p漂流瓶/漂流瓶.fbx.meta b/Assets/DC/p漂流瓶/漂流瓶.fbx.meta new file mode 100644 index 00000000..7f5c33b3 --- /dev/null +++ b/Assets/DC/p漂流瓶/漂流瓶.fbx.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 48f145d16ae0e9b419f605fa973d2f8a +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: aiStandardSurface1 + second: {fileID: 2100000, guid: b4106065fed561648a42deea16a169f6, type: 2} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DC/p漂流瓶/漂流瓶.prefab b/Assets/DC/p漂流瓶/漂流瓶.prefab new file mode 100644 index 00000000..01b2a713 --- /dev/null +++ b/Assets/DC/p漂流瓶/漂流瓶.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5656900299086411066 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalScale.x + value: 0.35477 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalScale.y + value: 0.35477 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalScale.z + value: 0.35477 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.0108178705 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 48f145d16ae0e9b419f605fa973d2f8a, + type: 3} + propertyPath: m_Name + value: "\u6F02\u6D41\u74F6" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 48f145d16ae0e9b419f605fa973d2f8a, type: 3} diff --git a/Assets/DC/p漂流瓶/漂流瓶.prefab.meta b/Assets/DC/p漂流瓶/漂流瓶.prefab.meta new file mode 100644 index 00000000..aa59f2b4 --- /dev/null +++ b/Assets/DC/p漂流瓶/漂流瓶.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0dcbfc4fae69178439c94fce49730b4f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index 7ea9cb1b..b06f6e01 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from CHINAMI-UKDLSK3 at 2026/2/25 15:57:38 \ No newline at end of file +Build from CHINAMI-UKDLSK3 at 2026/2/25 16:25:02 \ No newline at end of file diff --git a/Assets/_FishingMaster/Prefabs/Item/DriftBottle/DriftBottle.prefab b/Assets/_FishingMaster/Prefabs/Item/DriftBottle/DriftBottle.prefab index f7db6643..a30f6b53 100644 --- a/Assets/_FishingMaster/Prefabs/Item/DriftBottle/DriftBottle.prefab +++ b/Assets/_FishingMaster/Prefabs/Item/DriftBottle/DriftBottle.prefab @@ -2705,7 +2705,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6156551554595862101} + - {fileID: 3066478049750080749} - {fileID: 4319099661105096217} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2744,11 +2744,10 @@ MonoBehaviour: m_EditorClassIdentifier: bottleCollider: {fileID: 4070160425390736200} modelRoot: {fileID: 0} - fragmentEffect: {fileID: 0} + fragmentEffect: {fileID: 6574515772556389331} moveSpeed: 1.5 swimAmplitude: 0.1 swimFrequency: 2 - controller: {fileID: 6043703699465387595} --- !u!114 &6043703699465387595 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2803,7 +2802,7 @@ MonoBehaviour: m_OnSwitch: m_PersistentCalls: m_Calls: [] ---- !u!1001 &5979318471617270206 +--- !u!1001 &7171331696837987900 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -2811,79 +2810,159 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3486166547765047175} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 1016197517667619480, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 1232900497596705659, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 1640834365778819748, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 1772974824177206271, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 1993875861126054740, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 3484018344888570029, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 4748044519625127071, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 4773869516999723115, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Name + value: "\u6F02\u6D41\u74F6" + objectReference: {fileID: 0} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalScale.x value: 0.3 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalScale.y value: 0.3 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalScale.z value: 0.3 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.131 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} - propertyPath: m_Name - value: piaoliuping - objectReference: {fileID: 0} + - target: {fileID: 6824854545172086428, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 6828430356564457804, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 7412769306931073539, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 8298056026275554215, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 8841086381834493193, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - target: {fileID: 9112308481687290186, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -8429602205177196161, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: -435065460499414210, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} + - targetCorrespondingSourceObject: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} insertIndex: -1 addedObject: {fileID: 4255542132197924206} - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} ---- !u!4 &6156551554595862101 stripped + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4773869516999723115, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + insertIndex: -1 + addedObject: {fileID: 4434761890739606531} + m_SourcePrefab: {fileID: 100100000, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} +--- !u!1 &2433493176159471191 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4773869516999723115, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + m_PrefabInstance: {fileID: 7171331696837987900} + m_PrefabAsset: {fileID: 0} +--- !u!95 &4434761890739606531 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2433493176159471191} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 487a04d756ee8444c93a7d1478706d05, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!4 &3066478049750080749 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1ee0aeda9309f17419a189f36cf01dbe, type: 3} - m_PrefabInstance: {fileID: 5979318471617270206} + m_CorrespondingSourceObject: {fileID: 5263548687332004561, guid: 0dcbfc4fae69178439c94fce49730b4f, type: 3} + m_PrefabInstance: {fileID: 7171331696837987900} m_PrefabAsset: {fileID: 0} --- !u!1001 &7659386328149012325 PrefabInstance: @@ -2891,7 +2970,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 6156551554595862101} + m_TransformParent: {fileID: 3066478049750080749} m_Modifications: - target: {fileID: 2404913697329898470, guid: 035776f04719cd847a9c87057816c8f1, type: 3} propertyPath: m_Name @@ -2923,7 +3002,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5856124606629523979, guid: 035776f04719cd847a9c87057816c8f1, type: 3} propertyPath: m_LocalPosition.y - value: 0.436 + value: 0.87266654 objectReference: {fileID: 0} - target: {fileID: 5856124606629523979, guid: 035776f04719cd847a9c87057816c8f1, type: 3} propertyPath: m_LocalPosition.z @@ -2935,15 +3014,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5856124606629523979, guid: 035776f04719cd847a9c87057816c8f1, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5856124606629523979, guid: 035776f04719cd847a9c87057816c8f1, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5856124606629523979, guid: 035776f04719cd847a9c87057816c8f1, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5856124606629523979, guid: 035776f04719cd847a9c87057816c8f1, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/_FishingMaster/Prefabs/Item/DriftBottle/driftBottle.controller b/Assets/_FishingMaster/Prefabs/Item/DriftBottle/driftBottle.controller new file mode 100644 index 00000000..23295d4d --- /dev/null +++ b/Assets/_FishingMaster/Prefabs/Item/DriftBottle/driftBottle.controller @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: driftBottle + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isDie + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6450724563418066414} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &996243689980376909 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Take 001 + m_Speed: 0.5 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 1827226128182048838, guid: 48f145d16ae0e9b419f605fa973d2f8a, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &2743927754780126582 +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: isDie + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 996243689980376909} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &5663561168448728700 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2743927754780126582} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &6450724563418066414 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 996243689980376909} + m_Position: {x: 440, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5663561168448728700} + m_Position: {x: 405.1504, y: -5.0578766, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5663561168448728700} diff --git a/Assets/_FishingMaster/Prefabs/Item/DriftBottle/driftBottle.controller.meta b/Assets/_FishingMaster/Prefabs/Item/DriftBottle/driftBottle.controller.meta new file mode 100644 index 00000000..096a0012 --- /dev/null +++ b/Assets/_FishingMaster/Prefabs/Item/DriftBottle/driftBottle.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 487a04d756ee8444c93a7d1478706d05 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_FishingMaster/Scripts/Manager/GameInit.cs b/Assets/_FishingMaster/Scripts/Manager/GameInit.cs index ad9e3c0f..d31a2300 100644 --- a/Assets/_FishingMaster/Scripts/Manager/GameInit.cs +++ b/Assets/_FishingMaster/Scripts/Manager/GameInit.cs @@ -52,6 +52,8 @@ public class GameInit : MonoBehaviour public GamePlace gamePlace; public GameKey gameId; + + public bool debugMode; [NonSerialized] public Player self; diff --git a/Assets/_FishingMaster/Scripts/Statue/DriftBottle.cs b/Assets/_FishingMaster/Scripts/Statue/DriftBottle.cs index dd097507..4a488ecd 100644 --- a/Assets/_FishingMaster/Scripts/Statue/DriftBottle.cs +++ b/Assets/_FishingMaster/Scripts/Statue/DriftBottle.cs @@ -144,10 +144,13 @@ public class DriftBottle : MonoBehaviour // 注销 SafeUnregister(); - // 触发捕获事件 - OnBottleCaptured?.Invoke(this, fragmentIndex, statueIndex); - DriftBottleManager.Instance?.OnBottleCaptured(this, fragmentIndex, statueIndex); + CoroutineTaskManager.Instance.WaitSecondTodo(() => + { + DriftBottleManager.Instance?.OnBottleCaptured(this, fragmentIndex, statueIndex); + }, 2f); + // 触发捕获事件 + //OnBottleCaptured?.Invoke(this, fragmentIndex, statueIndex); // 播放特效 PlayCaptureEffects(); } @@ -157,10 +160,11 @@ public class DriftBottle : MonoBehaviour /// private void PlayCaptureEffects() { + fragmentEffect.gameObject.SetActive(false); // 碎片特效 - if (fragmentEffect != null) - fragmentEffect.Play(); - + var x = modelRoot.GetComponent(); + if(x != null) + x.SetBool("isDie",true); // 播放音效 GameManager.Ins?.PlaySound3D("漂流瓶击碎", transform); @@ -168,7 +172,7 @@ public class DriftBottle : MonoBehaviour CoroutineTaskManager.Instance.WaitSecondTodo(() => { RemoveInternal(); - }, 1f); + }, 2.5f); } /// diff --git a/Assets/_FishingMaster/Scripts/UI/LoginPanel.cs b/Assets/_FishingMaster/Scripts/UI/LoginPanel.cs index d0d126f1..e9785281 100644 --- a/Assets/_FishingMaster/Scripts/UI/LoginPanel.cs +++ b/Assets/_FishingMaster/Scripts/UI/LoginPanel.cs @@ -157,9 +157,15 @@ public class LoginPanel : MonoBehaviour CoroutineTaskManager.Instance.WaitSecondTodo(() => { //GameManager.Ins.CreateGameStartPoint(); - GameManager.Ins.CreateAICharacter(); + if (GameInit.Ins.debugMode) + { + GameManager.Ins.CreateGameStartPoint(); + } + else + { + GameManager.Ins.CreateAICharacter(); + } }, 1); - - + } }