Commit Graph

20 Commits

Author SHA1 Message Date
wangyang 139e4bc8e7 改人动画 2025-05-22 10:00:30 +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 08691c5b34 更新同步 2025-05-21 14:24:55 +08:00
huqibin 3b2d764174 UI响应 2025-05-21 13:30:40 +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
wangyang 8b6e5af503 换新 2025-05-20 11:54:16 +08:00
taosuqi 83d3b9084d 提交修改进入的场景 2025-05-20 10:50:37 +08:00
taosuqi 4e7a1ec3f2 tsq修改提交 2025-05-20 09:35:09 +08:00
huqibin 7c0c7e3475 场景修改2 2025-05-20 09:09:37 +08:00