Commit Graph

28 Commits

Author SHA1 Message Date
黄嘉宇 42d7471a5a Merge branch 'u3d' of http://gitea.umayle.com/huangjiayu/ShanDongVirtualPowerPlant into u3d
# Conflicts:
#	u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Model/ShanDongMap-AT.fbx.meta
2024-06-26 18:03:37 +08:00
黄嘉宇 9f21c4db8c 111 2024-06-26 18:02:41 +08:00
YangHua f9129738b1 12133 2024-06-26 09:18:15 +08:00
YangHua 54efd8336f 321 2024-06-26 09:07:22 +08:00
YangHua 0cc0ef38ca 32323 2024-06-25 19:07:08 +08:00
YangHua 4d8b296102 233 2024-06-25 19:06:41 +08:00
黄嘉宇 d7da638263 update art 2024-06-25 19:05:44 +08:00
YangHua 2234a8650f Merge branch 'u3d' of http://git.umayle.com/huangjiayu/ShanDongVirtualPowerPlant into u3d 2024-06-25 17:49:09 +08:00
YangHua 899b6a9f56 添加聚合逻辑 2024-06-25 17:48:46 +08:00
黄嘉宇 5f7da1c478 Merge branch 'u3d' of http://gitea.umayle.com/huangjiayu/ShanDongVirtualPowerPlant into u3d 2024-06-25 17:47:10 +08:00
黄嘉宇 78b8bc299c 调整美术效果 2024-06-25 17:46:54 +08:00
YangHua 17a3687159 2323 2024-06-25 13:21:51 +08:00
YangHua 70e6a6df55 添加web端通信逻辑 2024-06-23 23:35:35 +08:00
YangHua 11c2ada0f8 同步 2024-06-23 18:54:23 +08:00
YangHua 717d945927 12 2024-06-23 18:53:51 +08:00
huangjiayu bfe00a6d14 替换模型 2024-06-23 18:48:27 +08:00
YangHua 20d21f6c0a 32 2024-06-23 10:02:26 +08:00
YangHua c00de29a5f 2222 2024-06-23 09:39:45 +08:00
YangHua 565ab87830 12 2024-06-21 21:15:23 +08:00
YangHua 47fc2007aa Merge branch 'u3d' of http://git.umayle.com/huangjiayu/ShanDongVirtualPowerPlant into u3d 2024-06-21 13:44:36 +08:00
YangHua e9d4b173c7 添加地势标记逻辑 2024-06-21 13:44:10 +08:00
黄嘉宇 1f4884ab9d 材质提交 2024-06-21 13:43:20 +08:00
YangHua 0d422515f0 Merge branch 'u3d' of http://git.umayle.com/huangjiayu/ShanDongVirtualPowerPlant into u3d 2024-06-20 18:11:57 +08:00
YangHua 8faa470bbe 3 2024-06-20 18:11:28 +08:00
黄嘉宇 07ba37d2d8 `1 2024-06-20 18:10:22 +08:00
黄嘉宇 e0a5949a4e 123 2024-06-20 15:43:58 +08:00
黄嘉宇 1a3daccee2 1 2024-06-20 15:34:20 +08:00
黄嘉宇 f7cf809918 工程提交 2024-06-20 12:49:34 +08:00