zhouenguang 3 gadi atpakaļ
vecāks
revīzija
49ed600fa9

+ 13 - 8
dist/assets/config.json

@@ -7,17 +7,21 @@
                 {
                     "id": "My_Actor",
                     "name": "My_Actor",
-                    "url": "./assets/avatar/woman_0.zip",
+                    "url": "./assets/avatar/man_YXL.zip",
                     "gender": "man",
                     "components": [],
                     "animations": [
                         {
+                            "name": "Running",
+                            "url": "./assets/avatar/man_YXL/animations/Running.glb"
+                        },
+                        {
                             "name": "Walking",
-                            "url": "./assets/avatar/woman_0/animations/Walking.glb"
+                            "url": "./assets/avatar/man_YXL/animations/Walking.glb"
                         },
                         {
                             "name": "Idle",
-                            "url": "./assets/avatar/woman_0/animations/Idle.glb"
+                            "url": "./assets/avatar/man_YXL/animations/Idle.glb"
                         }
                     ]
                 }
@@ -102,6 +106,7 @@
                         {
                             "avatarId": "My_Actor",
                             "animations": [
+                                "Running",
                                 "Walking",
                                 "Idle"
                             ]
@@ -115,7 +120,7 @@
             "assetTotalSize": 24248947,
             "assetUrls": [
                 {
-                    "url": "./assets/avatar/woman_0/component_list.json",
+                    "url": "./assets/avatar/man_YXL/component_list.json",
                     "packName": "",
                     "typeName": "avatar",
                     "className": "",
@@ -123,7 +128,7 @@
                     "size": 14294
                 },
                 {
-                    "url": "./assets/avatar/woman_0/body.glb",
+                    "url": "./assets/avatar/man_YXL/man_YXL.glb",
                     "packName": "",
                     "typeName": "avatar",
                     "className": "",
@@ -131,7 +136,7 @@
                     "size": 137548
                 },
                 {
-                    "url": "./assets/avatar/woman_0/animations/Walking.glb",
+                    "url": "./assets/avatar/man_YXL/animations/Walking.glb",
                     "packName": "",
                     "typeName": "avatar",
                     "className": "",
@@ -139,7 +144,7 @@
                     "size": 99844
                 },
                 {
-                    "url": "./assets/avatar/woman_0/animations/Idle.glb",
+                    "url": "./assets/avatar/man_YXL/animations/Idle.glb",
                     "packName": "",
                     "typeName": "avatar",
                     "className": "",
@@ -147,7 +152,7 @@
                     "size": 208772
                 },
                 {
-                    "url": "./assets/KyotoAlley_Showcase.glb",
+                    "url": "./assets/level_L01.glb",
                     "packName": "",
                     "typeName": "MODEL",
                     "className": "粗模",

+ 3 - 3
dist/assets/config_YXTN.json

@@ -39,7 +39,7 @@
                             "className": "粗模",
                             "assetId": "",
                             "name": "KyotoAlley_Showcase.glb",
-                            "url": "./assets/level_L01_00006.glb",
+                            "url": "./assets/scene.glb",
                             "thumbnailUrl": ""
                         },
                         {
@@ -47,7 +47,7 @@
                           "className": "TV",
                           "assetId": "",
                           "name": "yqtgTV_xverse.glb",
-                          "url": "https://app-mgt-resource-1258211750.file.myqcloud.com/model/fefa5e668b634bc283feb5d6769f95ad/yqtgTV_xverse.glb",
+                          "url": "./assets/tv_0.glb",
                           "thumbnailUrl": ""
                         },
                         {
@@ -147,7 +147,7 @@
                     "size": 208772
                 },
                 {
-                    "url": "./assets/level_L01.glb",
+                    "url": "./assets/KyotoAlley_Showcase.glb",
                     "packName": "",
                     "typeName": "MODEL",
                     "className": "粗模",

+ 8 - 3
dist/assets/config_man_YXL.json

@@ -12,6 +12,10 @@
                     "components": [],
                     "animations": [
                         {
+                            "name": "Running",
+                            "url": "./assets/avatar/man_YXL/animations/Running.glb"
+                        },
+                        {
                             "name": "Walking",
                             "url": "./assets/avatar/man_YXL/animations/Walking.glb"
                         },
@@ -38,8 +42,8 @@
                             "typeName": "MODEL",
                             "className": "粗模",
                             "assetId": "",
-                            "name": "ground_LQC_xverse.glb",
-                            "url": "./assets/level_L01.glb",
+                            "name": "KyotoAlley_Showcase.glb",
+                            "url": "./assets/scene.glb",
                             "thumbnailUrl": ""
                         },
                         {
@@ -47,7 +51,7 @@
                           "className": "TV",
                           "assetId": "",
                           "name": "yqtgTV_xverse.glb",
-                          "url": "https://app-mgt-resource-1258211750.file.myqcloud.com/model/fefa5e668b634bc283feb5d6769f95ad/yqtgTV_xverse.glb",
+                          "url": "./assets/tv_0.glb",
                           "thumbnailUrl": ""
                         },
                         {
@@ -102,6 +106,7 @@
                         {
                             "avatarId": "My_Actor",
                             "animations": [
+                                "Running",
                                 "Walking",
                                 "Idle"
                             ]

+ 4 - 0
src/XverseAvatarManager.js

@@ -361,6 +361,10 @@ export default class XverseAvatarManager extends EventEmitter {
                 })
             }
             if (o.isMoving !== r) {
+                // 根据isMoving,判断是walk还是run
+                if(r == 1) o.motionType = MotionType.Walk
+                if(r == 2) o.motionType = MotionType.Run
+
                 o.isMoving = r;
                 let a = "Idle";
                 r && (a = "Walking",

+ 2 - 1
src/main.js

@@ -40,7 +40,8 @@ const l = async()=>{
             // wsServerUrl: "ws://localhost:6688/ws",
             //wsServerUrl: "ws://192.168.1.100:6688/ws",
             //wsServerUrl: "wss://meta-socket.4dage.com/ws",
-            wsServerUrl: "wss://meta-socket1.4dage.com/ws",
+            // wsServerUrl: "wss://meta-socket1.4dage.com/ws",
+            wsServerUrl: "wss://meta-socket2.4dage.com/ws",
             //appId: "10016",
             appId: "0000000008",    //"0000000003",    //"0000000007",
             token: " ",