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

tower_sanguo/assets/MOKA/util/Utils.ts

@@ -361,7 +361,7 @@ export class Utils {
         else if (type == 2)
             return minute + ":" + second;
         else
-            return times + "";
+            return times.toFixed(0);
         //return { h: hour, m: minute, s: second };
     }
 

tower_sanguo/assets/resources/module/drawRecruit/texture.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "c5955de8-ea9b-4bcd-9b65-ad186f2d4ef7",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "7697e641-9603-4799-ab5f-9ad9c1ccd115",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 122,
+  "platformSettings": {},
+  "subMetas": {
+    "bg": {
+      "ver": "1.0.4",
+      "uuid": "bc26a038-30fa-44fe-bea4-ed5dfbf19a45",
+      "rawTextureUuid": "7697e641-9603-4799-ab5f-9ad9c1ccd115",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 750,
+      "height": 122,
+      "rawWidth": 750,
+      "rawHeight": 122,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/bg1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "5c1006b4-2eb1-49e7-b9ac-b091a43345fc",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 1700,
+  "platformSettings": {},
+  "subMetas": {
+    "bg1": {
+      "ver": "1.0.4",
+      "uuid": "95a81aef-8718-47a1-b0e9-48ecce3baddb",
+      "rawTextureUuid": "5c1006b4-2eb1-49e7-b9ac-b091a43345fc",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 750,
+      "height": 1700,
+      "rawWidth": 750,
+      "rawHeight": 1700,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/bg2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "291eea8a-885b-4085-b74d-80a92ec75829",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 611,
+  "height": 410,
+  "platformSettings": {},
+  "subMetas": {
+    "bg2": {
+      "ver": "1.0.4",
+      "uuid": "3a189371-32c0-4e8b-be25-2d2c036a5e7f",
+      "rawTextureUuid": "291eea8a-885b-4085-b74d-80a92ec75829",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 611,
+      "height": 410,
+      "rawWidth": 611,
+      "rawHeight": 410,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/bg3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "956cd33f-02a0-45fe-80c6-6abfd98fa09b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 659,
+  "height": 122,
+  "platformSettings": {},
+  "subMetas": {
+    "bg3": {
+      "ver": "1.0.4",
+      "uuid": "443dccee-9c72-4804-9084-522f02615085",
+      "rawTextureUuid": "956cd33f-02a0-45fe-80c6-6abfd98fa09b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 659,
+      "height": 122,
+      "rawWidth": 659,
+      "rawHeight": 122,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/bg_button.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "7a010a1a-aa23-43e8-873d-370aa3264ad3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 190,
+  "height": 38,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_button": {
+      "ver": "1.0.4",
+      "uuid": "e0d8396b-8b24-426f-98c5-90753f15135a",
+      "rawTextureUuid": "7a010a1a-aa23-43e8-873d-370aa3264ad3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 190,
+      "height": 38,
+      "rawWidth": 190,
+      "rawHeight": 38,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/bg_icon.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "965b176b-0e42-402a-83e1-775276706249",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 159,
+  "height": 159,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_icon": {
+      "ver": "1.0.4",
+      "uuid": "65a490e4-1fc6-415b-8246-209b1aa98de1",
+      "rawTextureUuid": "965b176b-0e42-402a-83e1-775276706249",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 159,
+      "height": 159,
+      "rawWidth": 159,
+      "rawHeight": 159,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/bg_kapai.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "1c20ed55-65a9-47cd-8daf-dbf759b2cdce",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 139,
+  "height": 63,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_kapai": {
+      "ver": "1.0.4",
+      "uuid": "0e3adbba-89fe-43b4-ad32-61a3449e1c5f",
+      "rawTextureUuid": "1c20ed55-65a9-47cd-8daf-dbf759b2cdce",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 139,
+      "height": 63,
+      "rawWidth": 139,
+      "rawHeight": 63,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/bg_kapai1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "3eb438af-d6e3-4b75-9a5a-994ec6bc3506",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 347,
+  "height": 117,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_kapai1": {
+      "ver": "1.0.4",
+      "uuid": "285bdb25-39ee-45d2-8e8b-18830aacc91d",
+      "rawTextureUuid": "3eb438af-d6e3-4b75-9a5a-994ec6bc3506",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 347,
+      "height": 117,
+      "rawWidth": 347,
+      "rawHeight": 117,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/bg_yuanbao.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "34eeb165-b2c8-4916-a891-5f4619ebd0e6",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 192,
+  "height": 40,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_yuanbao": {
+      "ver": "1.0.4",
+      "uuid": "d203011f-50e3-44d4-a5da-5982de5442dc",
+      "rawTextureUuid": "34eeb165-b2c8-4916-a891-5f4619ebd0e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 192,
+      "height": 40,
+      "rawWidth": 192,
+      "rawHeight": 40,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/button.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "2fdea774-fb6f-4b44-847e-2dfebafd6588",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 310,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "button": {
+      "ver": "1.0.4",
+      "uuid": "81132e8a-dbcd-454c-aafa-380e8c13b1d2",
+      "rawTextureUuid": "2fdea774-fb6f-4b44-847e-2dfebafd6588",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 310,
+      "height": 124,
+      "rawWidth": 310,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/button2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "35276423-6e45-41f3-8b48-8328334b27b3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 310,
+  "height": 125,
+  "platformSettings": {},
+  "subMetas": {
+    "button2": {
+      "ver": "1.0.4",
+      "uuid": "567ad899-8800-40bf-abde-ef995238525b",
+      "rawTextureUuid": "35276423-6e45-41f3-8b48-8328334b27b3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 310,
+      "height": 125,
+      "rawWidth": 310,
+      "rawHeight": 125,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/icon_add.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "83f41f06-f698-4375-8281-8283b2aa180a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 39,
+  "height": 40,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_add": {
+      "ver": "1.0.4",
+      "uuid": "13e721e9-3cb2-4b4b-8ae9-306c654de764",
+      "rawTextureUuid": "83f41f06-f698-4375-8281-8283b2aa180a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 39,
+      "height": 40,
+      "rawWidth": 39,
+      "rawHeight": 40,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/icon_add1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "95b9e889-432f-47d5-93a9-e00a2bcb1dad",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 86,
+  "height": 86,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_add1": {
+      "ver": "1.0.4",
+      "uuid": "4f5c6488-290b-450c-91e4-b5d70c52c019",
+      "rawTextureUuid": "95b9e889-432f-47d5-93a9-e00a2bcb1dad",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 86,
+      "height": 86,
+      "rawWidth": 86,
+      "rawHeight": 86,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/icon_button_yb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "fdac95f4-b0eb-4263-bf2a-cb8c354b83f4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 51,
+  "height": 42,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_button_yb": {
+      "ver": "1.0.4",
+      "uuid": "9fd05ed8-2435-4384-a720-04919de4f21c",
+      "rawTextureUuid": "fdac95f4-b0eb-4263-bf2a-cb8c354b83f4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 51,
+      "height": 42,
+      "rawWidth": 51,
+      "rawHeight": 42,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/icon_dz.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "7c04798a-d83e-4103-bf59-5add3a6a9731",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 62,
+  "height": 65,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_dz": {
+      "ver": "1.0.4",
+      "uuid": "678cbc16-1328-4fd9-a49a-0526544f4a65",
+      "rawTextureUuid": "7c04798a-d83e-4103-bf59-5add3a6a9731",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 62,
+      "height": 65,
+      "rawWidth": 62,
+      "rawHeight": 65,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/icon_sp.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "11c51a24-2f12-4829-a897-5b77f9383e94",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 27,
+  "height": 26,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_sp": {
+      "ver": "1.0.4",
+      "uuid": "26adeb01-b5fe-454e-9d76-014db84f8538",
+      "rawTextureUuid": "11c51a24-2f12-4829-a897-5b77f9383e94",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 27,
+      "height": 26,
+      "rawWidth": 27,
+      "rawHeight": 26,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/icon_sp1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "a43ff27e-88a1-40ec-b6d0-132f794e6648",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 52,
+  "height": 50,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_sp1": {
+      "ver": "1.0.4",
+      "uuid": "e993f779-fc15-4476-acf5-5f82bc05fe7a",
+      "rawTextureUuid": "a43ff27e-88a1-40ec-b6d0-132f794e6648",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 52,
+      "height": 50,
+      "rawWidth": 52,
+      "rawHeight": 50,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/icon_tv.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "b8c133ce-dee9-4107-ab76-a392cdf2137c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 49,
+  "height": 59,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_tv": {
+      "ver": "1.0.4",
+      "uuid": "f194b3f4-b1d2-4b31-acec-0c27c67cddeb",
+      "rawTextureUuid": "b8c133ce-dee9-4107-ab76-a392cdf2137c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 49,
+      "height": 59,
+      "rawWidth": 49,
+      "rawHeight": 59,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/icon_yb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "0a69447c-a083-48d6-b9ec-8c8664b799e0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 51,
+  "height": 42,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_yb": {
+      "ver": "1.0.4",
+      "uuid": "8b92723b-157b-41b3-aee5-5718b7d9e76f",
+      "rawTextureUuid": "0a69447c-a083-48d6-b9ec-8c8664b799e0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 51,
+      "height": 42,
+      "rawWidth": 51,
+      "rawHeight": 42,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/kapai.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "f4267ac8-0b6d-472b-91f5-73202be58949",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 363,
+  "height": 554,
+  "platformSettings": {},
+  "subMetas": {
+    "kapai": {
+      "ver": "1.0.4",
+      "uuid": "d6836558-4353-466b-9f18-c20e6950141e",
+      "rawTextureUuid": "f4267ac8-0b6d-472b-91f5-73202be58949",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 363,
+      "height": 554,
+      "rawWidth": 363,
+      "rawHeight": 554,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/kapai1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "b2793ae1-a75a-4393-9938-db6de30c7ca1",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 133,
+  "height": 203,
+  "platformSettings": {},
+  "subMetas": {
+    "kapai1": {
+      "ver": "1.0.4",
+      "uuid": "f7a5c56f-9d83-43cd-b3ca-5bc7f9f61acc",
+      "rawTextureUuid": "b2793ae1-a75a-4393-9938-db6de30c7ca1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 133,
+      "height": 203,
+      "rawWidth": 133,
+      "rawHeight": 203,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/kapai_guang.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "88ba2b56-4457-48c1-8c84-c8af23e67e2a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 443,
+  "height": 631,
+  "platformSettings": {},
+  "subMetas": {
+    "kapai_guang": {
+      "ver": "1.0.4",
+      "uuid": "4f228f8a-45aa-4d47-9ea3-4b697cce2adb",
+      "rawTextureUuid": "88ba2b56-4457-48c1-8c84-c8af23e67e2a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 443,
+      "height": 631,
+      "rawWidth": 443,
+      "rawHeight": 631,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/kapai_guang1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "756fae67-6927-476c-a480-f52a6b5d4acb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 181,
+  "height": 251,
+  "platformSettings": {},
+  "subMetas": {
+    "kapai_guang1": {
+      "ver": "1.0.4",
+      "uuid": "aa9fa841-7b6b-4501-bae0-820e5f8892e5",
+      "rawTextureUuid": "756fae67-6927-476c-a480-f52a6b5d4acb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 181,
+      "height": 251,
+      "rawWidth": 181,
+      "rawHeight": 251,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/up.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "fbf02592-bd6a-4af0-9cd8-495f609975da",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 133,
+  "height": 37,
+  "platformSettings": {},
+  "subMetas": {
+    "up": {
+      "ver": "1.0.4",
+      "uuid": "475485f1-db41-47fb-8ea3-a3704737858e",
+      "rawTextureUuid": "fbf02592-bd6a-4af0-9cd8-495f609975da",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 133,
+      "height": 37,
+      "rawWidth": 133,
+      "rawHeight": 37,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/word.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "a47183c5-1477-411d-99a1-99ac100f30e3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 688,
+  "height": 127,
+  "platformSettings": {},
+  "subMetas": {
+    "word": {
+      "ver": "1.0.4",
+      "uuid": "de87c096-5a1d-44ae-8efc-0e4e5aca869d",
+      "rawTextureUuid": "a47183c5-1477-411d-99a1-99ac100f30e3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 688,
+      "height": 127,
+      "rawWidth": 688,
+      "rawHeight": 127,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/texture/xian.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "eb0d1168-8f7e-4094-af3a-dad9bf9613b3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 71,
+  "height": 4,
+  "platformSettings": {},
+  "subMetas": {
+    "xian": {
+      "ver": "1.0.4",
+      "uuid": "94a1491a-c609-471d-942c-7590c656c360",
+      "rawTextureUuid": "eb0d1168-8f7e-4094-af3a-dad9bf9613b3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 71,
+      "height": 4,
+      "rawWidth": 71,
+      "rawHeight": 4,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/scripts/effects/GrayEffectNodeProp.ts

@@ -0,0 +1,103 @@
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class GrayEffectNodeProp extends cc.Component {
+
+
+
+    //private _grayLevelSlider: cc.Slider = null;
+    //private _grayLevelSliderLabel: cc.Label = null;
+
+    @property({ type: false, displayName: '是否置灰' })
+    private UseGray = false;
+
+    _examplesParentNode: cc.Node = null;
+
+    onLoad() {
+        this._examplesParentNode = this.node;
+        if (this.UseGray)
+            this.SetGray();
+        else
+            this.Revert();
+    }
+
+    onEnable() {
+        //this._grayLevelSlider.node.on("slide", this._onSliderChanged, this);
+    }
+
+    onDisable() {
+        //this._grayLevelSlider.node.off("slide", this._onSliderChanged, this);
+    }
+
+    start() {
+        //this._onSliderChanged();
+        // 更新材质
+        //console.log("-----Gray:");
+        //this._updateRenderComponentMaterial({
+        //    grayLevel: 1
+        //});
+    }
+
+    SetGray() {
+        if (this._examplesParentNode == null) this._examplesParentNode = this.node;
+        this._updateRenderComponentMaterial({
+            grayLevel: 1
+        });
+    }
+
+    Revert() {
+        if (this._examplesParentNode == null) this._examplesParentNode = this.node;
+        this._updateRenderComponentMaterial({
+            grayLevel: 0
+        });
+    }
+
+    private _onSliderChanged() {
+        //this._grayLevelSliderLabel.string = `${this._grayLevelSlider.progress.toFixed(2)}`;
+        //
+        //// 更新材质
+        //this._updateRenderComponentMaterial({
+        //    grayLevel: this._grayLevelSlider.progress
+        //});
+    }
+
+    /**
+     * 更新渲染组件的材质
+     *
+     * 1. 获取材质
+     * 2. 给材质的 unitform 变量赋值
+     * 3. 重新将材质赋值回去
+     */
+    private _updateRenderComponentMaterial(param: {
+        /**
+         * 灰化程度 [0.0, 1.0] ，1.0 表示完全灰化
+         */
+        grayLevel: number;
+    }) {
+        this._examplesParentNode.children.forEach(childNode => {
+            //console.log("--Name: " + childNode.name);
+            if (childNode.getComponent(cc.RichText)) {
+                if (param.grayLevel != 0) {
+                    let strProp = childNode.getComponent(cc.RichText);
+                    let str = strProp.string;
+                    let strs = str.split("#");
+                    let target = "";
+                    for (let i = 0; i < strs.length; i++) {
+                        if (i != 0) {
+                            strs[i] = "#585858" + strs[i].slice(5);
+                        }
+                        target += strs[i];
+                    }
+                    strProp.string = target;
+                }
+            } else {
+                childNode.getComponents(cc.RenderComponent).forEach(renderComponent => {
+                    //console.log("-----Mat:", renderComponent);
+                    let material: cc.Material = renderComponent.getMaterial(0);
+                    material.setProperty("grayLevel", param.grayLevel);
+                    renderComponent.setMaterial(0, material);
+                });
+            }
+        });
+    }
+}

tower_sanguo/assets/scripts/effects/GrayEffectNodeProp.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "6423fb09-1f4d-4001-be39-0fa3a4acac4e",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

tower_sanguo/assets/scripts/module/drawRecruit/DrawGeneralUI.ts

@@ -1,5 +1,8 @@
 import BaseUI from "../../../MOKA/component/BaseUI";
 import Time from "../../../MOKA/util/Time";
+import { Utils } from "../../../MOKA/util/Utils";
+import { PLAYERPROP } from "../../data/GameDefinition";
+import GameController from "../../GameController";
 import DrawItem from "./DrawItem";
 import DrawRecruitModel from "./DrawRecruitModel";
 
@@ -10,6 +13,9 @@ export default class DrawGeneralUI extends BaseUI {
     protected static prefabUrl = "module/drawRecruit/drawGeneral";
     protected static className = "DrawGeneralUI";
 
+    @property({ type: cc.Label, displayName: '文本_元宝' })
+    txt_num_yb: cc.Label = null;
+
     @property({ type: cc.Node, displayName: '单抽页' })
     panel_one: cc.Node = null;
 
@@ -34,11 +40,30 @@ export default class DrawGeneralUI extends BaseUI {
     @property({ type: cc.Node, displayName: '十_结束页' })
     panelTen_end: cc.Node = null;
 
+    @property({ type: cc.Label, displayName: '文本_单抽元宝消耗' })
+    txt_cost_one: cc.Label = null;
+
+    @property({ type: cc.Label, displayName: '文本_十连抽元宝消耗' })
+    txt_cost_ten: cc.Label = null;
+
+    @property({ type: cc.Label, displayName: '文本_单抽倒计时' })
+    txt_timer_one: cc.Label = null;
+
+    private time_one: number = 3;
+    private isTimer_one: boolean = false;
+    private isOpenedOne: boolean = false;
+    private isOpenedTen: boolean = false;
     isDrawEnd: boolean = false;
     isOpenAll: boolean = false;
 
+    isCanClick: boolean = true;     //暂时没用
+
     start() {
         if (this.ui_data != null) {
+            let cfg = GameController.gameData.serverConfig_data;
+            this.txt_num_yb.string = GameController.gameData.player.getProp(PLAYERPROP.YB) + "";
+            this.txt_cost_one.string = cfg.invite_cost;
+            this.txt_cost_ten.string = cfg.invite_cost * 10 * cfg.invite_discount + "";
             this.panel_one.active = this.ui_data.type == 1;
             this.panel_ten.active = this.ui_data.type != 1;
 
@@ -55,8 +80,11 @@ export default class DrawGeneralUI extends BaseUI {
     }
 
     initPanelOne() {
+        this.isOpenedOne = false;
         this.panelOne_start.active = true;
         this.panelOne_end.active = false;
+        this.time_one = 3;
+        this.isTimer_one = true;
 
         //this.drawItem_one.openDraw(DrawRecruitModel.Ins.getAGeneral());
     }
@@ -67,8 +95,25 @@ export default class DrawGeneralUI extends BaseUI {
         this.panelTen_end.active = false;
     }
 
+    update(dt) {
+        if (this.isTimer_one) {
+            this.time_one -= dt;
+            if (this.time_one <= 0) {
+                this.time_one = 0;
+                this.isTimer_one = false;
+                if (!this.isOpenedOne) {
+                    this.openDraw_One();
+                }
+            }
+            this.txt_timer_one.string = "点击翻开卡牌(" + Utils.TimeToFormat(this.time_one, 1) + ")";
+        }
+    }
+
 
     async openDraw_One() {
+        if (this.isOpenedOne) return;
+        this.isOpenedOne = true;
+
         let general = DrawRecruitModel.Ins.getAGeneral();
         this.drawItem_one.openDraw(general);
         await Time.WaitForSeconds(0.5);
@@ -77,17 +122,19 @@ export default class DrawGeneralUI extends BaseUI {
     }
 
     async openDraw_Ten() {
+        this.isCanClick = false;
         let general = DrawRecruitModel.Ins.getAGeneral();
-        for (let i = 0; i < this.drawItem_tens.length; i++) {
+        for (let i = 0; cc.isValid(this) && i < this.drawItem_tens.length; i++) {
             if (!this.isOpenAll) {
                 this.drawItem_tens[i].openDraw(general);
                 await Time.WaitForSeconds(0.3);
             } else {
                 return;
             }
-            if (i == this.drawItem_tens.length - 1) {
+            if (cc.isValid(this) && i == this.drawItem_tens.length - 1) {
                 this.panelTen_start.active = false;
                 this.panelTen_end.active = true;
+                this.isCanClick = true;
             }
         }
     }
@@ -98,8 +145,7 @@ export default class DrawGeneralUI extends BaseUI {
 
     click_Draw_OneBtn() {
         this.drawItem_one.init();
-        this.panelOne_end.active = false;
-        this.panelOne_start.active = true;
+        this.initPanelOne();
     }
 
 
@@ -114,6 +160,7 @@ export default class DrawGeneralUI extends BaseUI {
         }
         this.panelTen_start.active = false;
         this.panelTen_end.active = true;
+        this.isCanClick = true;
     }
 
     click_Draw_TenBtn() {
@@ -125,4 +172,8 @@ export default class DrawGeneralUI extends BaseUI {
         this.panelTen_end.active = false;
         this.openDraw_Ten();
     }
+
+    click_AddYBBtn() {
+
+    }
 }

tower_sanguo/assets/scripts/module/drawRecruit/DrawItem.ts

@@ -11,6 +11,19 @@ export default class DrawItem extends cc.Component {
     node_opened: cc.Node = null;
     @property({ type: cc.Sprite, displayName: "图_武将" })
     img_hero: cc.Sprite = null;
+    @property({ type: cc.Sprite, displayName: "图_阵营" })
+    img_camp: cc.Sprite = null;
+    
+    @property({ type: cc.Sprite, displayName: "图_背光" })
+    img_light: cc.Sprite = null;
+    @property({ type: cc.Sprite, displayName: "图_背光开" })
+    img_light_opened: cc.Sprite = null;
+    
+    @property({ type: cc.Node, displayName: "提示_已拥有英雄" })
+    node_hasHero: cc.Node = null;
+    
+    @property({ type: cc.Label, displayName: "文本_碎片数" })
+    txt_slice: cc.Label = null;
 
     isOpened = false;
 
@@ -23,6 +36,7 @@ export default class DrawItem extends cc.Component {
         this.btn_open.scaleX = 1;
         this.node_opened.scaleX = 0;
         this.node_opened.active = false;
+        this.img_camp.node.active = false;
     }
 
     openDraw(general: GeneralVO) {
@@ -42,10 +56,17 @@ export default class DrawItem extends cc.Component {
                     cc.tween(this.node_opened)
                         .to(0.2, { scaleX: 1 })
                         .call(() => {
+                            this.img_camp.node.active = true;
                         })
                         .start();
                 })
                 .start();
-        })
+        });
+        cc.loader.loadRes("module/general/texture/icon_camp_" + general.camp, cc.SpriteFrame, (errr, asset) => {
+            if (errr) {
+                return;
+            }
+            this.img_camp.spriteFrame = asset;
+        });
     }
 }

tower_sanguo/assets/scripts/module/drawRecruit/DrawRecruitUI.ts

@@ -19,14 +19,27 @@ export default class DrawRecruitUI extends BaseUI {
     @property({ type: cc.Label, displayName: '文本_元宝' })
     txt_yb: cc.Label = null;
 
+
+    @property({ type: cc.Label, displayName: '文本_倍率' })
+    txt_rate: cc.Label = null;
+
     @property({ type: cc.Sprite, displayName: '图_心愿武将' })
     img_wish: cc.Sprite = null;
 
     @property({ type: cc.Label, displayName: '文本_心愿武将名' })
     txt_name: cc.Label = null;
 
-    @property({ type: cc.Label, displayName: '文本_倍率' })
-    txt_rate: cc.Label = null;
+    @property({ type: cc.Sprite, displayName: '图_心愿武将阵营' })
+    img_wish_camp: cc.Sprite = null;
+
+    @property({ type: cc.Label, displayName: '文本_单抽消耗' })
+    txt_cost_one: cc.Label = null;
+
+    @property({ type: cc.Label, displayName: '文本_十连抽实际消耗' })
+    txt_cost_ten: cc.Label = null;
+
+    @property({ type: cc.Label, displayName: '文本_十连抽原价消耗' })
+    txt_cost_ten_old: cc.Label = null;
 
     start() {
         this.initPanel();
@@ -34,6 +47,11 @@ export default class DrawRecruitUI extends BaseUI {
 
     initPanel() {
         this.txt_yb.string = GameController.gameData.player.getProp(PLAYERPROP.YB) + "";
+        let cfg = GameController.gameData.serverConfig_data;
+        this.txt_cost_one.string = cfg.invite_cost;
+        this.txt_cost_ten.string = cfg.invite_cost * 10 * cfg.invite_discount + "";
+        this.txt_cost_ten_old.string = cfg.invite_cost * 10 + "";
+
         //心愿武将接口
         if (DrawRecruitModel.Ins.cur_wish_id > 0) {
             let general = GameController.gameData.player.generals_bag[DrawRecruitModel.Ins.cur_wish_id];
@@ -41,12 +59,22 @@ export default class DrawRecruitUI extends BaseUI {
                 if (errr) {
                     return;
                 }
+                this.img_wish.node.active = true;
                 this.img_wish.spriteFrame = asset;
             });
+            cc.loader.loadRes("module/general/texture/icon_camp_" + general.camp, cc.SpriteFrame, (errr, asset) => {
+                if (errr) {
+                    return;
+                }
+                this.img_wish_camp.spriteFrame = asset;
+            });
             this.txt_name.string = general.name + "";
-        }else{
+            this.txt_rate.string = "服务器数据";
+        } else {
             this.img_wish.spriteFrame = null;
+            this.img_wish.node.active = false;
             this.txt_name.string = "指定武将";
+            this.txt_rate.string = "";
         }
     }
 
@@ -65,4 +93,8 @@ export default class DrawRecruitUI extends BaseUI {
         GameController.audioM.playEffect(AUDIO_TYPE.button);
         GameController.uiM.openUI(DrawGeneralUI, null, ViewZorder.UI, null, null, { type: 2 });
     }
+
+    click_AddYBBtn(){
+        
+    }
 }

tower_sanguo/assets/scripts/module/drawRecruit/DrawWishUI.ts

@@ -26,6 +26,10 @@ export default class DrawWishUI extends BaseUI {
     @property({ type: WishItem, displayName: "已拥有武将Item" })
     wishItem: WishItem = null;
 
+    
+    @property({ type: cc.Node, displayName: "广告按钮置灰" })
+    btn_adGray: cc.Node = null;
+
     /**心愿列表 key 武将id value wishitem*/
     private wishItemMap: Map<number, WishItem> = new Map<number, WishItem>();
 
@@ -59,11 +63,11 @@ export default class DrawWishUI extends BaseUI {
             let grl = tempGenerals[i];
             console.log("Color: " + grl.color + " Star: " + grl.star + " Camp: " + grl.camp);
             //if (grl.status == 3) {
-                let tempscr = cc.instantiate(this.wishItem.node).getComponent(WishItem);
-                tempscr.Init(grl);
-                tempscr.node.active = true;
-                this.content.addChild(tempscr.node);
-                this.wishItemMap.set(grl.id, tempscr);
+            let tempscr = cc.instantiate(this.wishItem.node).getComponent(WishItem);
+            tempscr.Init(grl);
+            tempscr.node.active = true;
+            this.content.addChild(tempscr.node);
+            this.wishItemMap.set(grl.id, tempscr);
             //}
         }
 
@@ -74,13 +78,17 @@ export default class DrawWishUI extends BaseUI {
                 if (errr) {
                     return;
                 }
+                this.img_wish.node.active = true;
                 this.img_wish.spriteFrame = asset;
             });
             this.txt_name.string = general.name + "";
+            this.txt_rate.string = "服务器数据";
             this.wishItemMap.get(DrawRecruitModel.Ins.cur_wish_id).updateSelectState(true);
         } else {
             this.img_wish.spriteFrame = null;
+            this.img_wish.node.active = false;
             this.txt_name.string = "指定武将";
+            this.txt_rate.string = "";
         }
     }
 
@@ -97,10 +105,16 @@ export default class DrawWishUI extends BaseUI {
     }
 
     click_AdSureBtn() {
-        console.log("GeneralBag: ",GameController.gameData.player.generals_bag);
+        let generalid = DrawRecruitModel.Ins.cur_wish_id_temp;
+        console.log("GeneralID: " + generalid);
+        console.log("GeneralBag: ", GameController.gameData.player.generals_bag);
         GameController.http.prayGeneral((data) => {
             console.log("-->Data: ", data);
-        }, { generalId: 112005 });
+        }, { generalId: generalid });
+    }
+
+    click_AdGrayBtn(){
+        console.log("you click ad gray btn");
     }
 
     onDestroy() {

tower_sanguo/assets/static_res/big_image/bg_top.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "d7260b1a-f6a1-47cf-b8b1-baad99a2e6ef",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 163,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_top": {
+      "ver": "1.0.4",
+      "uuid": "f3eb1f3c-f6f1-46fa-bf3f-22920d994298",
+      "rawTextureUuid": "d7260b1a-f6a1-47cf-b8b1-baad99a2e6ef",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 750,
+      "height": 162,
+      "rawWidth": 750,
+      "rawHeight": 163,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}