Johson il y a 6 ans
Parent
commit
4d17058c5b
62 fichiers modifiés avec 1103 ajouts et 629 suppressions
  1. 0 25
      assets/anim/showDzjjgame.anim
  2. 0 5
      assets/anim/showDzjjgame.anim.meta
  3. 0 25
      assets/anim/showplane.anim
  4. 0 5
      assets/anim/showplane.anim.meta
  5. 229 399
      assets/scenes/hall.fire
  6. 14 0
      assets/scripts/view/BuyuHallController.js
  7. 9 0
      assets/scripts/view/BuyuHallController.js.meta
  8. 14 0
      assets/scripts/view/CarsHallController.js
  9. 9 0
      assets/scripts/view/CarsHallController.js.meta
  10. 13 0
      assets/scripts/view/DianziYouyiHallController.js
  11. 9 0
      assets/scripts/view/DianziYouyiHallController.js.meta
  12. 3 161
      assets/scripts/view/DzjjHallController.js
  13. 51 9
      assets/scripts/view/GamesHallController.js
  14. 14 0
      assets/scripts/view/SportsHallController.js
  15. 9 0
      assets/scripts/view/SportsHallController.js.meta
  16. 48 0
      assets/scripts/view/SubHallManger.js
  17. 9 0
      assets/scripts/view/SubHallManger.js.meta
  18. 7 0
      assets/textures/buyu.meta
  19. BIN
      assets/textures/buyu/1.png
  20. 31 0
      assets/textures/buyu/1.png.meta
  21. BIN
      assets/textures/buyu/2.png
  22. 31 0
      assets/textures/buyu/2.png.meta
  23. BIN
      assets/textures/buyu/3.png
  24. 31 0
      assets/textures/buyu/3.png.meta
  25. BIN
      assets/textures/buyu/plane.png
  26. 31 0
      assets/textures/buyu/plane.png.meta
  27. BIN
      assets/textures/cargamehall/plane.png
  28. 31 0
      assets/textures/cargamehall/plane.png.meta
  29. 7 0
      assets/textures/dianziyouyi.meta
  30. BIN
      assets/textures/dianziyouyi/1.png
  31. 31 0
      assets/textures/dianziyouyi/1.png.meta
  32. BIN
      assets/textures/dianziyouyi/2.png
  33. 31 0
      assets/textures/dianziyouyi/2.png.meta
  34. BIN
      assets/textures/dianziyouyi/3.png
  35. 31 0
      assets/textures/dianziyouyi/3.png.meta
  36. BIN
      assets/textures/dianziyouyi/4.png
  37. 31 0
      assets/textures/dianziyouyi/4.png.meta
  38. BIN
      assets/textures/dianziyouyi/plane.png
  39. 31 0
      assets/textures/dianziyouyi/plane.png.meta
  40. BIN
      assets/textures/hall/agzr.png
  41. 31 0
      assets/textures/hall/agzr.png.meta
  42. BIN
      assets/textures/hall/bydd.png
  43. 31 0
      assets/textures/hall/bydd.png.meta
  44. BIN
      assets/textures/hall/dzjj.png
  45. 31 0
      assets/textures/hall/dzjj.png.meta
  46. BIN
      assets/textures/hall/tydd.png
  47. 31 0
      assets/textures/hall/tydd.png.meta
  48. 7 0
      assets/textures/sports.meta
  49. BIN
      assets/textures/sports/plane.png
  50. 31 0
      assets/textures/sports/plane.png.meta
  51. BIN
      assets/textures/sports/sports (1).png
  52. 31 0
      assets/textures/sports/sports (1).png.meta
  53. BIN
      assets/textures/sports/sports (2).png
  54. 31 0
      assets/textures/sports/sports (2).png.meta
  55. BIN
      assets/textures/sports/sports (3).png
  56. 31 0
      assets/textures/sports/sports (3).png.meta
  57. BIN
      assets/textures/sports/sports (4).png
  58. 31 0
      assets/textures/sports/sports (4).png.meta
  59. BIN
      assets/textures/sports/sports (5).png
  60. 31 0
      assets/textures/sports/sports (5).png.meta
  61. BIN
      assets/textures/sports/sports (6).png
  62. 31 0
      assets/textures/sports/sports (6).png.meta

+ 0 - 25
assets/anim/showDzjjgame.anim

@@ -1,25 +0,0 @@
-{
-  "__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": []
-}

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

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

+ 0 - 25
assets/anim/showplane.anim

@@ -1,25 +0,0 @@
-{
-  "__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": []
-}

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

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

Fichier diff supprimé car celui-ci est trop grand
+ 229 - 399
assets/scenes/hall.fire


+ 14 - 0
assets/scripts/view/BuyuHallController.js

@@ -0,0 +1,14 @@
+import FireEventObserver from '../framework/FireEventObserver';
+import SubHallManger from '../view/subHallManger'
+
+cc.Class({
+    extends: SubHallManger,
+
+    properties: {
+        plane:cc.Node,
+        gamesNode:cc.Node,
+        
+    },
+});
+
+

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "a93521e4-5e56-4e8e-bead-54fb8c19d4b7",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 14 - 0
assets/scripts/view/CarsHallController.js

@@ -0,0 +1,14 @@
+import FireEventObserver from '../framework/FireEventObserver';
+import SubHallManger from '../view/subHallManger'
+
+cc.Class({
+    extends: SubHallManger,
+
+    properties: {
+        plane:cc.Node,
+        gamesNode:cc.Node,
+        
+    },
+});
+
+

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "63490db9-d2d2-4d7c-b5b4-53e4c0483fd6",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 13 - 0
assets/scripts/view/DianziYouyiHallController.js

@@ -0,0 +1,13 @@
+import FireEventObserver from '../framework/FireEventObserver';
+import SubHallManger from '../view/subHallManger'
+
+cc.Class({
+    extends: SubHallManger,
+
+    properties: {
+        plane:cc.Node,
+        gamesNode:cc.Node,
+        
+    },
+});
+

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "935b6e0c-4ec7-46ef-a407-a8178a641828",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 3 - 161
assets/scripts/view/DzjjHallController.js

@@ -1,171 +1,13 @@
 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';
+import SubHallManger from '../view/subHallManger'
 
 cc.Class({
-    extends: FireEventObserver,
+    extends: SubHallManger,
 
     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,
+        gamesNode: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
-    }
 });
 
-

+ 51 - 9
assets/scripts/view/GamesHallController.js

@@ -28,6 +28,10 @@ cc.Class({
         nvren:cc.Node,
         hallsBtns:cc.Node,
         dzjjHall:cc.Node,
+        carsHall:cc.Node,
+        sportsHall:cc.Node,
+        dzyyHall:cc.Node,
+        buyuHall:cc.Node,
     },
 
     onLoad()
@@ -47,10 +51,16 @@ cc.Class({
         // this.node.Opacity=0;
         // this.node.runAction(cc.fadeIn(1.0));
         this.dzjjHall.active = false
-        this.animation = this.nvren.getComponent(cc.Animation);
+        this.carsHall.active = false
+        this.sportsHall.active = false
+        this.dzyyHall.active = false
+        this.buyuHall.active = false
+        this.show()
+        // this.animation = this.nvren.getComponent(cc.Animation);
         
-        this.animation.on('finished', this.onGuideFinished, this);
-        this.animation.play('nrcome1');
+        // this.animation.on('finished', this.onGuideFinished, this);
+        // this.animation.play('nrcome1');
+        var self = this
         
     },
     onGuideFinished(){
@@ -156,23 +166,55 @@ cc.Class({
     },
 
     clickCarGameHall(sender){
-        this.playEnd('cargamehall')
+        this.showingHall = this.carsHall.getComponent('CarsHallController')
+        this.display()
     },
     clickDZJJHall(sender){
-        
+        this.showingHall = this.dzjjHall.getComponent('DzjjHallController')
+        this.display()
+    },
+    clickSportsHall(sender){
+        this.showingHall = this.sportsHall.getComponent('SportsHallController')
+        this.display()
+    },
+    clickDZYYHall(sender){
+        this.showingHall = this.dzyyHall.getComponent('DianziYouyiHallController')
+        this.display()
+    },
+    clickBuYuHall(sender){
+        this.showingHall = this.buyuHall.getComponent('BuyuHallController')
+        this.display()
+    },
+    
+    
+    display(){
         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()
+            this.showingHall.playShow()
+            this.hallsBtns._parent._parent.active = false
         };
         animation.on('finished', hallsGoFinished, this);
         animation.play('hallsgo');
         this.animation.play('nrgo')
     },
     clickReturnBtn(){
-        
+        if (this.showingHall) {
+            this.showingHall.playEnd(this)
+            this.showingHall = null
+        }
     },
+    show(param)
+    {
+        this.hallsBtns._parent._parent.active = true
+        this.animation = this.nvren.getComponent(cc.Animation);
+        this.hallsBtns.getComponent(cc.Animation).off("finished")
+        this.hallsBtns.y = 0
+        this.hallsBtns.x = 0
+        this.hallsBtns.getComponent(cc.Animation).play('hallscome');
+        
+        this.animation.on('finished', this.onGuideFinished, this);
+        this.animation.play('nrcome1');
+    }
 });
 
 

+ 14 - 0
assets/scripts/view/SportsHallController.js

@@ -0,0 +1,14 @@
+import FireEventObserver from '../framework/FireEventObserver';
+import SubHallManger from '../view/subHallManger'
+
+cc.Class({
+    extends: SubHallManger,
+
+    properties: {
+        plane:cc.Node,
+        gamesNode:cc.Node,
+        
+    },
+});
+
+

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "c0b2e741-bb1e-46ab-9e9d-08bf921a67c9",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 48 - 0
assets/scripts/view/SubHallManger.js

@@ -0,0 +1,48 @@
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+
+    },
+
+    ctor: function () {
+
+    },
+
+    onLoad () {
+
+    },
+
+    start () {
+
+    },
+   
+    onDestroy()
+    {
+
+    },
+
+    playShow()
+    {
+        this.node.active = true
+        var actionTo = cc.moveBy(0.3, cc.v2(-1226, 0));
+        var actionTo1 = cc.moveBy(0.3, cc.v2(103, 0));
+        this.gamesNode.runAction(actionTo)
+        this.plane.runAction(actionTo1)
+    },
+
+    playEnd(target)
+    {
+        var finished = cc.callFunc(function() {
+            this.node.active = false;
+            if (target) {
+                target.show()
+            }
+        }, this, null);
+        var actionTo = cc.sequence(cc.moveBy(0.3, cc.v2(1226, 0)),finished);
+        var actionTo1 = cc.moveBy(0.3, cc.v2(-103, 0));
+        this.gamesNode.runAction(actionTo)
+        this.plane.runAction(actionTo1)
+    }
+    
+});

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "848cd966-eb64-47f7-b36b-08b65faa5ee8",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 7 - 0
assets/textures/buyu.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "6498a045-e18a-4f20-bbfa-700c1cbf4549",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

BIN
assets/textures/buyu/1.png


+ 31 - 0
assets/textures/buyu/1.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "f864ce28-503d-4efe-b95c-842c89a302a6",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "1": {
+      "ver": "1.0.3",
+      "uuid": "2c652aeb-e2ee-4f7b-8823-8ab65ce73dbc",
+      "rawTextureUuid": "f864ce28-503d-4efe-b95c-842c89a302a6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -12.5,
+      "trimX": 0,
+      "trimY": 25,
+      "width": 340,
+      "height": 608,
+      "rawWidth": 340,
+      "rawHeight": 633,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/buyu/2.png


+ 31 - 0
assets/textures/buyu/2.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "d7419bd2-de01-4626-ad2c-63fcc042575d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "2": {
+      "ver": "1.0.3",
+      "uuid": "1e0ab59a-839e-4283-97ac-dd5112d2b0db",
+      "rawTextureUuid": "d7419bd2-de01-4626-ad2c-63fcc042575d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": -3,
+      "trimX": 1,
+      "trimY": 6,
+      "width": 337,
+      "height": 627,
+      "rawWidth": 340,
+      "rawHeight": 633,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/buyu/3.png


+ 31 - 0
assets/textures/buyu/3.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "c859a9b5-dd50-47e0-92c4-8769e54166dc",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "3": {
+      "ver": "1.0.3",
+      "uuid": "b41a4180-1b44-4542-95da-70910767f577",
+      "rawTextureUuid": "c859a9b5-dd50-47e0-92c4-8769e54166dc",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": -11,
+      "trimX": 3,
+      "trimY": 22,
+      "width": 333,
+      "height": 611,
+      "rawWidth": 340,
+      "rawHeight": 633,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/buyu/plane.png


+ 31 - 0
assets/textures/buyu/plane.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "3e408285-d314-478c-ace0-99b2a4d86c0a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "plane": {
+      "ver": "1.0.3",
+      "uuid": "cccc15f1-9a3c-4b49-a722-832d82f28bfb",
+      "rawTextureUuid": "3e408285-d314-478c-ace0-99b2a4d86c0a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 4,
+      "trimY": 5,
+      "width": 101,
+      "height": 457,
+      "rawWidth": 109,
+      "rawHeight": 466,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/cargamehall/plane.png


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

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "0db3fe7b-bc9f-42db-b900-cdd0bace374f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "plane": {
+      "ver": "1.0.3",
+      "uuid": "59248473-05bf-4984-a4c7-e56200a19d72",
+      "rawTextureUuid": "0db3fe7b-bc9f-42db-b900-cdd0bace374f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 4,
+      "trimY": 5,
+      "width": 101,
+      "height": 457,
+      "rawWidth": 109,
+      "rawHeight": 466,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 7 - 0
assets/textures/dianziyouyi.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "597fdaf4-89df-4f39-b5f1-87e6c59b10a8",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

BIN
assets/textures/dianziyouyi/1.png


+ 31 - 0
assets/textures/dianziyouyi/1.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "bf21778d-f75b-470f-9789-6801849ad24a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "1": {
+      "ver": "1.0.3",
+      "uuid": "7a3990b2-5911-4aa4-96cd-2dfd7a270db5",
+      "rawTextureUuid": "bf21778d-f75b-470f-9789-6801849ad24a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 269,
+      "height": 616,
+      "rawWidth": 270,
+      "rawHeight": 616,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/dianziyouyi/2.png


+ 31 - 0
assets/textures/dianziyouyi/2.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "565b08cb-4c61-4725-a85b-0bae88de73f8",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "2": {
+      "ver": "1.0.3",
+      "uuid": "e94b30ec-10f1-44a2-b768-9f9f8be51695",
+      "rawTextureUuid": "565b08cb-4c61-4725-a85b-0bae88de73f8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 269,
+      "height": 616,
+      "rawWidth": 269,
+      "rawHeight": 616,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/dianziyouyi/3.png


+ 31 - 0
assets/textures/dianziyouyi/3.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "5c059eef-aa96-45dd-a866-57a3cb9f6317",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "3": {
+      "ver": "1.0.3",
+      "uuid": "1b974baf-f7e6-47bf-960a-1667b9fba04c",
+      "rawTextureUuid": "5c059eef-aa96-45dd-a866-57a3cb9f6317",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 269,
+      "height": 616,
+      "rawWidth": 270,
+      "rawHeight": 616,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/dianziyouyi/4.png


+ 31 - 0
assets/textures/dianziyouyi/4.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "efaa167e-e6db-428f-8f8c-db31da0fc92d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "4": {
+      "ver": "1.0.3",
+      "uuid": "81ffdda8-fea8-41a3-8acf-898556c40f85",
+      "rawTextureUuid": "efaa167e-e6db-428f-8f8c-db31da0fc92d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 269,
+      "height": 616,
+      "rawWidth": 270,
+      "rawHeight": 616,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/dianziyouyi/plane.png


+ 31 - 0
assets/textures/dianziyouyi/plane.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "7b3167d3-b23e-482a-904e-893af34adec1",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "plane": {
+      "ver": "1.0.3",
+      "uuid": "1c6db5f6-5004-43dd-8f19-945d205afc57",
+      "rawTextureUuid": "7b3167d3-b23e-482a-904e-893af34adec1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 4,
+      "trimY": 5,
+      "width": 101,
+      "height": 457,
+      "rawWidth": 109,
+      "rawHeight": 466,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/hall/agzr.png


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

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "47e88818-c934-453b-948c-98bcd32fa758",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "agzr": {
+      "ver": "1.0.3",
+      "uuid": "5f42ef05-2dd7-4900-b024-895725bc3cf6",
+      "rawTextureUuid": "47e88818-c934-453b-948c-98bcd32fa758",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -2.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 269,
+      "height": 609,
+      "rawWidth": 274,
+      "rawHeight": 609,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/hall/bydd.png


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

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "b83f08dc-90de-4ccd-875d-04d5e8f5fe58",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "bydd": {
+      "ver": "1.0.3",
+      "uuid": "fb9485c6-ec8d-420b-8b77-a7a81a21df2d",
+      "rawTextureUuid": "b83f08dc-90de-4ccd-875d-04d5e8f5fe58",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -2.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 269,
+      "height": 609,
+      "rawWidth": 274,
+      "rawHeight": 609,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/hall/dzjj.png


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

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "d3a12edc-e916-4b42-b5e1-a45a3cc09b23",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "dzjj": {
+      "ver": "1.0.3",
+      "uuid": "78127616-d26c-41a0-a210-e1e45a7572e3",
+      "rawTextureUuid": "d3a12edc-e916-4b42-b5e1-a45a3cc09b23",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": -1.5,
+      "trimX": 2,
+      "trimY": 3,
+      "width": 269,
+      "height": 606,
+      "rawWidth": 274,
+      "rawHeight": 609,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/hall/tydd.png


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

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "b176b4a9-5911-4cd9-a18d-7d6ed9c28ff5",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "tydd": {
+      "ver": "1.0.3",
+      "uuid": "f989b7f7-ed60-48cc-8bde-b9dee0c8df3e",
+      "rawTextureUuid": "b176b4a9-5911-4cd9-a18d-7d6ed9c28ff5",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -3,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 269,
+      "height": 611,
+      "rawWidth": 275,
+      "rawHeight": 611,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 7 - 0
assets/textures/sports.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "33d5faea-7750-4323-9a33-649146a7d475",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

BIN
assets/textures/sports/plane.png


+ 31 - 0
assets/textures/sports/plane.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "869ccf07-14bf-43ca-bd54-f55a6e01375d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "plane": {
+      "ver": "1.0.3",
+      "uuid": "4da94f53-983d-4be7-b47b-c21b5ccb0485",
+      "rawTextureUuid": "869ccf07-14bf-43ca-bd54-f55a6e01375d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 4,
+      "trimY": 5,
+      "width": 101,
+      "height": 457,
+      "rawWidth": 109,
+      "rawHeight": 466,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/sports/sports (1).png


+ 31 - 0
assets/textures/sports/sports (1).png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "28aafba3-96ee-46bc-be4f-0df051458084",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "sports (1)": {
+      "ver": "1.0.3",
+      "uuid": "3b75f128-7d73-467b-8a9a-256252752aaa",
+      "rawTextureUuid": "28aafba3-96ee-46bc-be4f-0df051458084",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 312,
+      "height": 234,
+      "rawWidth": 312,
+      "rawHeight": 234,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/sports/sports (2).png


+ 31 - 0
assets/textures/sports/sports (2).png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "2344f8f4-1471-4ec9-855c-ee00eb69ffdf",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "sports (2)": {
+      "ver": "1.0.3",
+      "uuid": "fa03509a-0a21-4782-a9cf-f31956d2950c",
+      "rawTextureUuid": "2344f8f4-1471-4ec9-855c-ee00eb69ffdf",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 312,
+      "height": 234,
+      "rawWidth": 312,
+      "rawHeight": 234,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/sports/sports (3).png


+ 31 - 0
assets/textures/sports/sports (3).png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "c6e9f4c5-ff60-4e63-8de5-317a458ce9ec",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "sports (3)": {
+      "ver": "1.0.3",
+      "uuid": "a58df3aa-f726-401e-a41f-5f268b8482b4",
+      "rawTextureUuid": "c6e9f4c5-ff60-4e63-8de5-317a458ce9ec",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 312,
+      "height": 234,
+      "rawWidth": 312,
+      "rawHeight": 234,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/sports/sports (4).png


+ 31 - 0
assets/textures/sports/sports (4).png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "0ad079df-973b-47e9-aae2-0adb957a6e64",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "sports (4)": {
+      "ver": "1.0.3",
+      "uuid": "f4e9685e-911a-46a0-a009-0bb83bdfdeb9",
+      "rawTextureUuid": "0ad079df-973b-47e9-aae2-0adb957a6e64",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 312,
+      "height": 234,
+      "rawWidth": 312,
+      "rawHeight": 234,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/sports/sports (5).png


+ 31 - 0
assets/textures/sports/sports (5).png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "db7c0c53-f7dc-42c9-b6e7-33c5be886a87",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "sports (5)": {
+      "ver": "1.0.3",
+      "uuid": "3ecfcad0-5aef-4884-ad62-6f05255e8a11",
+      "rawTextureUuid": "db7c0c53-f7dc-42c9-b6e7-33c5be886a87",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 312,
+      "height": 234,
+      "rawWidth": 312,
+      "rawHeight": 234,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/textures/sports/sports (6).png


+ 31 - 0
assets/textures/sports/sports (6).png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "a09a3693-3a2d-4171-8dbe-3fcfd86ff219",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "sports (6)": {
+      "ver": "1.0.3",
+      "uuid": "6671c262-08bf-499b-8e9b-0675dd343229",
+      "rawTextureUuid": "a09a3693-3a2d-4171-8dbe-3fcfd86ff219",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 312,
+      "height": 234,
+      "rawWidth": 312,
+      "rawHeight": 234,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff