From f4053fd2070ccf4088e88ec6e325a1aec26576ab Mon Sep 17 00:00:00 2001
From: ljx0517 <ljx0517@gmail.com>
Date: Mon, 13 Jun 2022 17:21:08 +0800
Subject: [PATCH] 11

---
 assets/elephant/scene/elephant.fire | 40 ++++++++++++++---------------
 assets/elephant/scene/elephant.ts   |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/assets/elephant/scene/elephant.fire b/assets/elephant/scene/elephant.fire
index 7555836..223c4e4 100644
--- a/assets/elephant/scene/elephant.fire
+++ b/assets/elephant/scene/elephant.fire
@@ -134,7 +134,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1334,
+      "width": 1200,
       "height": 750
     },
     "_anchorPoint": {
@@ -146,7 +146,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        667,
+        600,
         375,
         0,
         0,
@@ -1472,7 +1472,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1334,
+      "width": 1200,
       "height": 750
     },
     "_anchorPoint": {
@@ -1556,7 +1556,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1334,
+      "width": 1200,
       "height": 750
     },
     "_anchorPoint": {
@@ -1605,7 +1605,7 @@
         "__id__": 30
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 33
@@ -1634,7 +1634,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1334,
+      "width": 1200,
       "height": 276
     },
     "_anchorPoint": {
@@ -1805,7 +1805,7 @@
       "__uuid__": "34f1856c-0903-4c68-b8b3-6f318251f80b"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -1890,7 +1890,7 @@
         "__id__": 39
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 42
@@ -1919,7 +1919,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1334,
+      "width": 1200,
       "height": 152
     },
     "_anchorPoint": {
@@ -2090,7 +2090,7 @@
       "__uuid__": "429430f7-a25c-4f31-9eec-6e5bddf103e9"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -2297,7 +2297,7 @@
       "__uuid__": "c37d1a01-6305-4967-a5c5-791ea2747281"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -2382,7 +2382,7 @@
         "__id__": 56
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 59
@@ -2426,7 +2426,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -586.51,
+        -519.51,
         30,
         0,
         0,
@@ -2869,7 +2869,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1334,
+      "width": 1200,
       "height": 750
     },
     "_anchorPoint": {
@@ -3973,7 +3973,7 @@
       "__uuid__": "540cc7d2-c0ac-4fca-94d9-ee129eb4870e"
     },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -4828,7 +4828,7 @@
       "__uuid__": "1b376b4d-fce0-416d-981b-85726dc8d4b2"
     },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -4837,7 +4837,7 @@
     },
     "_fillStart": 0,
     "_fillRange": 0,
-    "_isTrimmedMode": true,
+    "_isTrimmedMode": false,
     "_atlas": null,
     "_id": "2eYkmIROpHDqdcHikIy4Mo"
   },
@@ -4971,7 +4971,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        516.567,
+        456.567,
         -310.76,
         0,
         0,
@@ -6522,7 +6522,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -606.402,
+        -520,
         319.081,
         0,
         0,
@@ -26829,7 +26829,7 @@
     "_enabled": true,
     "_designResolution": {
       "__type__": "cc.Size",
-      "width": 1334,
+      "width": 1200,
       "height": 750
     },
     "_fitWidth": true,
diff --git a/assets/elephant/scene/elephant.ts b/assets/elephant/scene/elephant.ts
index fde84dd..494ca74 100644
--- a/assets/elephant/scene/elephant.ts
+++ b/assets/elephant/scene/elephant.ts
@@ -234,6 +234,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
         const self = this;
         fur_kinds.forEach(kind => {
             const fur = user.myFurniture.furniture[kind];
+            console.log(kind, fur.rect)
             house.setFurnitureItem(self[kind], fur.id, fur.rect);
         });
     }
-- 
2.21.0