Pārlūkot izejas kodu

chang sub game hall

Johson 6 gadi atpakaļ
vecāks
revīzija
b7a0a553b9
85 mainītis faili ar 2607 papildinājumiem un 955 dzēšanām
  1. 7 0
      assets/anim.meta
  2. 153 0
      assets/anim/hallscome.anim
  3. 5 0
      assets/anim/hallscome.anim.meta
  4. 25 0
      assets/anim/hallsgo.anim
  5. 5 0
      assets/anim/hallsgo.anim.meta
  6. 39 0
      assets/anim/hallsin.anim
  7. 5 0
      assets/anim/hallsin.anim.meta
  8. 35 0
      assets/anim/nrcome.anim
  9. 5 0
      assets/anim/nrcome.anim.meta
  10. 37 0
      assets/anim/nrcome1.anim
  11. 5 0
      assets/anim/nrcome1.anim.meta
  12. 25 0
      assets/anim/nrgo.anim
  13. 5 0
      assets/anim/nrgo.anim.meta
  14. 25 0
      assets/anim/showDzjjgame.anim
  15. 5 0
      assets/anim/showDzjjgame.anim.meta
  16. 25 0
      assets/anim/showplane.anim
  17. 5 0
      assets/anim/showplane.anim.meta
  18. 221 0
      assets/resources/plists/cargamehall.plist
  19. 298 0
      assets/resources/plists/cargamehall.plist.meta
  20. BIN
      assets/resources/plists/cargamehall.png
  21. 9 9
      assets/resources/plists/cargamehall.png.meta
  22. 45 270
      assets/resources/plists/hall.plist
  23. 83 413
      assets/resources/plists/hall.plist.meta
  24. BIN
      assets/resources/plists/hall.png
  25. 5 5
      assets/resources/plists/hall.png.meta
  26. 521 187
      assets/scenes/hall.fire
  27. 0 11
      assets/scripts/Login.js
  28. 18 0
      assets/scripts/framework/FireEventObserver.js
  29. 152 0
      assets/scripts/view/CarGameHallController.js
  30. 1 1
      assets/scripts/view/CarGameHallController.js.meta
  31. 171 0
      assets/scripts/view/DzjjHallController.js
  32. 9 0
      assets/scripts/view/DzjjHallController.js.meta
  33. 178 0
      assets/scripts/view/GamesHallController.js
  34. 9 0
      assets/scripts/view/GamesHallController.js.meta
  35. 7 0
      assets/textures/Competitivegame.meta
  36. BIN
      assets/textures/Competitivegame/jdqs.png
  37. 31 0
      assets/textures/Competitivegame/jdqs.png.meta
  38. BIN
      assets/textures/Competitivegame/plane.png
  39. 11 11
      assets/textures/Competitivegame/plane.png.meta
  40. BIN
      assets/textures/Competitivegame/scgo.png
  41. 9 9
      assets/textures/Competitivegame/scgo.png.meta
  42. BIN
      assets/textures/Competitivegame/wzrr.png
  43. 31 0
      assets/textures/Competitivegame/wzrr.png.meta
  44. BIN
      assets/textures/Competitivegame/yxlm.png
  45. 31 0
      assets/textures/Competitivegame/yxlm.png.meta
  46. 7 0
      assets/textures/cargamehall.meta
  47. BIN
      assets/textures/cargamehall/bg.png
  48. 8 8
      assets/textures/cargamehall/bg.png.meta
  49. BIN
      assets/textures/cargamehall/bottom.png
  50. 8 8
      assets/textures/cargamehall/bottom.png.meta
  51. BIN
      assets/textures/cargamehall/game1.png
  52. 31 0
      assets/textures/cargamehall/game1.png.meta
  53. BIN
      assets/textures/cargamehall/game2.png
  54. 31 0
      assets/textures/cargamehall/game2.png.meta
  55. BIN
      assets/textures/cargamehall/game3.png
  56. 31 0
      assets/textures/cargamehall/game3.png.meta
  57. BIN
      assets/textures/cargamehall/game4.png
  58. 31 0
      assets/textures/cargamehall/game4.png.meta
  59. BIN
      assets/textures/cargamehall/game5.png
  60. 31 0
      assets/textures/cargamehall/game5.png.meta
  61. BIN
      assets/textures/cargamehall/game6.png
  62. 31 0
      assets/textures/cargamehall/game6.png.meta
  63. BIN
      assets/textures/cargamehall/nvr.png
  64. 31 0
      assets/textures/cargamehall/nvr.png.meta
  65. BIN
      assets/textures/cargamehall/topbanner.png
  66. 31 0
      assets/textures/cargamehall/topbanner.png.meta
  67. BIN
      assets/textures/hall/bg.png
  68. BIN
      assets/textures/hall/bottom.png
  69. 4 4
      assets/textures/hall/bottom.png.meta
  70. BIN
      assets/textures/hall/cpdd.png
  71. 9 9
      assets/textures/hall/cpdd.png.meta
  72. BIN
      assets/textures/hall/dzyy.png
  73. 31 0
      assets/textures/hall/dzyy.png.meta
  74. BIN
      assets/textures/hall/nvren.png
  75. 8 8
      assets/textures/hall/nvren.png.meta
  76. BIN
      assets/textures/hall/qpdd.png
  77. 31 0
      assets/textures/hall/qpdd.png.meta
  78. BIN
      assets/textures/hall/体育.png
  79. BIN
      assets/textures/hall/彩票.png
  80. BIN
      assets/textures/hall/棋牌大厅.png
  81. BIN
      assets/textures/hall/欢乐捕鱼.png
  82. BIN
      assets/textures/hall/游艺.png
  83. BIN
      assets/textures/hall/真人.png
  84. BIN
      assets/textures/hall/竞技.png
  85. 2 2
      settings/project.json

+ 7 - 0
assets/anim.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "e9ad5528-5326-4ebc-9877-d31b7e502036",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

+ 153 - 0
assets/anim/hallscome.anim

@@ -0,0 +1,153 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "hallscome",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 1.4,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "paths": {
+      "item1": {
+        "props": {
+          "x": [
+            {
+              "frame": 0,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.0166666666666666,
+              "value": 134.5
+            }
+          ]
+        }
+      },
+      "item2": {
+        "props": {
+          "x": [
+            {
+              "frame": 0,
+              "value": 2174.5
+            },
+            {
+              "frame": 0.36666666666666664,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.0833333333333333,
+              "value": 430.5
+            }
+          ]
+        }
+      },
+      "item3": {
+        "props": {
+          "x": [
+            {
+              "frame": 0,
+              "value": 2174.5
+            },
+            {
+              "frame": 0.8166666666666667,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.1833333333333333,
+              "value": 726.5
+            }
+          ]
+        }
+      },
+      "item4": {
+        "props": {
+          "x": [
+            {
+              "frame": 0,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.0333333333333334,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.25,
+              "value": 1002
+            },
+            {
+              "frame": 1.2666666666666666,
+              "value": 1022.5
+            }
+          ]
+        }
+      },
+      "item5": {
+        "props": {
+          "x": [
+            {
+              "frame": 0,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.1,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.3166666666666667,
+              "value": 1218
+            },
+            {
+              "frame": 1.3333333333333333,
+              "value": 1318.5
+            }
+          ]
+        }
+      },
+      "item6": {
+        "props": {
+          "x": [
+            {
+              "frame": 0,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.15,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.35,
+              "value": 1614
+            },
+            {
+              "frame": 1.3666666666666667,
+              "value": 1614.5
+            }
+          ]
+        }
+      },
+      "item7": {
+        "props": {
+          "x": [
+            {
+              "frame": 0,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.25,
+              "value": 2174.5
+            },
+            {
+              "frame": 1.3833333333333333,
+              "value": 1776
+            },
+            {
+              "frame": 1.4,
+              "value": 1910.5
+            }
+          ]
+        }
+      }
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/anim/hallscome.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "e99bf519-f2d2-4ceb-b227-4907297020f8",
+  "subMetas": {}
+}

+ 25 - 0
assets/anim/hallsgo.anim

@@ -0,0 +1,25 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "hallsgo",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.16666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "props": {
+      "y": [
+        {
+          "frame": 0,
+          "value": 0
+        },
+        {
+          "frame": 0.16666666666666666,
+          "value": 750
+        }
+      ]
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/anim/hallsgo.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "fb152d4d-8fea-4459-a625-61c50f52123a",
+  "subMetas": {}
+}

+ 39 - 0
assets/anim/hallsin.anim

@@ -0,0 +1,39 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "hallsin",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.5,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "props": {
+      "y": [
+        {
+          "frame": 0,
+          "value": 750
+        },
+        {
+          "frame": 0.5,
+          "value": 0
+        }
+      ],
+      "opacity": [
+        {
+          "frame": 0,
+          "value": 0
+        },
+        {
+          "frame": 0.2833333333333333,
+          "value": 0
+        },
+        {
+          "frame": 0.5,
+          "value": 255
+        }
+      ]
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/anim/hallsin.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "3ed6fb64-f724-45a1-a79d-3f8458c02561",
+  "subMetas": {}
+}

+ 35 - 0
assets/anim/nrcome.anim

@@ -0,0 +1,35 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "nrcome",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 3,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": "22",
+  "curveData": {
+    "props": {
+      "scaleX": [
+        {
+          "frame": 0,
+          "value": 1
+        },
+        {
+          "frame": 3,
+          "value": 1.05
+        }
+      ],
+      "scaleY": [
+        {
+          "frame": 0,
+          "value": 1
+        },
+        {
+          "frame": 3,
+          "value": 1.05
+        }
+      ]
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/anim/nrcome.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "5b794f14-beed-45c6-a1f9-d0d59c004f64",
+  "subMetas": {}
+}

+ 37 - 0
assets/anim/nrcome1.anim

@@ -0,0 +1,37 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "nrcome1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 1.1666666666666667,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "props": {
+      "x": [
+        {
+          "frame": 0,
+          "value": 180
+        },
+        {
+          "frame": 0.8333333333333334,
+          "value": 220
+        },
+        {
+          "frame": 1,
+          "value": 209
+        },
+        {
+          "frame": 1.0833333333333333,
+          "value": 200
+        },
+        {
+          "frame": 1.1666666666666667,
+          "value": 209
+        }
+      ]
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/anim/nrcome1.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "ef9ce90a-0912-47e5-840c-0f4984a1365f",
+  "subMetas": {}
+}

+ 25 - 0
assets/anim/nrgo.anim

@@ -0,0 +1,25 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "nrgo",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.16666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "props": {
+      "x": [
+        {
+          "frame": 0,
+          "value": 209
+        },
+        {
+          "frame": 0.16666666666666666,
+          "value": -200
+        }
+      ]
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/anim/nrgo.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "966df04e-de79-424e-9567-630e7172fe71",
+  "subMetas": {}
+}

+ 25 - 0
assets/anim/showDzjjgame.anim

@@ -0,0 +1,25 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "showDzjjgame",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.5,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "props": {
+      "x": [
+        {
+          "frame": 0,
+          "value": 1500
+        },
+        {
+          "frame": 0.5,
+          "value": 0
+        }
+      ]
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/anim/showDzjjgame.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "db1a552e-7c1d-4f68-a6e4-ada375da8519",
+  "subMetas": {}
+}

+ 25 - 0
assets/anim/showplane.anim

@@ -0,0 +1,25 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "showplane",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.5,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "props": {
+      "x": [
+        {
+          "frame": 0,
+          "value": -100
+        },
+        {
+          "frame": 0.5,
+          "value": 0
+        }
+      ]
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/anim/showplane.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "b46225ef-508e-4c82-8eb6-42d044a074f7",
+  "subMetas": {}
+}

+ 221 - 0
assets/resources/plists/cargamehall.plist

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>frames</key>
+        <dict>
+            <key>cargamehall (1).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{221,98}</string>
+                <key>spriteSourceSize</key>
+                <string>{221,98}</string>
+                <key>textureRect</key>
+                <string>{{226,71},{221,98}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (10).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{62,71}</string>
+                <key>spriteSourceSize</key>
+                <string>{62,71}</string>
+                <key>textureRect</key>
+                <string>{{356,0},{62,71}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (11).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{62,72}</string>
+                <key>spriteSourceSize</key>
+                <string>{62,72}</string>
+                <key>textureRect</key>
+                <string>{{0,71},{62,72}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (12).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{46,43}</string>
+                <key>spriteSourceSize</key>
+                <string>{46,43}</string>
+                <key>textureRect</key>
+                <string>{{21,0},{46,43}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (13).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{21,21}</string>
+                <key>spriteSourceSize</key>
+                <string>{21,21}</string>
+                <key>textureRect</key>
+                <string>{{0,0},{21,21}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (2).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{259,110}</string>
+                <key>spriteSourceSize</key>
+                <string>{259,110}</string>
+                <key>textureRect</key>
+                <string>{{177,169},{259,110}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (3).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{123,142}</string>
+                <key>spriteSourceSize</key>
+                <string>{123,142}</string>
+                <key>textureRect</key>
+                <string>{{0,279},{123,142}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (4).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{91,145}</string>
+                <key>spriteSourceSize</key>
+                <string>{91,145}</string>
+                <key>textureRect</key>
+                <string>{{235,279},{91,145}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (5).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{112,144}</string>
+                <key>spriteSourceSize</key>
+                <string>{112,144}</string>
+                <key>textureRect</key>
+                <string>{{123,279},{112,144}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (6).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{177,102}</string>
+                <key>spriteSourceSize</key>
+                <string>{177,102}</string>
+                <key>textureRect</key>
+                <string>{{0,169},{177,102}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (7).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{227,58}</string>
+                <key>spriteSourceSize</key>
+                <string>{227,58}</string>
+                <key>textureRect</key>
+                <string>{{67,0},{227,58}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (8).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{164,90}</string>
+                <key>spriteSourceSize</key>
+                <string>{164,90}</string>
+                <key>textureRect</key>
+                <string>{{62,71},{164,90}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>cargamehall (9).png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{62,69}</string>
+                <key>spriteSourceSize</key>
+                <string>{62,69}</string>
+                <key>textureRect</key>
+                <string>{{294,0},{62,69}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+        </dict>
+        <key>metadata</key>
+        <dict>
+            <key>format</key>
+            <integer>3</integer>
+            <key>pixelFormat</key>
+            <string>RGBA8888</string>
+            <key>premultiplyAlpha</key>
+            <false/>
+            <key>realTextureFileName</key>
+            <string>cargamehall.png</string>
+            <key>size</key>
+            <string>{447,424}</string>
+            <key>smartupdate</key>
+            <string>$TexturePacker:SmartUpdate:b821b0f7c4233d5e8f77ca2ed932ddb7:8efc75e09e5b880ccdb015d1372a65ef:afa9a29e678901e54e327f338ed7896e$</string>
+            <key>textureFileName</key>
+            <string>cargamehall.png</string>
+        </dict>
+    </dict>
+</plist>

+ 298 - 0
assets/resources/plists/cargamehall.plist.meta

@@ -0,0 +1,298 @@
+{
+  "ver": "1.2.4",
+  "uuid": "79a2873a-187a-4e4c-87ad-5762c4b8dde8",
+  "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+  "size": {
+    "width": 447,
+    "height": 424
+  },
+  "type": "Texture Packer",
+  "subMetas": {
+    "cargamehall (1).png": {
+      "ver": "1.0.3",
+      "uuid": "6ae5c8b5-7e67-4d81-91dd-cb05d9b1f340",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 226,
+      "trimY": 71,
+      "width": 221,
+      "height": 98,
+      "rawWidth": 221,
+      "rawHeight": 98,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (10).png": {
+      "ver": "1.0.3",
+      "uuid": "82c74abb-9654-4a6f-91bd-2dc3c739db8c",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 356,
+      "trimY": 0,
+      "width": 62,
+      "height": 71,
+      "rawWidth": 62,
+      "rawHeight": 71,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (11).png": {
+      "ver": "1.0.3",
+      "uuid": "08c41cc2-ea46-4c37-98de-b28c567d080b",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 71,
+      "width": 62,
+      "height": 72,
+      "rawWidth": 62,
+      "rawHeight": 72,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (12).png": {
+      "ver": "1.0.3",
+      "uuid": "899113cc-e97c-4dfb-969c-48c76351d422",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 21,
+      "trimY": 0,
+      "width": 46,
+      "height": 43,
+      "rawWidth": 46,
+      "rawHeight": 43,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (13).png": {
+      "ver": "1.0.3",
+      "uuid": "f3ef1187-74ee-4d64-936a-bb1be33ad9b0",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 21,
+      "height": 21,
+      "rawWidth": 21,
+      "rawHeight": 21,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (2).png": {
+      "ver": "1.0.3",
+      "uuid": "47249b1a-1920-47ce-98f4-0810dd4968bf",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 177,
+      "trimY": 169,
+      "width": 259,
+      "height": 110,
+      "rawWidth": 259,
+      "rawHeight": 110,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (3).png": {
+      "ver": "1.0.3",
+      "uuid": "dcdbaea7-02ac-403f-a513-0fa833e9c9f9",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 279,
+      "width": 123,
+      "height": 142,
+      "rawWidth": 123,
+      "rawHeight": 142,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (4).png": {
+      "ver": "1.0.3",
+      "uuid": "2dd2165c-6ec7-4550-a847-00ad4e734d96",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 235,
+      "trimY": 279,
+      "width": 91,
+      "height": 145,
+      "rawWidth": 91,
+      "rawHeight": 145,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (5).png": {
+      "ver": "1.0.3",
+      "uuid": "013e7cc2-b61d-476d-8dcd-631030301c58",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 123,
+      "trimY": 279,
+      "width": 112,
+      "height": 144,
+      "rawWidth": 112,
+      "rawHeight": 144,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (6).png": {
+      "ver": "1.0.3",
+      "uuid": "99f1d674-d059-492f-8db0-f678b63049c6",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 169,
+      "width": 177,
+      "height": 102,
+      "rawWidth": 177,
+      "rawHeight": 102,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (7).png": {
+      "ver": "1.0.3",
+      "uuid": "b4a2a847-ca29-4118-add9-7b28b6c3ae9e",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 67,
+      "trimY": 0,
+      "width": 227,
+      "height": 58,
+      "rawWidth": 227,
+      "rawHeight": 58,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (8).png": {
+      "ver": "1.0.3",
+      "uuid": "49035905-b75f-4901-b79f-a34c96d74d00",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 62,
+      "trimY": 71,
+      "width": 164,
+      "height": 90,
+      "rawWidth": 164,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "cargamehall (9).png": {
+      "ver": "1.0.3",
+      "uuid": "7912a83b-5792-4862-87fb-86b789e62160",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 294,
+      "trimY": 0,
+      "width": 62,
+      "height": 69,
+      "rawWidth": 62,
+      "rawHeight": 69,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/plists/cargamehall.png


+ 9 - 9
assets/textures/hall/棋牌大厅.png.meta → assets/resources/plists/cargamehall.png.meta

@@ -1,26 +1,26 @@
 {
   "ver": "2.2.0",
-  "uuid": "9b22e8ea-5dd2-4f3f-8a11-7dd8e476e65c",
+  "uuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "subMetas": {
-    "棋牌大厅": {
+    "cargamehall": {
       "ver": "1.0.3",
-      "uuid": "a4ca2244-1588-4169-b6c7-ec2ec381adc6",
-      "rawTextureUuid": "9b22e8ea-5dd2-4f3f-8a11-7dd8e476e65c",
+      "uuid": "4d41b52b-19a2-4ae0-95e7-3c0d310e4ce2",
+      "rawTextureUuid": "828fdeeb-bd0b-4a7f-89a5-5ae24c67101c",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
-      "width": 224,
-      "height": 249,
-      "rawWidth": 224,
-      "rawHeight": 249,
+      "width": 447,
+      "height": 423,
+      "rawWidth": 447,
+      "rawHeight": 424,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

+ 45 - 270
assets/resources/plists/hall.plist

@@ -11,11 +11,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{218,96}</string>
+                <string>{221,98}</string>
                 <key>spriteSourceSize</key>
-                <string>{218,96}</string>
+                <string>{221,98}</string>
                 <key>textureRect</key>
-                <string>{{388,165},{218,96}}</string>
+                <string>{{200,59},{221,98}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -26,11 +26,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{46,43}</string>
+                <string>{44,44}</string>
                 <key>spriteSourceSize</key>
-                <string>{46,43}</string>
+                <string>{44,44}</string>
                 <key>textureRect</key>
-                <string>{{538,0},{46,43}}</string>
+                <string>{{44,0},{44,44}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -41,11 +41,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{58,32}</string>
+                <string>{388,92}</string>
                 <key>spriteSourceSize</key>
-                <string>{58,32}</string>
+                <string>{388,92}</string>
                 <key>textureRect</key>
-                <string>{{405,0},{58,32}}</string>
+                <string>{{561,157},{388,92}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -56,11 +56,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{105,461}</string>
+                <string>{59,55}</string>
                 <key>spriteSourceSize</key>
-                <string>{105,461}</string>
+                <string>{59,55}</string>
                 <key>textureRect</key>
-                <string>{{644,165},{105,461}}</string>
+                <string>{{138,0},{59,55}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -71,11 +71,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{57,32}</string>
+                <string>{200,43}</string>
                 <key>spriteSourceSize</key>
-                <string>{57,32}</string>
+                <string>{200,43}</string>
                 <key>textureRect</key>
-                <string>{{463,0},{57,32}}</string>
+                <string>{{0,59},{200,43}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -86,75 +86,15 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{57,54}</string>
+                <string>{506,57}</string>
                 <key>spriteSourceSize</key>
-                <string>{57,54}</string>
+                <string>{506,57}</string>
                 <key>textureRect</key>
-                <string>{{200,49},{57,54}}</string>
+                <string>{{421,59},{506,57}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
             <key>hall (15).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{59,32}</string>
-                <key>spriteSourceSize</key>
-                <string>{59,32}</string>
-                <key>textureRect</key>
-                <string>{{346,0},{59,32}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (16).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{58,32}</string>
-                <key>spriteSourceSize</key>
-                <string>{58,32}</string>
-                <key>textureRect</key>
-                <string>{{288,0},{58,32}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (17).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{236,48}</string>
-                <key>spriteSourceSize</key>
-                <string>{236,48}</string>
-                <key>textureRect</key>
-                <string>{{584,0},{236,48}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (18).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{62,55}</string>
-                <key>spriteSourceSize</key>
-                <string>{62,55}</string>
-                <key>textureRect</key>
-                <string>{{257,49},{62,55}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (19).png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -165,7 +105,7 @@
                 <key>spriteSourceSize</key>
                 <string>{561,57}</string>
                 <key>textureRect</key>
-                <string>{{0,106},{561,57}}</string>
+                <string>{{0,157},{561,57}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -176,161 +116,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{59,59}</string>
-                <key>spriteSourceSize</key>
-                <string>{59,59}</string>
-                <key>textureRect</key>
-                <string>{{736,106},{59,59}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (20).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{58,32}</string>
+                <string>{122,59}</string>
                 <key>spriteSourceSize</key>
-                <string>{58,32}</string>
+                <string>{122,59}</string>
                 <key>textureRect</key>
-                <string>{{230,0},{58,32}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (21).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{53,53}</string>
-                <key>spriteSourceSize</key>
-                <string>{53,53}</string>
-                <key>textureRect</key>
-                <string>{{96,49},{53,53}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (22).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{51,53}</string>
-                <key>spriteSourceSize</key>
-                <string>{51,53}</string>
-                <key>textureRect</key>
-                <string>{{149,49},{51,53}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (23).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{561,57}</string>
-                <key>spriteSourceSize</key>
-                <string>{561,57}</string>
-                <key>textureRect</key>
-                <string>{{319,49},{561,57}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (24).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{68,21}</string>
-                <key>spriteSourceSize</key>
-                <string>{68,21}</string>
-                <key>textureRect</key>
-                <string>{{75,0},{68,21}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (25).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{38,118}</string>
-                <key>spriteSourceSize</key>
-                <string>{38,118}</string>
-                <key>textureRect</key>
-                <string>{{606,165},{38,118}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (26).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{29,29}</string>
-                <key>spriteSourceSize</key>
-                <string>{29,29}</string>
-                <key>textureRect</key>
-                <string>{{143,0},{29,29}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (27).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{18,33}</string>
-                <key>spriteSourceSize</key>
-                <string>{18,33}</string>
-                <key>textureRect</key>
-                <string>{{520,0},{18,33}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (28).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{75,1}</string>
-                <key>spriteSourceSize</key>
-                <string>{75,1}</string>
-                <key>textureRect</key>
-                <string>{{0,0},{75,1}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (29).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{45,52}</string>
-                <key>spriteSourceSize</key>
-                <string>{45,52}</string>
-                <key>textureRect</key>
-                <string>{{51,49},{45,52}}</string>
+                <string>{{793,0},{122,59}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -341,26 +131,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{58,59}</string>
+                <string>{122,54}</string>
                 <key>spriteSourceSize</key>
-                <string>{58,59}</string>
+                <string>{122,54}</string>
                 <key>textureRect</key>
-                <string>{{795,106},{58,59}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>hall (30).png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{58,31}</string>
-                <key>spriteSourceSize</key>
-                <string>{58,31}</string>
-                <key>textureRect</key>
-                <string>{{172,0},{58,31}}</string>
+                <string>{{544,0},{122,54}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -371,11 +146,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{59,59}</string>
+                <string>{112,57}</string>
                 <key>spriteSourceSize</key>
-                <string>{59,59}</string>
+                <string>{112,57}</string>
                 <key>textureRect</key>
-                <string>{{561,106},{59,59}}</string>
+                <string>{{432,0},{112,57}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -386,11 +161,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{59,59}</string>
+                <string>{127,55}</string>
                 <key>spriteSourceSize</key>
-                <string>{59,59}</string>
+                <string>{127,55}</string>
                 <key>textureRect</key>
-                <string>{{620,106},{59,59}}</string>
+                <string>{{666,0},{127,55}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -401,11 +176,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{51,51}</string>
+                <string>{117,53}</string>
                 <key>spriteSourceSize</key>
-                <string>{51,51}</string>
+                <string>{117,53}</string>
                 <key>textureRect</key>
-                <string>{{0,49},{51,51}}</string>
+                <string>{{197,0},{117,53}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -416,11 +191,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{49,49}</string>
+                <string>{118,53}</string>
                 <key>spriteSourceSize</key>
-                <string>{49,49}</string>
+                <string>{118,53}</string>
                 <key>textureRect</key>
-                <string>{{820,0},{49,49}}</string>
+                <string>{{314,0},{118,53}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -431,11 +206,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{388,92}</string>
+                <string>{50,47}</string>
                 <key>spriteSourceSize</key>
-                <string>{388,92}</string>
+                <string>{50,47}</string>
                 <key>textureRect</key>
-                <string>{{0,165},{388,92}}</string>
+                <string>{{88,0},{50,47}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -446,11 +221,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{57,59}</string>
+                <string>{44,44}</string>
                 <key>spriteSourceSize</key>
-                <string>{57,59}</string>
+                <string>{44,44}</string>
                 <key>textureRect</key>
-                <string>{{679,106},{57,59}}</string>
+                <string>{{0,0},{44,44}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -466,9 +241,9 @@
             <key>realTextureFileName</key>
             <string>hall.png</string>
             <key>size</key>
-            <string>{880,626}</string>
+            <string>{949,249}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:9bc9c580685dd17f5ec5b4c668f4f727:2ffd0e2725cd8059e874a21c777a3aa8:333c9ff079a5b8ddfb0c61408e972979$</string>
+            <string>$TexturePacker:SmartUpdate:9fde52521c1c9dc27d5f9085d3c586d5:0eb543f39ca6773bf62df86208f379ee:333c9ff079a5b8ddfb0c61408e972979$</string>
             <key>textureFileName</key>
             <string>hall.png</string>
         </dict>

+ 83 - 413
assets/resources/plists/hall.plist.meta

@@ -3,8 +3,8 @@
   "uuid": "6a81be05-7114-4e40-a456-82e6acda7645",
   "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
   "size": {
-    "width": 880,
-    "height": 626
+    "width": 949,
+    "height": 249
   },
   "type": "Texture Packer",
   "subMetas": {
@@ -17,12 +17,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 388,
-      "trimY": 165,
-      "width": 218,
-      "height": 96,
-      "rawWidth": 218,
-      "rawHeight": 96,
+      "trimX": 200,
+      "trimY": 59,
+      "width": 221,
+      "height": 98,
+      "rawWidth": 221,
+      "rawHeight": 98,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -39,12 +39,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 538,
+      "trimX": 44,
       "trimY": 0,
-      "width": 46,
-      "height": 43,
-      "rawWidth": 46,
-      "rawHeight": 43,
+      "width": 44,
+      "height": 44,
+      "rawWidth": 44,
+      "rawHeight": 44,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -61,12 +61,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 405,
-      "trimY": 0,
-      "width": 58,
-      "height": 32,
-      "rawWidth": 58,
-      "rawHeight": 32,
+      "trimX": 561,
+      "trimY": 157,
+      "width": 388,
+      "height": 92,
+      "rawWidth": 388,
+      "rawHeight": 92,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -83,12 +83,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 644,
-      "trimY": 165,
-      "width": 105,
-      "height": 461,
-      "rawWidth": 105,
-      "rawHeight": 461,
+      "trimX": 138,
+      "trimY": 0,
+      "width": 59,
+      "height": 55,
+      "rawWidth": 59,
+      "rawHeight": 55,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -105,12 +105,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 463,
-      "trimY": 0,
-      "width": 57,
-      "height": 32,
-      "rawWidth": 57,
-      "rawHeight": 32,
+      "trimX": 0,
+      "trimY": 59,
+      "width": 200,
+      "height": 43,
+      "rawWidth": 200,
+      "rawHeight": 43,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -127,12 +127,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 200,
-      "trimY": 49,
-      "width": 57,
-      "height": 54,
-      "rawWidth": 57,
-      "rawHeight": 54,
+      "trimX": 421,
+      "trimY": 59,
+      "width": 506,
+      "height": 57,
+      "rawWidth": 506,
+      "rawHeight": 57,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -142,95 +142,7 @@
     },
     "hall (15).png": {
       "ver": "1.0.3",
-      "uuid": "da291d3e-fb85-48c1-93a0-d623d3b09736",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 346,
-      "trimY": 0,
-      "width": 59,
-      "height": 32,
-      "rawWidth": 59,
-      "rawHeight": 32,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (16).png": {
-      "ver": "1.0.3",
-      "uuid": "0b1fab52-d913-491f-9142-90cb6da50825",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 288,
-      "trimY": 0,
-      "width": 58,
-      "height": 32,
-      "rawWidth": 58,
-      "rawHeight": 32,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (17).png": {
-      "ver": "1.0.3",
-      "uuid": "aa75a8a9-3db7-44a3-9105-35f03c987620",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 584,
-      "trimY": 0,
-      "width": 236,
-      "height": 48,
-      "rawWidth": 236,
-      "rawHeight": 48,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (18).png": {
-      "ver": "1.0.3",
-      "uuid": "137fae3c-aa7e-4253-adbb-95c535c1d7c3",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 257,
-      "trimY": 49,
-      "width": 62,
-      "height": 55,
-      "rawWidth": 62,
-      "rawHeight": 55,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (19).png": {
-      "ver": "1.0.3",
-      "uuid": "894a5862-6a51-4038-9e5e-240b7dbc5c2a",
+      "uuid": "64b43405-6aac-4331-b8dd-554dd2cac4c8",
       "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
       "trimType": "auto",
       "trimThreshold": 1,
@@ -238,7 +150,7 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 106,
+      "trimY": 157,
       "width": 561,
       "height": 57,
       "rawWidth": 561,
@@ -259,11 +171,11 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 736,
-      "trimY": 106,
-      "width": 59,
+      "trimX": 793,
+      "trimY": 0,
+      "width": 122,
       "height": 59,
-      "rawWidth": 59,
+      "rawWidth": 122,
       "rawHeight": 59,
       "borderTop": 0,
       "borderBottom": 0,
@@ -272,226 +184,6 @@
       "spriteType": "normal",
       "subMetas": {}
     },
-    "hall (20).png": {
-      "ver": "1.0.3",
-      "uuid": "fe434fb7-6630-47ba-aab1-96e2a0cee8aa",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 230,
-      "trimY": 0,
-      "width": 58,
-      "height": 32,
-      "rawWidth": 58,
-      "rawHeight": 32,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (21).png": {
-      "ver": "1.0.3",
-      "uuid": "52c9e1d0-89c7-4a0a-aafc-8797f4cecc32",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 96,
-      "trimY": 49,
-      "width": 53,
-      "height": 53,
-      "rawWidth": 53,
-      "rawHeight": 53,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (22).png": {
-      "ver": "1.0.3",
-      "uuid": "52626d96-5296-4077-b3f2-7d6cd6cb0e78",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 149,
-      "trimY": 49,
-      "width": 51,
-      "height": 53,
-      "rawWidth": 51,
-      "rawHeight": 53,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (23).png": {
-      "ver": "1.0.3",
-      "uuid": "61ed0f5b-b715-4e60-ab60-f9c392e90db8",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 319,
-      "trimY": 49,
-      "width": 561,
-      "height": 57,
-      "rawWidth": 561,
-      "rawHeight": 57,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (24).png": {
-      "ver": "1.0.3",
-      "uuid": "3cd08ed7-d722-4c0f-8a0d-45393a3755e0",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 75,
-      "trimY": 0,
-      "width": 68,
-      "height": 21,
-      "rawWidth": 68,
-      "rawHeight": 21,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (25).png": {
-      "ver": "1.0.3",
-      "uuid": "08dea84d-cc5e-4194-af35-7e1a14a5fccb",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 606,
-      "trimY": 165,
-      "width": 38,
-      "height": 118,
-      "rawWidth": 38,
-      "rawHeight": 118,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (26).png": {
-      "ver": "1.0.3",
-      "uuid": "2f3ce66c-dd0d-4065-b691-edd0e438ff17",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 143,
-      "trimY": 0,
-      "width": 29,
-      "height": 29,
-      "rawWidth": 29,
-      "rawHeight": 29,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (27).png": {
-      "ver": "1.0.3",
-      "uuid": "7dc6eb98-0e61-4440-9b28-79b36d82c51c",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 520,
-      "trimY": 0,
-      "width": 18,
-      "height": 33,
-      "rawWidth": 18,
-      "rawHeight": 33,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (28).png": {
-      "ver": "1.0.3",
-      "uuid": "fdc63f7b-475e-4e00-9994-3659b59e2498",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 75,
-      "height": 1,
-      "rawWidth": 75,
-      "rawHeight": 1,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (29).png": {
-      "ver": "1.0.3",
-      "uuid": "7202f678-fac8-4ac8-875a-050a7bf9af87",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 51,
-      "trimY": 49,
-      "width": 45,
-      "height": 52,
-      "rawWidth": 45,
-      "rawHeight": 52,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
     "hall (3).png": {
       "ver": "1.0.3",
       "uuid": "ad19d7f6-2827-4fa7-9ec6-4c2f3d1f5a4d",
@@ -501,34 +193,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 795,
-      "trimY": 106,
-      "width": 58,
-      "height": 59,
-      "rawWidth": 58,
-      "rawHeight": 59,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (30).png": {
-      "ver": "1.0.3",
-      "uuid": "83ebcf79-cf9f-4946-b048-37b2ec343194",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 172,
+      "trimX": 544,
       "trimY": 0,
-      "width": 58,
-      "height": 31,
-      "rawWidth": 58,
-      "rawHeight": 31,
+      "width": 122,
+      "height": 54,
+      "rawWidth": 122,
+      "rawHeight": 54,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -545,12 +215,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 561,
-      "trimY": 106,
-      "width": 59,
-      "height": 59,
-      "rawWidth": 59,
-      "rawHeight": 59,
+      "trimX": 432,
+      "trimY": 0,
+      "width": 112,
+      "height": 57,
+      "rawWidth": 112,
+      "rawHeight": 57,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -567,12 +237,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 620,
-      "trimY": 106,
-      "width": 59,
-      "height": 59,
-      "rawWidth": 59,
-      "rawHeight": 59,
+      "trimX": 666,
+      "trimY": 0,
+      "width": 127,
+      "height": 55,
+      "rawWidth": 127,
+      "rawHeight": 55,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -589,12 +259,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 49,
-      "width": 51,
-      "height": 51,
-      "rawWidth": 51,
-      "rawHeight": 51,
+      "trimX": 197,
+      "trimY": 0,
+      "width": 117,
+      "height": 53,
+      "rawWidth": 117,
+      "rawHeight": 53,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -611,12 +281,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 820,
+      "trimX": 314,
       "trimY": 0,
-      "width": 49,
-      "height": 49,
-      "rawWidth": 49,
-      "rawHeight": 49,
+      "width": 118,
+      "height": 53,
+      "rawWidth": 118,
+      "rawHeight": 53,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -633,12 +303,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 165,
-      "width": 388,
-      "height": 92,
-      "rawWidth": 388,
-      "rawHeight": 92,
+      "trimX": 88,
+      "trimY": 0,
+      "width": 50,
+      "height": 47,
+      "rawWidth": 50,
+      "rawHeight": 47,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -655,12 +325,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 679,
-      "trimY": 106,
-      "width": 57,
-      "height": 59,
-      "rawWidth": 57,
-      "rawHeight": 59,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 44,
+      "height": 44,
+      "rawWidth": 44,
+      "rawHeight": 44,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/resources/plists/hall.png


+ 5 - 5
assets/resources/plists/hall.png.meta

@@ -14,13 +14,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": -2,
-      "offsetY": 1,
+      "offsetY": 3,
       "trimX": 0,
       "trimY": 0,
-      "width": 876,
-      "height": 624,
-      "rawWidth": 880,
-      "rawHeight": 626,
+      "width": 945,
+      "height": 243,
+      "rawWidth": 949,
+      "rawHeight": 249,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 521 - 187
assets/scenes/hall.fire


+ 0 - 11
assets/scripts/Login.js

@@ -1,11 +0,0 @@
-
-cc.Class({
-    extends: cc.Component,
-    
-    onBtnQuickStartClicked:function(){
-        // cc.vv.userMgr.guestAuth();
-        //jump to register user info.
-        cc.director.loadScene("hall");
-    },
-    
-});

+ 18 - 0
assets/scripts/framework/FireEventObserver.js

@@ -2,6 +2,7 @@
 import LogicUnitManager from './LogicUnitManager'
 import DataModelManager from 'DataModelManager'
 import GameProcessManager   from '../net/GameProcessManager'
+import PlayerInfoModel from '../model/PlayerInfoModel';
 
 cc.Class({
     extends: cc.Component,
@@ -78,5 +79,22 @@ cc.Class({
            
        }
     },
+
+    playShow(callbackFun)
+    {
+        this.node.opacity=0;
+        this.node.runAction(cc.fadeIn(1.0));
+    },
+
+    playEnd(nextSence)
+    {
+        var callbackFun = null
+        if (nextSence) {
+            callbackFun = function(){
+                cc.director.loadScene(nextSence)
+                };
+        }
+        this.node.runAction(cc.sequence(cc.fadeOut(1.0),cc.callFunc(callbackFun)));
+    }
     
 });

+ 152 - 0
assets/scripts/view/CarGameHallController.js

@@ -0,0 +1,152 @@
+import FireEventObserver from '../framework/FireEventObserver';
+import PreloadManager from '../common/PreloadManager';
+import AudioControlManager from '../common/AudioControlManager';
+import Event from '../net/Event';
+import LogicUnitManager from '../framework/LogicUnitManager'
+import Common from '../common/Common';
+
+cc.Class({
+    extends: FireEventObserver,
+
+    properties: {
+        // progressBar: cc.ProgressBar,
+
+        // wxLogin:cc.Button,
+        // ykLogin:cc.Button,
+        // zhLogin:cc.Button,
+        // ljLogin:cc.Button,
+        // yk2Login:cc.Button,
+
+        // loginBtnNode:cc.Node,
+        // loadproNode:cc.Node,
+        // loginBannerNode:cc.Node,
+
+        // regAndreadNode:cc.Node,
+        // regNode:cc.Node,
+        // readNode:cc.Node,
+        // gotoRegBtn:cc.Node,
+        
+    },
+
+    onLoad()
+    {
+        // window['onGameBoot']();
+        // cc.macro.ENABLE_CULLING = false;
+        // this.loginBtnNode.active = false
+        // this.progressBarTarget = 0;
+        // this.scale = 1;
+        // this.initListener();
+        // this.preloadCount = 0;
+        // this.preloadTotal = 5;
+        // this.lum = LogicUnitManager;
+        // this.loginLogic = this.lum.getBehavior('LoginBehavior');
+        // // this.loginLogic.CreateLoginStart();
+        // this.bloaded = true
+        this.playShow()
+    },
+
+    initListener()
+    {
+        // this.onBehaviorEvent('LoginBehavior',Event.COM_MSG.PRELOAD_DONE,this.onLoaded.bind(this));
+        // this.onBehaviorEvent('LoginBehavior',Event.SOCKET_MSG.OPEN, this.onSocketOpen.bind(this));
+    },
+
+
+    onSocketOpen(sender,result)
+    {
+        this.bloaded = true
+    },
+
+    onLoaded(sender, result)
+    {
+        this.preloadCount++;
+        this.progressBarTarget = this.preloadCount / this.preloadTotal;
+        console.log("this.preloadCount:"+this.preloadCount+"this.progressBarTarget:"+this.progressBarTarget+"")
+        if (this.progressBarTarget >= 1 && this.bloaded)
+        {
+            this.onResourcesLoaded();
+        }
+    },
+
+    start()
+    {
+        // this.preloadManager = new PreloadManager();
+        // this.audioControlManager = new AudioControlManager();
+        // //加载动画和预制体
+        // this.preloadManager.run();
+        // //加载音频
+        // this.audioControlManager.run();
+
+        // var self = this;
+        // cc.director.preloadScene("hall", function(){
+        //     console.log("preload scene battle");
+        //     self.onLoaded();
+        // })
+    },
+
+    onResourcesLoaded()
+    {
+        this.loginBtnNode.active = true
+        this.loadproNode.active = false
+    },
+
+    update(dt)
+    {
+        // if (this.progressBar.progress < this.progressBarTarget)
+        // {
+        //     this.progressBar.progress += dt*this.scale
+        // }
+        // if (this.progressBarTarget >= 1 && this.bloaded && this.loginLogic.needShowAuth == false) {
+        //     this.onResourcesLoaded();
+        // } else if (this.progressBarTarget >= 5 / 6 && this.bloaded && this.loginLogic.needShowAuth == false) {
+        //     this.onResourcesLoaded();
+        // }
+    },
+
+    clickWXLogin(sender)
+    {
+        //weixin login
+        // this.loginLogic.login()
+    },
+    clickYKLogin(sender){
+        //youke login
+        cc.director.loadScene('hall');
+    },
+    clickZHLogin(sender){
+        //zhang hao login
+        sender.target.active = false
+        this.ykLogin.node.active = false
+
+        this.loginBannerNode.active = true
+        this.ljLogin.node.active = true
+        this.yk2Login.node.active = true
+    },
+
+    clickRegBtn(sender){
+        this.regAndreadNode.active = true
+        this.regNode.active = true
+    },
+
+    clickReadYsBtn(sender){
+        this.regNode.active = false
+        this.readNode.active = true
+        
+    },
+
+    clickCloseReg(sender){
+        if (this.regNode.active) {
+            this.regAndreadNode.active = false
+        }else{
+            this.regNode.active = true
+            this.readNode.active = false
+        }
+    },
+
+    clickCarGameHall(sender){
+        this.node.runAction(cc.sequence(cc.fadeOut(1.0),cc.callFunc(function(){
+            cc.director.loadScene('cargamehall')
+            })));
+    }
+});
+
+

+ 1 - 1
assets/scripts/Login.js.meta → assets/scripts/view/CarGameHallController.js.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.5",
-  "uuid": "ca35cf13-5ade-4333-b6af-da74802fc53a",
+  "uuid": "9b4c6428-bfad-48e8-9d28-3f26ca30ede3",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

+ 171 - 0
assets/scripts/view/DzjjHallController.js

@@ -0,0 +1,171 @@
+import FireEventObserver from '../framework/FireEventObserver';
+import PreloadManager from '../common/PreloadManager';
+import AudioControlManager from '../common/AudioControlManager';
+import Event from '../net/Event';
+import LogicUnitManager from '../framework/LogicUnitManager'
+import Common from '../common/Common';
+
+cc.Class({
+    extends: FireEventObserver,
+
+    properties: {
+        // progressBar: cc.ProgressBar,
+
+        // wxLogin:cc.Button,
+        // ykLogin:cc.Button,
+        // zhLogin:cc.Button,
+        // ljLogin:cc.Button,
+        // yk2Login:cc.Button,
+
+        // loginBtnNode:cc.Node,
+        // loadproNode:cc.Node,
+        // loginBannerNode:cc.Node,
+
+        // regAndreadNode:cc.Node,
+        // regNode:cc.Node,
+        // readNode:cc.Node,
+        // gotoRegBtn:cc.Node,
+        plane:cc.Node,
+        gamsNode:cc.Node,
+        
+    },
+
+    onLoad()
+    {
+        // window['onGameBoot']();
+        // cc.macro.ENABLE_CULLING = false;
+        // this.loginBtnNode.active = false
+        // this.progressBarTarget = 0;
+        // this.scale = 1;
+        // this.initListener();
+        // this.preloadCount = 0;
+        // this.preloadTotal = 5;
+        // this.lum = LogicUnitManager;
+        // this.loginLogic = this.lum.getBehavior('LoginBehavior');
+        // // this.loginLogic.CreateLoginStart();
+        // this.bloaded = true
+        // this.playShow()
+        // this.show()
+    },
+
+    initListener()
+    {
+        // this.onBehaviorEvent('LoginBehavior',Event.COM_MSG.PRELOAD_DONE,this.onLoaded.bind(this));
+        // this.onBehaviorEvent('LoginBehavior',Event.SOCKET_MSG.OPEN, this.onSocketOpen.bind(this));
+    },
+
+
+    onSocketOpen(sender,result)
+    {
+        this.bloaded = true
+    },
+
+    onLoaded(sender, result)
+    {
+        // this.preloadCount++;
+        // this.progressBarTarget = this.preloadCount / this.preloadTotal;
+        // console.log("this.preloadCount:"+this.preloadCount+"this.progressBarTarget:"+this.progressBarTarget+"")
+        // if (this.progressBarTarget >= 1 && this.bloaded)
+        // {
+        //     this.onResourcesLoaded();
+        // }
+    },
+
+    start()
+    {
+        // this.preloadManager = new PreloadManager();
+        // this.audioControlManager = new AudioControlManager();
+        // //加载动画和预制体
+        // this.preloadManager.run();
+        // //加载音频
+        // this.audioControlManager.run();
+
+        // var self = this;
+        // cc.director.preloadScene("hall", function(){
+        //     console.log("preload scene battle");
+        //     self.onLoaded();
+        // })
+    },
+
+    onResourcesLoaded()
+    {
+        this.loginBtnNode.active = true
+        this.loadproNode.active = false
+    },
+
+    update(dt)
+    {
+        // if (this.progressBar.progress < this.progressBarTarget)
+        // {
+        //     this.progressBar.progress += dt*this.scale
+        // }
+        // if (this.progressBarTarget >= 1 && this.bloaded && this.loginLogic.needShowAuth == false) {
+        //     this.onResourcesLoaded();
+        // } else if (this.progressBarTarget >= 5 / 6 && this.bloaded && this.loginLogic.needShowAuth == false) {
+        //     this.onResourcesLoaded();
+        // }
+    },
+
+    clickWXLogin(sender)
+    {
+        //weixin login
+        // this.loginLogic.login()
+    },
+    clickYKLogin(sender){
+        //youke login
+        cc.director.loadScene('hall');
+    },
+    clickZHLogin(sender){
+        //zhang hao login
+        sender.target.active = false
+        this.ykLogin.node.active = false
+
+        this.loginBannerNode.active = true
+        this.ljLogin.node.active = true
+        this.yk2Login.node.active = true
+    },
+
+    clickRegBtn(sender){
+        this.regAndreadNode.active = true
+        this.regNode.active = true
+    },
+
+    clickReadYsBtn(sender){
+        this.regNode.active = false
+        this.readNode.active = true
+        
+    },
+
+    clickCloseReg(sender){
+        if (this.regNode.active) {
+            this.regAndreadNode.active = false
+        }else{
+            this.regNode.active = true
+            this.readNode.active = false
+        }
+    },
+
+    clickCarGameHall(sender){
+        this.node.runAction(cc.sequence(cc.fadeOut(1.0),cc.callFunc(function(){
+            cc.director.loadScene('cargamehall')
+            })));
+    },
+    show()
+    {
+        var animationPlane = this.plane.getComponent(cc.Animation);
+        
+        
+        var hallsGoFinished = function(){
+            this.node.active = true
+        };
+        animationPlane.on('play', hallsGoFinished, this);
+        this.node.active = true
+        animationPlane.play('showplane');
+        this.gamsNode.getComponent(cc.Animation).play('showDzjjgame')
+    },
+    showMy: function(){
+        this.node.active = true
+    }
+});
+
+

+ 9 - 0
assets/scripts/view/DzjjHallController.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "0150bfa0-787f-4e44-8612-9bbd7fc11f90",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 178 - 0
assets/scripts/view/GamesHallController.js

@@ -0,0 +1,178 @@
+import FireEventObserver from '../framework/FireEventObserver';
+import PreloadManager from '../common/PreloadManager';
+import AudioControlManager from '../common/AudioControlManager';
+import Event from '../net/Event';
+import LogicUnitManager from '../framework/LogicUnitManager'
+import Common from '../common/Common';
+
+cc.Class({
+    extends: FireEventObserver,
+
+    properties: {
+        // progressBar: cc.ProgressBar,
+
+        // wxLogin:cc.Button,
+        // ykLogin:cc.Button,
+        // zhLogin:cc.Button,
+        // ljLogin:cc.Button,
+        // yk2Login:cc.Button,
+
+        // loginBtnNode:cc.Node,
+        // loadproNode:cc.Node,
+        // loginBannerNode:cc.Node,
+
+        // regAndreadNode:cc.Node,
+        // regNode:cc.Node,
+        // readNode:cc.Node,
+        // gotoRegBtn:cc.Node,
+        nvren:cc.Node,
+        hallsBtns:cc.Node,
+        dzjjHall:cc.Node,
+    },
+
+    onLoad()
+    {
+        // window['onGameBoot']();
+        // cc.macro.ENABLE_CULLING = false;
+        // this.loginBtnNode.active = false
+        // this.progressBarTarget = 0;
+        // this.scale = 1;
+        // this.initListener();
+        // this.preloadCount = 0;
+        // this.preloadTotal = 5;
+        // this.lum = LogicUnitManager;
+        // this.loginLogic = this.lum.getBehavior('LoginBehavior');
+        // // this.loginLogic.CreateLoginStart();
+        // this.bloaded = true
+        // this.node.Opacity=0;
+        // this.node.runAction(cc.fadeIn(1.0));
+        this.dzjjHall.active = false
+        this.animation = this.nvren.getComponent(cc.Animation);
+        
+        this.animation.on('finished', this.onGuideFinished, this);
+        this.animation.play('nrcome1');
+        
+    },
+    onGuideFinished(){
+        console.log("onGuideFinished--------------------")
+        this.animation.play('nrcome')
+    },
+
+    initListener()
+    {
+        // this.onBehaviorEvent('LoginBehavior',Event.COM_MSG.PRELOAD_DONE,this.onLoaded.bind(this));
+        // this.onBehaviorEvent('LoginBehavior',Event.SOCKET_MSG.OPEN, this.onSocketOpen.bind(this));
+    },
+
+
+    onSocketOpen(sender,result)
+    {
+        this.bloaded = true
+    },
+
+    onLoaded(sender, result)
+    {
+        this.preloadCount++;
+        this.progressBarTarget = this.preloadCount / this.preloadTotal;
+        console.log("this.preloadCount:"+this.preloadCount+"this.progressBarTarget:"+this.progressBarTarget+"")
+        if (this.progressBarTarget >= 1 && this.bloaded)
+        {
+            this.onResourcesLoaded();
+        }
+    },
+
+    start()
+    {
+        // this.preloadManager = new PreloadManager();
+        // this.audioControlManager = new AudioControlManager();
+        // //加载动画和预制体
+        // this.preloadManager.run();
+        // //加载音频
+        // this.audioControlManager.run();
+
+        // var self = this;
+        // cc.director.preloadScene("hall", function(){
+        //     console.log("preload scene battle");
+        //     self.onLoaded();
+        // })
+    },
+
+    onResourcesLoaded()
+    {
+        this.loginBtnNode.active = true
+        this.loadproNode.active = false
+    },
+
+    update(dt)
+    {
+        // if (this.progressBar.progress < this.progressBarTarget)
+        // {
+        //     this.progressBar.progress += dt*this.scale
+        // }
+        // if (this.progressBarTarget >= 1 && this.bloaded && this.loginLogic.needShowAuth == false) {
+        //     this.onResourcesLoaded();
+        // } else if (this.progressBarTarget >= 5 / 6 && this.bloaded && this.loginLogic.needShowAuth == false) {
+        //     this.onResourcesLoaded();
+        // }
+    },
+
+    clickWXLogin(sender)
+    {
+        //weixin login
+        // this.loginLogic.login()
+    },
+    clickYKLogin(sender){
+        //youke login
+        cc.director.loadScene('hall');
+    },
+    clickZHLogin(sender){
+        //zhang hao login
+        sender.target.active = false
+        this.ykLogin.node.active = false
+
+        this.loginBannerNode.active = true
+        this.ljLogin.node.active = true
+        this.yk2Login.node.active = true
+    },
+
+    clickRegBtn(sender){
+        this.regAndreadNode.active = true
+        this.regNode.active = true
+    },
+
+    clickReadYsBtn(sender){
+        this.regNode.active = false
+        this.readNode.active = true
+        
+    },
+
+    clickCloseReg(sender){
+        if (this.regNode.active) {
+            this.regAndreadNode.active = false
+        }else{
+            this.regNode.active = true
+            this.readNode.active = false
+        }
+    },
+
+    clickCarGameHall(sender){
+        this.playEnd('cargamehall')
+    },
+    clickDZJJHall(sender){
+        
+        var animation = this.hallsBtns.getComponent(cc.Animation);
+        var hallsGoFinished = function(){
+            // this.dzjjHall.active = true
+            console.log(this.dzjjHall.getComponent('DzjjHallController'))
+            this.dzjjHall.getComponent('DzjjHallController').show()
+        };
+        animation.on('finished', hallsGoFinished, this);
+        animation.play('hallsgo');
+        this.animation.play('nrgo')
+    },
+    clickReturnBtn(){
+        
+    },
+});
+
+

+ 9 - 0
assets/scripts/view/GamesHallController.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "91e0e45a-eb48-4894-a66f-412c5677f9af",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 7 - 0
assets/textures/Competitivegame.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "3559b894-89f6-412b-ad2d-d316f5c6ae5a",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

BIN
assets/textures/Competitivegame/jdqs.png


+ 31 - 0
assets/textures/Competitivegame/jdqs.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "57399111-8364-4671-8843-f5c45c237b43",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "jdqs": {
+      "ver": "1.0.3",
+      "uuid": "8e283c21-9e80-42db-9d12-0d0d9cd5429c",
+      "rawTextureUuid": "57399111-8364-4671-8843-f5c45c237b43",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 3.5,
+      "offsetY": 0,
+      "trimX": 7,
+      "trimY": 0,
+      "width": 269,
+      "height": 594,
+      "rawWidth": 276,
+      "rawHeight": 594,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/Competitivegame/plane.png


+ 11 - 11
assets/textures/hall/体育.png.meta → assets/textures/Competitivegame/plane.png.meta

@@ -1,26 +1,26 @@
 {
   "ver": "2.2.0",
-  "uuid": "193b5ea6-4f59-4b1d-9018-69b99e0f662b",
+  "uuid": "5a553c35-c92a-4dc4-947c-7d8ebc2f9167",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "subMetas": {
-    "体育": {
+    "plane": {
       "ver": "1.0.3",
-      "uuid": "3323b0f9-2733-453b-831b-c32f44c72bc4",
-      "rawTextureUuid": "193b5ea6-4f59-4b1d-9018-69b99e0f662b",
+      "uuid": "b4a6fbc7-5ad9-4d3c-979e-3a24713c6ded",
+      "rawTextureUuid": "5a553c35-c92a-4dc4-947c-7d8ebc2f9167",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -9.5,
-      "trimX": 0,
-      "trimY": 19,
-      "width": 224,
-      "height": 230,
-      "rawWidth": 224,
-      "rawHeight": 249,
+      "offsetY": -0.5,
+      "trimX": 4,
+      "trimY": 5,
+      "width": 101,
+      "height": 457,
+      "rawWidth": 109,
+      "rawHeight": 466,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/Competitivegame/scgo.png


+ 9 - 9
assets/textures/hall/欢乐捕鱼.png.meta → assets/textures/Competitivegame/scgo.png.meta

@@ -1,26 +1,26 @@
 {
   "ver": "2.2.0",
-  "uuid": "132cbf75-c54c-470f-ad0b-f3cc907a2a9f",
+  "uuid": "40db6004-eed5-43b7-ac6f-67ecce15fa95",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "subMetas": {
-    "欢乐捕鱼": {
+    "scgo": {
       "ver": "1.0.3",
-      "uuid": "4a8c74af-0878-48d4-9998-e2d017524199",
-      "rawTextureUuid": "132cbf75-c54c-470f-ad0b-f3cc907a2a9f",
+      "uuid": "e975e311-61fb-460b-bc17-4011cd1dbeb7",
+      "rawTextureUuid": "40db6004-eed5-43b7-ac6f-67ecce15fa95",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 4,
       "trimY": 0,
-      "width": 224,
-      "height": 249,
-      "rawWidth": 224,
-      "rawHeight": 249,
+      "width": 269,
+      "height": 594,
+      "rawWidth": 277,
+      "rawHeight": 594,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/Competitivegame/wzrr.png


+ 31 - 0
assets/textures/Competitivegame/wzrr.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "029b7a14-d843-4f45-be4a-47c63b478bd4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "wzrr": {
+      "ver": "1.0.3",
+      "uuid": "8410a466-7613-4550-a5b8-082284916e9f",
+      "rawTextureUuid": "029b7a14-d843-4f45-be4a-47c63b478bd4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -3.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 269,
+      "height": 594,
+      "rawWidth": 276,
+      "rawHeight": 594,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/Competitivegame/yxlm.png


+ 31 - 0
assets/textures/Competitivegame/yxlm.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "c1c7a703-b299-4631-993e-11983a42d623",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "yxlm": {
+      "ver": "1.0.3",
+      "uuid": "c6d63e4a-481d-4574-a7ee-871ca6e72dc4",
+      "rawTextureUuid": "c1c7a703-b299-4631-993e-11983a42d623",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2.5,
+      "offsetY": 0,
+      "trimX": 5,
+      "trimY": 0,
+      "width": 271,
+      "height": 596,
+      "rawWidth": 276,
+      "rawHeight": 596,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 7 - 0
assets/textures/cargamehall.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "861a837c-b424-4ad4-8227-b7efd10ce895",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

BIN
assets/textures/cargamehall/bg.png


+ 8 - 8
assets/textures/hall/真人.png.meta → assets/textures/cargamehall/bg.png.meta

@@ -1,15 +1,15 @@
 {
   "ver": "2.2.0",
-  "uuid": "e6fd4579-fb4b-4c9a-b7aa-fc3bd1d4c169",
+  "uuid": "51a1d003-af53-4bfe-9802-167f866f74b6",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "subMetas": {
-    "真人": {
+    "bg": {
       "ver": "1.0.3",
-      "uuid": "c9727590-ed17-49fd-8fd3-8dff191fe897",
-      "rawTextureUuid": "e6fd4579-fb4b-4c9a-b7aa-fc3bd1d4c169",
+      "uuid": "da560717-e218-4e2e-acf7-eb5c6c39d1d6",
+      "rawTextureUuid": "51a1d003-af53-4bfe-9802-167f866f74b6",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -17,10 +17,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 224,
-      "height": 249,
-      "rawWidth": 224,
-      "rawHeight": 249,
+      "width": 1334,
+      "height": 750,
+      "rawWidth": 1334,
+      "rawHeight": 750,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/cargamehall/bottom.png


+ 8 - 8
assets/textures/hall/游艺.png.meta → assets/textures/cargamehall/bottom.png.meta

@@ -1,15 +1,15 @@
 {
   "ver": "2.2.0",
-  "uuid": "bc8fa3f1-a184-4bb3-bfcb-fb1aaee2ca29",
+  "uuid": "5816096e-a75f-48f8-bfd6-ccb6d20ff6d3",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "subMetas": {
-    "游艺": {
+    "bottom": {
       "ver": "1.0.3",
-      "uuid": "cd73c2c4-3531-47b0-8cc5-821800ee370b",
-      "rawTextureUuid": "bc8fa3f1-a184-4bb3-bfcb-fb1aaee2ca29",
+      "uuid": "d96becfe-43fd-4b90-a927-b1b30837501c",
+      "rawTextureUuid": "5816096e-a75f-48f8-bfd6-ccb6d20ff6d3",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -17,10 +17,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 224,
-      "height": 249,
-      "rawWidth": 224,
-      "rawHeight": 249,
+      "width": 1319,
+      "height": 174,
+      "rawWidth": 1319,
+      "rawHeight": 174,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/cargamehall/game1.png


+ 31 - 0
assets/textures/cargamehall/game1.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "4922c624-0252-4f42-99e7-2353c1072eac",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "game1": {
+      "ver": "1.0.3",
+      "uuid": "ed6cb3f9-d992-4b88-8078-1a467776af9e",
+      "rawTextureUuid": "4922c624-0252-4f42-99e7-2353c1072eac",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 9,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 300,
+      "height": 282,
+      "rawWidth": 300,
+      "rawHeight": 300,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/cargamehall/game2.png


+ 31 - 0
assets/textures/cargamehall/game2.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "3cff736e-0f9c-4a47-9609-4b0596c96323",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "game2": {
+      "ver": "1.0.3",
+      "uuid": "725d38ea-4684-46c9-9e46-eb9902bef135",
+      "rawTextureUuid": "3cff736e-0f9c-4a47-9609-4b0596c96323",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 17,
+      "width": 300,
+      "height": 265,
+      "rawWidth": 300,
+      "rawHeight": 300,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/cargamehall/game3.png


+ 31 - 0
assets/textures/cargamehall/game3.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "7b02bc0a-2181-497f-a61b-696c93383832",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "game3": {
+      "ver": "1.0.3",
+      "uuid": "60297324-bfd0-4089-b810-976778a9d061",
+      "rawTextureUuid": "7b02bc0a-2181-497f-a61b-696c93383832",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 4,
+      "trimX": 0,
+      "trimY": 10,
+      "width": 300,
+      "height": 272,
+      "rawWidth": 300,
+      "rawHeight": 300,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/cargamehall/game4.png


+ 31 - 0
assets/textures/cargamehall/game4.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "7535843b-127a-4fbc-920c-3245f680a5d0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "game4": {
+      "ver": "1.0.3",
+      "uuid": "bfd8b1f4-171c-48e3-a322-ed2350bede3c",
+      "rawTextureUuid": "7535843b-127a-4fbc-920c-3245f680a5d0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 15,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 300,
+      "height": 270,
+      "rawWidth": 300,
+      "rawHeight": 300,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/cargamehall/game5.png


+ 31 - 0
assets/textures/cargamehall/game5.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "fb868c4b-86d3-4014-8393-647dcf2a1eeb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "game5": {
+      "ver": "1.0.3",
+      "uuid": "9b8925f8-abc7-4a6d-9670-70eb1694b833",
+      "rawTextureUuid": "fb868c4b-86d3-4014-8393-647dcf2a1eeb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 6,
+      "trimX": 0,
+      "trimY": 6,
+      "width": 300,
+      "height": 276,
+      "rawWidth": 300,
+      "rawHeight": 300,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/cargamehall/game6.png


+ 31 - 0
assets/textures/cargamehall/game6.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "d6c4762c-d165-4344-9c78-bd3ba8392ec0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "game6": {
+      "ver": "1.0.3",
+      "uuid": "c2e7734b-1af7-455d-86c7-bf6bab486449",
+      "rawTextureUuid": "d6c4762c-d165-4344-9c78-bd3ba8392ec0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 14,
+      "width": 300,
+      "height": 271,
+      "rawWidth": 300,
+      "rawHeight": 300,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/cargamehall/nvr.png


+ 31 - 0
assets/textures/cargamehall/nvr.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "ad785570-f948-4928-93eb-522163a32f12",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "nvr": {
+      "ver": "1.0.3",
+      "uuid": "c280c021-019b-40f5-bb9e-809c725347e8",
+      "rawTextureUuid": "ad785570-f948-4928-93eb-522163a32f12",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0.5,
+      "trimX": 1,
+      "trimY": 0,
+      "width": 438,
+      "height": 643,
+      "rawWidth": 441,
+      "rawHeight": 644,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/cargamehall/topbanner.png


+ 31 - 0
assets/textures/cargamehall/topbanner.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "147b18ad-41ee-4d2d-9f7e-dcaa5d3b649e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "topbanner": {
+      "ver": "1.0.3",
+      "uuid": "16af9438-b289-4fd0-8bdf-cc7b85ed745b",
+      "rawTextureUuid": "147b18ad-41ee-4d2d-9f7e-dcaa5d3b649e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 4,
+      "trimY": 4,
+      "width": 1336,
+      "height": 119,
+      "rawWidth": 1344,
+      "rawHeight": 127,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/hall/bg.png


BIN
assets/textures/hall/bottom.png


+ 4 - 4
assets/textures/hall/bottom.png.meta

@@ -15,10 +15,10 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": -0.5,
-      "trimX": 4,
-      "trimY": 5,
-      "width": 1261,
-      "height": 85,
+      "trimX": 5,
+      "trimY": 6,
+      "width": 1259,
+      "height": 83,
       "rawWidth": 1269,
       "rawHeight": 94,
       "borderTop": 0,

BIN
assets/textures/hall/cpdd.png


+ 9 - 9
assets/textures/hall/彩票.png.meta → assets/textures/hall/cpdd.png.meta

@@ -1,26 +1,26 @@
 {
   "ver": "2.2.0",
-  "uuid": "cf5bc598-3732-42a4-a46c-a407ba4c56a2",
+  "uuid": "958493b4-d631-4cfe-9793-f3e960d98853",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "subMetas": {
-    "彩票": {
+    "cpdd": {
       "ver": "1.0.3",
-      "uuid": "2ebc620e-86f2-45a7-9909-2071ec55c710",
-      "rawTextureUuid": "cf5bc598-3732-42a4-a46c-a407ba4c56a2",
+      "uuid": "fd49a8b1-32ef-4476-9beb-7c700578ac4c",
+      "rawTextureUuid": "958493b4-d631-4cfe-9793-f3e960d98853",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": -0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 2,
       "trimY": 0,
-      "width": 299,
-      "height": 525,
-      "rawWidth": 300,
-      "rawHeight": 525,
+      "width": 269,
+      "height": 598,
+      "rawWidth": 274,
+      "rawHeight": 598,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/dzyy.png


+ 31 - 0
assets/textures/hall/dzyy.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "47e30c2c-0cb7-4567-8ade-f5339f0b9590",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "dzyy": {
+      "ver": "1.0.3",
+      "uuid": "d4a1b667-6801-48f7-aed3-138756f833a5",
+      "rawTextureUuid": "47e30c2c-0cb7-4567-8ade-f5339f0b9590",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 0,
+      "width": 269,
+      "height": 598,
+      "rawWidth": 274,
+      "rawHeight": 598,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/hall/nvren.png


+ 8 - 8
assets/textures/hall/竞技.png.meta → assets/textures/hall/nvren.png.meta

@@ -1,15 +1,15 @@
 {
   "ver": "2.2.0",
-  "uuid": "641493a8-0c66-4adf-a246-64f91df30021",
+  "uuid": "49238004-1b5e-439b-a060-cfc8ef44cca3",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "subMetas": {
-    "竞技": {
+    "nvren": {
       "ver": "1.0.3",
-      "uuid": "e8833ab8-0896-4d86-9e48-68cf7ed473e3",
-      "rawTextureUuid": "641493a8-0c66-4adf-a246-64f91df30021",
+      "uuid": "cb542506-d8d1-4b81-b03e-d0bc33cee179",
+      "rawTextureUuid": "49238004-1b5e-439b-a060-cfc8ef44cca3",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -17,10 +17,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 224,
-      "height": 249,
-      "rawWidth": 224,
-      "rawHeight": 249,
+      "width": 360,
+      "height": 689,
+      "rawWidth": 360,
+      "rawHeight": 689,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/qpdd.png


+ 31 - 0
assets/textures/hall/qpdd.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "dc906a03-7857-484c-9acc-90ce122ac11f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "qpdd": {
+      "ver": "1.0.3",
+      "uuid": "468e54fd-77fb-43f3-a7d8-6d7bb1e924f6",
+      "rawTextureUuid": "dc906a03-7857-484c-9acc-90ce122ac11f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 0,
+      "trimX": 3,
+      "trimY": 0,
+      "width": 269,
+      "height": 598,
+      "rawWidth": 274,
+      "rawHeight": 598,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/hall/体育.png


BIN
assets/textures/hall/彩票.png


BIN
assets/textures/hall/棋牌大厅.png


BIN
assets/textures/hall/欢乐捕鱼.png


BIN
assets/textures/hall/游艺.png


BIN
assets/textures/hall/真人.png


BIN
assets/textures/hall/竞技.png


+ 2 - 2
settings/project.json

@@ -29,7 +29,7 @@
     "height": 640,
     "width": 960
   },
-  "start-scene": "current",
   "use-customize-simulator": true,
-  "use-project-simulator-setting": false
+  "use-project-simulator-setting": false,
+  "start-scene": "current"
 }

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels