PineappleTech/MRFishingMaster
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：添加威海，调整鱼潮结束问题

Browse Source
This commit is contained in:
bzx
2026-02-26 15:02:50 +08:00
parent a23069c62c
commit 0724218e86
17 changed files with 40370 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/DC/地形/山东威海.fbx Normal file
View File

Binary file not shown.

109
Assets/DC/地形/山东威海.fbx.meta Normal file
View File

@@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: bdd2373f8f447ec43beff8dd013b45c3
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
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:

80
Assets/DC/地形/山东威海.prefab Normal file
View File

@@ -0,0 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &5254201373262960002
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -3901992563441801604, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2bb3eed0404231447a5670edef51ff1c, type: 2}
- target: {fileID: 919132149155446097, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_Name
value: "\u5C71\u4E1C\u5A01\u6D77"
objectReference: {fileID: 0}
- target: {fileID: 4495414801083549842, guid: bdd2373f8f447ec43beff8dd013b45c3,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: fb8c6fc9a9a57a04aa81ead6f0796e95, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bdd2373f8f447ec43beff8dd013b45c3, type: 3}

7
Assets/DC/地形/山东威海.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bdf2cc5719faab540ae1f24a484b0b05
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/DC/地形/重庆_新.fbx Normal file
View File

Binary file not shown.

109
Assets/DC/地形/重庆_新.fbx.meta Normal file
View File

@@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 05fe9abe1213c24418b952e2273b9457
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
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:

80
Assets/DC/地形/重庆_新.prefab Normal file
View File

@@ -0,0 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &6337263446956028413
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4780072770720950627, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: fb8c6fc9a9a57a04aa81ead6f0796e95, type: 2}
- target: {fileID: 919132149155446097, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_Name
value: "\u91CD\u5E86_\u65B0"
objectReference: {fileID: 0}
- target: {fileID: 4253280567622488715, guid: 05fe9abe1213c24418b952e2273b9457,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2bb3eed0404231447a5670edef51ff1c, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 05fe9abe1213c24418b952e2273b9457, type: 3}

7
Assets/DC/地形/重庆_新.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ae2ce6a6bac1d114c9db1880fb52a230
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/StreamingAssets/build_info
View File

@@ -1 +1 @@
Build from CHINAMI-UKDLSK3 at 2026/2/26 14:28:56
Build from CHINAMI-UKDLSK3 at 2026/2/26 15:02:19

2
Assets/_FishingMaster/Prefabs/Item/Shop.prefab
View File

@@ -4670,7 +4670,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 8148689944970915624}

72
Assets/_FishingMaster/Scenes/Hunan_Xiangxi_Yongshun_XintiandiShangchang.unity
View File

@@ -1950,75 +1950,6 @@ MonoBehaviour:
m_OnBeforeControlPointDelete:
m_PersistentCalls:
m_Calls: []
--- !u!1001 &196099346
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 200376452116098825, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7472597198521513423, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalPosition.y
value: 0.01
objectReference: {fileID: 0}
- target: {fileID: 8585038537897819669, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_Name
value: "\u6E56\u5357\u6E58\u897F"
objectReference: {fileID: 0}
- target: {fileID: 8585038537897819669, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8966666566183707823, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8966666566183707823, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8966666566183707823, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8966666566183707823, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8966666566183707823, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8966666566183707823, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8966666566183707823, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8966666566183707823, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8966666566183707823, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8966666566183707823, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c1e5483a63d7d9640820f87e50385d1c, type: 3}
--- !u!1 &196331408
GameObject:
m_ObjectHideFlags: 0
@@ -16689,7 +16620,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_IsActive: 0
m_IsActive: 1
--- !u!64 &1733408063
MeshCollider:
m_ObjectHideFlags: 0
@@ -19969,6 +19900,5 @@ SceneRoots:
- {fileID: 511102474}
- {fileID: 1850405259}
- {fileID: 1829879399827287605}
- {fileID: 196099346}
- {fileID: 486697711}
- {fileID: 946929118}

19970
Assets/_FishingMaster/Scenes/Jiangxi_Nanchang_Xinjian_XvhuiGuangchang.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/_FishingMaster/Scenes/Jiangxi_Nanchang_Xinjian_XvhuiGuangchang.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e5a963315ea19cc4c90935b755ab19ad
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

19986
Assets/_FishingMaster/Scenes/Shandong_Weihai_Jingqu_W37.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/_FishingMaster/Scenes/Shandong_Weihai_Jingqu_W37.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c1d3376ba7e76b74bbf07616ee13cbde
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
Assets/_FishingMaster/Scripts/Fish/Base/FishSpawner.cs
View File

@@ -87,11 +87,12 @@ public class FishSpawner : MonoBehaviour
if(!IsFishTide)
fishTideTimer += Time.deltaTime;
if (fishTideTimer >= 200&& !IsFishTide)
if (fishTideTimer >= 200&& !IsFishTide&& !GameManager.Ins.isGameEnd)
{
if (GameInit.Ins.self.handState == handState.Gun)
{
GameManager.Ins.StartFishTideEvent();
fishTideTimer = 0;
}
else
{

3
ProjectSettings/EditorBuildSettings.asset
View File

@@ -14,6 +14,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/_FishingMaster/Scenes/Hunan_Xiangxi_Yongshun_XintiandiShangchang.unity
guid: 928362c9fa6d07641b951a27cd19ad39
- enabled: 0
path: Assets/_FishingMaster/Scenes/Shandong_Weihai_Jingqu_W37.unity
guid: c1d3376ba7e76b74bbf07616ee13cbde
m_configObjects:
Unity.XR.PXR.Settings: {fileID: 11400000, guid: 394d00ed08bdcde4c96c9952ff9a20ce, type: 2}
com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 7d54fe958ff70274898aedb4739d2f73, type: 2}