Johson 6 lat temu
rodzic
commit
876e199338
53 zmienionych plików z 470 dodań i 428 usunięć
  1. 56 56
      assets/resources/plists/hall.plist
  2. 104 104
      assets/resources/plists/hall.plist.meta
  3. BIN
      assets/resources/plists/hall.png
  4. 6 6
      assets/resources/plists/hall.png.meta
  5. 128 131
      assets/scenes/hall.fire
  6. 13 1
      assets/scripts/view/GamesHallController.js
  7. 2 1
      assets/scripts/view/SubHallManger.js
  8. BIN
      assets/textures/Competitivegame/jdqs.png
  9. 6 6
      assets/textures/Competitivegame/jdqs.png.meta
  10. BIN
      assets/textures/Competitivegame/scgo.png
  11. 6 6
      assets/textures/Competitivegame/scgo.png.meta
  12. BIN
      assets/textures/Competitivegame/wzrr.png
  13. 6 6
      assets/textures/Competitivegame/wzrr.png.meta
  14. BIN
      assets/textures/Competitivegame/yxlm.png
  15. 7 7
      assets/textures/Competitivegame/yxlm.png.meta
  16. BIN
      assets/textures/buyu/1.png
  17. 8 8
      assets/textures/buyu/1.png.meta
  18. BIN
      assets/textures/buyu/2.png
  19. 8 8
      assets/textures/buyu/2.png.meta
  20. BIN
      assets/textures/buyu/3.png
  21. 7 7
      assets/textures/buyu/3.png.meta
  22. BIN
      assets/textures/dianziyouyi/1.png
  23. 7 7
      assets/textures/dianziyouyi/1.png.meta
  24. BIN
      assets/textures/dianziyouyi/2.png
  25. 7 7
      assets/textures/dianziyouyi/2.png.meta
  26. BIN
      assets/textures/dianziyouyi/3.png
  27. 7 7
      assets/textures/dianziyouyi/3.png.meta
  28. BIN
      assets/textures/dianziyouyi/4.png
  29. 7 7
      assets/textures/dianziyouyi/4.png.meta
  30. BIN
      assets/textures/hall/agzr.png
  31. 5 5
      assets/textures/hall/agzr.png.meta
  32. BIN
      assets/textures/hall/bg.png
  33. BIN
      assets/textures/hall/bottom.png
  34. 7 7
      assets/textures/hall/bottom.png.meta
  35. BIN
      assets/textures/hall/bydd.png
  36. 6 6
      assets/textures/hall/bydd.png.meta
  37. BIN
      assets/textures/hall/cpdd.png
  38. 4 4
      assets/textures/hall/cpdd.png.meta
  39. BIN
      assets/textures/hall/dzjj.png
  40. 3 3
      assets/textures/hall/dzjj.png.meta
  41. BIN
      assets/textures/hall/dzyy.png
  42. 4 4
      assets/textures/hall/dzyy.png.meta
  43. BIN
      assets/textures/hall/nvren.png
  44. 4 4
      assets/textures/hall/nvren.png.meta
  45. BIN
      assets/textures/hall/obm.png
  46. 8 8
      assets/textures/hall/obm.png.meta
  47. BIN
      assets/textures/hall/qpdd.png
  48. 6 6
      assets/textures/hall/qpdd.png.meta
  49. BIN
      assets/textures/hall/top.png
  50. 31 0
      assets/textures/hall/top.png.meta
  51. BIN
      assets/textures/hall/tydd.png
  52. 5 5
      assets/textures/hall/tydd.png.meta
  53. 2 1
      settings/project.json

+ 56 - 56
assets/resources/plists/hall.plist

@@ -11,11 +11,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{221,98}</string>
+                <string>{187,42}</string>
                 <key>spriteSourceSize</key>
-                <string>{221,98}</string>
+                <string>{187,42}</string>
                 <key>textureRect</key>
-                <string>{{200,59},{221,98}}</string>
+                <string>{{520,42},{187,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -26,11 +26,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{44,44}</string>
+                <string>{124,61}</string>
                 <key>spriteSourceSize</key>
-                <string>{44,44}</string>
+                <string>{124,61}</string>
                 <key>textureRect</key>
-                <string>{{44,0},{44,44}}</string>
+                <string>{{765,42},{124,61}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -41,11 +41,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{388,92}</string>
+                <string>{130,62}</string>
                 <key>spriteSourceSize</key>
-                <string>{388,92}</string>
+                <string>{130,62}</string>
                 <key>textureRect</key>
-                <string>{{561,157},{388,92}}</string>
+                <string>{{0,103},{130,62}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -56,11 +56,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{59,55}</string>
+                <string>{115,66}</string>
                 <key>spriteSourceSize</key>
-                <string>{59,55}</string>
+                <string>{115,66}</string>
                 <key>textureRect</key>
-                <string>{{138,0},{59,55}}</string>
+                <string>{{249,103},{115,66}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -71,11 +71,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{200,43}</string>
+                <string>{67,78}</string>
                 <key>spriteSourceSize</key>
-                <string>{200,43}</string>
+                <string>{67,78}</string>
                 <key>textureRect</key>
-                <string>{{0,59},{200,43}}</string>
+                <string>{{546,103},{67,78}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -86,146 +86,146 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{506,57}</string>
+                <string>{42,42}</string>
                 <key>spriteSourceSize</key>
-                <string>{506,57}</string>
+                <string>{42,42}</string>
                 <key>textureRect</key>
-                <string>{{421,59},{506,57}}</string>
+                <string>{{0,0},{42,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>hall (15).png</key>
+            <key>hall (2).png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{561,57}</string>
+                <string>{473,42}</string>
                 <key>spriteSourceSize</key>
-                <string>{561,57}</string>
+                <string>{473,42}</string>
                 <key>textureRect</key>
-                <string>{{0,157},{561,57}}</string>
+                <string>{{42,0},{473,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>hall (2).png</key>
+            <key>hall (3).png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{122,59}</string>
+                <string>{520,42}</string>
                 <key>spriteSourceSize</key>
-                <string>{122,59}</string>
+                <string>{520,42}</string>
                 <key>textureRect</key>
-                <string>{{793,0},{122,59}}</string>
+                <string>{{0,42},{520,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>hall (3).png</key>
+            <key>hall (4).png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{122,54}</string>
+                <string>{68,77}</string>
                 <key>spriteSourceSize</key>
-                <string>{122,54}</string>
+                <string>{68,77}</string>
                 <key>textureRect</key>
-                <string>{{544,0},{122,54}}</string>
+                <string>{{478,103},{68,77}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>hall (4).png</key>
+            <key>hall (5).png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{112,57}</string>
+                <string>{42,42}</string>
                 <key>spriteSourceSize</key>
-                <string>{112,57}</string>
+                <string>{42,42}</string>
                 <key>textureRect</key>
-                <string>{{432,0},{112,57}}</string>
+                <string>{{560,0},{42,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>hall (5).png</key>
+            <key>hall (6).png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{127,55}</string>
+                <string>{45,42}</string>
                 <key>spriteSourceSize</key>
-                <string>{127,55}</string>
+                <string>{45,42}</string>
                 <key>textureRect</key>
-                <string>{{666,0},{127,55}}</string>
+                <string>{{515,0},{45,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>hall (6).png</key>
+            <key>hall (7).png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{117,53}</string>
+                <string>{253,128}</string>
                 <key>spriteSourceSize</key>
-                <string>{117,53}</string>
+                <string>{253,128}</string>
                 <key>textureRect</key>
-                <string>{{197,0},{117,53}}</string>
+                <string>{{613,103},{253,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>hall (7).png</key>
+            <key>hall (8).png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{118,53}</string>
+                <string>{119,66}</string>
                 <key>spriteSourceSize</key>
-                <string>{118,53}</string>
+                <string>{119,66}</string>
                 <key>textureRect</key>
-                <string>{{314,0},{118,53}}</string>
+                <string>{{130,103},{119,66}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>hall (8).png</key>
+            <key>hall (9).png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{50,47}</string>
+                <string>{114,70}</string>
                 <key>spriteSourceSize</key>
-                <string>{50,47}</string>
+                <string>{114,70}</string>
                 <key>textureRect</key>
-                <string>{{88,0},{50,47}}</string>
+                <string>{{364,103},{114,70}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>hall (9).png</key>
+            <key>hall(15).png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{44,44}</string>
+                <string>{58,58}</string>
                 <key>spriteSourceSize</key>
-                <string>{44,44}</string>
+                <string>{58,58}</string>
                 <key>textureRect</key>
-                <string>{{0,0},{44,44}}</string>
+                <string>{{707,42},{58,58}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -241,9 +241,9 @@
             <key>realTextureFileName</key>
             <string>hall.png</string>
             <key>size</key>
-            <string>{949,249}</string>
+            <string>{889,231}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:9fde52521c1c9dc27d5f9085d3c586d5:0eb543f39ca6773bf62df86208f379ee:333c9ff079a5b8ddfb0c61408e972979$</string>
+            <string>$TexturePacker:SmartUpdate:a2f1331c50db9817cc80d0f3ca548b1d:b88fbaa99109a659368f49071f403980:333c9ff079a5b8ddfb0c61408e972979$</string>
             <key>textureFileName</key>
             <string>hall.png</string>
         </dict>

+ 104 - 104
assets/resources/plists/hall.plist.meta

@@ -3,8 +3,8 @@
   "uuid": "6a81be05-7114-4e40-a456-82e6acda7645",
   "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
   "size": {
-    "width": 949,
-    "height": 249
+    "width": 889,
+    "height": 231
   },
   "type": "Texture Packer",
   "subMetas": {
@@ -17,12 +17,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 200,
-      "trimY": 59,
-      "width": 221,
-      "height": 98,
-      "rawWidth": 221,
-      "rawHeight": 98,
+      "trimX": 520,
+      "trimY": 42,
+      "width": 187,
+      "height": 42,
+      "rawWidth": 187,
+      "rawHeight": 42,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -39,12 +39,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 44,
-      "trimY": 0,
-      "width": 44,
-      "height": 44,
-      "rawWidth": 44,
-      "rawHeight": 44,
+      "trimX": 765,
+      "trimY": 42,
+      "width": 124,
+      "height": 61,
+      "rawWidth": 124,
+      "rawHeight": 61,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -61,12 +61,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 561,
-      "trimY": 157,
-      "width": 388,
-      "height": 92,
-      "rawWidth": 388,
-      "rawHeight": 92,
+      "trimX": 0,
+      "trimY": 103,
+      "width": 130,
+      "height": 62,
+      "rawWidth": 130,
+      "rawHeight": 62,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -83,12 +83,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 138,
-      "trimY": 0,
-      "width": 59,
-      "height": 55,
-      "rawWidth": 59,
-      "rawHeight": 55,
+      "trimX": 249,
+      "trimY": 103,
+      "width": 115,
+      "height": 66,
+      "rawWidth": 115,
+      "rawHeight": 66,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -105,12 +105,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 59,
-      "width": 200,
-      "height": 43,
-      "rawWidth": 200,
-      "rawHeight": 43,
+      "trimX": 546,
+      "trimY": 103,
+      "width": 67,
+      "height": 78,
+      "rawWidth": 67,
+      "rawHeight": 78,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -127,34 +127,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 421,
-      "trimY": 59,
-      "width": 506,
-      "height": 57,
-      "rawWidth": 506,
-      "rawHeight": 57,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "hall (15).png": {
-      "ver": "1.0.3",
-      "uuid": "64b43405-6aac-4331-b8dd-554dd2cac4c8",
-      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
       "trimX": 0,
-      "trimY": 157,
-      "width": 561,
-      "height": 57,
-      "rawWidth": 561,
-      "rawHeight": 57,
+      "trimY": 0,
+      "width": 42,
+      "height": 42,
+      "rawWidth": 42,
+      "rawHeight": 42,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -171,12 +149,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 793,
+      "trimX": 42,
       "trimY": 0,
-      "width": 122,
-      "height": 59,
-      "rawWidth": 122,
-      "rawHeight": 59,
+      "width": 473,
+      "height": 42,
+      "rawWidth": 473,
+      "rawHeight": 42,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -193,12 +171,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 544,
-      "trimY": 0,
-      "width": 122,
-      "height": 54,
-      "rawWidth": 122,
-      "rawHeight": 54,
+      "trimX": 0,
+      "trimY": 42,
+      "width": 520,
+      "height": 42,
+      "rawWidth": 520,
+      "rawHeight": 42,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -215,12 +193,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 432,
-      "trimY": 0,
-      "width": 112,
-      "height": 57,
-      "rawWidth": 112,
-      "rawHeight": 57,
+      "trimX": 478,
+      "trimY": 103,
+      "width": 68,
+      "height": 77,
+      "rawWidth": 68,
+      "rawHeight": 77,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -237,12 +215,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 666,
+      "trimX": 560,
       "trimY": 0,
-      "width": 127,
-      "height": 55,
-      "rawWidth": 127,
-      "rawHeight": 55,
+      "width": 42,
+      "height": 42,
+      "rawWidth": 42,
+      "rawHeight": 42,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -259,12 +237,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 197,
+      "trimX": 515,
       "trimY": 0,
-      "width": 117,
-      "height": 53,
-      "rawWidth": 117,
-      "rawHeight": 53,
+      "width": 45,
+      "height": 42,
+      "rawWidth": 45,
+      "rawHeight": 42,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -281,12 +259,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 314,
-      "trimY": 0,
-      "width": 118,
-      "height": 53,
-      "rawWidth": 118,
-      "rawHeight": 53,
+      "trimX": 613,
+      "trimY": 103,
+      "width": 253,
+      "height": 128,
+      "rawWidth": 253,
+      "rawHeight": 128,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -303,12 +281,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 88,
-      "trimY": 0,
-      "width": 50,
-      "height": 47,
-      "rawWidth": 50,
-      "rawHeight": 47,
+      "trimX": 130,
+      "trimY": 103,
+      "width": 119,
+      "height": 66,
+      "rawWidth": 119,
+      "rawHeight": 66,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -325,12 +303,34 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 44,
-      "height": 44,
-      "rawWidth": 44,
-      "rawHeight": 44,
+      "trimX": 364,
+      "trimY": 103,
+      "width": 114,
+      "height": 70,
+      "rawWidth": 114,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "hall(15).png": {
+      "ver": "1.0.3",
+      "uuid": "7134d4cb-38aa-4103-8613-a8ee5f1cff84",
+      "rawTextureUuid": "da1a5a0d-7ad2-4ff6-9ca7-64f5ad42a374",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 707,
+      "trimY": 42,
+      "width": 58,
+      "height": 58,
+      "rawWidth": 58,
+      "rawHeight": 58,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/resources/plists/hall.png


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

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -2,
-      "offsetY": 3,
+      "offsetX": -0.5,
+      "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 945,
-      "height": 243,
-      "rawWidth": 949,
-      "rawHeight": 249,
+      "width": 888,
+      "height": 231,
+      "rawWidth": 889,
+      "rawHeight": 231,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

Plik diff jest za duży
+ 128 - 131
assets/scenes/hall.fire


+ 13 - 1
assets/scripts/view/GamesHallController.js

@@ -4,6 +4,7 @@ import AudioControlManager from '../common/AudioControlManager';
 import Event from '../net/Event';
 import LogicUnitManager from '../framework/LogicUnitManager'
 import Common from '../common/Common';
+// import sql from '../common/autogensqlitebindings_api'
 
 cc.Class({
     extends: FireEventObserver,
@@ -39,6 +40,9 @@ cc.Class({
         GundongMask:cc.Mask,
         Gundong1:cc.Layout,
         GundongMask1:cc.Mask,
+
+        returnNode:cc.Node,
+        shareNode:cc.Node,
     },
 
     onLoad()
@@ -63,7 +67,9 @@ cc.Class({
         this.dzyyHall.active = false
         this.buyuHall.active = false
         this.caipiaoHall.active = false
-        
+
+        this.returnNode.active =false
+        this.shareNode.active =true
         // this.playShow()
         // this.animation = this.nvren.getComponent(cc.Animation);
         
@@ -88,6 +94,8 @@ cc.Class({
         //         ['9' , [4,9,15,21]]]
         // var myMap = new Map(ss);
         // console.log(myMap.keys());
+        // this._db = new sql.SQLiteWrapper();
+        // this._dbPath = this._db.initializing("data.db","res","");
     },
     onGuideFinished(){
         console.log("onGuideFinished--------------------")
@@ -287,6 +295,7 @@ cc.Class({
     
     
     display(){
+        
         var animation = this.hallsBtns.getComponent(cc.Animation);
         var hallsGoFinished = function(){
             this.showingHall.playShow(this)
@@ -313,9 +322,12 @@ cc.Class({
         
         this.animation.on('finished', this.onGuideFinished, this);
         this.animation.play('nrcome1');
+        
     },
     setShowingHall(Hall){
         this.showingHall = Hall==this?null:Hall
+        this.returnNode.active =Hall!=this
+        this.shareNode.active =Hall==this
     }
 });
 

+ 2 - 1
assets/scripts/view/SubHallManger.js

@@ -29,11 +29,12 @@ cc.Class({
         }
         this.node.active = true
         var actionTo = cc.moveBy(0.3, cc.v2(-1226, 0));
-        var actionTo1 = cc.moveBy(0.3, cc.v2(103, 0));
+        var actionTo1 = cc.moveBy(0.3, cc.v2(100, 0));
         this.gamesNode.runAction(actionTo)
         if (this.plane) {
             this.plane.runAction(actionTo1)
         }
+        this.setShowingHall(this)
     },
 
     playEnd(direction)

BIN
assets/textures/Competitivegame/jdqs.png


+ 6 - 6
assets/textures/Competitivegame/jdqs.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 3.5,
-      "offsetY": 0,
-      "trimX": 7,
-      "trimY": 0,
+      "offsetX": 0.5,
+      "offsetY": 1,
+      "trimX": 4,
+      "trimY": 1,
       "width": 269,
-      "height": 594,
+      "height": 441,
       "rawWidth": 276,
-      "rawHeight": 594,
+      "rawHeight": 445,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/Competitivegame/scgo.png


+ 6 - 6
assets/textures/Competitivegame/scgo.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
+      "offsetX": 0.5,
+      "offsetY": 1,
       "trimX": 4,
-      "trimY": 0,
+      "trimY": 1,
       "width": 269,
-      "height": 594,
-      "rawWidth": 277,
-      "rawHeight": 594,
+      "height": 441,
+      "rawWidth": 276,
+      "rawHeight": 445,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/Competitivegame/wzrr.png


+ 6 - 6
assets/textures/Competitivegame/wzrr.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -3.5,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
+      "offsetX": 0.5,
+      "offsetY": 1,
+      "trimX": 4,
+      "trimY": 1,
       "width": 269,
-      "height": 594,
+      "height": 441,
       "rawWidth": 276,
-      "rawHeight": 594,
+      "rawHeight": 445,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/Competitivegame/yxlm.png


+ 7 - 7
assets/textures/Competitivegame/yxlm.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 2.5,
-      "offsetY": 0,
-      "trimX": 5,
-      "trimY": 0,
-      "width": 271,
-      "height": 596,
+      "offsetX": 0.5,
+      "offsetY": 1,
+      "trimX": 4,
+      "trimY": 1,
+      "width": 269,
+      "height": 441,
       "rawWidth": 276,
-      "rawHeight": 596,
+      "rawHeight": 445,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/buyu/1.png


+ 8 - 8
assets/textures/buyu/1.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -12.5,
-      "trimX": 0,
-      "trimY": 25,
-      "width": 340,
-      "height": 608,
-      "rawWidth": 340,
-      "rawHeight": 633,
+      "offsetX": 9.5,
+      "offsetY": 2,
+      "trimX": 19,
+      "trimY": 0,
+      "width": 343,
+      "height": 437,
+      "rawWidth": 362,
+      "rawHeight": 441,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/buyu/2.png


+ 8 - 8
assets/textures/buyu/2.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": -3,
-      "trimX": 1,
-      "trimY": 6,
-      "width": 337,
-      "height": 627,
-      "rawWidth": 340,
-      "rawHeight": 633,
+      "offsetX": 12,
+      "offsetY": 0,
+      "trimX": 27,
+      "trimY": 0,
+      "width": 350,
+      "height": 463,
+      "rawWidth": 380,
+      "rawHeight": 463,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/buyu/3.png


+ 7 - 7
assets/textures/buyu/3.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": -11,
-      "trimX": 3,
-      "trimY": 22,
+      "offsetX": 11.5,
+      "offsetY": 0,
+      "trimX": 28,
+      "trimY": 0,
       "width": 333,
-      "height": 611,
-      "rawWidth": 340,
-      "rawHeight": 633,
+      "height": 445,
+      "rawWidth": 366,
+      "rawHeight": 445,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/dianziyouyi/1.png


+ 7 - 7
assets/textures/dianziyouyi/1.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
+      "offsetX": 0.5,
+      "offsetY": -0.5,
+      "trimX": 4,
+      "trimY": 4,
       "width": 269,
-      "height": 616,
-      "rawWidth": 270,
-      "rawHeight": 616,
+      "height": 441,
+      "rawWidth": 276,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/dianziyouyi/2.png


+ 7 - 7
assets/textures/dianziyouyi/2.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
+      "offsetX": 0.5,
+      "offsetY": -0.5,
+      "trimX": 4,
+      "trimY": 4,
       "width": 269,
-      "height": 616,
-      "rawWidth": 269,
-      "rawHeight": 616,
+      "height": 441,
+      "rawWidth": 276,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/dianziyouyi/3.png


+ 7 - 7
assets/textures/dianziyouyi/3.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
+      "offsetX": 0.5,
+      "offsetY": -0.5,
+      "trimX": 4,
+      "trimY": 4,
       "width": 269,
-      "height": 616,
-      "rawWidth": 270,
-      "rawHeight": 616,
+      "height": 441,
+      "rawWidth": 276,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/dianziyouyi/4.png


+ 7 - 7
assets/textures/dianziyouyi/4.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 3,
+      "trimY": 4,
       "width": 269,
-      "height": 616,
-      "rawWidth": 270,
-      "rawHeight": 616,
+      "height": 441,
+      "rawWidth": 275,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/agzr.png


+ 5 - 5
assets/textures/hall/agzr.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -2.5,
+      "offsetX": -0.5,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
+      "trimX": 2,
+      "trimY": 3,
       "width": 269,
-      "height": 600,
+      "height": 442,
       "rawWidth": 274,
-      "rawHeight": 600,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/bg.png


BIN
assets/textures/hall/bottom.png


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

@@ -14,13 +14,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 5,
-      "trimY": 6,
-      "width": 1259,
-      "height": 83,
-      "rawWidth": 1269,
-      "rawHeight": 94,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 1274,
+      "height": 157,
+      "rawWidth": 1274,
+      "rawHeight": 157,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/bydd.png


+ 6 - 6
assets/textures/hall/bydd.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -2.5,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
+      "offsetX": -0.5,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 4,
       "width": 269,
-      "height": 600,
+      "height": 441,
       "rawWidth": 274,
-      "rawHeight": 600,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/cpdd.png


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

@@ -14,13 +14,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": -0.5,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 2,
-      "trimY": 0,
+      "trimY": 4,
       "width": 269,
-      "height": 598,
+      "height": 441,
       "rawWidth": 274,
-      "rawHeight": 598,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/dzjj.png


+ 3 - 3
assets/textures/hall/dzjj.png.meta

@@ -16,11 +16,11 @@
       "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 2,
-      "trimY": 0,
+      "trimY": 3,
       "width": 269,
-      "height": 600,
+      "height": 442,
       "rawWidth": 274,
-      "rawHeight": 600,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/dzyy.png


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

@@ -14,13 +14,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": -0.5,
-      "offsetY": 0,
+      "offsetY": -0.5,
       "trimX": 2,
-      "trimY": 0,
+      "trimY": 4,
       "width": 269,
-      "height": 598,
+      "height": 441,
       "rawWidth": 274,
-      "rawHeight": 598,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/nvren.png


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

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -0.5,
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 360,
-      "height": 689,
+      "width": 359,
+      "height": 671,
       "rawWidth": 360,
-      "rawHeight": 689,
+      "rawHeight": 671,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/obm.png


+ 8 - 8
assets/textures/hall/obm.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0.5,
-      "offsetY": -0.5,
-      "trimX": 1,
-      "trimY": 1,
-      "width": 60,
-      "height": 60,
-      "rawWidth": 61,
-      "rawHeight": 61,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 80,
+      "height": 79,
+      "rawWidth": 80,
+      "rawHeight": 79,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/qpdd.png


+ 6 - 6
assets/textures/hall/qpdd.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0.5,
-      "offsetY": 0,
-      "trimX": 3,
-      "trimY": 0,
+      "offsetX": -0.5,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 4,
       "width": 269,
-      "height": 598,
+      "height": 441,
       "rawWidth": 274,
-      "rawHeight": 598,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/textures/hall/top.png


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

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "11d28771-05cb-4b37-bb68-2df2b37e04cc",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "top": {
+      "ver": "1.0.3",
+      "uuid": "87d56f03-af5d-4443-b303-cf064d828df4",
+      "rawTextureUuid": "11d28771-05cb-4b37-bb68-2df2b37e04cc",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 1334,
+      "height": 91,
+      "rawWidth": 1334,
+      "rawHeight": 91,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/hall/tydd.png


+ 5 - 5
assets/textures/hall/tydd.png.meta

@@ -13,14 +13,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": -1,
       "offsetY": 0,
-      "trimX": 3,
-      "trimY": 0,
+      "trimX": 2,
+      "trimY": 3,
       "width": 269,
-      "height": 602,
+      "height": 442,
       "rawWidth": 275,
-      "rawHeight": 602,
+      "rawHeight": 448,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

+ 2 - 1
settings/project.json

@@ -23,12 +23,13 @@
   "group-list": [
     "default"
   ],
-  "last-module-event-record-time": 1555472389182,
+  "last-module-event-record-time": 1557052165489,
   "simulator-orientation": false,
   "simulator-resolution": {
     "height": 640,
     "width": 960
   },
+  "start-scene": "3d2a8ea9-326d-4c94-858d-d7d7d9088eb4",
   "use-customize-simulator": true,
   "use-project-simulator-setting": false
 }

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików