future 1 year ago
parent
commit
8d36c04c95

+ 25 - 4
assets/resources/prefab/run/sidebar_page.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 50
+      },
+      {
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 54
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -617,7 +620,7 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 0.9,
     "_target": null,
     "_id": ""
   },
@@ -812,7 +815,7 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 0.9,
     "_target": null,
     "_id": ""
   },
@@ -1007,7 +1010,7 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 0.9,
     "_target": {
       "__id__": 33
     },
@@ -1198,6 +1201,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "1bpxvaj5tKwLfFsXrGavAM"
   },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 53
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "68gkVWjpVGj45zT6xmIDhP"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 3 - 3
assets/scene/game.scene

@@ -11228,7 +11228,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 960,
+      "y": 960.0000000000001,
       "z": 0
     },
     "_lrot": {
@@ -11718,7 +11718,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -11.224,
-      "y": -1782.2,
+      "y": -1782.2000000000003,
       "z": 0
     },
     "_lrot": {
@@ -11848,7 +11848,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 2 - 2
assets/script/run/gameManager.ts

@@ -105,7 +105,7 @@ export class gameManager extends Component {
             }
             for (let i = 2; i <= scene_num; i++) {
                 let url = http.get_level_resource(level_id,i)
-                http.run_get(url,(err,data)=>{
+                http.run_get_static(url,(err,data)=>{
                     if(!err){
                         let _data = JSON.parse(data)
                         scene_count++;
@@ -170,7 +170,7 @@ export class gameManager extends Component {
         let first_load_res:Map<string,boolean> = new Map;
         for (let i = 0; i < 2; i++) {
             let url = http.get_level_resource(level_id,i)
-            http.run_get(url,(err,data)=>{
+            http.run_get_static(url,(err,data)=>{
                 if(!err){
                     let _data = JSON.parse(data)
                     first_count++;

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

@@ -44,7 +44,7 @@ export class game_list extends Component {
     public loadView(){
         let user_data = gameManager.getUserData()
         let url = http.getGameList(user_data.select_page)
-        http.run_get(url,(err,data)=>{
+        http.run_get_static(url,(err,data)=>{
             if(!err){
                 let msg:LevelMessage  = JSON.parse(data)
                 this.initGameList(msg)
@@ -113,7 +113,7 @@ export class game_list extends Component {
         this.content.off(Node.EventType.TOUCH_CANCEL)
         this.content.off(Node.EventType.TOUCH_END)
         let url = http.getGameList(gameManager.getStaticUserData().select_page)
-        http.run_get(url,(err,data)=>{
+        http.run_get_static(url,(err,data)=>{
             if(!err){
                 let msg:LevelMessage  = JSON.parse(data)
                 this.initGameList(msg)
@@ -202,7 +202,7 @@ export class game_list extends Component {
         let call = ()=>{
             let url = http.get_level_info(item.getData().id)
             gameManager.Singleton.showLoadingLevel()
-            http.run_get(url,(err,data)=>{
+            http.run_get_static(url,(err,data)=>{
                 if(!err){
                     let _data:LevelInfoMessage = JSON.parse(data)
                     if(_data.code===config.MSG_CODE.SUCCESS){

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

@@ -29,7 +29,7 @@ export class loading_view extends Component {
             switch(progress){
                 case 0.2:
                     this.m_pause_status = true;
-                    http.run_get(http.get_sys_config(),(err,data)=>{
+                    http.run_get_static(http.get_sys_config(),(err,data)=>{
                         if(!err){
                             let sys_data:sysMessage = JSON.parse(data)
                             gameManager.setSysData(sys_data)
@@ -124,7 +124,7 @@ export class loading_view extends Component {
 
                 case 0.7:
                     this.m_pause_status = true;
-                    http.run_get(http.get_test_user_list(),(err,data)=>{
+                    http.run_get_static(http.get_test_user_list(),(err,data)=>{
                         if(!err){
                             let _data:getTestUserListMessage = JSON.parse(data)
                             for (let index = 0; index < _data.content.length; index++) {