add pre

assets/prefab/gameHallItem.prefab

@@ -0,0 +1,223 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "item4",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [],
+    "_active": true,
+    "_level": 1,
+    "_components": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 269,
+      "height": 442
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "5f42ef05-2dd7-4900-b024-895725bc3cf6"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_state": 0,
+    "_atlas": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "duration": 0.1,
+    "zoomScale": 0.9,
+    "clickEvents": [
+      {
+        "__id__": 4
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "150a2PY4JBHi40n+3ZrPoZn",
+    "handler": "clickTable",
+    "customEventData": ""
+  },
+  {
+    "__type__": "150a2PY4JBHi40n+3ZrPoZn",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "bg": {
+      "__id__": 2
+    },
+    "liug1": {
+      "__uuid__": "2119fc45-d967-486b-804e-23270788f144"
+    },
+    "liug2": {
+      "__uuid__": "b69b0ab6-97fa-41d8-981d-f02434901598"
+    },
+    "liug3": {
+      "__uuid__": "36e90764-9980-44ab-8b54-ba37564b9481"
+    },
+    "liug4": {
+      "__uuid__": "380749a5-acdf-42a3-bac3-7c87844eb3ec"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "9f464238-32fc-49ce-bbd3-6e636b8a7627"
+    },
+    "fileId": "2esFW04iBMeojqLGD93o2Z",
+    "sync": false
+  }
+]

assets/prefab/gameHallItem.prefab.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "9f464238-32fc-49ce-bbd3-6e636b8a7627",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "subMetas": {}
+}

assets/prefab/liuguang1.prefab

@@ -17,7 +17,7 @@
     "_parent": null,
     "_children": [],
     "_active": true,
-    "_level": 2,
+    "_level": 1,
     "_components": [
       {
         "__id__": 2
@@ -94,7 +94,7 @@
     },
     "_fillStart": 0,
     "_fillRange": 0,
-    "_isTrimmedMode": true,
+    "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
     "_srcBlendFactor": 770,
@@ -126,7 +126,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "2119fc45-d967-486b-804e-23270788f144"
     },
     "fileId": "d3c2a8utdDaqa8q5xkIi8Z",
     "sync": false

assets/prefab/liuguang3.prefab

@@ -0,0 +1,164 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "liuguang3",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 60,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -78.3,
+      "y": -178.51,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_spriteFrame": {
+      "__uuid__": "15a4987d-ccd4-4e22-a637-c3b858d1aa1e"
+    },
+    "_type": 0,
+    "_sizeMode": 2,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": false,
+    "_state": 0,
+    "_atlas": null,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 9,
+    "_left": 26.200000000000003,
+    "_right": 0,
+    "_top": 369.01,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "5ed822ce-728b-4e6b-a12f-ca49881e604a"
+    },
+    "_clips": [
+      {
+        "__uuid__": "5ed822ce-728b-4e6b-a12f-ca49881e604a"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "88lDk8JrREn7144uljQxE3",
+    "sync": false
+  }
+]

assets/prefab/liuguang3.prefab.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "36e90764-9980-44ab-8b54-ba37564b9481",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "subMetas": {}
+}

assets/resources/hall.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "54c5f639-514d-4adb-a11e-27934ff3ad6f",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

assets/resources/hall/agzr.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "0c645b12-7455-45c2-b570-c81375025066",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "agzr": {
+      "ver": "1.0.3",
+      "uuid": "d3b18330-3455-4d32-bf15-e630925d03c9",
+      "rawTextureUuid": "0c645b12-7455-45c2-b570-c81375025066",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 3,
+      "width": 269,
+      "height": 442,
+      "rawWidth": 274,
+      "rawHeight": 448,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/hall/bydd.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "ec80490a-181e-417f-9116-ef58e1337a80",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "bydd": {
+      "ver": "1.0.3",
+      "uuid": "2a074b3e-bf0c-4fbe-9357-e9be01092597",
+      "rawTextureUuid": "ec80490a-181e-417f-9116-ef58e1337a80",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 4,
+      "width": 269,
+      "height": 441,
+      "rawWidth": 274,
+      "rawHeight": 448,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/hall/cpdd.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "e012a4fb-3b01-4c4c-aabb-76c25daf82ba",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "cpdd": {
+      "ver": "1.0.3",
+      "uuid": "9d69e34c-90a2-47d5-bb36-cd3fa79dc3b4",
+      "rawTextureUuid": "e012a4fb-3b01-4c4c-aabb-76c25daf82ba",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 4,
+      "width": 269,
+      "height": 441,
+      "rawWidth": 274,
+      "rawHeight": 448,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/hall/dzjj.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "2a939153-2e70-4d87-bf59-2c23fec7296d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "dzjj": {
+      "ver": "1.0.3",
+      "uuid": "3c739343-dae6-4655-8c85-b233247e6bc9",
+      "rawTextureUuid": "2a939153-2e70-4d87-bf59-2c23fec7296d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 3,
+      "width": 269,
+      "height": 442,
+      "rawWidth": 274,
+      "rawHeight": 448,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/hall/dzyy.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "c2805bdb-1870-4ec2-addd-0bdd602bbb83",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "dzyy": {
+      "ver": "1.0.3",
+      "uuid": "e471c595-d921-40ab-a4d6-09c499b2e30d",
+      "rawTextureUuid": "c2805bdb-1870-4ec2-addd-0bdd602bbb83",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 4,
+      "width": 269,
+      "height": 441,
+      "rawWidth": 274,
+      "rawHeight": 448,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/hall/qpdd.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "666119e0-dc60-43f4-ab5f-78c28d46f327",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "qpdd": {
+      "ver": "1.0.3",
+      "uuid": "a0247295-86b1-4671-b0ec-efea673cd371",
+      "rawTextureUuid": "666119e0-dc60-43f4-ab5f-78c28d46f327",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 4,
+      "width": 269,
+      "height": 441,
+      "rawWidth": 274,
+      "rawHeight": 448,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/hall/tydd.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "6c9facd4-cb8e-4de8-8316-48eaf61c1076",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "tydd": {
+      "ver": "1.0.3",
+      "uuid": "04c5dfc4-36ee-4021-aa2d-9e4222b54762",
+      "rawTextureUuid": "6c9facd4-cb8e-4de8-8316-48eaf61c1076",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 3,
+      "width": 269,
+      "height": 442,
+      "rawWidth": 275,
+      "rawHeight": 448,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/scripts/common/Define.js

@@ -6,6 +6,8 @@ let Define = {
 	'NICKNAME': 'Gavin',
 	'MYACCOUNT': 'TEST_2',
 	'MYPASSWORD': 'E10ADC3949BA59ABBE56E057F20F883E',
+	"GameHttpUrl": "http://api.boyin18.com",
+	// "GameHttpUrl": "http://192.168.2.186/qpapi/public",//内网
 	'GameWanFaUrl':'http://yx.xxw360.com/api/game/game',
 	'GameWanFaMore':'http://yx.xxw360.com/api/game/game_lits',
 	'GameRoomUrl':'https://yx.xxw360.com/api/game/room',

assets/scripts/controller/UserMgr.js

@@ -59,7 +59,7 @@ cc.Class({
             }
         };
         
-        cc.vv.http.sendRequest("/hideLogin",null,onLogin);
+        cc.vv.http.sendRequest("/sys/user/hideLogin",null,onLogin);
     },
     
     onAuth:function(ret){
@@ -96,20 +96,44 @@ cc.Class({
         // cc.vv.wc.show("正在登录游戏");
         cc.vv.http.sendRequest("/sys/user/login",data,onLogin);
     },
+
+    getGameList(data,callback){
+        var onEnter = function(ret){
+            if(ret.status !== 1){
+                console.log(ret.msg);
+            }
+            else{
+                console.log(ret);
+                callback(ret)
+                // cc.director.loadScene("hall");
+            }
+        }
+        if (data == null) {
+            data = {
+                pid :0
+            };
+        }
+        
+        cc.vv.http.sendRequest("/sys/menu/getMenus",data,onEnter)
+    },
     
     create:function(data){
         var self = this;
         var onCreate = function(ret){
-            console.log('create: ' + ret.errcode);
-            
-            if(ret.errcode !== 0){
-                console.log(ret.errmsg);
+            console.log('create: ' + ret.status);
+            console.log(ret.msg);
+            if(ret.status !== 1){
+                console.log(ret.msg);
             }
             else{
                 self.account = data['user']
-                self.pass = data['pass']
+                self.pass = data['password']
                 self.phone = data['usphoneer']
-                self.login();
+                var loginData = {
+                    user:data['user'],
+                    password:data['password']
+                }
+                self.login(loginData);
             }
         };
         

assets/scripts/net/HTTP.js

@@ -1,15 +1,16 @@
 //var URL = "http://120.77.56.190:9000";
 //var URL = "http://127.0.0.1:9000";
-// var URL = "http://api.boyin18.com/sys/user";
-var URL = "http://192.168.2.186/qpapi/public"
+import Define from '../common/Define'
+var URL = "http://api.boyin18.com";
+// var URL = "http://192.168.2.186/qpapi/public"
 var HTTP = cc.Class({
     extends: cc.Component,
 
     statics:{
         sessionId : 0,
         userId : 0,
-        master_url:URL,
-        url:URL,
+        master_url:Define.GameHttpUrl,
+        url:Define.GameHttpUrl,
         sendRequest : function(path,data,handler,extraUrl){
             var xhr = cc.loader.getXMLHttpRequest();
             xhr.timeout = 5000;

assets/scripts/view/AginHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/AgxinHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/BBinHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/BuyuHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/CaiPiaoHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,
@@ -18,7 +18,8 @@ cc.Class({
         //     ['5' , [3,10,13,25,26,28,30,31]],
         //     ['7' , [1,7,23,24]],
         //     ['9' , [4,9,15,21]]]
-
+        
+        cc.vv.userMgr.getGameList({pid:this.gameid},this.OnGetGamelist.bind(this));
         var subcp= [['1' , []],
             ['2' , [10,11,12]],
             ['3' , [28,29,30,31,32,33,34,35]],
@@ -40,6 +41,32 @@ cc.Class({
         showingHall.parentScene = this
         this.playEnd(showingHall)
     },
+
+    OnGetGamelist(ret){
+        console.log("OnGetGamelist caipap")
+        // if (ret.data.data && ret.data.data.length>0) {
+        //     this.hallsBtns.children.forEach(element => {
+        //         element.destroy()
+        //     });
+        //     var gameitems = ret.data.data
+        //     var xStartPos =  135
+        //     var yStarPos = 350
+        //     var stepX = 300
+        //     gameitems.sort(function (a,b) {
+        //         return a.id - b.id
+        //     })
+        //     for (let index = 0; index < gameitems.length; index++) {
+        //         const data = gameitems[index]
+        //         var gameItem = cc.instantiate(this.gameHallItem)
+        //         gameItem.name = "item"+data.id
+        //         var itemx = xStartPos + index*stepX
+        //         var itemy = yStarPos
+        //         gameItem.getComponent('gameHallItem').setGameData(itemx,itemy,data,this)
+        //         this.hallsBtns.addChild(gameItem)
+        //     }
+        //     this.hallsBtns.width = gameitems.length*(gameItem.width+30)
+        // }
+    },
 });
 
 

assets/scripts/view/CaiPiaosubHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/CarsHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/DianziYouyiHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/DzjjHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/GamesHallController.js

@@ -38,6 +38,8 @@ cc.Class({
         hallListBtn:cc.Node,
 
         shopNode:cc.Node,
+
+        gameHallItem:cc.Prefab,
     },
 
     onLoad()
@@ -86,16 +88,17 @@ cc.Class({
 
         // this._db = new sql.SQLiteWrapper();
         // this._dbPath = this._db.initializing("data.db","res","");
+        cc.vv.userMgr.getGameList(null,this.OnGetGamelist.bind(this)); //获取游戏列表
 
         var subhall= [
-            ['1' , this.caipiaoHall.getComponent('CaiPiaoHallController')],
-            ['2' , this.carsHall.getComponent('CarsHallController')],
-            ['3' , this.dzyyHall.getComponent('DianziYouyiHallController')],
-            ['4' , this.zhenrenHall.getComponent('ZhenrenHallController')],
-            ['5' , this.dzjjHall.getComponent('DzjjHallController')],
-            ['6' , this.buyuHall.getComponent('BuyuHallController')],
+            [1 , this.caipiaoHall.getComponent('CaiPiaoHallController')],
+            [2 , this.carsHall.getComponent('CarsHallController')],
+            [3 , this.dzyyHall.getComponent('DianziYouyiHallController')],
+            [4 , this.zhenrenHall.getComponent('ZhenrenHallController')],
+            [5 , this.dzjjHall.getComponent('DzjjHallController')],
+            [6 , this.buyuHall.getComponent('BuyuHallController')],
             // ['7' , this.sportsHall.getComponent('SportsHallController')]
-            ['7' , this.webviewNode.getComponent('WebviewCtrl')]
+            [7 , this.webviewNode.getComponent('WebviewCtrl')]
         ]
 
         this.myhallMap = new Map(subhall);
@@ -104,6 +107,31 @@ cc.Class({
         this.halllist.moved = false
         ViewManager.registerView('tips',this.tipsLayer)
     },
+    
+    OnGetGamelist(ret){
+        if (ret.data.data && ret.data.data.length>0) {
+            this.hallsBtns.children.forEach(element => {
+                element.destroy()
+            });
+            var gameitems = ret.data.data
+            var xStartPos =  135
+            var yStarPos = 350
+            var stepX = 300
+            gameitems.sort(function (a,b) {
+                return a.id - b.id
+            })
+            for (let index = 0; index < gameitems.length; index++) {
+                const data = gameitems[index]
+                var gameItem = cc.instantiate(this.gameHallItem)
+                gameItem.name = "item"+data.id
+                var itemx = xStartPos + index*stepX
+                var itemy = yStarPos
+                gameItem.getComponent('gameHallItem').setGameData(itemx,itemy,data,this)
+                this.hallsBtns.addChild(gameItem)
+            }
+            this.hallsBtns.width = gameitems.length*(gameItem.width+30)
+        }
+    },
     onGuideFinished(){
         console.log("onGuideFinished--------------------")
         this.animation.play('nrcome')
@@ -284,10 +312,11 @@ cc.Class({
     },
 
     clickHallList(sender,customEventData){
-        var nextScene = this.myhallMap.get(customEventData)
-        nextScene.initScene(customEventData)
+        
+        var nextScene = this.myhallMap.get(Number(customEventData))
+        nextScene.initScene(Number(customEventData))
         nextScene.parentScene = this
-        this.setHalllist(customEventData)
+        this.setHalllist(Number(customEventData))
         if (nextScene) {
             this.showingHall.playEnd(nextScene)
         }

assets/scripts/view/LoadingUIController.js

@@ -71,7 +71,7 @@ cc.Class({
         }
         var data = {
             user:user,
-            pass:pass, 
+            password:pass, 
             confirm_password:cmpass,
             phone:phone
         };

assets/scripts/view/MgHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/SportsGameController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/SportsHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/WebviewCtrl.js

@@ -1,4 +1,4 @@
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 cc.Class({
     extends: SubHallManger,
 

assets/scripts/view/ZhenrenHallController.js

@@ -1,5 +1,5 @@
 import FireEventObserver from '../framework/FireEventObserver';
-import SubHallManger from '../view/subHallManger'
+import SubHallManger from '../view/SubHallManger'
 
 cc.Class({
     extends: SubHallManger,

assets/scripts/view/gameHallItem.js

@@ -0,0 +1,73 @@
+import Common from '../common/Common';
+import Define from '../common/Define'
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        bg:cc.Sprite,
+        liug1:cc.Prefab,
+        liug2:cc.Prefab,
+        liug3:cc.Prefab,
+        liug4:cc.Prefab,
+    },
+
+    // LIFE-CYCLE CALLBACKS:
+
+     onLoad () 
+     {
+        
+     },
+    randomNum(minNum,maxNum){ 
+        switch(arguments.length){
+            case 1:
+                return parseInt(Math.random()*minNum+1,10);
+            break;
+            case 2:
+                return parseInt(Math.random()*(maxNum-minNum+1)+minNum,10);
+            break;
+                default:
+                    return 0;
+                break;
+        }
+    },
+
+	clickTable(sender)
+	{
+        console.log("clickTable")
+        this.parentNode.clickHall(sender,this.gameid)
+    },
+
+    setGameData(x,y,data,parentNode)
+    {
+        var subhall= [
+            [1 , "hall/cpdd.png"],
+            [2 , "hall/qpdd.png"],
+            [3 , "hall/dzyy.png"],
+            [4 , "hall/agzr.png"],
+            [5 , "hall/dzjj.png"],
+            [6 , "hall/bydd.png"],
+            [7 , "hall/tydd.png"]
+        ]
+        var tempIndex = this.randomNum(1,4)
+        var liug = cc.instantiate(this["liug"+tempIndex])
+        this.node.addChild(liug)
+        var myhallMap = new Map(subhall);
+        var self = this;
+        this.node.y = y;
+        this.node.x = x;
+        this.gameid = data.id
+        this.parentNode = parentNode
+        var self = this;
+        cc.loader.loadRes(myhallMap.get(data.id), cc.SpriteFrame, function (err, spriteFrame) {
+            self.bg.getComponent(cc.Sprite).spriteFrame = spriteFrame;
+        });
+        if (data.iconUrl) {
+            Common.loadImage(Define.GameHttpUrl+data.iconUrl,function(texture){
+                var sprite  = new cc.SpriteFrame(texture);
+                self.bg.getComponent(cc.Sprite).spriteFrame = sprite;
+            })
+        }
+        // this.node.on(cc.Node.EventType.TOUCH_END, this.clickTable.bind(this));
+    },
+    // update (dt) {},
+});

assets/scripts/view/gameHallItem.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "150a23d8-e090-478b-8d27-fb766b3e8667",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/textures/hall/组 10.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "bfb698a3-097a-47d3-ae14-b0c4a1fc201e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "组 10": {
+      "ver": "1.0.3",
+      "uuid": "c319a026-8c4f-4152-a6bf-0f67a7bf5bb5",
+      "rawTextureUuid": "bfb698a3-097a-47d3-ae14-b0c4a1fc201e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -2,
+      "trimX": 3,
+      "trimY": 9,
+      "width": 152,
+      "height": 56,
+      "rawWidth": 160,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/textures/hall/组 11.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "25cbb4e3-d32a-4929-9845-b246e6ba8c55",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "组 11": {
+      "ver": "1.0.3",
+      "uuid": "4593f80a-3934-42b7-9112-b1419f2f9498",
+      "rawTextureUuid": "25cbb4e3-d32a-4929-9845-b246e6ba8c55",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -0.5,
+      "trimX": 17,
+      "trimY": 6,
+      "width": 124,
+      "height": 59,
+      "rawWidth": 160,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/textures/hall/组 7.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "0bf2e900-11b1-41ab-9fff-6c93ceb63e65",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "组 7": {
+      "ver": "1.0.3",
+      "uuid": "f2e5a3fa-2487-4395-8ec3-7cc5d082ccf9",
+      "rawTextureUuid": "0bf2e900-11b1-41ab-9fff-6c93ceb63e65",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": 1.5,
+      "trimX": 14,
+      "trimY": 0,
+      "width": 130,
+      "height": 67,
+      "rawWidth": 160,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/textures/hall/组 8.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "f41ff08a-ef86-4edd-bc4a-25f48e4302df",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "组 8": {
+      "ver": "1.0.3",
+      "uuid": "f1e33a40-9aeb-4e4f-a019-514a0866cb34",
+      "rawTextureUuid": "f41ff08a-ef86-4edd-bc4a-25f48e4302df",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 19,
+      "trimY": 5,
+      "width": 121,
+      "height": 60,
+      "rawWidth": 160,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/textures/hall/组 9.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "1dade6b2-b00e-4a0d-bde8-70b461d8ae72",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "组 9": {
+      "ver": "1.0.3",
+      "uuid": "5993842c-51e2-421b-99e2-521cfab47c27",
+      "rawTextureUuid": "1dade6b2-b00e-4a0d-bde8-70b461d8ae72",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -2,
+      "trimX": 15,
+      "trimY": 9,
+      "width": 128,
+      "height": 56,
+      "rawWidth": 160,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/textures/webview.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "f7536bc0-0eef-461b-b14f-fbc67cb9bfb1",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

assets/textures/webview/新东方-刷新图标.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "f4e748bf-a5ed-40a8-87e2-7b59af12bbe4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "新东方-刷新图标": {
+      "ver": "1.0.3",
+      "uuid": "beabb71d-57e9-44a7-b73b-3c77e0d93b81",
+      "rawTextureUuid": "f4e748bf-a5ed-40a8-87e2-7b59af12bbe4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 35,
+      "height": 35,
+      "rawWidth": 35,
+      "rawHeight": 35,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/textures/hall/保险箱.png.meta → assets/textures/webview/矩形 1.png.meta

@@ -1,26 +1,26 @@
 {
   "ver": "2.2.0",
-  "uuid": "d250e5b1-284a-4752-9527-ad02017c6843",
+  "uuid": "ea24d351-a185-4587-a55f-a23a442fba0c",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "subMetas": {
-    "保险箱": {
+    "矩形 1": {
       "ver": "1.0.3",
-      "uuid": "2ef0f52a-06c2-411d-97b3-766ba44b313b",
-      "rawTextureUuid": "d250e5b1-284a-4752-9527-ad02017c6843",
+      "uuid": "190505c9-ff2c-4488-aec9-35e6307d69a8",
+      "rawTextureUuid": "ea24d351-a185-4587-a55f-a23a442fba0c",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 4,
-      "width": 324,
-      "height": 124,
-      "rawWidth": 324,
-      "rawHeight": 132,
+      "trimY": 0,
+      "width": 1334,
+      "height": 70,
+      "rawWidth": 1334,
+      "rawHeight": 70,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/textures/webview/返回 (1) 拷贝 3.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "1dcdf445-907d-4296-8110-5a093c27d41f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "返回 (1) 拷贝 3": {
+      "ver": "1.0.3",
+      "uuid": "ed2bbef6-8c6b-44be-898e-c5f06eada8c1",
+      "rawTextureUuid": "1dcdf445-907d-4296-8110-5a093c27d41f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 21,
+      "height": 37,
+      "rawWidth": 22,
+      "rawHeight": 37,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/textures/webview/返回 (1) 拷贝.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "7486ad1c-0b77-4465-ad9c-840934198432",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "返回 (1) 拷贝": {
+      "ver": "1.0.3",
+      "uuid": "3c939fe3-6924-4cd5-b84e-2b2c62bc123d",
+      "rawTextureUuid": "7486ad1c-0b77-4465-ad9c-840934198432",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 0,
+      "width": 21,
+      "height": 37,
+      "rawWidth": 22,
+      "rawHeight": 37,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/textures/webview/返回游戏.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "30a987d8-77c0-43a4-8b25-8a7ad1bcb7e8",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "返回游戏": {
+      "ver": "1.0.3",
+      "uuid": "9889b875-59d2-43f1-af31-ed39808e9d7c",
+      "rawTextureUuid": "30a987d8-77c0-43a4-8b25-8a7ad1bcb7e8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 177,
+      "height": 32,
+      "rawWidth": 177,
+      "rawHeight": 32,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}