Commit Graph

62 Commits

Author SHA1 Message Date
huqibin b73f6d51a2 演示BUG 2025-05-30 18:01:37 +08:00
huqibin 5ea6792003 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-30 16:57:10 +08:00
huqibin a42cf4ff14 默认加载PPT 2025-05-30 16:57:06 +08:00
taosuqi 122c4316d2 提交marmab面板./ 2025-05-30 16:50:29 +08:00
huqibin 7da02fd3ce UI呈现Title 2025-05-30 16:24:29 +08:00
taosuqi 0cb74c562d Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-30 15:33:36 +08:00
taosuqi 393d73b8c6 提交了模型旋转代码参数./ 2025-05-30 15:33:25 +08:00
huqibin 4869a00f61 对比界面 2025-05-30 15:33:19 +08:00
huqibin 720bcede25 对比界面Prefab 2025-05-30 14:51:55 +08:00
huqibin 5d5d8a9051 高粱玉米对比页面BUG 2025-05-26 19:45:33 +08:00
taosuqi 5597565df0 修改人物图片这一块./ 2025-05-26 18:27:49 +08:00
huqibin 448c52083e 视锥剔除 2025-05-26 17:26:42 +08:00
huqibin f0f5812b70 PPT异步加载 2025-05-26 16:36:07 +08:00
taosuqi b16cf7b59c 5.26早上提交 2025-05-26 11:21:18 +08:00
huqibin 3c0b5ca839 场景弹出PPT页面 2025-05-24 15:37:36 +08:00
huqibin 905608dd0d PPT读取 2025-05-23 17:45:28 +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 1d4f44f870 Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-23 15:55:35 +08:00
taosuqi 4f6711f4c3 修改面板 2025-05-23 15:55:27 +08:00
huqibin c4d223f3d9 fadepanel 2025-05-23 15:03:10 +08:00
huqibin e92e6408fe Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master 2025-05-23 14:54:38 +08:00
huqibin 800ed593d9 添加PPT部分UI 2025-05-23 14:54:33 +08:00
taosuqi 5bc306b656 修改UI_PlantComparisonPanel面板这一块 2025-05-23 13:31:12 +08:00
taosuqi 4e530cfaaf 修改UI这一块 2025-05-23 11:28:53 +08:00
huqibin 0a4cbdb6b4 场景光照BUG 2025-05-22 18:30:04 +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 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 51e99e77ef 读取高粱部分的信息 2025-05-22 10:37:24 +08:00
taosuqi 3de666c204 修改对比框中的透明度这一块./ 2025-05-22 09:18:54 +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 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
huqibin 919f64cf4a UI界面 2025-05-20 17:21:07 +08:00