diff --git a/Assets/Settings.meta b/Assets/Settings.meta new file mode 100644 index 00000000..cf7cbe22 --- /dev/null +++ b/Assets/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7dd4ca2b4ca3a53419908267c74eac17 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/Resources.meta b/Assets/Settings/Resources.meta new file mode 100644 index 00000000..fd1cba3c --- /dev/null +++ b/Assets/Settings/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e83bd3dd5eede754d83d585ac6a4c4e1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/Resources/AstarGizmos.asset b/Assets/Settings/Resources/AstarGizmos.asset new file mode 100644 index 00000000..2db24cca --- /dev/null +++ b/Assets/Settings/Resources/AstarGizmos.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 98e3089fbc7bff2b78412546c703c554, type: 3} + m_Name: AstarGizmos + m_EditorClassIdentifier: + version: 0 + settings: + lineOpacity: 1 + solidOpacity: 0.55 + textOpacity: 1 + lineOpacityBehindObjects: 0.12 + solidOpacityBehindObjects: 0.45 + textOpacityBehindObjects: 0.9 + curveResolution: 1 diff --git a/Assets/Settings/Resources/AstarGizmos.asset.meta b/Assets/Settings/Resources/AstarGizmos.asset.meta new file mode 100644 index 00000000..1692fe09 --- /dev/null +++ b/Assets/Settings/Resources/AstarGizmos.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d35a7bbb5a28fe84da13c54bc282a8e0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index 401f1185..67c3efff 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from CHINAMI-UKDLSK3 at 2026/2/25 18:44:22 \ No newline at end of file +Build from CHINAMI-UKDLSK3 at 2026/2/26 11:25:05 \ No newline at end of file diff --git a/Assets/_FishingMaster/Resources/UI/GameEndPanel.prefab b/Assets/_FishingMaster/Resources/UI/GameEndPanel.prefab index d2ff6f65..b6768bdb 100644 --- a/Assets/_FishingMaster/Resources/UI/GameEndPanel.prefab +++ b/Assets/_FishingMaster/Resources/UI/GameEndPanel.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8752822591931382253} - - {fileID: 8208989221260626878} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -80,35 +79,10 @@ MonoBehaviour: - {fileID: 6436007625884725661} - {fileID: 2087006512555372914} - {fileID: 5042642764156235233} - starDelay: 0.3 - starScaleUpDuration: 0.5 - starScaleDownDuration: 0.3 - maxStarScale: 1.5 - rotationAmount: 360 - scaleCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 + starScaleUpTime: 0.5 + starScaleDownTime: 0.3 + starMaxScale: 1.4 + scoreAnimDuration: 2 --- !u!1 &2087006512555372914 GameObject: m_ObjectHideFlags: 0 @@ -551,8 +525,8 @@ MonoBehaviour: m_Calls: [] m_text: 10,000,000 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7129aa8b72db0db4b86ee472340e2fea, type: 2} - m_sharedMaterial: {fileID: -487995970503204994, guid: 7129aa8b72db0db4b86ee472340e2fea, type: 2} + m_fontAsset: {fileID: 11400000, guid: e375a3b6680d3c848b457b0516e02a8e, type: 2} + m_sharedMaterial: {fileID: -4503282815784229796, guid: e375a3b6680d3c848b457b0516e02a8e, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -699,78 +673,3 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8348101048851820986 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8208989221260626878} - - component: {fileID: 213799295019703702} - - component: {fileID: 7502204432275395688} - m_Layer: 0 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8208989221260626878 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348101048851820986} - 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: 1105046740674994638} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &213799295019703702 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348101048851820986} - m_CullTransparentMesh: 1 ---- !u!114 &7502204432275395688 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348101048851820986} - 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: 0.5529412} - 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: 7d3cf8d120c29034f999575007473a9a, 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 diff --git a/Assets/_FishingMaster/Scenes/Company1Floor.unity b/Assets/_FishingMaster/Scenes/Company1Floor.unity index 1023e91b..7c03d500 100644 --- a/Assets/_FishingMaster/Scenes/Company1Floor.unity +++ b/Assets/_FishingMaster/Scenes/Company1Floor.unity @@ -18588,7 +18588,7 @@ MonoBehaviour: - {fileID: 1377506921} - {fileID: 1843022233} statueShowOffset: {x: 0, y: 0, z: 5} - debugMode: 1 + debugMode: 0 --- !u!1 &2025442969 GameObject: m_ObjectHideFlags: 0 @@ -19620,13 +19620,11 @@ MonoBehaviour: playerPre: {fileID: 4948796608574586180, guid: a110645e05c819e4092419e6b612928f, type: 3} player: {fileID: 0} rightHndPre: {fileID: 4668082031036255617, guid: 3ce08ae37b405ed4689f51fe430496f1, type: 3} + Shop: {fileID: 0} fishSpawner: {fileID: 1611498068} driftBottleManager: {fileID: 2019247425} - GameStart: 0 isGameEnd: 0 - isFishTide: 0 itemList: [] - log: {fileID: 0} aiCharacterPre: {fileID: 3138103488680208938, guid: fd270e281173bf348a948a0a3a30594b, type: 3} isGamePlay: 0 --- !u!1660057539 &9223372036854775807 diff --git a/Assets/_FishingMaster/Scripts/Manager/GameManager.cs b/Assets/_FishingMaster/Scripts/Manager/GameManager.cs index c06f2135..8413095e 100644 --- a/Assets/_FishingMaster/Scripts/Manager/GameManager.cs +++ b/Assets/_FishingMaster/Scripts/Manager/GameManager.cs @@ -536,6 +536,7 @@ public class GameManager : MonoBehaviour { isGameEnd = true; fishSpawner.DestroyAllFish(); + driftBottleManager.ClearAllStatuesCompleted(); EventDispatcher.TriggerEvent("HideShop",1); ShowEndGameUI(true); AudioManager.Ins.SoundPlay(1, true); @@ -559,10 +560,10 @@ public class GameManager : MonoBehaviour { if (Input.GetKeyDown(KeyCode.Space)) { - GameInit.Ins.self.AddCoin(5000); - //GameInit.Ins.self.AddScore(10000); - //WinEndGame(); - StartFishTideEvent(); + //GameInit.Ins.self.AddCoin(5000); + GameInit.Ins.self.AddScore(10000); + WinEndGame(); + //StartFishTideEvent(); //StartDriftBottleEvent(); } if (fishSpawner.GetFishCount(FishType.AngelHorse) >= 1) diff --git a/Assets/_FishingMaster/Scripts/Player/Player.cs b/Assets/_FishingMaster/Scripts/Player/Player.cs index 07f1277c..2d1335d9 100644 --- a/Assets/_FishingMaster/Scripts/Player/Player.cs +++ b/Assets/_FishingMaster/Scripts/Player/Player.cs @@ -279,6 +279,8 @@ public class Player : MonoBehaviour public void UserGun() { + if(GameManager.Ins.isGameEnd) + return; playerHands.gunPent.SetActive(true); playerHands.RefreshGun(GunId); GameManager.Ins.rightHand.Hide(); diff --git a/Assets/_FishingMaster/Scripts/Statue/DriftBottleManager.cs b/Assets/_FishingMaster/Scripts/Statue/DriftBottleManager.cs index e14819ca..b99e2dac 100644 --- a/Assets/_FishingMaster/Scripts/Statue/DriftBottleManager.cs +++ b/Assets/_FishingMaster/Scripts/Statue/DriftBottleManager.cs @@ -88,6 +88,8 @@ public class DriftBottleManager : MonoBehaviour private void Update() { + if(GameManager.Ins.isGameEnd) + return; if (!isEventActive || allStatuesCompleted) return; spawnTimer += Time.deltaTime; @@ -503,5 +505,15 @@ public class DriftBottleManager : MonoBehaviour return Mathf.Max(0, spawnInterval - spawnTimer); } + public void ClearAllStatuesCompleted() + { + foreach (var item in activeBottles) + { + item.gameObject.SetActive(false); + Destroy(item.gameObject); + } + activeBottles.Clear(); + } + #endregion } diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 6ad09ea4..bf9337e9 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -6,7 +6,7 @@ QualitySettings: serializedVersion: 5 m_CurrentQuality: 0 m_QualitySettings: - - serializedVersion: 2 + - serializedVersion: 3 name: Very Low pixelLightCount: 0 shadows: 0 @@ -19,17 +19,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 1 - textureQuality: 1 + globalTextureMipmapLimit: 1 + textureMipmapLimitSettings: [] anisotropicTextures: 0 antiAliasing: 4 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 0 realtimeGICPUUsage: 25 lodBias: 0.3 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -42,8 +45,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Low pixelLightCount: 0 shadows: 0 @@ -56,17 +68,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 2 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 0 realtimeGICPUUsage: 25 lodBias: 0.4 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -79,8 +94,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Medium pixelLightCount: 1 shadows: 1 @@ -93,17 +117,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 2 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 1 antiAliasing: 4 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 1 realtimeGICPUUsage: 25 lodBias: 0.7 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -116,8 +143,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: High pixelLightCount: 2 shadows: 2 @@ -130,17 +166,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 skinWeights: 2 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 realtimeGICPUUsage: 50 lodBias: 1 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -153,8 +192,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Very High pixelLightCount: 3 shadows: 2 @@ -167,17 +215,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 skinWeights: 4 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 realtimeGICPUUsage: 50 lodBias: 1.5 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -190,8 +241,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Ultra pixelLightCount: 4 shadows: 2 @@ -204,17 +264,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 skinWeights: 255 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 4 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 0 realtimeGICPUUsage: 100 lodBias: 2 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -227,5 +290,18 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: {} + m_TextureMipmapLimitGroupNames: [] + m_PerPlatformDefaultQuality: + Android: 0 + Server: 0 + Standalone: 0