Commit Graph

33 Commits

Author SHA1 Message Date
ZYT
9fd79074dc 添加山西运城场景 2026-02-26 14:35:08 +08:00
ZYT
2b06bd17e4 Merge remote-tracking branch 'origin/main' into L_uo
# Conflicts:
#	Assets/StreamingAssets/build_info
2026-02-26 11:33:46 +08:00
ZYT
c8632a03d0 添加辽宁水游城,河南开封室外,陕西榆林场景 2026-02-26 11:33:27 +08:00
bzx
78e7da158c fix:解决游戏结束,枪械问题,解决漂流瓶不消失问题 2026-02-26 11:32:09 +08:00
ZYT
57751f5b74 添加四川凉山场景 2026-02-26 10:19:44 +08:00
ZYT
6df8761b22 Merge remote-tracking branch 'origin/main' into L_uo
# Conflicts:
#	Assets/StreamingAssets/build_info
2026-02-26 10:06:54 +08:00
ZYT
1f93d50e72 添加宁夏银川兴庆新华百货场景 2026-02-26 10:06:36 +08:00
bzx
d5fd22b794 Merge remote-tracking branch 'origin/L_uo' 2026-02-25 18:45:17 +08:00
bzx
123f929af6 fix:调整道具价格,添加商城禁止提示 2026-02-25 18:45:12 +08:00
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
ZYT
d83269faa5 添加宁夏吴忠利通义务商品,宁夏银川兴庆新华百货室外,辽宁葫芦岛场景 2026-02-25 18:24:18 +08:00
bzx
dfd387200d fix:调整开始鱼潮,添加北京密云,调整鱼大小 2026-02-25 18:16:15 +08:00
ZYT
00d4373c02 添加辽宁鞍山骊山大悦城场景 2026-02-25 15:08:32 +08:00
ZYT
4152edb907 添加剩余枚举 2026-02-25 14:51:42 +08:00
ZYT
a9b4948ebc 注释多余创建AI代码 2026-02-25 14:20:53 +08:00
bzx
64e119fbc8 Merge remote-tracking branch 'origin/L_uo' 2026-02-25 14:13:34 +08:00
bzx
6945681b83 fix:调整鱼的路线,调整漂流瓶 2026-02-25 14:09:43 +08:00
ZYT
c6822064e7 Merge remote-tracking branch 'origin/main' into L_uo
# Conflicts:
#	Assets/StreamingAssets/build_info
2026-02-25 13:38:32 +08:00
ZYT
72883ba1a0 添加AI 2026-02-25 13:36:03 +08:00
bzx
534579b84e fix:调整鱼大小,解决鲨鱼bug 2026-02-25 12:02:33 +08:00
bzx
99ca869d6a fix:修复雕像和商城问题 2026-02-25 11:33:19 +08:00
bzx
d05f5887b2 fix:调整武器效果 2026-02-25 10:41:41 +08:00
bzx
e43accfe20 fix:添加鱼群对象池,调整雕像受击 2026-02-24 15:32:20 +08:00
bzx
1304d107c7 add:调整商城界面。添加雕像事件 2026-02-24 14:21:22 +08:00
bzx
da2e45cc09 add:添加鱼潮事件 2026-02-14 16:48:33 +08:00
bzx
a6278f878a add:添加积分结算界面,调整商店问题, 2026-02-12 15:09:22 +08:00
bzx
33991b16b8 add:添加魔鬼鱼,红包,鲨鱼事件等 2026-02-11 19:07:13 +08:00
bzx
2ba9a15c69 fix:添加商城功能,添加右手预制体,添加鲨鱼和海龟 2026-02-06 19:45:25 +08:00
bzx
886b9dcab2 fix:添加语音资源,添加两种卡通鱼,初始化商城 2026-02-06 10:42:36 +08:00
bzx
f5744d943a fix:添加场景,添加金币效果,鱼种调整为卡通形象 2026-02-05 15:06:21 +08:00
bzx
ecd17dcde1 add:添加寻路组件,添加鱼,鱼群,鱼群生成脚本 2026-02-02 18:41:29 +08:00
bzx
1e20753b69 fix;添加鱼预制体,添加鱼配置表,删除项目中不需要的物体 2026-02-02 16:36:09 +08:00
bzx
91a394ad97 init:初始化项目 2026-02-02 15:16:02 +08:00