ZYT 7601a0519c Merge remote-tracking branch 'origin/main' into L_uo ...

# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/StreamingAssets/build_info
#	Assets/_FishingMaster/Prefabs/Fish/AngelHorse.prefab
#	Assets/_FishingMaster/Prefabs/Fish/Angelfish.prefab
#	Assets/_FishingMaster/Prefabs/Fish/BreamFish.prefab
#	Assets/_FishingMaster/Prefabs/Fish/ClownFish.prefab
#	Assets/_FishingMaster/Prefabs/Fish/DevilRay.prefab
#	Assets/_FishingMaster/Prefabs/Fish/LanternFish.prefab
#	Assets/_FishingMaster/Prefabs/Fish/LightFish.prefab
#	Assets/_FishingMaster/Prefabs/Fish/PufferFish.prefab
#	Assets/_FishingMaster/Prefabs/Fish/RedSnapperFish.prefab
#	Assets/_FishingMaster/Prefabs/Fish/YellowFish.prefab
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset

2026-02-25 18:24:48 +08:00

..

.idea

init：初始化项目

2026-02-02 15:16:02 +08:00

Actions

fix：添加场景，添加金币效果，鱼种调整为卡通形象

2026-02-05 15:06:21 +08:00

ConstDefault

init：初始化项目

2026-02-02 15:16:02 +08:00

Data

fix：添加商城功能，添加右手预制体，添加鲨鱼和海龟

2026-02-06 19:45:25 +08:00

Enemy

fix：添加商城功能，添加右手预制体，添加鲨鱼和海龟

2026-02-06 19:45:25 +08:00

Fish

fix：调整开始鱼潮，添加北京密云，调整鱼大小

2026-02-25 18:16:15 +08:00

Item

fix：调整商城大小

2026-02-25 15:57:54 +08:00

Manager

Merge remote-tracking branch 'origin/main' into L_uo

2026-02-25 18:24:48 +08:00

Player

fix：添加鱼群对象池，调整雕像受击

2026-02-24 15:32:20 +08:00

Plugins

add：添加魔鬼鱼，红包，鲨鱼事件等

2026-02-11 19:07:13 +08:00

Statue

add：添加漂流瓶破碎动画，init里添加调试开关

2026-02-25 16:25:28 +08:00

UI

add：添加漂流瓶破碎动画，init里添加调试开关

2026-02-25 16:25:28 +08:00

Weapons

init：初始化项目

2026-02-02 15:16:02 +08:00

Actions.meta

init：初始化项目

2026-02-02 15:16:02 +08:00

ConstDefault.meta

init：初始化项目

2026-02-02 15:16:02 +08:00

Data.meta

init：初始化项目

2026-02-02 15:16:02 +08:00

Enemy.meta

init：初始化项目

2026-02-02 15:16:02 +08:00

Fish.meta

fix；添加鱼预制体，添加鱼配置表，删除项目中不需要的物体

2026-02-02 16:36:09 +08:00

Item.meta

fix：添加场景，添加金币效果，鱼种调整为卡通形象

2026-02-05 15:06:21 +08:00

Manager.meta

init：初始化项目

2026-02-02 15:16:02 +08:00

Player.meta

init：初始化项目

2026-02-02 15:16:02 +08:00

Plugins.meta

init：初始化项目

2026-02-02 15:16:02 +08:00

Statue.meta

add：调整商城界面。添加雕像事件

2026-02-24 14:21:22 +08:00

UI.meta

init：初始化项目

2026-02-02 15:16:02 +08:00

Weapons.meta

init：初始化项目

2026-02-02 15:16:02 +08:00