future há 1 ano atrás
pai
commit
bba64734b8

+ 4 - 4
assets/scene/game.scene

@@ -5918,7 +5918,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -540,
-      "y": -960,
+      "y": -960.0000000000001,
       "z": 0
     },
     "_lrot": {
@@ -5970,7 +5970,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 540,
-      "y": 960,
+      "y": 960.0000000000001,
       "z": 0
     },
     "_lrot": {
@@ -6299,7 +6299,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6351,7 +6351,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

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

@@ -1,4 +1,4 @@
-import { _decorator, Component, Node, Tween } from 'cc';
+import { _decorator, Component, Node, sys, Tween } from 'cc';
 import { gameManager } from './gameManager';
 import { scene_item_data, task_data, widget_item_data } from '../../data/data';
 import { scene_layer } from './scene_layer';
@@ -63,6 +63,16 @@ export class game_run extends Component {
         this.login_view.active = false;
         this.game_list.active = false;
         this.mGameManger.initGR(this)
+
+        if(sys.platform==sys.Platform.MOBILE_BROWSER) {
+            this.game_health_view.active = false
+            this.showLoading()
+        } else {
+            this.showHealthView()
+        }
+    }
+
+    public showHealthView() {
         this.game_health_view.getComponent(game_health_view).startShow(()=> {
             this.game_health_view.active = false;
             this.showLoading()

+ 14 - 14
assets/script/run/loading_view/loading_view.ts

@@ -91,25 +91,25 @@ export class loading_view extends Component {
                                         }
                                        
                                     })
-                                }
-                                ,fail(res) {
+                                },
+                                fail(res) {
                                     console.log(`login 调用失败`);
                                 }
                             });
                         }
                         else if(sys.platform==sys.Platform.WECHAT_GAME){
-                            console.log('WECHAT_GAME WECHAT_GAME WECHAT_GAME')
-                            user_data.user_id = "微信小游戏123";
-                            formData.openid = user_data.user_id;
-                            login_call_back();
-                            // wx.login({
-                            //     success(res) {
-                            //         console.log('wx_login success:',res)
-                            //     },
-                            //     fali(err) {
-                            //         console.log('wx_login err:',err)
-                            //     }
-                            // })
+                            // console.log('WECHAT_GAME WECHAT_GAME WECHAT_GAME')
+                            // user_data.user_id = "微信小游戏123";
+                            // formData.openid = user_data.user_id;
+                            // login_call_back();
+                            wx.login({
+                                success(res) {
+                                    console.log('wx_login success:',res)
+                                },
+                                fali(err) {
+                                    console.log('wx_login err:',err)
+                                }
+                            })
                         }
                         else{
                             user_data.user_id = "123";

+ 3 - 0
assets/script/run/tips/rule_view.ts

@@ -13,6 +13,7 @@ export class rule_view extends Component {
     private mData :ui_att_item[] = null;
     public initView(rule_list:ui_att_item[]){
         this.mData = rule_list;
+        this.btn_rule_left.off(Node.EventType.TOUCH_END)
         this.btn_rule_left.on(Node.EventType.TOUCH_END,()=>{
             if( (this.m_page-1)<0){
                 
@@ -23,6 +24,7 @@ export class rule_view extends Component {
             this.updateBtnStatus()
             gameManager.Singleton.sys_click_button_music()
         })
+        this.btn_rule_right.off(Node.EventType.TOUCH_END)
         this.btn_rule_right.on(Node.EventType.TOUCH_END,()=>{
             if( (this.m_page+1)>=this.mData.length){
  
@@ -33,6 +35,7 @@ export class rule_view extends Component {
             this.updateBtnStatus()
             gameManager.Singleton.sys_click_button_music()
         })
+        this.btn_rule_close.off(Node.EventType.TOUCH_END)
         this.btn_rule_close.on(Node.EventType.TOUCH_END,()=>{
             this.close()
             gameManager.Singleton.sys_click_button_music()