diff --git a/.gitignore b/.gitignore index 242a311..c896beb 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,32 @@ Plugins/**/Intermediate/* # Cache files for the editor to use DerivedDataCache/* +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md000.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md001.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md002.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md003.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md004.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md005.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md006.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md007.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md008.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md010.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md011.uasset +SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md012.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Concrete_Slab_sdvjeioa/High/MI_sdvjeioa.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Concrete_Slab_sdvjeioa/High/MI_sdvjeioa_Inst.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Concrete_Slab_sdvjeioa/High/MI_sdvjeioa_Inst1.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Concrete_Slab_sdvjeioa/High/T_sdvjeioa_4K_B.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Concrete_Slab_sdvjeioa/High/T_sdvjeioa_4K_H.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Concrete_Slab_sdvjeioa/High/T_sdvjeioa_4K_N.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Concrete_Slab_sdvjeioa/High/T_sdvjeioa_4K_ORM.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Mild_Scratches_slnobhpc/Medium/MI_slnobhpc.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Mild_Scratches_slnobhpc/Medium/MI_slnobhpc_Inst1.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Mild_Scratches_slnobhpc/Medium/MI_slnobhpc_Inst2.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Mild_Scratches_slnobhpc/Medium/T_slnobhpc_2K_MR.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/MI_sjynfhyc.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/MI_sjynfhyc_Inst1.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/MI_sjynfhyc_Inst2.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_B.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_N.uasset +SpaceStudioClient/Content/Fab/Megascans/Surfaces/Wall_Paint_Detail_sjynfhyc/Medium/T_sjynfhyc_2K_ORM.uasset diff --git a/InteractiveControl/Content/Version2/widget/Page_mode2_12_MLZGC.uasset b/InteractiveControl/Content/Version2/widget/Page_mode2_12_MLZGC.uasset new file mode 100644 index 0000000..fef2c3f --- /dev/null +++ b/InteractiveControl/Content/Version2/widget/Page_mode2_12_MLZGC.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6406a920b674a47726eee96481753de5b74f1336813dec0c6e44b741376218c +size 193438 diff --git a/SpaceStudioClient/Content/3D_Assets/Blueprint/BP_梅陇镇广场.uasset b/SpaceStudioClient/Content/3D_Assets/Blueprint/BP_梅陇镇广场.uasset new file mode 100644 index 0000000..3753f14 --- /dev/null +++ b/SpaceStudioClient/Content/3D_Assets/Blueprint/BP_梅陇镇广场.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d853e7414c901782e9df98e45b2be4fc77c41b9cdbd28c5892c216b8632c7656 +size 46186 diff --git a/SpaceStudioClient/Content/3D_Assets/Map/L_MLZGC.umap b/SpaceStudioClient/Content/3D_Assets/Map/L_MLZGC.umap new file mode 100644 index 0000000..015c75d --- /dev/null +++ b/SpaceStudioClient/Content/3D_Assets/Map/L_MLZGC.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99b761cb07d128e4a1117fe365c9dcaa99e168841802e29978402dd6222c2661 +size 25654 diff --git a/SpaceStudioClient/Content/Blueprints/BP_UDPMessageProcessor.uasset b/SpaceStudioClient/Content/Blueprints/BP_UDPMessageProcessor.uasset index f46004c..4e98217 100644 --- a/SpaceStudioClient/Content/Blueprints/BP_UDPMessageProcessor.uasset +++ b/SpaceStudioClient/Content/Blueprints/BP_UDPMessageProcessor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce381accf6a655ab7e900aed0f56ab19dd9afbc6ea882f6c7353167aa6f653af -size 1371221 +oid sha256:a58265053a555cc1a2c38fe7dc63935b832bb0a0792126f9184e74e2e188a30d +size 1341578 diff --git a/SpaceStudioClient/Content/Blueprints/ND_PC.uasset b/SpaceStudioClient/Content/Blueprints/ND_PC.uasset index 8c60475..5563090 100644 --- a/SpaceStudioClient/Content/Blueprints/ND_PC.uasset +++ b/SpaceStudioClient/Content/Blueprints/ND_PC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7150917c34eec6c3c1355be5d0ccda7ae9d3cd9b3fba5dde8657a2b3a5333615 -size 2103777 +oid sha256:2064f8bc986399eb7272fa5394e397e969d1f1425e5bcff4008e7f24b707acba +size 2068546 diff --git a/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset b/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset index a0e2249..875b22f 100644 --- a/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset +++ b/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fa0113290963c954757bc7c52121d6fd897e8d479cb6026fe0d1ff3346eba03 -size 1189596 +oid sha256:96edf4ed96279672b503952c6c7631c9c6f62afa292da391df501b8e16f0a66c +size 1185680 diff --git a/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_C.uasset b/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_C.uasset index ab34add..9fae13f 100644 --- a/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_C.uasset +++ b/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_C.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1ccd112fedfa2a3f990cb1ddae6b704fec3c3d54abb1c843331a9225fba7441 -size 303976 +oid sha256:632b81d348fb694726ca742bd1d5e43668b608099cc7779d8fe4c47b6749d35b +size 299981 diff --git a/SpaceStudioClient/Content/Main.umap b/SpaceStudioClient/Content/Main.umap index dd140e6..812f10c 100644 --- a/SpaceStudioClient/Content/Main.umap +++ b/SpaceStudioClient/Content/Main.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f60b58e38cf0a0d90994a6aec467e1baab0463463d1bac52c9d68afcf1f6b2e -size 75756 +oid sha256:f3740809d016e19875aff9adcb8b0c4ba5855efc130ba7ad8be4f2a51cd8991d +size 75442 diff --git a/SpaceStudioClient/Content/YYZ_demo/Level/L_MLZGC.umap b/SpaceStudioClient/Content/YYZ_demo/Level/L_MLZGC.umap new file mode 100644 index 0000000..4084955 --- /dev/null +++ b/SpaceStudioClient/Content/YYZ_demo/Level/L_MLZGC.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83899533357b5c6498d6df2e2e2a2d5f53d19b0a9dd74823f52f617f0bedf933 +size 1409 diff --git a/SpaceStudioClient/Content/config.json b/SpaceStudioClient/Content/config.json index ffd2266..06b4a71 100644 --- a/SpaceStudioClient/Content/config.json +++ b/SpaceStudioClient/Content/config.json @@ -2,7 +2,7 @@ "master": true, "ndisplay": true, "slaveIp": "127.0.0.1", - "ControllerIp": "192.168.1.157", + "ControllerIp": "192.168.1.157", "ControllerPort": 80, "MediaServerIp": "192.168.1.19", "MediaServerPort": 8699, @@ -214,29 +214,6 @@ "y": 1.8, "z": 1.2 } - }, - "L_DGJY": { - "StagePos": { - "x": -64.04962, - "y": -25.995844, - "z": 0 - }, - "ViewPointPos": { - "x": 0, - "y": 0, - "z": 160 - }, - "StageRotation": 90, - "MoveLimit": { - "x": 2900, - "y": 900, - "z": 200 - }, - "MoveSpeed": { - "x": 1.8, - "y": 1.8, - "z": 1.2 - } } } } \ No newline at end of file