PineappleTech/MRFishingMaster
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83 Commits 2 Branches 0 Tags
81badd7ff7a0fb6e7865e7af08a2bc8432bc2b38
Commit Graph

83 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ZYT
81badd7ff7 修改音乐 2026-02-28 17:18:05 +08:00
bzx
860a707a10 fix：修复鱼潮之后鱼少的问题 2026-02-28 15:41:19 +08:00
ZYT
2bba21c9a0 Merge remote-tracking branch 'origin/main' into L_uo 
# Conflicts:
#	Assets/_FishingMaster/Scenes/Jilin_Changchun_Beihu_WyueGuangchang.unity
#	Assets/_FishingMaster/Scenes/Jilin_Changchun_Beihu_WyueGuangchang.unity.meta
 2026-02-28 14:05:33 +08:00
ZYT
efc5442598 添加剩余场景 2026-02-28 14:04:34 +08:00
bzx
37422a41f0 Merge remote-tracking branch 'origin/L_uo' 
# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/StreamingAssets/build_info
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
 2026-02-27 17:17:22 +08:00
bzx
33f61135d3 fix：打包马鞍山山东潍坊吉林长春 2026-02-27 17:16:55 +08:00
ZYT
9fc1ebe9d0 Merge remote-tracking branch 'origin/main' into L_uo 
# Conflicts:
#	Assets/DC/临沧市临翔区恒基广场(地下场景下降）地形2.prefab.meta
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/Unity.VisualScripting.Generated/VisualScripting.Core/link.xml.meta
#	Assets/_FishingMaster/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity.meta
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
 2026-02-27 15:26:31 +08:00
bzx
1ce67d92b3 Merge remote-tracking branch 'origin/L_uo' 
# Conflicts:
#	Assets/StreamingAssets/build_info
 2026-02-27 15:25:26 +08:00
ZYT
c9418a7280 添加枚举22-25场景 2026-02-27 15:24:47 +08:00
bzx
9134caddab fix：调整漂流瓶生成间隔 2026-02-27 15:24:32 +08:00
ZYT
981c529a36 Merge remote-tracking branch 'origin/main' into L_uo 2026-02-27 11:45:24 +08:00
ZYT
58171c58f0 添加枚举16-21场景 2026-02-27 11:45:14 +08:00
bzx
598addbc85 Merge remote-tracking branch 'origin/L_uo' 
# Conflicts:
#	Assets/StreamingAssets/build_info
 2026-02-27 11:44:52 +08:00
bzx
ab21bc0d1e add：添加鱼潮来袭UI，调整商店禁止提示UI 2026-02-27 11:44:40 +08:00
ZYT
0cbe568f01 Merge remote-tracking branch 'origin/main' into L_uo 2026-02-27 10:38:42 +08:00
ZYT
a8a00a2462 添加山东济南槐荫室内，室外场景 2026-02-27 10:38:38 +08:00
bzx
2fe7ec4d2c Merge remote-tracking branch 'origin/L_uo' 
# Conflicts:
#	Assets/StreamingAssets/build_info
 2026-02-26 18:49:12 +08:00
bzx
2b26cf1dbd fix：調整石像事件，修复石像无法完成的问题 2026-02-26 18:48:48 +08:00
ZYT
9c4d704fd8 Merge remote-tracking branch 'origin/main' into L_uo 2026-02-26 18:20:23 +08:00
ZYT
8044b259dd 添加枚举6-12场景 2026-02-26 18:20:12 +08:00
bzx
7067993457 Merge remote-tracking branch 'origin/L_uo' 
# Conflicts:
#	Assets/StreamingAssets/build_info
 2026-02-26 18:14:57 +08:00
bzx
36f7ffe7ea fix：添加吉林吉林梅州银川场地，调整结束问题 2026-02-26 18:14:29 +08:00
ZYT
e5d0930516 Merge remote-tracking branch 'origin/main' into L_uo 
# Conflicts:
#	Assets/StreamingAssets/build_info
 2026-02-26 16:45:40 +08:00
ZYT
0365b9705d 添加扬州邗江探索中心室外场景 2026-02-26 16:45:22 +08:00
bzx
62e9288226 Merge remote-tracking branch 'origin/L_uo' 2026-02-26 16:43:33 +08:00
bzx
105070d4d8 fix：调整删除鱼 2026-02-26 16:43:29 +08:00
ZYT
52dd18731f Merge remote-tracking branch 'origin/main' into L_uo 
# Conflicts:
#	Assets/DC/雕像/龙王雕像.prefab
#	Assets/StreamingAssets/build_info
#	Assets/Unity.VisualScripting.Generated/VisualScripting.Core/AotStubs.cs
#	Assets/Unity.VisualScripting.Generated/VisualScripting.Core/AotStubs.cs.meta
#	Assets/Unity.VisualScripting.Generated/VisualScripting.Core/link.xml.meta
#	Assets/_FishingMaster/Prefabs/Fish/fish2/DevilRay.prefab
#	Assets/_FishingMaster/Scenes/Bejing_Miyun_RuijiaShangchang.unity
#	Assets/_FishingMaster/Scenes/Company1Floor.unity
#	Assets/_FishingMaster/Scenes/Ningxia_Wuzhong_Litong_YiwuShangmaocheng.unity
#	Assets/_FishingMaster/Scripts/Manager/GameInit.cs
#	ProjectSettings/EditorBuildSettings.asset
 2026-02-26 16:16:45 +08:00
ZYT
161f2ec339 添加浙江金华科技馆场景 2026-02-26 16:16:14 +08:00
bzx
45731b1841 fix：调整雕像碰撞检测，删除鱼群的时候判断是否为null 2026-02-26 16:14:53 +08:00
ZYT
0e29328454 Merge remote-tracking branch 'origin/main' into L_uo 
# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	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/Shark.prefab
#	Assets/_FishingMaster/Prefabs/Fish/Turtle.prefab
#	Assets/_FishingMaster/Prefabs/Fish/YellowFish.prefab
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
 2026-02-26 15:05:38 +08:00
bzx
be729bdd95 Merge remote-tracking branch 'origin/L_uo' 
# Conflicts:
#	Assets/StreamingAssets/build_info
 2026-02-26 15:04:18 +08:00
bzx
52562c4bf1 fix：补充 2026-02-26 15:03:55 +08:00
bzx
0724218e86 fix：添加威海，调整鱼潮结束问题 2026-02-26 15:02:50 +08:00
ZYT
9fd79074dc 添加山西运城场景 2026-02-26 14:35:08 +08:00
bzx
a23069c62c fix：调整商店里道具价格位置 2026-02-26 14:33:21 +08:00
bzx
8c69fac418 删除无用脚本，调整鱼大小 2026-02-26 14:01:39 +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
9bbdecb02a Merge remote-tracking branch 'origin/L_uo' 2026-02-25 18:16:18 +08:00
bzx
dfd387200d fix：调整开始鱼潮，添加北京密云，调整鱼大小 2026-02-25 18:16:15 +08:00
ZYT
4afd7cfa39 Merge remote-tracking branch 'origin/main' into L_uo 
# Conflicts:
#	Assets/StreamingAssets/build_info
#	Assets/_FishingMaster/Scripts/UI/LoginPanel.cs
 2026-02-25 16:26:56 +08:00
ZYT
a727a88c65 调整辽宁鞍山骊山大悦城场景 2026-02-25 16:26:39 +08:00