future 1 rok temu
rodzic
commit
b86a5f66d0

+ 6 - 6
assets/run/ani/clock_ani.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.2,
-    "wrapMode": 2,
+    "speed": 0.5,
+    "wrapMode": 22,
     "enableTrsBlending": false,
-    "_duration": 0.18333333333333332,
+    "_duration": 0.35,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -69,15 +69,15 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.16666666666666666
+      0.3333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "94502ddd-0b27-472a-b338-4bcfa7e7735b@f9941",
+        "__uuid__": "7c3d4ecb-b7f1-4536-953c-95828547b280@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "8944a2ad-36a9-47d0-bf55-1378eb7cd3ee@f9941",
+        "__uuid__": "11d340e6-fe85-4cff-815e-bfd2e996de78@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

BIN
assets/run/img_boss_tips.png


+ 31 - 31
assets/run/img_boss_tips.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -1,
-        "offsetY": -0.5,
+        "offsetX": 0,
+        "offsetY": 0,
         "trimX": 0,
-        "trimY": 21,
-        "width": 208,
-        "height": 88,
-        "rawWidth": 210,
-        "rawHeight": 129,
+        "trimY": 0,
+        "width": 215,
+        "height": 91,
+        "rawWidth": 215,
+        "rawHeight": 91,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -104,
-            -44,
+            -107.5,
+            -45.5,
             0,
-            104,
-            -44,
+            107.5,
+            -45.5,
             0,
-            -104,
-            44,
+            -107.5,
+            45.5,
             0,
-            104,
-            44,
+            107.5,
+            45.5,
             0
           ],
           "indexes": [
@@ -84,32 +84,32 @@
           ],
           "uv": [
             0,
-            108,
-            208,
-            108,
+            91,
+            215,
+            91,
             0,
-            20,
-            208,
-            20
+            0,
+            215,
+            0
           ],
           "nuv": [
             0,
-            0.15503875968992248,
-            0.9904761904761905,
-            0.15503875968992248,
             0,
-            0.8372093023255814,
-            0.9904761904761905,
-            0.8372093023255814
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
-            -104,
-            -44,
+            -107.5,
+            -45.5,
             0
           ],
           "maxPos": [
-            104,
-            44,
+            107.5,
+            45.5,
             0
           ]
         },

BIN
assets/run/login/img_clock.png


+ 8 - 8
assets/run/login/login_clock_1.png.meta → assets/run/login/img_clock.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "94502ddd-0b27-472a-b338-4bcfa7e7735b",
+  "uuid": "7c3d4ecb-b7f1-4536-953c-95828547b280",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "94502ddd-0b27-472a-b338-4bcfa7e7735b@6c48a",
-      "displayName": "login_clock_1",
+      "uuid": "7c3d4ecb-b7f1-4536-953c-95828547b280@6c48a",
+      "displayName": "img_clock",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "94502ddd-0b27-472a-b338-4bcfa7e7735b",
+        "imageUuidOrDatabaseUri": "7c3d4ecb-b7f1-4536-953c-95828547b280",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "94502ddd-0b27-472a-b338-4bcfa7e7735b@f9941",
-      "displayName": "login_clock_1",
+      "uuid": "7c3d4ecb-b7f1-4536-953c-95828547b280@f9941",
+      "displayName": "img_clock",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "94502ddd-0b27-472a-b338-4bcfa7e7735b@6c48a",
+        "imageUuidOrDatabaseUri": "7c3d4ecb-b7f1-4536-953c-95828547b280@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "94502ddd-0b27-472a-b338-4bcfa7e7735b@f9941"
+    "redirect": "7c3d4ecb-b7f1-4536-953c-95828547b280@f9941"
   }
 }

BIN
assets/run/login/img_clock_glow.png


+ 8 - 8
assets/run/login/login_clock_0.png.meta → assets/run/login/img_clock_glow.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "8944a2ad-36a9-47d0-bf55-1378eb7cd3ee",
+  "uuid": "11d340e6-fe85-4cff-815e-bfd2e996de78",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "8944a2ad-36a9-47d0-bf55-1378eb7cd3ee@6c48a",
-      "displayName": "login_clock_0",
+      "uuid": "11d340e6-fe85-4cff-815e-bfd2e996de78@6c48a",
+      "displayName": "img_clock_glow",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "8944a2ad-36a9-47d0-bf55-1378eb7cd3ee",
+        "imageUuidOrDatabaseUri": "11d340e6-fe85-4cff-815e-bfd2e996de78",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "8944a2ad-36a9-47d0-bf55-1378eb7cd3ee@f9941",
-      "displayName": "login_clock_0",
+      "uuid": "11d340e6-fe85-4cff-815e-bfd2e996de78@f9941",
+      "displayName": "img_clock_glow",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "8944a2ad-36a9-47d0-bf55-1378eb7cd3ee@6c48a",
+        "imageUuidOrDatabaseUri": "11d340e6-fe85-4cff-815e-bfd2e996de78@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "8944a2ad-36a9-47d0-bf55-1378eb7cd3ee@f9941"
+    "redirect": "11d340e6-fe85-4cff-815e-bfd2e996de78@f9941"
   }
 }

BIN
assets/run/login/login_clock_0.png


BIN
assets/run/login/login_clock_1.png


Plik diff jest za duży
+ 153 - 138
assets/scene/game.scene


+ 4 - 2
assets/script/run/game_run.ts

@@ -103,10 +103,12 @@ export class game_run extends Component {
     }
 
     public showLogin(){
-        this.login_view.active = true;
+        // this.login_view.active = true;
+        this.login_view.getComponent(login_view).show()
         this.login_view.getComponent(login_view).initView(()=>{
             this.showGameList(()=>{ //加载完成关闭登录界面
-                this.login_view.active = false;
+                // this.login_view.active = false;
+                this.login_view.getComponent(login_view).hide()
             })
         })
     }

+ 14 - 0
assets/script/run/login_view/clock.ts

@@ -0,0 +1,14 @@
+import { _decorator, Component, Node } from 'cc';
+const { ccclass, property } = _decorator;
+
+@ccclass('clock')
+export class clock extends Component {
+    start() {
+
+    }
+
+    update(deltaTime: number) {
+        
+    }
+}
+

+ 9 - 0
assets/script/run/login_view/clock.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "0a3d9d08-0c2c-4bb9-bcf2-6a174095478a",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 11 - 0
assets/script/run/login_view/login_view.ts

@@ -14,6 +14,7 @@ export class login_view extends Component {
     @property(Node) yinyue:Node = null;
     @property(Node) yinxiao:Node = null;
     @property(Node) peiyin:Node = null;
+    @property(Node) clock:Node = null;
     @property(Node) btn_clear_data:Node = null;
     @property(Node) btn_check_debug:Node = null;
     @property(Node) lab_check_debug:Node = null;
@@ -52,6 +53,16 @@ export class login_view extends Component {
         this.peiyin.getComponent(peiyin).initView()
     }
 
+    public show() {
+        this.node.active = true
+        this.clock.getComponent(Animation).play()
+    }
+
+    public hide() {
+        this.node.active = false
+        this.clock.getComponent(Animation).stop()
+    }
+
     public checkSidebar() {
         let userUnlockLevesData = gameManager.getUserUnlockLevesData()
         if(SdkUtil.ttCheckSceneShowRewards()==false || userUnlockLevesData.status==1) {

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików