future 1 year ago
parent
commit
1bfa0689ff

BIN
assets/run/login/img_book_shadow.png


+ 10 - 10
assets/run/login/img_book_shadow.png.meta

@@ -46,9 +46,9 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 664,
+        "width": 618,
         "height": 740,
-        "rawWidth": 664,
+        "rawWidth": 618,
         "rawHeight": 740,
         "borderTop": 0,
         "borderBottom": 0,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -332,
+            -309,
             -370,
             0,
-            332,
+            309,
             -370,
             0,
-            -332,
+            -309,
             370,
             0,
-            332,
+            309,
             370,
             0
           ],
@@ -85,11 +85,11 @@
           "uv": [
             0,
             740,
-            664,
+            618,
             740,
             0,
             0,
-            664,
+            618,
             0
           ],
           "nuv": [
@@ -103,12 +103,12 @@
             1
           ],
           "minPos": [
-            -332,
+            -309,
             -370,
             0
           ],
           "maxPos": [
-            332,
+            309,
             370,
             0
           ]

BIN
assets/run/login/img_clock_bg.png


+ 18 - 18
assets/run/login/img_clock_bg.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "20927dba-8a5f-4a08-ad1c-4cfa42a89d87",
+  "uuid": "d3acd020-58ad-4486-a3b5-71c8463a1589",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "20927dba-8a5f-4a08-ad1c-4cfa42a89d87@6c48a",
+      "uuid": "d3acd020-58ad-4486-a3b5-71c8463a1589@6c48a",
       "displayName": "img_clock_bg",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "20927dba-8a5f-4a08-ad1c-4cfa42a89d87",
+        "imageUuidOrDatabaseUri": "d3acd020-58ad-4486-a3b5-71c8463a1589",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "20927dba-8a5f-4a08-ad1c-4cfa42a89d87@f9941",
+      "uuid": "d3acd020-58ad-4486-a3b5-71c8463a1589@f9941",
       "displayName": "img_clock_bg",
       "id": "f9941",
       "name": "spriteFrame",
@@ -43,11 +43,11 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0.5,
+        "offsetY": 1,
         "trimX": 0,
         "trimY": 0,
         "width": 1080,
-        "height": 678,
+        "height": 677,
         "rawWidth": 1080,
         "rawHeight": 679,
         "borderTop": 0,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -540,
-            -339,
+            -338.5,
             0,
             540,
-            -339,
+            -338.5,
             0,
             -540,
-            339,
+            338.5,
             0,
             540,
-            339,
+            338.5,
             0
           ],
           "indexes": [
@@ -88,15 +88,15 @@
             1080,
             679,
             0,
-            1,
+            2,
             1080,
-            1
+            2
           ],
           "nuv": [
             0,
-            0.0014727540500736377,
+            0.0029455081001472753,
             1,
-            0.0014727540500736377,
+            0.0029455081001472753,
             0,
             1,
             1,
@@ -104,17 +104,17 @@
           ],
           "minPos": [
             -540,
-            -339,
+            -338.5,
             0
           ],
           "maxPos": [
             540,
-            339,
+            338.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "20927dba-8a5f-4a08-ad1c-4cfa42a89d87@6c48a",
+        "imageUuidOrDatabaseUri": "d3acd020-58ad-4486-a3b5-71c8463a1589@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "20927dba-8a5f-4a08-ad1c-4cfa42a89d87@f9941"
+    "redirect": "d3acd020-58ad-4486-a3b5-71c8463a1589@f9941"
   }
 }

BIN
assets/run/login/login_bg.png


File diff suppressed because it is too large
+ 150 - 183
assets/scene/game.scene


+ 21 - 1
assets/script/run/game_list_view/game_list.ts

@@ -105,6 +105,10 @@ export class game_list extends Component {
             this.start_pos = et.getUILocation()
         })
         this.content.on(Node.EventType.TOUCH_MOVE,(et:EventTouch)=>{
+            // console.log('select_page=',gameManager.getStaticUserData().select_page)
+            // if(gameManager.getStaticUserData().select_page ==1) {
+            //     return
+            // }
             this.onTouchActive = false
             if( Math.abs(this.start_pos.x-et.getUILocation().x)<30){
                 this.start_pos = et.getUILocation()
@@ -117,7 +121,22 @@ export class game_list extends Component {
             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);
+            let content_position_x = n_p.x-this.x_len
+            console.log('content_position_x=',content_position_x)
+            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);
         })
         this.content.on(Node.EventType.TOUCH_END,()=>{
             this.x_len = 0
@@ -134,6 +153,7 @@ export class game_list extends Component {
     touchContentScroll() {
         this.onTouchActive = true
         if(this.content.position.x==this.content_original_pos.x) {
+            console.log('touchContentScroll touchContentScroll')
             return
         }
         if(this.content.position.x < 0) { // 向左滑动

Some files were not shown because too many files changed in this diff