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 |
|
taosuqi
|
01c2562df8
|
提交？
|
2025-05-20 13:26:45 +08:00 |
|
wangyang
|
57d932fb35
|
Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master
|
2025-05-20 13:09:25 +08:00 |
|
wangyang
|
6562fa7f73
|
1
|
2025-05-20 13:09:11 +08:00 |
|
wangyang
|
8b6e5af503
|
换新
|
2025-05-20 11:54:16 +08:00 |
|
taosuqi
|
cd5a906fc9
|
修改顶部UI
|
2025-05-20 11:27:39 +08:00 |
|
taosuqi
|
f702d0c48a
|
Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master
|
2025-05-20 10:50:44 +08:00 |
|
taosuqi
|
83d3b9084d
|
提交修改进入的场景
|
2025-05-20 10:50:37 +08:00 |
|
taosuqi
|
4e7a1ec3f2
|
tsq修改提交
|
2025-05-20 09:35:09 +08:00 |
|
huqibin
|
4a51b0acab
|
3
|
2025-05-20 09:20:49 +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
|
77119de7bb
|
冲突
|
2025-05-19 18:04:49 +08:00 |
|
taosuqi
|
2b2a4c82e7
|
下班提交
|
2025-05-19 18:04:05 +08:00 |
|
wangyang
|
ca51b2b3d0
|
11
|
2025-05-19 18:02:01 +08:00 |
|
taosuqi
|
a047407d1a
|
Merge branch 'master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2
|
2025-05-19 16:18:20 +08:00 |
|
taosuqi
|
a55ae8f2c0
|
解决报错
|
2025-05-19 16:18:12 +08:00 |
|
wangyang
|
7e2d7dfec3
|
改头发
|
2025-05-19 15:41:51 +08:00 |
|
wangyang
|
175ff4c08d
|
打光，更换动画
|
2025-05-19 15:37:31 +08:00 |
|
taosuqi
|
6798c5c18e
|
修改加载预制体
|
2025-05-19 14:08:07 +08:00 |
|
taosuqi
|
8b4faa2ab7
|
5.19提交修改
|
2025-05-19 13:27:33 +08:00 |
|
wangyang
|
c96966d4d7
|
美术场景添加
|
2025-05-19 10:20:35 +08:00 |