ZhengMingShuai
|
f672556287
|
备份
|
2023-11-28 16:48:24 +08:00 |
|
ZhengMingShuai
|
3e60516ddc
|
Merge branch 'LRC' of http://192.168.0.155:3000/LiRuoChen/HanXinGongGuanTowerCraneVisualization into ZMS1.0
# Conflicts:
# Assets/LRC/Prefab/TowerCrane/TowerCrane.prefab
# Assets/SampleSceneAssets/Particles/ButterFlies.vfx
# Assets/SampleSceneAssets/Particles/FallingLeaves.vfx
# Assets/SampleSceneAssets/Particles/FloatingDust.vfx
# Assets/Samples.meta
# Assets/Samples/High Definition RP.meta
# Assets/Samples/High Definition RP/13.1.9.meta
# Assets/Samples/High Definition RP/13.1.9/Additional Post-processing Data.meta
# Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples.meta
# Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/LensFlarePresets.meta
# Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/LensFlarePresets/Polycount.asset.meta
# Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/LensFlarePresets/Smartphone_Smudged.asset.meta
# Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/Textures.meta
# Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/Textures/Shimmer.png.meta
# Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/Textures/Shimmer2.png.meta
# Assets/Samples/High Definition RP/13.1.9/Local Volumetric 3D Texture Samples.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Fonts/LiberationSans.ttf.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/Fonts and Materials.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/Fonts and Materials/LiberationSans SDF.asset.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/Shaders/TMPro.cginc.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc.meta
# Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/TMP Settings.asset.meta
# Assets/Samples/High Definition RP/13.1.9/Particle System Shader Samples.meta
# Assets/Samples/High Definition RP/13.1.9/Procedural Sky.meta
# Assets/Scenes/PrefabEditingScene.unity
# Assets/Scenes/PrefabEditingSceneOld.unity
# Assets/Scenes/PrefabEditingSceneOld.unity.meta
# Assets/Scenes/PrefabScene.unity
# Assets/Scenes/SampleScene.unity
# Assets/Scenes/Volume.meta
# Assets/Scenes/Volume/VolumeGlobal Z.asset
# Assets/ZMS/Script/3D/CameraUSE/CameraPointWinding.cs
# Assets/ZMS/Script/3D/Configuration/Configuration.cs
# Assets/ZMS/Script/3D/Configuration/ConstructConf.cs
# Assets/ZMS/Script/3D/Configuration/SiteConfigura.cs
|
2023-11-23 10:57:29 +08:00 |
|
ZhengMingShuai
|
5820c5ad71
|
socket
|
2023-11-23 10:49:24 +08:00 |
|
ZhengMingShuai
|
22fe31e89d
|
版本更改
|
2023-11-21 13:55:18 +08:00 |
|
|
|
ac58ea78a6
|
更改版本到2022；
修复了部分用到了新特性的材质到基本特性；
添加了ui界面
|
2023-11-21 09:49:40 +08:00 |
|
ZhengMingShuai
|
9b679b92b9
|
Merge branch 'LRC' of http://192.168.0.155:3000/LiRuoChen/HanXinGongGuanTowerCraneVisualization into ZMS
# Conflicts:
# Assets/Fbx/Materials/dimian.mat
# Assets/LRC/Scripts/TowerCrane/TowerGerminate.cs
|
2023-11-17 09:01:59 +08:00 |
|
ZhengMingShuai
|
b5fd82d64f
|
no message
|
2023-11-17 08:53:50 +08:00 |
|
|
|
e767674f25
|
Merge remote-tracking branch 'origin/ZMS' into LRC
# Conflicts:
# Assets/Fbx.meta
# Assets/Fbx/LOU Z1.fbm.meta
# Assets/Fbx/LOU Z1.fbm/1496812903321.jpg.meta
# Assets/Fbx/LOU Z1.fbm/2023-11-13_212049.png.meta
# Assets/Fbx/Lu.fbm.meta
# Assets/Fbx/Lu.fbm/daolu.png.meta
# Assets/Fbx/Materials.meta
# Assets/Fbx/Materials/dimian.mat
# Assets/Fbx/Materials/jianzhuwang.mat
# Assets/Fbx/Project.fbm.meta
# Assets/Fbx/Project.fbm/MetalCastIron001_GLOSS_1K_SPECULAR.jpg.meta
# Assets/Fbx/Project.fbm/MetalCastIron001_REFL_1K_SPECULAR.jpg.meta
# Assets/Fbx/Project.fbm/zhongjian.png.meta
# Assets/Fbx/Project.fbm/黑色金属漆面.png.meta
# Assets/Fbx/Tower Crane L.fbm.meta
# Assets/Fbx/Tower Crane L.fbm/Materials.meta
# Assets/Fbx/Tower Crane.fbm.meta
# Assets/Fbx/WL.fbm.meta
# Assets/Fbx/WL.fbm/Materials.meta
# Assets/Fbx/weilan.fbm.meta
# Assets/Scenes/PrefabScene.meta
# Assets/Scenes/PrefabScene.unity
# Assets/Scenes/VolumeGlobal S2.asset
# Assets/Scenes/VolumeRayTracingProfile S2.asset
|
2023-11-17 08:49:57 +08:00 |
|
|
|
ec9d5d5324
|
update base buliding fbx
|
2023-11-15 13:42:12 +08:00 |
|
ZhengMingShuai
|
67f4f4da2f
|
Merge branch 'LRC' of http://192.168.0.155:3000/LiRuoChen/HanXinGongGuanTowerCraneVisualization into ZMS
|
2023-11-15 11:59:11 +08:00 |
|
ZhengMingShuai
|
17eb93cc8d
|
字体，视角跳转时衔接，边缘限制等
|
2023-11-15 10:13:28 +08:00 |
|
|
|
12492c8143
|
移植lrc工程部分
|
2023-11-11 22:00:49 +08:00 |
|
ZhengMingShuai
|
d4428a4652
|
no message
|
2023-11-08 19:30:55 +08:00 |
|
ZhengMingShuai
|
074040bca2
|
no message
|
2023-11-08 09:59:12 +08:00 |
|
