Merge branch 'master' of http://zhi-edu.com:3000/lan/zedu_client

assets/animation/232_10_2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "88c98595-25dc-43b9-b73a-846d454a4a40",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1280,
+  "height": 800,
+  "platformSettings": {},
+  "subMetas": {
+    "232_10_2": {
+      "ver": "1.0.4",
+      "uuid": "d61a20ac-f891-4db4-acb4-a88515e10776",
+      "rawTextureUuid": "88c98595-25dc-43b9-b73a-846d454a4a40",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -27,
+      "offsetY": -80,
+      "trimX": 505,
+      "trimY": 282,
+      "width": 216,
+      "height": 396,
+      "rawWidth": 1280,
+      "rawHeight": 800,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/gameHome/texture/HomeMainUI/btnChildSeme.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 127,
-  "height": 53,
+  "width": 248,
+  "height": 282,
   "platformSettings": {},
   "subMetas": {
     "btnChildSeme": {

assets/gameHome/texture/HomeMainUI/btnSemeBg.png.meta

@@ -8,7 +8,7 @@
   "genMipmaps": false,
   "packable": true,
   "width": 248,
-  "height": 205,
+  "height": 237,
   "platformSettings": {},
   "subMetas": {
     "btnSemeBg": {

assets/script/ui/Editor.ts

@@ -218,6 +218,7 @@ export default class Editor extends cc.Component {
             if (sprite && sprite.sizeMode == cc.Sprite.SizeMode.CUSTOM) {
                 data.w = node.width.toFixed(1)
                 data.h = node.height.toFixed(1)
+                if (!sprite.trim) data.trim = sprite.trim
             }
             let layout = node.getComponent(cc.Layout)
             if (layout && layout.enabled) {

assets/script/ui/gameMode/BaseGameUI.ts

@@ -105,7 +105,10 @@ export class BaseGameUI extends BaseUI {
                 }
 
                 if (data.w) {
-                    if (sprite) sprite.sizeMode = cc.Sprite.SizeMode.CUSTOM
+                    if (sprite) {
+                        sprite.sizeMode = cc.Sprite.SizeMode.CUSTOM
+                        if (data.trim != undefined) sprite.trim = data.trim
+                    }
                     node.width = parseFloat(data.w)
                 }
                 if (data.h) {

doimg/outPngPoints.js

@@ -49,7 +49,7 @@ let outConfig = (mode) => {
                 }
                 points[pointKeys[i]] = data
             }
-            fs.writeFileSync('D:/' + gamePath[options.gameType] + '/packages/CCSceneMenu/' + mode + '/DrawImg/' + fileObj.name + '.json', JSON.stringify(points), {
+            fs.writeFileSync('../packages/CCSceneMenu/' + mode + '/DrawImg/' + fileObj.name + '.json', JSON.stringify(points), {
                     encoding: 'utf8', flag: 'w'
                 }
             )

gameRes/gameHomeSeme/S231/G05/P04/data_231_5_4.json

@@ -6,15 +6,15 @@
   "allDur": 1,
   "node": [
     {
-      "name": "item1",
+      "name": "01",
       "tex": "01",
       "x": "907.3",
       "y": "508.5",
       "act": 1,
-      "v": "1"
+      "v": "-1"
     },
     {
-      "name": "item2",
+      "name": "02",
       "tex": "02",
       "x": "907.3",
       "y": "350.5",
@@ -22,7 +22,7 @@
       "v": "1"
     },
     {
-      "name": "item3",
+      "name": "03",
       "tex": "03",
       "x": "907.3",
       "y": "193.5",

gameRes/gameHomeSeme/S231/G05/P05/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "71775409-504a-4ba4-9b13-a4eaad3f8e97",
   "downloadMode": 0,
-  "duration": 4.788,
+  "duration": 4.68,
   "subMetas": {}
 }

gameRes/gameHomeSeme/S231/G06/P10/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "ff7a701a-8252-412c-941e-53af24130723",
   "downloadMode": 0,
-  "duration": 4.68,
+  "duration": 4.716,
   "subMetas": {}
 }

gameRes/gameHomeSeme/S231/G06/P11/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "10e848d1-c76d-451c-a826-55e7f7029958",
   "downloadMode": 0,
-  "duration": 4.68,
+  "duration": 4.716,
   "subMetas": {}
 }

gameRes/gameHomeSeme/S231/G06/P12/audio.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "d9f497d2-d8d1-44a2-b1b9-50d227e0e52e",
   "downloadMode": 0,
-  "duration": 4.68,
+  "duration": 4.716,
   "subMetas": {}
 }

gameRes/gameHomeSeme/S231/G06/P12/data_231_6_12.json

@@ -14,7 +14,7 @@
       "v": "-1"
     },
     {
-      "name": "01-",
+      "name": "01",
       "tex": "01",
       "x": "919.0",
       "y": "479.0",
@@ -22,7 +22,7 @@
       "v": "-1"
     },
     {
-      "name": "03",
+      "name": "03-",
       "tex": "03-",
       "x": "1081.0",
       "y": "248.0",

gameRes/gameHomeSeme/S231/G06/P15/data_231_6_15.json

@@ -14,7 +14,7 @@
       "v": "1"
     },
     {
-      "name": "01-",
+      "name": "01",
       "tex": "01",
       "x": "585.4",
       "y": "212.3",

gameRes/gameHomeSeme/S231/G07/P03/02.png.meta

@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 263,
+      "width": 262,
       "height": 240,
-      "rawWidth": 263,
+      "rawWidth": 262,
       "rawHeight": 240,
       "borderTop": 0,
       "borderBottom": 0,

gameRes/gameHomeSeme/S231/G07/P03/data_231_7_3.json

@@ -6,20 +6,20 @@
   "allDur": 1,
   "node": [
     {
-      "name": "01",
+      "name": "01-",
       "tex": "01-",
       "x": "260.0",
       "y": "380.0",
       "act": 1,
-      "v": "1"
+      "v": "-1"
     },
     {
-      "name": "02-",
+      "name": "02",
       "tex": "02",
       "x": "640.0",
       "y": "380.0",
       "act": 1,
-      "v": "-1"
+      "v": "1"
     },
     {
       "name": "03",

gameRes/gameHomeSeme/S231/G08/P06/data_231_8_6.json

@@ -16,16 +16,16 @@
     {
       "name": "02",
       "tex": "02",
-      "x": "368.0",
-      "y": "242.7",
+      "x": "616.9",
+      "y": "392.0",
       "act": 1,
       "v": "-1"
     },
     {
       "name": "03-",
       "tex": "03-",
-      "x": "605.4",
-      "y": "385.9",
+      "x": "386.7",
+      "y": "225.9",
       "act": 1,
       "v": "1"
     },
@@ -40,7 +40,7 @@
     {
       "name": "05",
       "tex": "05",
-      "x": "906.0",
+      "x": "918.4",
       "y": "463.1",
       "act": 1,
       "v": "-1"

gameRes/gameHomeSeme/S231/G08/P07/data_231_8_7.json

@@ -24,8 +24,8 @@
     {
       "name": "03-",
       "tex": "03-",
-      "x": "605.4",
-      "y": "385.9",
+      "x": "964.5",
+      "y": "489.0",
       "act": 1,
       "v": "1"
     },
@@ -40,8 +40,8 @@
     {
       "name": "05",
       "tex": "05",
-      "x": "903.9",
-      "y": "494.6",
+      "x": "621.2",
+      "y": "428.8",
       "act": 1,
       "v": "-1"
     }