Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

assets/resources/game/prefab/game.prefab

@@ -558,8 +558,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 205,
-      "height": 189
+      "width": 204,
+      "height": 190
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -570,7 +570,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        57.339,
+        55.339,
         88.83500000000001,
         0,
         0,
@@ -808,7 +808,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "13b33b17-f517-4b4f-a146-39bb8e270fc1"
+      "__uuid__": "ded8d2bb-9a3a-44b1-9a93-694edc1b693c"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -5554,7 +5554,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "edyBlpoZRLA6Zjm4yhDxc+",
+    "fileId": "06G0XFghJDNLefu5XLiaBn",
     "sync": false
   },
   {
@@ -5766,7 +5766,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "63OiVMl6RN07Qf803YkJQK",
+    "fileId": "c3vq4NHQ1NUL5dqKaUrcZF",
     "sync": false
   },
   {
@@ -5875,7 +5875,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "06OD89Y4RGxJFlp9asauv/",
+    "fileId": "28Lk0JaeNGUYqlEXOfwnp1",
     "sync": false
   },
   {

assets/resources/game/texture/main/piazi.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "fffd5b24-012a-4376-bc20-b889590488b7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 204,
+  "height": 190,
+  "platformSettings": {},
+  "subMetas": {
+    "piazi": {
+      "ver": "1.0.4",
+      "uuid": "ded8d2bb-9a3a-44b1-9a93-694edc1b693c",
+      "rawTextureUuid": "fffd5b24-012a-4376-bc20-b889590488b7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 204,
+      "height": 190,
+      "rawWidth": 204,
+      "rawHeight": 190,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/login/login.prefab

@@ -272,7 +272,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 365,
-      "height": 256
+      "height": 242
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -434,7 +434,7 @@
       "__uuid__": "08cd98e8-cbd9-44c8-8cb6-09609780aa3c"
     },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",

assets/resources/module/warnTip/texture/bg4.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "da3fb28c-343e-4398-ae63-fff21a0e7fb0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 640,
+  "height": 380,
+  "platformSettings": {},
+  "subMetas": {
+    "bg4": {
+      "ver": "1.0.4",
+      "uuid": "452dd136-a70e-4541-91a9-a5108df1522f",
+      "rawTextureUuid": "da3fb28c-343e-4398-ae63-fff21a0e7fb0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 640,
+      "height": 380,
+      "rawWidth": 640,
+      "rawHeight": 380,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}