v1.0.8

7af33e0c · zengsijie · 6d3f7cac · 7af33e0c · 7af33e0c
Commit 7af33e0c authored Oct 19, 2018 by zengsijie
Hide whitespace changes
Inline Side-by-side

Showing with 105 additions and 105 deletions

0ad3d90d8.json zuiqiangnaochoujin/v1.0.8/res/import/0a/0ad3d90d8.json +103 -103

0f5f062a1.json zuiqiangnaochoujin/v1.0.8/res/import/0f/0f5f062a1.json +2 -2

No files found.
--- a/zuiqiangnaochoujin/v1.0.8/res/import/0a/0ad3d90d8.json
+++ b/zuiqiangnaochoujin/v1.0.8/res/import/0a/0ad3d90d8.json
@@ -23,6 +23,9 @@
        {
          "__id__": 7
        },
+        {
+          "__id__": 8
+        },
        {
          "__id__": 9
        },
@@ -37,9 +40,6 @@
        },
        {
          "__id__": 13
-        },
-        {
-          "__id__": 14
        }
      ],
      "_level": 1,
@@ -50,10 +50,10 @@
            "__id__": 1
          },
          "rightNode": {
-            "__id__": 9
+            "__id__": 7
          },
          "dogNode": {
-            "__id__": 7
+            "__id__": 13
          },
          "rightAudio": {
            "__uuid__": "5fxNCCBo1LWKSR41ULDd6A"
@@ -353,28 +353,19 @@
    },
    {
      "__type__": "cc.Node",
-      "_name": "catBtn",
+      "_name": "right",
      "_parent": {
        "__id__": 1
      },
-      "_children": [
-        {
-          "__id__": 8
-        }
-      ],
-      "_level": 2,
+      "_active": false,
      "_components": [
        {
          "__type__": "cc.Sprite",
          "node": {
            "__id__": 7
          },
-          "_sizeMode": 0
-        },
-        {
-          "__type__": "4fa29eaUI1KFq2TDcOYir/y",
-          "node": {
-            "__id__": 7
+          "_spriteFrame": {
+            "__uuid__": "acmXhqGmZIyqekTJt3nEC7"
          }
        }
      ],
@@ -386,23 +377,16 @@
        "asset": {
          "__uuid__": "0eP6fUf/NAmJIPEmZv6Lah"
        },
-        "fileId": "100+bFF6xHToEumuY+lY6u"
-      },
-      "_color": {
-        "__type__": "cc.Color",
-        "r": 121,
-        "g": 118,
-        "b": 118
+        "fileId": "37ax0bGr5Hy6O3UXiNcLQ8"
      },
      "_contentSize": {
        "__type__": "cc.Size",
-        "width": 100,
-        "height": 100
+        "width": 225,
+        "height": 219
      },
      "_position": {
        "__type__": "cc.Vec3",
-        "x": -89,
-        "y": 303
+        "y": -355
      },
      "_scale": {
        "__type__": "cc.Vec3",
@@ -413,25 +397,26 @@
    },
    {
      "__type__": "cc.Node",
-      "_name": "New Label",
+      "_name": "New Sprite",
      "_parent": {
-        "__id__": 7
+        "__id__": 1
      },
-      "_level": 3,
+      "_level": 2,
      "_components": [
        {
-          "__type__": "cc.Label",
+          "__type__": "cc.Sprite",
          "node": {
            "__id__": 8
          },
-          "_srcBlendFactor": 1,
-          "_useOriginalSize": false,
-          "_string": "猫咪",
-          "_N$string": "猫咪",
-          "_fontSize": 35,
-          "_N$horizontalAlign": 1,
-          "_N$verticalAlign": 1,
-          "_N$fontFamily": "黑体"
+          "_spriteFrame": {
+            "__uuid__": "8aFvTUsKRFU5c54DSF9fAq"
+          }
+        },
+        {
+          "__type__": "4fa29eaUI1KFq2TDcOYir/y",
+          "node": {
+            "__id__": 8
+          }
        }
      ],
      "_prefab": {
@@ -442,22 +427,17 @@
        "asset": {
          "__uuid__": "0eP6fUf/NAmJIPEmZv6Lah"
        },
-        "fileId": "4cCYZJ15lFo7P7bzp3khJ6"
-      },
-      "_color": {
-        "__type__": "cc.Color",
-        "r": 62,
-        "g": 19,
-        "b": 1
+        "fileId": "36hGY2JwBOYp+MmCrwS7sq"
      },
      "_contentSize": {
        "__type__": "cc.Size",
-        "width": 70,
-        "height": 40
+        "width": 150,
+        "height": 334
      },
      "_position": {
        "__type__": "cc.Vec3",
-        "y": -8.1
+        "x": -134,
+        "y": 61
      },
      "_scale": {
        "__type__": "cc.Vec3",
@@ -468,11 +448,11 @@
    },
    {
      "__type__": "cc.Node",
-      "_name": "right",
+      "_name": "New Sprite",
      "_parent": {
        "__id__": 1
      },
-      "_active": false,
+      "_level": 2,
      "_components": [
        {
          "__type__": "cc.Sprite",
@@ -480,7 +460,13 @@
            "__id__": 9
          },
          "_spriteFrame": {
-            "__uuid__": "acmXhqGmZIyqekTJt3nEC7"
+            "__uuid__": "8aFvTUsKRFU5c54DSF9fAq"
+          }
+        },
+        {
+          "__type__": "4fa29eaUI1KFq2TDcOYir/y",
+          "node": {
+            "__id__": 9
          }
        }
      ],
@@ -492,20 +478,21 @@
        "asset": {
          "__uuid__": "0eP6fUf/NAmJIPEmZv6Lah"
        },
-        "fileId": "37ax0bGr5Hy6O3UXiNcLQ8"
+        "fileId": "19gAN5bkVM2IzOA2MMGwgR"
      },
      "_contentSize": {
        "__type__": "cc.Size",
-        "width": 225,
-        "height": 219
+        "width": 150,
+        "height": 334
      },
      "_position": {
        "__type__": "cc.Vec3",
-        "y": -355
+        "x": 47,
+        "y": 61
      },
      "_scale": {
        "__type__": "cc.Vec3",
-        "x": 1,
+        "x": -1,
        "y": 1,
        "z": 1
      }
@@ -524,7 +511,7 @@
            "__id__": 10
          },
          "_spriteFrame": {
-            "__uuid__": "8aFvTUsKRFU5c54DSF9fAq"
+            "__uuid__": "42mpRpRCFDQYZcD5zrL5K3"
          }
        },
        {
@@ -542,17 +529,16 @@
        "asset": {
          "__uuid__": "0eP6fUf/NAmJIPEmZv6Lah"
        },
-        "fileId": "36hGY2JwBOYp+MmCrwS7sq"
+        "fileId": "251XptNplEV5e+aK0ssLIH"
      },
      "_contentSize": {
        "__type__": "cc.Size",
-        "width": 150,
-        "height": 334
+        "width": 638,
+        "height": 289
      },
      "_position": {
        "__type__": "cc.Vec3",
-        "x": -134,
-        "y": 61
+        "y": -122
      },
      "_scale": {
        "__type__": "cc.Vec3",
@@ -575,7 +561,7 @@
            "__id__": 11
          },
          "_spriteFrame": {
-            "__uuid__": "8aFvTUsKRFU5c54DSF9fAq"
+            "__uuid__": "20mtWyMDZB5LwdLnszWjns"
          }
        },
        {
@@ -593,21 +579,21 @@
        "asset": {
          "__uuid__": "0eP6fUf/NAmJIPEmZv6Lah"
        },
-        "fileId": "19gAN5bkVM2IzOA2MMGwgR"
+        "fileId": "e8R5H0cmVMjIxI39paEwmX"
      },
      "_contentSize": {
        "__type__": "cc.Size",
-        "width": 150,
-        "height": 334
+        "width": 293,
+        "height": 311
      },
      "_position": {
        "__type__": "cc.Vec3",
-        "x": 47,
-        "y": 61
+        "x": 207,
+        "y": 91
      },
      "_scale": {
        "__type__": "cc.Vec3",
-        "x": -1,
+        "x": 1,
        "y": 1,
        "z": 1
      }
@@ -626,7 +612,7 @@
            "__id__": 12
          },
          "_spriteFrame": {
-            "__uuid__": "42mpRpRCFDQYZcD5zrL5K3"
+            "__uuid__": "61qTTn/e1IObf9LUIArFkn"
          }
        },
        {
@@ -644,16 +630,16 @@
        "asset": {
          "__uuid__": "0eP6fUf/NAmJIPEmZv6Lah"
        },
-        "fileId": "251XptNplEV5e+aK0ssLIH"
+        "fileId": "27cNt3httOy4ZxN6EuPYxp"
      },
      "_contentSize": {
        "__type__": "cc.Size",
-        "width": 638,
-        "height": 289
+        "width": 389,
+        "height": 240
      },
      "_position": {
        "__type__": "cc.Vec3",
-        "y": -122
+        "y": -64
      },
      "_scale": {
        "__type__": "cc.Vec3",
@@ -664,10 +650,15 @@
    },
    {
      "__type__": "cc.Node",
-      "_name": "New Sprite",
+      "_name": "catBtn",
      "_parent": {
        "__id__": 1
      },
+      "_children": [
+        {
+          "__id__": 14
+        }
+      ],
      "_level": 2,
      "_components": [
        {
@@ -675,9 +666,7 @@
          "node": {
            "__id__": 13
          },
-          "_spriteFrame": {
-            "__uuid__": "20mtWyMDZB5LwdLnszWjns"
-          }
+          "_sizeMode": 0
        },
        {
          "__type__": "4fa29eaUI1KFq2TDcOYir/y",
@@ -694,17 +683,23 @@
        "asset": {
          "__uuid__": "0eP6fUf/NAmJIPEmZv6Lah"
        },
-        "fileId": "e8R5H0cmVMjIxI39paEwmX"
+        "fileId": "100+bFF6xHToEumuY+lY6u"
+      },
+      "_color": {
+        "__type__": "cc.Color",
+        "r": 121,
+        "g": 118,
+        "b": 118
      },
      "_contentSize": {
        "__type__": "cc.Size",
-        "width": 293,
-        "height": 311
+        "width": 100,
+        "height": 100
      },
      "_position": {
        "__type__": "cc.Vec3",
-        "x": 207,
-        "y": 91
+        "x": -89,
+        "y": 303
      },
      "_scale": {
        "__type__": "cc.Vec3",
@@ -715,26 +710,25 @@
    },
    {
      "__type__": "cc.Node",
-      "_name": "New Sprite",
+      "_name": "New Label",
      "_parent": {
-        "__id__": 1
+        "__id__": 13
      },
-      "_level": 2,
+      "_level": 3,
      "_components": [
        {
-          "__type__": "cc.Sprite",
+          "__type__": "cc.Label",
          "node": {
            "__id__": 14
          },
-          "_spriteFrame": {
-            "__uuid__": "61qTTn/e1IObf9LUIArFkn"
-          }
-        },
-        {
-          "__type__": "4fa29eaUI1KFq2TDcOYir/y",
-          "node": {
-            "__id__": 14
-          }
+          "_srcBlendFactor": 1,
+          "_useOriginalSize": false,
+          "_string": "猫咪",
+          "_N$string": "猫咪",
+          "_fontSize": 35,
+          "_N$horizontalAlign": 1,
+          "_N$verticalAlign": 1,
+          "_N$fontFamily": "黑体"
        }
      ],
      "_prefab": {
@@ -745,16 +739,22 @@
        "asset": {
          "__uuid__": "0eP6fUf/NAmJIPEmZv6Lah"
        },
-        "fileId": "27cNt3httOy4ZxN6EuPYxp"
+        "fileId": "4cCYZJ15lFo7P7bzp3khJ6"
+      },
+      "_color": {
+        "__type__": "cc.Color",
+        "r": 62,
+        "g": 19,
+        "b": 1
      },
      "_contentSize": {
        "__type__": "cc.Size",
-        "width": 389,
-        "height": 240
+        "width": 70,
+        "height": 40
      },
      "_position": {
        "__type__": "cc.Vec3",
-        "y": -64
+        "y": -8.1
      },
      "_scale": {
        "__type__": "cc.Vec3",

--- a/zuiqiangnaochoujin/v1.0.8/res/import/0f/0f5f062a1.json
+++ b/zuiqiangnaochoujin/v1.0.8/res/import/0f/0f5f062a1.json
@@ -103,8 +103,8 @@
          },
          "_srcBlendFactor": 1,
          "_useOriginalSize": false,
-          "_string": "小明握了一棵草进教室。\n老师：小明！滚出去。\n小明：老师，我不滚！因为我不叫小明。\n请问为什么？",
-          "_N$string": "小明握了一棵草进教室。\n老师：小明！滚出去。\n小明：老师，我不滚！因为我不叫小明。\n请问为什么？",
+          "_string": "如何让小明变得更可爱？",
+          "_N$string": "如何让小明变得更可爱？",
          "_N$fontFamily": "黑体",
          "_N$overflow": 1
        }