Commit Graph

63 Commits

Author SHA1 Message Date
huqibin b2af23d2e1 高粱lod 2025-05-29 11:04:35 +08:00
wangyang 1f1081665d LOD 2025-05-29 09:49:50 +08:00
huqibin 0b30c44306 场景碰撞器 2025-05-27 10:22:38 +08:00
huqibin 5d5d8a9051 高粱玉米对比页面BUG 2025-05-26 19:45:33 +08:00
taosuqi 5597565df0 修改人物图片这一块./ 2025-05-26 18:27:49 +08:00
wangyang 531aefb098 合并 2025-05-26 18:13:22 +08:00
wangyang cdbc63ebc5 配景 2025-05-26 18:06:51 +08:00
huqibin e2a9eb68a2 剔除 2025-05-26 17:35:33 +08:00
taosuqi e769e0d64c 修改碰撞这一块./ 2025-05-26 17:01:14 +08:00
taosuqi 2a9b04eb37 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-26 11:21:43 +08:00
taosuqi b16cf7b59c 5.26早上提交 2025-05-26 11:21:18 +08:00
huqibin 8910de85ee 工具生成角度和道路模型碰撞 2025-05-26 08:56:22 +08:00
huqibin ae85a59a61 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-23 16:23:45 +08:00
huqibin 73574e1174 读取PPT界面 2025-05-23 16:23:41 +08:00
taosuqi 4f6711f4c3 修改面板 2025-05-23 15:55:27 +08:00
huqibin 800ed593d9 添加PPT部分UI 2025-05-23 14:54:33 +08:00
taosuqi 4e530cfaaf 修改UI这一块 2025-05-23 11:28:53 +08:00
huqibin 7601afe235 动画跳动 2025-05-23 11:11:27 +08:00
huqibin 1491d02e32 添加动画演示 2025-05-23 09:45:36 +08:00
huqibin 45410ee04c 暂存贴图 2025-05-22 19:49:18 +08:00
huqibin 6bf44db46f 修改对焦位置 2025-05-22 19:44:44 +08:00
huqibin 95f650edf0 第一人称定位掉了 2025-05-22 18:34:05 +08:00
huqibin 0a4cbdb6b4 场景光照BUG 2025-05-22 18:30:04 +08:00
wangyang a37c5df1dd 改主场景灯光 2025-05-22 18:03:37 +08:00
wangyang da4e2c9e48 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-22 16:14:54 +08:00
wangyang a531edcbe5 添加高粱比对模型 2025-05-22 16:14:36 +08:00
huqibin e6b61a1ccc Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master
# Conflicts:
#	UserSettings/EditorUserSettings.asset
2025-05-22 15:35:57 +08:00
huqibin cf881a3448 加入划线测量 2025-05-22 15:34:48 +08:00
taosuqi ca2b5bb12a 修改了对比面板这一块./ 2025-05-22 13:18:14 +08:00
taosuqi 853e9755bb 5.22上午提交 2025-05-22 13:07:18 +08:00
huqibin 3d80ed9e62 添加划线读取作物信息 2025-05-22 12:46:45 +08:00
wangyang 3243c02642 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-22 10:03:08 +08:00
wangyang 41ee4458a1 hb 2025-05-22 10:02:55 +08:00
huqibin 92cd09de17 配置作物信息 2025-05-22 10:02:05 +08:00
wangyang 139e4bc8e7 改人动画 2025-05-22 10:00:30 +08:00
taosuqi 3de666c204 修改对比框中的透明度这一块./ 2025-05-22 09:18:54 +08:00
huqibin 1ec9dafda5 替换玉米模型 2025-05-22 08:50:48 +08:00
wangyang 4a74453743 合并 2025-05-21 18:10:00 +08:00
wangyang 8554325329 加玉米 2025-05-21 18:07:53 +08:00
huqibin 909cab50b2 tongbu2 2025-05-21 18:06:39 +08:00
huqibin cf655438e8 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master
# Conflicts:
#	UserSettings/EditorUserSettings.asset
2025-05-21 18:01:29 +08:00
huqibin 565d317e66 分图 2025-05-21 18:00:12 +08:00
taosuqi 1ea0b06204 冲突这一块 2025-05-21 16:13:40 +08:00
taosuqi 15e69da3f5 新增表格 2025-05-21 16:12:42 +08:00
huqibin 5edd75841a 添加点击健康植株弹出玉米 2025-05-21 15:20:52 +08:00
huqibin f90a7c98a8 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-21 14:26:04 +08:00
huqibin 08691c5b34 更新同步 2025-05-21 14:24:55 +08:00
taosuqi 4cb80a26b5 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-21 14:22:28 +08:00
taosuqi c645785273 修改UI这一块2./ 2025-05-21 14:22:21 +08:00
huqibin 28d15ecb16 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master
# Conflicts:
#	Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab.meta
2025-05-21 13:31:45 +08:00