update

地图对象
gaowanlu · Jan 21, 2024 · e864048 · e864048
1 parent af09454
commit e864048
Show file tree

Hide file tree

Showing 9 changed files with 3,141 additions and 1,548 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 
 # production
 /build
+/nwjs
 
 # misc
 .DS_Store

diff --git a/README.md b/README.md
@@ -3,4 +3,12 @@
 ```bash
 npm install
 npm run build
+cd nwjs
+./nwjs/nw.exe ./build --ignore-certificate-errors
+
+{
+  "name": "nw-demo",
+  "version": "0.0.1",
+  "main": "index.html"
+}
 ```
diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "thub",
   "version": "0.1.0",
   "private": true,
+  "main": "index.html",
   "dependencies": {
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",

diff --git a/public/assets/map.json b/public/assets/map.json
diff --git a/public/assets/地图.tiled-project b/public/assets/地图.tiled-project
@@ -2,7 +2,7 @@
     "automappingRulesFile": "",
     "commands": [
     ],
-    "compatibilityVersion": 1100,
+    "compatibilityVersion": 1080,
     "extensionsPath": "extensions",
     "folders": [
         "."

diff --git a/public/assets/地图.tiled-session b/public/assets/地图.tiled-session
@@ -3,16 +3,17 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "地图.json",
+    "activeFile": "地图.tmx",
     "expandedProjectPaths": [
         "."
     ],
+    "file.lastUsedOpenFilter": "全部文件 (*)",
     "fileStates": {
         "": {
-            "scaleInDock": 1
+            "scaleInDock": 0.33
         },
         "terrain_atlas.tsx": {
-            "scaleInDock": 0.125,
+            "scaleInDock": 0.75,
             "scaleInEditor": 1
         },
         "地图.json": {
@@ -25,20 +26,44 @@
         },
         "地图.json#terrain_atlas": {
             "scaleInDock": 0.33
+        },
+        "地图.tmj": {
+            "scale": 1,
+            "selectedLayer": 1,
+            "viewCenter": {
+                "x": 879.5,
+                "y": 391.5
+            }
+        },
+        "地图.tmj#terrain_atlas": {
+            "scaleInDock": 1.5
+        },
+        "地图.tmx": {
+            "scale": 0.33,
+            "selectedLayer": 3,
+            "viewCenter": {
+                "x": 292.4242424242424,
+                "y": 331.81818181818187
+            }
+        },
+        "地图.tmx#terrain_atlas": {
+            "scaleInDock": 0.33
         }
     },
     "last.exportedFilePath": "C:/Users/gaowanlu/Desktop/MyProject/thub/public/assets",
     "last.imagePath": "C:/Users/gaowanlu/Desktop/MyProject/thub/public/assets/Atlas",
     "map.lastUsedExportFilter": "JSON map files (*.tmj *.json)",
-    "map.lastUsedFormat": "json",
+    "map.lastUsedFormat": "tmx",
     "openFiles": [
-        "地图.json",
-        "terrain_atlas.tsx"
+        "地图.tmx"
     ],
     "project": "地图.tiled-project",
     "recentFiles": [
+        "地图.tmx",
         "terrain_atlas.tsx",
+        "地图.tmj",
         "地图.json"
     ],
+    "tileset.embedInMap": true,
     "tileset.lastUsedFormat": "tsx"
 }
diff --git a/public/assets/地图.tmj b/public/assets/地图.tmj
diff --git a/public/assets/地图.tmx b/public/assets/地图.tmx
diff --git a/src/pages/GamePage.jsx b/src/pages/GamePage.jsx
@@ -31,6 +31,8 @@ const WIDTH = 1320;
 const HEIGHT = 680;
 let miniMap;
 
+let Objects = [];
+
 WS.connect();
 
 // function collectStar(player, star) {
@@ -120,6 +122,7 @@ function GamePage() {
             this.load.tilemapTiledJSON({ key: 'map', url: 'assets/map.json' });
             // 加载地图使用的图块集
             this.load.image('tiles', 'assets/Atlas/terrain_atlas.png');
+            this.load.spritesheet('tilesetSprite', 'assets/Atlas/terrain_atlas.png', { frameWidth: 32, frameHeight: 32 });
         }
 
         // 创建场景
@@ -136,6 +139,7 @@ function GamePage() {
             layer1.setCollisionByExclusion([-1]);
             let layer2 = map.createLayer("scene_layer2", tiles, 0, 0);
             layer2.setCollisionByExclusion([-1]);
+
             this.cameras.main.setBounds(0, 0, map.widthInPixels, map.heightInPixels);
             this.cameras.main.setSize(WIDTH, HEIGHT);
 
@@ -232,6 +236,28 @@ function GamePage() {
             this.physics.add.collider(player, beds2);
             this.physics.add.collider(player, beds3);
 
+
+
+            // Load object layer
+            let objectLayer = map.getObjectLayer('object_layer1');
+
+            if (objectLayer) {
+                // Iterate through objects in the object layer
+                objectLayer.objects.forEach(object => {
+                    // Example: create a sprite at each object's position
+                    let sprite = this.physics.add.sprite(object.x, object.y - 32, 'tilesetSprite', object.gid - 1);
+                    sprite.setOrigin(0, 0);
+                    this.physics.world.enable(sprite);
+                    Objects.push(sprite);
+                });
+            }
+
+
+            Objects.forEach((v, i, arr) => {
+                this.physics.add.collider(player, v);
+            });
+
+
             // 键盘
             cursors = this.input.keyboard.createCursorKeys();
             cursors.w = this.input.keyboard.addKey(Phaser.Input.Keyboard.KeyCodes.W);
@@ -282,6 +308,11 @@ function GamePage() {
                         this.physics.add.collider(newPlayer, beds1);
                         this.physics.add.collider(newPlayer, beds2);
                         this.physics.add.collider(newPlayer, beds3);
+
+                        Objects.forEach((v, i, arr) => {
+                            this.physics.add.collider(newPlayer, v);
+                        });
+
                     }
                     // 将消息装入对应玩家的message
                     for (let j = 0; j < data.Data.length; j++) {