future 1 éve
szülő
commit
cb9ce0e619

+ 8 - 8
assets/run/ani/fangdajing.anim

@@ -77,14 +77,14 @@
       0.25,
       0.75,
       1,
-      1.3
+      1.2999999523162842
     ],
     "_values": [
       {
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 46.628,
+        "value": 46.62799835205078,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -96,7 +96,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 178.486,
+        "value": 178.48599243164062,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -134,7 +134,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 46.628,
+        "value": 46.62799835205078,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -161,7 +161,7 @@
       0.25,
       0.75,
       1,
-      1.3
+      1.2999999523162842
     ],
     "_values": [
       {
@@ -180,7 +180,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": -52.128,
+        "value": -52.12799835205078,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -218,7 +218,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": -160.478,
+        "value": -160.47799682617188,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -245,7 +245,7 @@
       0.25,
       0.75,
       1,
-      1.3
+      1.2999999523162842
     ],
     "_values": [
       {

BIN
assets/run/levle_loading_img.png


+ 28 - 28
assets/run/levle_loading_img.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -2,
+        "offsetX": 0,
         "offsetY": 0,
-        "trimX": 2,
+        "trimX": 0,
         "trimY": 0,
-        "width": 163,
-        "height": 168,
-        "rawWidth": 171,
-        "rawHeight": 168,
+        "width": 602,
+        "height": 649,
+        "rawWidth": 602,
+        "rawHeight": 649,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -81.5,
-            -84,
+            -301,
+            -324.5,
             0,
-            81.5,
-            -84,
+            301,
+            -324.5,
             0,
-            -81.5,
-            84,
+            -301,
+            324.5,
             0,
-            81.5,
-            84,
+            301,
+            324.5,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            2,
-            168,
-            165,
-            168,
-            2,
             0,
-            165,
+            649,
+            602,
+            649,
+            0,
+            0,
+            602,
             0
           ],
           "nuv": [
-            0.011695906432748537,
             0,
-            0.9649122807017544,
             0,
-            0.011695906432748537,
             1,
-            0.9649122807017544,
+            0,
+            0,
+            1,
+            1,
             1
           ],
           "minPos": [
-            -81.5,
-            -84,
+            -301,
+            -324.5,
             0
           ],
           "maxPos": [
-            81.5,
-            84,
+            301,
+            324.5,
             0
           ]
         },

BIN
assets/run/loading_0.png


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "8812c234-a828-405e-b9ca-d81c69a1ed6f",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "8812c234-a828-405e-b9ca-d81c69a1ed6f@6c48a",
-      "displayName": "loading_0",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "8812c234-a828-405e-b9ca-d81c69a1ed6f",
-        "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": "8812c234-a828-405e-b9ca-d81c69a1ed6f@f9941",
-      "displayName": "loading_0",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 540,
-        "height": 960,
-        "rawWidth": 540,
-        "rawHeight": 960,
-        "borderTop": 0,
-        "borderBottom": 271.7,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -270,
-            -480,
-            0,
-            270,
-            -480,
-            0,
-            -270,
-            480,
-            0,
-            270,
-            480,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            960,
-            540,
-            960,
-            0,
-            0,
-            540,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -270,
-            -480,
-            0
-          ],
-          "maxPos": [
-            270,
-            480,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "8812c234-a828-405e-b9ca-d81c69a1ed6f@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "8812c234-a828-405e-b9ca-d81c69a1ed6f@f9941"
-  }
-}

BIN
assets/run/loading_0_img.png


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "4ab81ca7-77e8-47c3-b881-346cfaf7dfa9",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "4ab81ca7-77e8-47c3-b881-346cfaf7dfa9@6c48a",
-      "displayName": "loading_0_img",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "4ab81ca7-77e8-47c3-b881-346cfaf7dfa9",
-        "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": "4ab81ca7-77e8-47c3-b881-346cfaf7dfa9@f9941",
-      "displayName": "loading_0_img",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": -3.5,
-        "offsetY": 0,
-        "trimX": 1,
-        "trimY": 0,
-        "width": 162,
-        "height": 168,
-        "rawWidth": 171,
-        "rawHeight": 168,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -81,
-            -84,
-            0,
-            81,
-            -84,
-            0,
-            -81,
-            84,
-            0,
-            81,
-            84,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            1,
-            168,
-            163,
-            168,
-            1,
-            0,
-            163,
-            0
-          ],
-          "nuv": [
-            0.005847953216374269,
-            0,
-            0.9532163742690059,
-            0,
-            0.005847953216374269,
-            1,
-            0.9532163742690059,
-            1
-          ],
-          "minPos": [
-            -81,
-            -84,
-            0
-          ],
-          "maxPos": [
-            81,
-            84,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ab81ca7-77e8-47c3-b881-346cfaf7dfa9@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "4ab81ca7-77e8-47c3-b881-346cfaf7dfa9@f9941"
-  }
-}

BIN
assets/run/login/img_text_bi.png


+ 0 - 134
assets/run/login/img_text_bi.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "85527698-e333-4879-bf0c-41e6ef12a80f",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "85527698-e333-4879-bf0c-41e6ef12a80f@6c48a",
-      "displayName": "img_text_bi",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "85527698-e333-4879-bf0c-41e6ef12a80f",
-        "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": "85527698-e333-4879-bf0c-41e6ef12a80f@f9941",
-      "displayName": "img_text_bi",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0.5,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 221,
-        "height": 216,
-        "rawWidth": 221,
-        "rawHeight": 217,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -110.5,
-            -108,
-            0,
-            110.5,
-            -108,
-            0,
-            -110.5,
-            108,
-            0,
-            110.5,
-            108,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            217,
-            221,
-            217,
-            0,
-            1,
-            221,
-            1
-          ],
-          "nuv": [
-            0,
-            0.004608294930875576,
-            1,
-            0.004608294930875576,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -110.5,
-            -108,
-            0
-          ],
-          "maxPos": [
-            110.5,
-            108,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "85527698-e333-4879-bf0c-41e6ef12a80f@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "85527698-e333-4879-bf0c-41e6ef12a80f@f9941"
-  }
-}

BIN
assets/run/login/img_text_ji.png


+ 0 - 134
assets/run/login/img_text_ji.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "ca1a6dbe-90a3-4286-9a8e-76a373495665",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "ca1a6dbe-90a3-4286-9a8e-76a373495665@6c48a",
-      "displayName": "img_text_ji",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ca1a6dbe-90a3-4286-9a8e-76a373495665",
-        "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": "ca1a6dbe-90a3-4286-9a8e-76a373495665@f9941",
-      "displayName": "img_text_ji",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 224,
-        "height": 229,
-        "rawWidth": 224,
-        "rawHeight": 229,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -112,
-            -114.5,
-            0,
-            112,
-            -114.5,
-            0,
-            -112,
-            114.5,
-            0,
-            112,
-            114.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            229,
-            224,
-            229,
-            0,
-            0,
-            224,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -112,
-            -114.5,
-            0
-          ],
-          "maxPos": [
-            112,
-            114.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "ca1a6dbe-90a3-4286-9a8e-76a373495665@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "ca1a6dbe-90a3-4286-9a8e-76a373495665@f9941"
-  }
-}

BIN
assets/run/login/login_img.png


+ 0 - 134
assets/run/login/login_img.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "147e44b9-5e61-40af-a5a7-55f301bb7497",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "147e44b9-5e61-40af-a5a7-55f301bb7497@6c48a",
-      "displayName": "login_img",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "147e44b9-5e61-40af-a5a7-55f301bb7497",
-        "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": "147e44b9-5e61-40af-a5a7-55f301bb7497@f9941",
-      "displayName": "login_img",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": -6.5,
-        "trimX": 0,
-        "trimY": 13,
-        "width": 1030,
-        "height": 1306,
-        "rawWidth": 1030,
-        "rawHeight": 1319,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -515,
-            -653,
-            0,
-            515,
-            -653,
-            0,
-            -515,
-            653,
-            0,
-            515,
-            653,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            1306,
-            1030,
-            1306,
-            0,
-            0,
-            1030,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            0.9901440485216073,
-            1,
-            0.9901440485216073
-          ],
-          "minPos": [
-            -515,
-            -653,
-            0
-          ],
-          "maxPos": [
-            515,
-            653,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "147e44b9-5e61-40af-a5a7-55f301bb7497@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "147e44b9-5e61-40af-a5a7-55f301bb7497@f9941"
-  }
-}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 130 - 1958
assets/scene/game.scene


+ 7 - 2
assets/script/run/game_list_view/game_list.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, EventTouch, instantiate, JsonAsset, Label, Layout, Node, Prefab, Sprite, sys, UITransform, Vec2, Vec3 } from 'cc';
+import { _decorator, Component, EventTouch, instantiate, JsonAsset, Label, Layout, Node, Prefab, ScrollView, Sprite, sys, UITransform, Vec2, Vec3 } from 'cc';
 import { http } from '../../http';
 import { gameManager } from '../gameManager';
 import { LevelInfoMessage, LevelItemData, LevelMessage, scene_item_data } from '../../../data/data';
@@ -22,6 +22,7 @@ export class game_list extends Component {
     private m_data:LevelMessage = null;
     private x_len:number = 0;
     private onTouchActive:boolean = true;
+    private onClickItem:boolean = false;
     private start_pos:Vec2 = Vec2.ZERO;
     private page_limit_count:number = 6
     
@@ -117,11 +118,13 @@ export class game_list extends Component {
             this.content.position = new Vec3(n_p.x-this.x_len ,this.content.position.y);
         })
         this.content.on(Node.EventType.TOUCH_END,()=>{
+            if(this.onClickItem) { return }
             this.x_len = 0
             this.touchContentScroll()
             this.content.position = new Vec3(0,this.content.position.y)
         })
         this.content.on(Node.EventType.TOUCH_CANCEL,()=>{
+            if(this.onClickItem) { return }
             this.x_len = 0
             this.touchContentScroll()
             this.content.position = new Vec3(0,this.content.position.y)
@@ -180,7 +183,7 @@ export class game_list extends Component {
     }
 
     onItemClick(item:level_list_item){
-        if(!this.onTouchActive){
+        if(this.onTouchActive==false){
             return
         }
         gameManager.Singleton.sys_click_button_music()
@@ -229,7 +232,9 @@ export class game_list extends Component {
         let call = ()=>{
             let url = http.get_level_info(item.getData().id)
             gameManager.Singleton.showLoadingLevel()
+            this.onClickItem = true
             http.run_get_static(url,(err,data)=>{
+                this.onClickItem = false
                 if(!err){
                     let _data:LevelInfoMessage = JSON.parse(data)
                     if(_data.code===config.MSG_CODE.SUCCESS){

+ 3 - 1
assets/script/run/game_run.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Node, sys, Tween } from 'cc';
+import { _decorator, Component, Node, sys, Tween, Animation } from 'cc';
 import { gameManager } from './gameManager';
 import { scene_item_data, task_data, widget_item_data } from '../../data/data';
 import { scene_layer } from './scene_layer';
@@ -188,10 +188,12 @@ export class game_run extends Component {
 
     public showLoadingLevel(){
         this.loading_level.active = true;
+        this.loading_level.getComponent(Animation).play()
     }
 
     public hideLoadingLevel(){
         this.loading_level.active = false;
+        this.loading_level.getComponent(Animation).stop()
     }
 
     public loadTopLayer(){

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott