future 1 year ago
parent
commit
76cc638099

BIN
assets/run/win_fail_bg.png


+ 134 - 0
assets/run/win_fail_bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "5579eb6b-e5c3-4e78-a183-6fdbeb3e5d3f",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "5579eb6b-e5c3-4e78-a183-6fdbeb3e5d3f@6c48a",
+      "displayName": "win_fail_bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "5579eb6b-e5c3-4e78-a183-6fdbeb3e5d3f",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "5579eb6b-e5c3-4e78-a183-6fdbeb3e5d3f@f9941",
+      "displayName": "win_fail_bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1080,
+        "height": 1920,
+        "rawWidth": 1080,
+        "rawHeight": 1920,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -540,
+            -960,
+            0,
+            540,
+            -960,
+            0,
+            -540,
+            960,
+            0,
+            540,
+            960,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1920,
+            1080,
+            1920,
+            0,
+            0,
+            1080,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -540,
+            -960,
+            0
+          ],
+          "maxPos": [
+            540,
+            960,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "5579eb6b-e5c3-4e78-a183-6fdbeb3e5d3f@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "5579eb6b-e5c3-4e78-a183-6fdbeb3e5d3f@f9941"
+  }
+}

+ 152 - 152
assets/scene/game.scene

@@ -178,7 +178,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 960.0000000000001,
+    "_orthoHeight": 960,
     "_near": 0,
     "_far": 1000,
     "_color": {
@@ -347,7 +347,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -651,7 +651,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1164,7 +1164,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2013,7 +2013,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4190,7 +4190,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4251,7 +4251,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -540,
-      "y": -959.9999999999999,
+      "y": -960,
       "z": 0
     },
     "_lrot": {
@@ -4290,7 +4290,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5132,7 +5132,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 859.9999999999999,
+      "y": 860,
       "z": 0
     },
     "_lrot": {
@@ -9067,7 +9067,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -9273,7 +9273,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -540,
-      "y": -959.9999999999999,
+      "y": -960,
       "z": 0
     },
     "_lrot": {
@@ -9312,7 +9312,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -12770,6 +12770,9 @@
     "_children": [
       {
         "__id__": 360
+      },
+      {
+        "__id__": 364
       }
     ],
     "_active": false,
@@ -12825,94 +12828,30 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "bg",
+    "_name": "win_share",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 359
     },
-    "_children": [
-      {
-        "__id__": 361
-      },
-      {
-        "__id__": 365
-      },
-      {
-        "__id__": 369
-      },
-      {
-        "__id__": 373
-      },
-      {
-        "__id__": 376
-      }
-    ],
+    "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 379
+        "__id__": 361
       },
-      {
-        "__id__": 380
-      }
-    ],
-    "_prefab": null,
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": "1fT+7amMVBqrLg+WZ1ZCAe"
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "img_close",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 360
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
       {
         "__id__": 362
       },
       {
         "__id__": 363
-      },
-      {
-        "__id__": 364
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 385.456,
-      "y": 352.631,
+      "x": 332.736,
+      "y": -352.45399999999995,
       "z": 0
     },
     "_lrot": {
@@ -12936,7 +12875,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "137vvOHrhB2oiWMjFvblXL"
+    "_id": "9dV9LvBLtBDp20QhiZEms9"
   },
   {
     "__type__": "cc.UITransform",
@@ -12944,21 +12883,21 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 361
+      "__id__": 360
     },
     "_enabled": true,
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 160,
-      "height": 187
+      "width": 124,
+      "height": 248
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "b0kRejxQVGf61/ds6AQnWY"
+    "_id": "caKTTq+GBL/oKxQ052X5va"
   },
   {
     "__type__": "cc.Sprite",
@@ -12966,7 +12905,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 361
+      "__id__": 360
     },
     "_enabled": true,
     "__prefab": null,
@@ -12981,7 +12920,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f638ecc7-7f39-4e37-b9ed-65488e2022c4@f9941",
+      "__uuid__": "93abb769-968e-4995-8709-0fbd69d8e3e0@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -12997,7 +12936,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "a4WA3pLvpM+J/84z7dkb07"
+    "_id": "a4md+5copJJ7Y9tmQyu0W4"
   },
   {
     "__type__": "cc.Button",
@@ -13005,7 +12944,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 361
+      "__id__": 360
     },
     "_enabled": true,
     "__prefab": null,
@@ -13047,15 +12986,76 @@
     "_duration": 0.1,
     "_zoomScale": 0.9,
     "_target": null,
-    "_id": "b6Ierrc9NDs5zlqFZCI4kU"
+    "_id": "bbfaVtshJNirpiH89jSYSK"
   },
   {
     "__type__": "cc.Node",
-    "_name": "win_share",
+    "_name": "bg",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 360
+      "__id__": 359
+    },
+    "_children": [
+      {
+        "__id__": 365
+      },
+      {
+        "__id__": 369
+      },
+      {
+        "__id__": 373
+      },
+      {
+        "__id__": 376
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 379
+      },
+      {
+        "__id__": 380
+      }
+    ],
+    "_prefab": null,
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": "1fT+7amMVBqrLg+WZ1ZCAe"
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "img_close",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 364
     },
     "_children": [],
     "_active": true,
@@ -13073,8 +13073,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 332.736,
-      "y": -390.454,
+      "x": 385.456,
+      "y": 352.631,
       "z": 0
     },
     "_lrot": {
@@ -13098,7 +13098,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "9dV9LvBLtBDp20QhiZEms9"
+    "_id": "137vvOHrhB2oiWMjFvblXL"
   },
   {
     "__type__": "cc.UITransform",
@@ -13112,15 +13112,15 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 124,
-      "height": 248
+      "width": 160,
+      "height": 187
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "caKTTq+GBL/oKxQ052X5va"
+    "_id": "b0kRejxQVGf61/ds6AQnWY"
   },
   {
     "__type__": "cc.Sprite",
@@ -13143,7 +13143,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "93abb769-968e-4995-8709-0fbd69d8e3e0@f9941",
+      "__uuid__": "f638ecc7-7f39-4e37-b9ed-65488e2022c4@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -13159,7 +13159,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "a4md+5copJJ7Y9tmQyu0W4"
+    "_id": "a4WA3pLvpM+J/84z7dkb07"
   },
   {
     "__type__": "cc.Button",
@@ -13209,7 +13209,7 @@
     "_duration": 0.1,
     "_zoomScale": 0.9,
     "_target": null,
-    "_id": "bbfaVtshJNirpiH89jSYSK"
+    "_id": "b6Ierrc9NDs5zlqFZCI4kU"
   },
   {
     "__type__": "cc.Node",
@@ -13217,7 +13217,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 360
+      "__id__": 364
     },
     "_children": [],
     "_active": false,
@@ -13379,7 +13379,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 360
+      "__id__": 364
     },
     "_children": [],
     "_active": false,
@@ -13485,7 +13485,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 360
+      "__id__": 364
     },
     "_children": [],
     "_active": true,
@@ -13594,7 +13594,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 360
+      "__id__": 364
     },
     "_enabled": true,
     "__prefab": null,
@@ -13616,7 +13616,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 360
+      "__id__": 364
     },
     "_enabled": true,
     "__prefab": null,
@@ -13692,7 +13692,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "21091907-4c46-45c5-9277-985e1c59a2d0@f9941",
+      "__uuid__": "5579eb6b-e5c3-4e78-a183-6fdbeb3e5d3f@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -13751,10 +13751,10 @@
     "_enabled": true,
     "__prefab": null,
     "btn_close": {
-      "__id__": 361
+      "__id__": 365
     },
     "btn_share": {
-      "__id__": 365
+      "__id__": 360
     },
     "btn_next": {
       "__id__": 369
@@ -14104,8 +14104,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 231.45,
-      "y": 127.394,
+      "x": 283.45,
+      "y": 171.394,
       "z": 0
     },
     "_lrot": {
@@ -14738,39 +14738,6 @@
     "_lockFlags": 0,
     "_id": "adXcbGVTBLmbsg5+yU4JDR"
   },
-  {
-    "__type__": "cc.BlockInputEvents",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 387
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_id": "d7CatWp85Keq2flYI9NRqL"
-  },
-  {
-    "__type__": "5085ecER0VE+6RxyGStyx3Z",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 387
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "btn_close": {
-      "__id__": 389
-    },
-    "btn_fail_reLife": {
-      "__id__": 397
-    },
-    "btn_fail_reStart": {
-      "__id__": 401
-    },
-    "_id": "bdOKN/AVlLlrrHq9UsL55p"
-  },
   {
     "__type__": "cc.Sprite",
     "_name": "",
@@ -14792,7 +14759,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "21091907-4c46-45c5-9277-985e1c59a2d0@f9941",
+      "__uuid__": "5579eb6b-e5c3-4e78-a183-6fdbeb3e5d3f@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -14810,6 +14777,39 @@
     "_atlas": null,
     "_id": "90hVHOs0NKjImpRaVbqQ+d"
   },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 387
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_id": "d7CatWp85Keq2flYI9NRqL"
+  },
+  {
+    "__type__": "5085ecER0VE+6RxyGStyx3Z",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 387
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "btn_close": {
+      "__id__": 389
+    },
+    "btn_fail_reLife": {
+      "__id__": 397
+    },
+    "btn_fail_reStart": {
+      "__id__": 401
+    },
+    "_id": "bdOKN/AVlLlrrHq9UsL55p"
+  },
   {
     "__type__": "cc.Animation",
     "_name": "",
@@ -14846,7 +14846,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24283,7 +24283,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24376,7 +24376,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24545,7 +24545,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24597,7 +24597,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24718,7 +24718,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 6 - 16
assets/script/run/game_list_view/game_list.ts

@@ -122,6 +122,11 @@ export class game_list extends Component {
 
     touchContentMove(et:EventTouch) {
         this.onTouchActive = false
+        if( Math.abs(this.start_pos.x-et.getUILocation().x)<30){
+            this.start_pos = et.getUILocation()
+            this.onTouchActive = true
+            return
+        }
         let p = new Vec3(et.getUILocation().x,et.getUILocation().y)
         let n_p = this.content.parent.getComponent(UITransform).convertToNodeSpaceAR(p)
         let pos = this.content.parent.getComponent(UITransform).convertToWorldSpaceAR(this.content.position)
@@ -129,29 +134,14 @@ export class game_list extends Component {
             this.x_len = (et.getUILocation().x - pos.x)*1;
         }
         let content_position_x = n_p.x-this.x_len
-        // console.log('content_position_x=',content_position_x)
         let select_page = gameManager.getStaticUserData().select_page
         if(select_page==1 && content_position_x > this.content_original_pos.x - 50) {
             return
         }
         if(select_page==this.getAllPage() && content_position_x < this.content_original_pos.x + 50) {
-            return
+           return
         }
         this.content.position = new Vec3(content_position_x,this.content.position.y);
-
-        // this.onTouchActive = false
-        // if( Math.abs(this.start_pos.x-et.getUILocation().x)<30){
-        //     this.start_pos = et.getUILocation()
-        //     this.onTouchActive = true
-        //     return
-        // }
-        // let p = new Vec3(et.getUILocation().x,et.getUILocation().y)
-        // let n_p = this.content.parent.getComponent(UITransform).convertToNodeSpaceAR(p)
-        // let pos = this.content.parent.getComponent(UITransform).convertToWorldSpaceAR(this.content.position)
-        // if(this.x_len==0){
-        //     this.x_len = (et.getUILocation().x - pos.x)*1;
-        // }
-        // this.content.position = new Vec3(n_p.x-this.x_len ,this.content.position.y);
     }
 
     touchContentScroll() {