future пре 1 година
родитељ
комит
95981f3a46

+ 8 - 8
assets/scene/game.scene

@@ -14915,7 +14915,7 @@
         "__id__": 435
         "__id__": 435
       }
       }
     ],
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
     "_components": [
       {
       {
         "__id__": 440
         "__id__": 440
@@ -14937,7 +14937,7 @@
     "_lpos": {
     "_lpos": {
       "__type__": "cc.Vec3",
       "__type__": "cc.Vec3",
       "x": 0,
       "x": 0,
-      "y": 960.0000000000001,
+      "y": 960,
       "z": 0
       "z": 0
     },
     },
     "_lrot": {
     "_lrot": {
@@ -14988,7 +14988,7 @@
     "_lpos": {
     "_lpos": {
       "__type__": "cc.Vec3",
       "__type__": "cc.Vec3",
       "x": 0,
       "x": 0,
-      "y": -960.0000000000001,
+      "y": -960,
       "z": 0
       "z": 0
     },
     },
     "_lrot": {
     "_lrot": {
@@ -15027,7 +15027,7 @@
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
       "width": 1080,
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -15781,7 +15781,7 @@
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
       "width": 1080,
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -15927,7 +15927,7 @@
         "__id__": 511
         "__id__": 511
       }
       }
     ],
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 516
         "__id__": 516
@@ -17603,7 +17603,7 @@
     "_lpos": {
     "_lpos": {
       "__type__": "cc.Vec3",
       "__type__": "cc.Vec3",
       "x": 0,
       "x": 0,
-      "y": -630,
+      "y": -670,
       "z": 0
       "z": 0
     },
     },
     "_lrot": {
     "_lrot": {
@@ -17755,7 +17755,7 @@
     "_left": 0,
     "_left": 0,
     "_right": 0,
     "_right": 0,
     "_top": 0,
     "_top": 0,
-    "_bottom": 280,
+    "_bottom": 240,
     "_horizontalCenter": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
     "_isAbsLeft": true,

+ 5 - 5
assets/script/run/game_list_view/game_list.ts

@@ -114,21 +114,21 @@ export class game_list extends Component {
             let n_p = this.content.parent.getComponent(UITransform).convertToNodeSpaceAR(p)
             let n_p = this.content.parent.getComponent(UITransform).convertToNodeSpaceAR(p)
             let pos = this.content.parent.getComponent(UITransform).convertToWorldSpaceAR(this.content.position)
             let pos = this.content.parent.getComponent(UITransform).convertToWorldSpaceAR(this.content.position)
             if(this.x_len==0){
             if(this.x_len==0){
-                this.x_len = (et.getUILocation().x - pos.x)*2;
+                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.position = new Vec3(n_p.x-this.x_len ,this.content.position.y);
         })
         })
         this.content.on(Node.EventType.TOUCH_END,()=>{
         this.content.on(Node.EventType.TOUCH_END,()=>{
-            if(this.onClickItem) { return }
             this.x_len = 0
             this.x_len = 0
+            if(this.onClickItem) { return }
             this.touchContentScroll()
             this.touchContentScroll()
-            this.content.position = new Vec3(0,this.content.position.y)
+            this.content.position = new Vec3(-19,this.content.position.y)
         })
         })
         this.content.on(Node.EventType.TOUCH_CANCEL,()=>{
         this.content.on(Node.EventType.TOUCH_CANCEL,()=>{
-            if(this.onClickItem) { return }
             this.x_len = 0
             this.x_len = 0
+            if(this.onClickItem) { return }
             this.touchContentScroll()
             this.touchContentScroll()
-            this.content.position = new Vec3(0,this.content.position.y)
+            this.content.position = new Vec3(-19,this.content.position.y)
         })
         })
     }
     }
 
 

+ 7 - 1
assets/script/run/login_view/login_view.ts

@@ -56,11 +56,17 @@ export class login_view extends Component {
     public show() {
     public show() {
         this.node.active = true
         this.node.active = true
         this.clock.getComponent(Animation).play()
         this.clock.getComponent(Animation).play()
+        if(this.btn_sidebar_box.active) {
+            this.btn_sidebar_box.getComponent(Animation).play()
+        }
     }
     }
 
 
     public hide() {
     public hide() {
         this.node.active = false
         this.node.active = false
         this.clock.getComponent(Animation).stop()
         this.clock.getComponent(Animation).stop()
+        if(this.btn_sidebar_box.active) {
+            this.btn_sidebar_box.getComponent(Animation).stop()
+        }
     }
     }
 
 
     public checkSidebar() {
     public checkSidebar() {
@@ -82,7 +88,7 @@ export class login_view extends Component {
                     node.getComponent(sidebar_page).show(isToEnterFromSidebar, (view:sidebar_page)=> {
                     node.getComponent(sidebar_page).show(isToEnterFromSidebar, (view:sidebar_page)=> {
                         gameManager.request_user_unlock_number_status(config.User_unlock_levels_number_status.RECEIVE,(data)=> {                        
                         gameManager.request_user_unlock_number_status(config.User_unlock_levels_number_status.RECEIVE,(data)=> {                        
                             view.close()
                             view.close()
-                            // this.btn_sidebar_box.getComponent(Animation).stop()
+                            this.btn_sidebar_box.getComponent(Animation).stop()
                             this.btn_sidebar_box.active = false
                             this.btn_sidebar_box.active = false
                         },null)
                         },null)
                     })
                     })