Commit Graph

78 Commits

Author SHA1 Message Date
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 2991508c36 zh 2025-05-22 18:05:24 +08:00
wangyang a37c5df1dd 改主场景灯光 2025-05-22 18:03:37 +08:00
huqibin 76686ca9d1 另外的填生成高粱 2025-05-22 17:42:02 +08:00
huqibin e39569a2eb Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-22 17:02:43 +08:00
huqibin d954c3927d 拿取工具 2025-05-22 17:02:40 +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 2e699b6143 更新UI 2025-05-22 16:13:42 +08:00
taosuqi 5b017667bb 修改层级这一块./ 2025-05-22 15:59:10 +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 9b5025e9cf 添加划线 2025-05-22 15:35:31 +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
huqibin b89c3bd230 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-22 10:37:27 +08:00
huqibin 51e99e77ef 读取高粱部分的信息 2025-05-22 10:37:24 +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 19acda5c36 tongbu 2025-05-21 18:01:06 +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
taosuqi c5cabd9533 修改UI这一块./ 2025-05-21 14:21:57 +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
huqibin 3b2d764174 UI响应 2025-05-21 13:30:40 +08:00
taosuqi b2c6e8b265 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-21 13:22:08 +08:00
taosuqi f4baf144da 修改顶部UI 2025-05-21 13:22:01 +08:00
huqibin bd59df4cd4 动态生成高粱 2025-05-21 11:15:17 +08:00
wangyang e8bc442b06 添加高粱x2 2025-05-20 17:52:48 +08:00
huqibin 919f64cf4a UI界面 2025-05-20 17:21:07 +08:00
huqibin e1c2af9d55 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master
# Conflicts:
#	Assets/ArtRes/Models/Materials/fa 2.mat
#	Assets/ArtRes/Models/Materials/fa 2.mat.meta
2025-05-20 13:27:45 +08:00
huqibin 7339062beb TSQ同步UI 2025-05-20 13:26:57 +08:00