 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 |
|
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 |
|
taosuqi
|
cd5a906fc9
|
修改顶部UI
|
2025-05-20 11:27:39 +08:00 |
|
huqibin
|
7c0c7e3475
|
场景修改2
|
2025-05-20 09:09:37 +08:00 |
|
huqibin
|
848e33a34b
|
场景初始化——1
|
2025-05-20 09:00:01 +08:00 |
|
taosuqi
|
2b2a4c82e7
|
下班提交
|
2025-05-19 18:04:05 +08:00 |
|
taosuqi
|
a55ae8f2c0
|
解决报错
|
2025-05-19 16:18:12 +08:00 |
|
taosuqi
|
6798c5c18e
|
修改加载预制体
|
2025-05-19 14:08:07 +08:00 |
|
taosuqi
|
8b4faa2ab7
|
5.19提交修改
|
2025-05-19 13:27:33 +08:00 |
|
taosuqi
|
386f6918e5
|
增加UI预制体
|
2025-05-19 09:20:37 +08:00 |
|
taosuqi
|
29b1d498f5
|
新增ui预制体
|
2025-05-16 16:16:10 +08:00 |
|
taosuqi
|
7efa1c5351
|
模板
|
2025-05-16 11:19:31 +08:00 |