future 1 жил өмнө
parent
commit
7e7492467f

BIN
assets/run/img_text_sound_bg.png


+ 41 - 41
assets/run/img_text_sound_bg.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "b9b8fa36-e469-4001-a39a-3d736c419ec7",
+  "uuid": "f3893d5c-2873-479b-becc-7a88ba2af14b",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "b9b8fa36-e469-4001-a39a-3d736c419ec7@6c48a",
+      "uuid": "f3893d5c-2873-479b-becc-7a88ba2af14b@6c48a",
       "displayName": "img_text_sound_bg",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "b9b8fa36-e469-4001-a39a-3d736c419ec7",
+        "imageUuidOrDatabaseUri": "f3893d5c-2873-479b-becc-7a88ba2af14b",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "b9b8fa36-e469-4001-a39a-3d736c419ec7@f9941",
+      "uuid": "f3893d5c-2873-479b-becc-7a88ba2af14b@f9941",
       "displayName": "img_text_sound_bg",
       "id": "f9941",
       "name": "spriteFrame",
@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -1,
+        "offsetX": 0,
         "offsetY": 0,
-        "trimX": 11,
-        "trimY": 13,
-        "width": 1038,
-        "height": 253,
-        "rawWidth": 1062,
-        "rawHeight": 279,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1077,
+        "height": 587,
+        "rawWidth": 1077,
+        "rawHeight": 587,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -519,
-            -126.5,
+            -538.5,
+            -293.5,
             0,
-            519,
-            -126.5,
+            538.5,
+            -293.5,
             0,
-            -519,
-            126.5,
+            -538.5,
+            293.5,
             0,
-            519,
-            126.5,
+            538.5,
+            293.5,
             0
           ],
           "indexes": [
@@ -83,38 +83,38 @@
             3
           ],
           "uv": [
-            11,
-            266,
-            1049,
-            266,
-            11,
-            13,
-            1049,
-            13
+            0,
+            587,
+            1077,
+            587,
+            0,
+            0,
+            1077,
+            0
           ],
           "nuv": [
-            0.010357815442561206,
-            0.04659498207885305,
-            0.987758945386064,
-            0.04659498207885305,
-            0.010357815442561206,
-            0.953405017921147,
-            0.987758945386064,
-            0.953405017921147
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
-            -519,
-            -126.5,
+            -538.5,
+            -293.5,
             0
           ],
           "maxPos": [
-            519,
-            126.5,
+            538.5,
+            293.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "b9b8fa36-e469-4001-a39a-3d736c419ec7@6c48a",
+        "imageUuidOrDatabaseUri": "f3893d5c-2873-479b-becc-7a88ba2af14b@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "b9b8fa36-e469-4001-a39a-3d736c419ec7@f9941"
+    "redirect": "f3893d5c-2873-479b-becc-7a88ba2af14b@f9941"
   }
 }

+ 28 - 46
assets/scene/game.scene

@@ -6076,7 +6076,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 74.65,
+      "y": 94.65,
       "z": 0
     },
     "_lrot": {
@@ -6114,7 +6114,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 862,
+      "width": 822,
       "height": 69.3
     },
     "_anchorPoint": {
@@ -6175,10 +6175,10 @@
     "__prefab": null,
     "_alignFlags": 40,
     "_target": null,
-    "_left": 100,
-    "_right": 100,
-    "_top": 0,
-    "_bottom": 0,
+    "_left": 120,
+    "_right": 120,
+    "_top": 55.99999999999997,
+    "_bottom": 75.00000000000009,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -6188,7 +6188,7 @@
     "_isAbsHorizontalCenter": true,
     "_isAbsVerticalCenter": true,
     "_originalWidth": 3600,
-    "_originalHeight": 0,
+    "_originalHeight": 454.3,
     "_alignMode": 1,
     "_lockFlags": 0,
     "_id": "58LW9xCOtHaoQh7chSvuDr"
@@ -6206,7 +6206,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1062,
-      "height": 139.3
+      "height": 189.3
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6236,7 +6236,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "b9b8fa36-e469-4001-a39a-3d736c419ec7@f9941",
+      "__uuid__": "f3893d5c-2873-479b-becc-7a88ba2af14b@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -6274,8 +6274,8 @@
     "_startAxis": 0,
     "_paddingLeft": 0,
     "_paddingRight": 0,
-    "_paddingTop": 30,
-    "_paddingBottom": 40,
+    "_paddingTop": 60,
+    "_paddingBottom": 60,
     "_spacingX": 0,
     "_spacingY": 0,
     "_verticalDirection": 1,
@@ -15563,6 +15563,9 @@
     ],
     "_active": false,
     "_components": [
+      {
+        "__id__": 441
+      },
       {
         "__id__": 442
       },
@@ -15625,9 +15628,6 @@
       },
       {
         "__id__": 440
-      },
-      {
-        "__id__": 441
       }
     ],
     "_prefab": null,
@@ -15682,36 +15682,6 @@
     },
     "_id": "112jhSPdVI7LReLR3qoDIN"
   },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 437
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 100,
-    "_originalHeight": 100,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": "ceBUfx97lBoa1JJmSbdXxR"
-  },
   {
     "__type__": "cc.Sprite",
     "_name": "",
@@ -15736,9 +15706,9 @@
       "__uuid__": "354290d8-788c-4a4b-ab96-5d5c58d4e3f1@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
-    "_type": 1,
+    "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -15870,6 +15840,18 @@
     },
     "_id": "58xDB3nrRGdYjhZGLG0lSX"
   },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 436
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_id": "63BMc9y/1GoL3J1BRYx4j+"
+  },
   {
     "__type__": "cc.Node",
     "_name": "check_open",

+ 0 - 4
assets/script/run/tips/shouji_item.ts

@@ -40,10 +40,6 @@ export class shouji_item extends Component {
     public showTipIcon(){
         this.icon.active = true;
     }
-
-    public getIsShowTipIcon():boolean {
-        return this.icon.active
-    }
 }