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

tower_sanguo/assets/resources/data/db_data.json

@@ -8,7 +8,7 @@
         "mission_arrive": 1,
         "mission_passed": 0,
         "prestige": 10000,
-        "useserver":1
+        "useserver": 0
     },
     "generals": [
         {

tower_sanguo/assets/resources/module/generalUpStar/general_up_star.prefab

@@ -3204,7 +3204,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 372,
+      "width": 400,
       "height": 44
     },
     "_anchorPoint": {
@@ -3260,7 +3260,7 @@
       "__uuid__": "ba239886-f96d-42a9-b5b0-00c09863ec5d"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -3323,7 +3323,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -46,
+        -54.293,
         -79.004,
         0,
         0,
@@ -3432,7 +3432,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -115,
+        -127.438,
         -79.004,
         0,
         0,
@@ -3541,7 +3541,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        152.249,
+        169.352,
         -79.004,
         0,
         0,
@@ -3648,7 +3648,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -158.004,
+        -175,
         -79.004,
         0,
         0,
@@ -3759,7 +3759,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        3.932,
+        6.135,
         -79.004,
         0,
         0,
@@ -3973,7 +3973,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        80,
+        91.921,
         -79.004,
         0,
         0,

tower_sanguo/assets/resources/module/getLiangCao/prefab/switch_item.prefab

@@ -260,7 +260,7 @@
         1,
         1,
         1,
-        0
+        1
       ]
     },
     "_eulerAngles": {
@@ -1196,6 +1196,18 @@
       "__id__": 1
     },
     "_enabled": true,
+    "lbl_icon_name": {
+      "__id__": 20
+    },
+    "lbl_item_name": {
+      "__id__": 27
+    },
+    "lbl_item_desc": {
+      "__id__": 30
+    },
+    "btn_look": {
+      "__id__": 11
+    },
     "_id": ""
   },
   {

tower_sanguo/assets/resources/module/main/prefab_texture/new.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "ee534f0c-c44c-4a53-9973-4c9ad440d9bd",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "eaada743-2951-4ce8-b7b2-64dc62de46eb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "1": {
+      "ver": "1.0.4",
+      "uuid": "17e47750-d0b8-419f-9cca-22661a416928",
+      "rawTextureUuid": "eaada743-2951-4ce8-b7b2-64dc62de46eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/10.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "8b44dae1-8063-4b62-8d32-2a1ae4651b0a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 80,
+  "height": 82,
+  "platformSettings": {},
+  "subMetas": {
+    "10": {
+      "ver": "1.0.4",
+      "uuid": "a7206e6f-7fe6-4390-858d-5f543efa2d04",
+      "rawTextureUuid": "8b44dae1-8063-4b62-8d32-2a1ae4651b0a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 80,
+      "height": 82,
+      "rawWidth": 80,
+      "rawHeight": 82,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "4c453612-535b-4891-a992-162f6043c920",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "2": {
+      "ver": "1.0.4",
+      "uuid": "2c65c5e8-890e-43b1-8e60-ab36102bad77",
+      "rawTextureUuid": "4c453612-535b-4891-a992-162f6043c920",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "f124d109-c41a-422c-9f92-7ec3fef34233",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "3": {
+      "ver": "1.0.4",
+      "uuid": "85bbed91-a193-4e8e-ba7d-7a3d80cbf6c7",
+      "rawTextureUuid": "f124d109-c41a-422c-9f92-7ec3fef34233",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/4.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "0098eb7d-aa68-4fea-a6a9-1f3c5ad4176c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "4": {
+      "ver": "1.0.4",
+      "uuid": "ede4bdc6-bf98-4efa-bc71-44c3a35b79ca",
+      "rawTextureUuid": "0098eb7d-aa68-4fea-a6a9-1f3c5ad4176c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/5.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "563b7cbe-5148-4177-9b3f-0ff3e8d1f82b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "5": {
+      "ver": "1.0.4",
+      "uuid": "d6540430-250f-4236-8d7d-ce24199356e7",
+      "rawTextureUuid": "563b7cbe-5148-4177-9b3f-0ff3e8d1f82b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/6.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "29ae528e-0b13-4be3-97cc-ea763993f221",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "6": {
+      "ver": "1.0.4",
+      "uuid": "cb11e3f9-3c8e-49dd-aeea-eeb6ce5e536f",
+      "rawTextureUuid": "29ae528e-0b13-4be3-97cc-ea763993f221",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/7.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "c45bd9a9-c18e-4973-8c2b-37a34d85fac8",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 106,
+  "height": 115,
+  "platformSettings": {},
+  "subMetas": {
+    "7": {
+      "ver": "1.0.4",
+      "uuid": "4ec3c0cb-ee77-430e-945b-7d58df38e625",
+      "rawTextureUuid": "c45bd9a9-c18e-4973-8c2b-37a34d85fac8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 106,
+      "height": 115,
+      "rawWidth": 106,
+      "rawHeight": 115,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/8.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "c0eb1875-7712-48b7-8029-cf5d625ff0aa",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 86,
+  "height": 93,
+  "platformSettings": {},
+  "subMetas": {
+    "8": {
+      "ver": "1.0.4",
+      "uuid": "b59871df-e94a-4406-b2c9-e5407cde5dfd",
+      "rawTextureUuid": "c0eb1875-7712-48b7-8029-cf5d625ff0aa",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 86,
+      "height": 93,
+      "rawWidth": 86,
+      "rawHeight": 93,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/9.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "cb6daad0-8b3a-434f-a1bc-57041bdc97e7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 87,
+  "height": 91,
+  "platformSettings": {},
+  "subMetas": {
+    "9": {
+      "ver": "1.0.4",
+      "uuid": "ef31ea7f-d9e7-4000-a19c-042ef293f09c",
+      "rawTextureUuid": "cb6daad0-8b3a-434f-a1bc-57041bdc97e7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 87,
+      "height": 91,
+      "rawWidth": 87,
+      "rawHeight": 91,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/Bottom_2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "a374d918-f2e0-486f-b9c7-cb3e73bea6cc",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 259,
+  "height": 148,
+  "platformSettings": {},
+  "subMetas": {
+    "Bottom_2": {
+      "ver": "1.0.4",
+      "uuid": "e9df044c-7485-406a-a963-1da2d9f53c03",
+      "rawTextureUuid": "a374d918-f2e0-486f-b9c7-cb3e73bea6cc",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 259,
+      "height": 148,
+      "rawWidth": 259,
+      "rawHeight": 148,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/guanka.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "1e526695-7a2e-4b8e-8f43-5925f800a8d6",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 300,
+  "height": 88,
+  "platformSettings": {},
+  "subMetas": {
+    "guanka": {
+      "ver": "1.0.4",
+      "uuid": "52c3977e-248c-436f-a0a3-53326e7c87b1",
+      "rawTextureUuid": "1e526695-7a2e-4b8e-8f43-5925f800a8d6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 300,
+      "height": 88,
+      "rawWidth": 300,
+      "rawHeight": 88,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "0559f0b0-b045-46a5-992d-da09d1a40d4d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 80,
+  "height": 82,
+  "platformSettings": {},
+  "subMetas": {
+    "icon": {
+      "ver": "1.0.4",
+      "uuid": "84ecadbb-a68f-49d4-b8ce-3b47ed1aab9b",
+      "rawTextureUuid": "0559f0b0-b045-46a5-992d-da09d1a40d4d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 80,
+      "height": 82,
+      "rawWidth": 80,
+      "rawHeight": 82,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "0d2c178c-f532-4c86-9906-7cf2528d0e6d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "icon1": {
+      "ver": "1.0.4",
+      "uuid": "92198ebd-a3cf-4faf-a38a-fe065d8339f4",
+      "rawTextureUuid": "0d2c178c-f532-4c86-9906-7cf2528d0e6d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "e4c546d7-bcb2-4d84-8c92-fc8417ece599",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "icon2": {
+      "ver": "1.0.4",
+      "uuid": "b686e797-64a9-4967-a46c-fbb141a134b3",
+      "rawTextureUuid": "e4c546d7-bcb2-4d84-8c92-fc8417ece599",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon2_xing.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "0fd4efd8-86cc-4695-831f-2ebe3c10a158",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 23,
+  "height": 25,
+  "platformSettings": {},
+  "subMetas": {
+    "icon2_xing": {
+      "ver": "1.0.4",
+      "uuid": "2f4ce484-7f2f-482f-a192-dfc62cd4ee00",
+      "rawTextureUuid": "0fd4efd8-86cc-4695-831f-2ebe3c10a158",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 23,
+      "height": 25,
+      "rawWidth": 23,
+      "rawHeight": 25,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "baf5a00c-3a88-477a-832f-01d9962aabd5",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "icon3": {
+      "ver": "1.0.4",
+      "uuid": "0653d82f-f6ff-43e0-886f-f0b97633e400",
+      "rawTextureUuid": "baf5a00c-3a88-477a-832f-01d9962aabd5",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon4.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "b69729ec-2bb3-4d59-b524-e03d9c9f2893",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "icon4": {
+      "ver": "1.0.4",
+      "uuid": "81f91986-ac6b-4cc1-b864-03a3ba4e5941",
+      "rawTextureUuid": "b69729ec-2bb3-4d59-b524-e03d9c9f2893",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon5.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "4d7e5537-7f8d-44ab-a44b-8c2970e47c7a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "icon5": {
+      "ver": "1.0.4",
+      "uuid": "65b7d535-7bdb-4a34-9a04-7e0c7e519e83",
+      "rawTextureUuid": "4d7e5537-7f8d-44ab-a44b-8c2970e47c7a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon5_1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "5b8faf44-f33b-43a9-bf4b-aaabeddbc613",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 59,
+  "height": 61,
+  "platformSettings": {},
+  "subMetas": {
+    "icon5_1": {
+      "ver": "1.0.4",
+      "uuid": "affe8831-aea5-41f8-af1e-2cd97c1c98d6",
+      "rawTextureUuid": "5b8faf44-f33b-43a9-bf4b-aaabeddbc613",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 59,
+      "height": 61,
+      "rawWidth": 59,
+      "rawHeight": 61,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon6.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "81e3dcbe-a938-43b5-ab01-fb98b46c89f4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 85,
+  "height": 85,
+  "platformSettings": {},
+  "subMetas": {
+    "icon6": {
+      "ver": "1.0.4",
+      "uuid": "93a9712c-d0e2-40a7-87ae-dba70318cb18",
+      "rawTextureUuid": "81e3dcbe-a938-43b5-ab01-fb98b46c89f4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 85,
+      "height": 85,
+      "rawWidth": 85,
+      "rawHeight": 85,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon7.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "005ec911-2534-4d20-9fc0-bdf1dc925419",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 114,
+  "height": 143,
+  "platformSettings": {},
+  "subMetas": {
+    "icon7": {
+      "ver": "1.0.4",
+      "uuid": "81d132e3-1dfa-4bd1-b583-d97fb9c01eaa",
+      "rawTextureUuid": "005ec911-2534-4d20-9fc0-bdf1dc925419",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 114,
+      "height": 143,
+      "rawWidth": 114,
+      "rawHeight": 143,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon7_bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "a9f68942-f639-43e3-8d77-7f81adc5acef",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 34,
+  "platformSettings": {},
+  "subMetas": {
+    "icon7_bg": {
+      "ver": "1.0.4",
+      "uuid": "783fa47e-aaa5-4ffa-be1e-a19d0d54b7a8",
+      "rawTextureUuid": "a9f68942-f639-43e3-8d77-7f81adc5acef",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 34,
+      "rawWidth": 128,
+      "rawHeight": 34,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon7_yb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "5f9bd287-b316-498b-b82d-7890ca9630c6",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 29,
+  "height": 24,
+  "platformSettings": {},
+  "subMetas": {
+    "icon7_yb": {
+      "ver": "1.0.4",
+      "uuid": "d781b134-f509-4eb8-8709-7b494853ce27",
+      "rawTextureUuid": "5f9bd287-b316-498b-b82d-7890ca9630c6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 29,
+      "height": 24,
+      "rawWidth": 29,
+      "rawHeight": 24,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon_end.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "d04a09f9-7aed-4c5d-bc2c-b45fa5a992bd",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 105,
+  "height": 95,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_end": {
+      "ver": "1.0.4",
+      "uuid": "9f4633cd-5f77-4f18-9982-1875576a59c3",
+      "rawTextureUuid": "d04a09f9-7aed-4c5d-bc2c-b45fa5a992bd",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 105,
+      "height": 95,
+      "rawWidth": 105,
+      "rawHeight": 95,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/icon_end1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "961632d5-8a27-435a-85a5-11f6dc222fd9",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 101,
+  "height": 102,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_end1": {
+      "ver": "1.0.4",
+      "uuid": "c1aa03a4-f7e3-4bd3-a1c4-5b13bd3902b7",
+      "rawTextureUuid": "961632d5-8a27-435a-85a5-11f6dc222fd9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 101,
+      "height": 102,
+      "rawWidth": 101,
+      "rawHeight": 102,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/jian1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "e36ef01c-04a1-4f1f-9ef3-ae38182ad7a5",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 94,
+  "height": 93,
+  "platformSettings": {},
+  "subMetas": {
+    "jian1": {
+      "ver": "1.0.4",
+      "uuid": "1bd29466-eaf7-42c1-92ab-28d6213ffadd",
+      "rawTextureUuid": "e36ef01c-04a1-4f1f-9ef3-ae38182ad7a5",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 94,
+      "height": 93,
+      "rawWidth": 94,
+      "rawHeight": 93,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/jian2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "fabba440-6472-4491-9533-3cd7664a135c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 94,
+  "height": 93,
+  "platformSettings": {},
+  "subMetas": {
+    "jian2": {
+      "ver": "1.0.4",
+      "uuid": "dddcb8a4-f945-4517-b5fd-c810caf00a09",
+      "rawTextureUuid": "fabba440-6472-4491-9533-3cd7664a135c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 94,
+      "height": 93,
+      "rawWidth": 94,
+      "rawHeight": 93,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/lc.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "fb31d16c-be1d-46d0-87ed-2a30e98ed9f8",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 23,
+  "height": 25,
+  "platformSettings": {},
+  "subMetas": {
+    "lc": {
+      "ver": "1.0.4",
+      "uuid": "6ce83f7d-2b82-4837-b977-54deefa8d18e",
+      "rawTextureUuid": "fb31d16c-be1d-46d0-87ed-2a30e98ed9f8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 23,
+      "height": 25,
+      "rawWidth": 23,
+      "rawHeight": 25,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/lc1_progress.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "0eeeadd9-5325-4ad6-93bd-332f0f945238",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 167,
+  "height": 22,
+  "platformSettings": {},
+  "subMetas": {
+    "lc1_progress": {
+      "ver": "1.0.4",
+      "uuid": "ffa61c00-2858-44fe-925a-d17c6ef54a70",
+      "rawTextureUuid": "0eeeadd9-5325-4ad6-93bd-332f0f945238",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 167,
+      "height": 22,
+      "rawWidth": 167,
+      "rawHeight": 22,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/lc_bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "c99c1c74-d36d-4976-8238-fa32b3858ab2",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 163,
+  "height": 29,
+  "platformSettings": {},
+  "subMetas": {
+    "lc_bg": {
+      "ver": "1.0.4",
+      "uuid": "568c71e5-acff-4843-b9f8-fa8b209d318e",
+      "rawTextureUuid": "c99c1c74-d36d-4976-8238-fa32b3858ab2",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 163,
+      "height": 29,
+      "rawWidth": 163,
+      "rawHeight": 29,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/lc_progress.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "cc67d634-e10d-49c1-8257-50b6466a2c67",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 167,
+  "height": 22,
+  "platformSettings": {},
+  "subMetas": {
+    "lc_progress": {
+      "ver": "1.0.4",
+      "uuid": "cf3891f3-1d0d-40d7-a2ee-e38f3c516231",
+      "rawTextureUuid": "cc67d634-e10d-49c1-8257-50b6466a2c67",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 167,
+      "height": 22,
+      "rawWidth": 167,
+      "rawHeight": 22,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/qipao.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "f37b7672-1c63-4a51-9254-55651abda3e3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 43,
+  "height": 36,
+  "platformSettings": {},
+  "subMetas": {
+    "qipao": {
+      "ver": "1.0.4",
+      "uuid": "40aeeb77-948a-40b4-bca7-9e687c6fc061",
+      "rawTextureUuid": "f37b7672-1c63-4a51-9254-55651abda3e3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 43,
+      "height": 36,
+      "rawWidth": 43,
+      "rawHeight": 36,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/suo.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "a3e0b592-311f-4d82-8022-4ce828ff5a77",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 40,
+  "height": 48,
+  "platformSettings": {},
+  "subMetas": {
+    "suo": {
+      "ver": "1.0.4",
+      "uuid": "f79dfbe1-d40c-4fc4-b96b-2091b7f81e5f",
+      "rawTextureUuid": "a3e0b592-311f-4d82-8022-4ce828ff5a77",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 40,
+      "height": 48,
+      "rawWidth": 40,
+      "rawHeight": 48,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/main/prefab_texture/new/tv.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "4c82feac-c219-4e68-b4d3-3981570ba853",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 37,
+  "height": 43,
+  "platformSettings": {},
+  "subMetas": {
+    "tv": {
+      "ver": "1.0.4",
+      "uuid": "95ecc82b-de46-453b-9850-aafb383c30e4",
+      "rawTextureUuid": "4c82feac-c219-4e68-b4d3-3981570ba853",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 37,
+      "height": 43,
+      "rawWidth": 37,
+      "rawHeight": 43,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/scripts/data/GameData.ts

@@ -75,7 +75,7 @@ export default class GameData {
         'star', 'help', 'turntable', 'taskActive', 'task', 'commanderskill', 'openfun'];
 
     /** 是否使用本地资源，不使用oss资源 */
-    private useLocal: boolean = true;
+    private useLocal: boolean = false;
 
     async initLocalConfigs() {
         console.log('initLocalConfigs');

tower_sanguo/assets/scripts/module/checkpointRedBag/CheckpointRedBagBtn.ts

@@ -48,7 +48,9 @@ export default class CheckpointRedBagBtn extends cc.Component {
     /** 点击到通关红包 */
     private onClickChPoRedBag() {
         GameController.audioM.playEffect(AUDIO_TYPE.button);
-        GameController.http.getStageReward();
+        if (CheckpointRedBagModle.redbag_data.cur_count > 0) {
+            GameController.http.getStageReward();
+        }
     }
     /** 看视频领取通关红包回调 */
     private onReciveTVRewardCall(reply) {

tower_sanguo/assets/scripts/module/checkpointRedBag/CheckpointRedBagModle.ts

@@ -43,7 +43,7 @@ export default class CheckpointRedBagModle {
         /** 当日累计数量 */
         cumulative_count: 0,
         /** 红包币数量累计存储限制 */
-        limit_count: 20,
+        limit_count: 0,
     }
     /** 当前波有没有爆红包 */
     public static cur_is_get: boolean = false;
@@ -66,6 +66,7 @@ export default class CheckpointRedBagModle {
             let temp_str_temp_data = JSON.parse(temp_data);
             if (temp_str_temp_data) this.redbag_data = temp_str_temp_data;
         }
+        this.redbag_data.limit_count = GameController.gameData.serverConfig_data.saveLimit;
     }
     /** 新的一波开始了 
      * - 更新状态
@@ -94,21 +95,19 @@ export default class CheckpointRedBagModle {
     private static redBag_world_pos: cc.Vec2 = null!;
     /** 掉落请求回调 
      *  - 服务端回复
-            // "stageRewardNum": Integer, (用户通关红包剩余数量)
-            // "stageRewardRedBag": Integer, (用户当前通关红包币数量)
-            // "stageRewardDrop": Integer, (用户当天红包掉落次数)
-            // "stageRewardLastTime": Long, (用户最后更新通关红包的时间)
-            // "stageRewardVideoTime": Integer (用户通关红包视频次数)
+        "StageRewardNum": Integer, (用户通关红包当前数量)
+        "StageRewardRedBag": Integer, (用户打开通关红包币数量)
+        "StageRewardDrop": Integer, (用户当天红包掉落次数)
+        "stageRewardLastTime": Long, (用户最后更新通关红包的时间)
+        "stageRewardVideoTime": Integer (用户通关红包视频次数)
     */
     public static saveStageRewardCall(reply) {
         cc.log('怪物掉落红包币结果：', reply)
         let data = reply.data;
         if (data && data.code === 1) {
             let data2 = data.data;
-            this.redbag_data.cur_count = data2.StageRewardRedBag;
+            // this.redbag_data.cur_count = data2.StageRewardNum;
             this.redbag_data.cumulative_count = data2.StageRewardDrop;
-            let t_limit_count = data2.StageRewardNum + data2.StageRewardDrop;// 限制次数 = 剩余次数 + 当日累计
-            this.redbag_data.limit_count = t_limit_count;
 
 
             // this.redbag_data.cumulative_count++;
@@ -122,8 +121,9 @@ export default class CheckpointRedBagModle {
                 let node_pos = node_red.parent.convertToNodeSpaceAR(this.redBag_world_pos);
                 node_red.setPosition(node_pos);
             })
-        } else {
-
+        } else if (data && data.code === 0) {
+            // 达到上限
+            this.redbag_data.cumulative_count = this.redbag_data.limit_count;
         }
     }
 
@@ -147,10 +147,8 @@ export default class CheckpointRedBagModle {
         let data = reply.data;
         if (data && data.code === 1) {
             let data2 = data.data;
-            this.redbag_data.cur_count = data2.StageRewardRedBag;
+            // this.redbag_data.cur_count = data2.StageRewardNum;
             this.redbag_data.cumulative_count = data2.StageRewardDrop;
-            let t_limit_count = data2.StageRewardNum + data2.StageRewardDrop;// 限制次数 = 剩余次数 + 当日累计
-            this.redbag_data.limit_count = t_limit_count;
             this.lookVideoCall();
         } else {
 

tower_sanguo/assets/scripts/module/getLiangCao/AddFoodUI.ts

@@ -17,9 +17,44 @@ export default class AddFoodUI extends BaseUI {
     private comp_ScrollList: any = null;
 
     /** 列表数据 */
-    private list_data = {
-        
-    }
+    private list_data = [
+        {
+            pfbType: 0,
+            id: 1,
+            icon_name: '粮草',
+            item_name: '投资',
+            item_desc: '可以获得大量粮草',
+            /** 跳转id */
+            gotoui: 7,
+        },
+        {
+            pfbType: 0,
+            id: 2,
+            icon_name: '粮草',
+            item_name: '转盘',
+            item_desc: '可以获得大量粮草',
+            /** 跳转id */
+            gotoui: 6,
+        },
+        {
+            pfbType: 0,
+            id: 3,
+            icon_name: '粮草',
+            item_name: '任务',
+            item_desc: '可以获得大量粮草',
+            /** 跳转id */
+            gotoui: 0,
+        },
+        {
+            pfbType: 0,
+            id: 4,
+            icon_name: '粮草',
+            item_name: '视频',
+            item_desc: '可以获得大量粮草',
+            /** 跳转id */
+            gotoui: -1,
+        },
+    ]
     onLoad() {
 
     }
@@ -30,7 +65,7 @@ export default class AddFoodUI extends BaseUI {
 
     /** 初始化列表 */
     private initList() {
-        let list_data = this.getData();
+        let list_data = this.list_data;//this.getData();
         if (this.comp_ScrollList) this.comp_ScrollList.clearItem();
         this.comp_ScrollList = this.p_scroll_list.node.getComponent('TableViewUtils');
         this.comp_ScrollList.init(list_data, this.p_scroll_list, this.scroll_tiem, 0, true);

tower_sanguo/assets/scripts/module/getLiangCao/GetLiangCaoUI.ts

@@ -28,7 +28,7 @@ export default class GetLiangCaoUI extends BaseUI {
         this.initStyle();
     }
     private initStyle() {
-        this.lbl_can_up.string = GetLiangCaoModel.canExpUpTimes() + '';
+        this.lbl_can_up.string = GetLiangCaoModel.canExpUpTimes() + '次';
         this.lbl_rest_times.string = GetLiangCaoModel.model_data.rest_vedio_times + '次';
         this.lbl_lc_count.string = 'x' + GetLiangCaoModel.food_count;
     }

tower_sanguo/assets/scripts/module/getLiangCao/switch_item.ts

@@ -5,13 +5,38 @@
 // Learn life-cycle callbacks:
 //  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
 
+import { ViewZorder } from "../../../MOKA/data/ViewZOrder";
+import { AUDIO_TYPE } from "../../data/GameDefinition";
+import GameController from "../../GameController";
+import investUI from "../invest/investUI";
+import TaskUI from "../task/TaskUI";
+import turntableUI from "../turntable/turntableUI";
+import AddFoodUI from "./AddFoodUI";
+
 const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class switch_item extends cc.Component {
 
+    @property({ type: cc.Label, displayName: '奖励名称' })
+    private lbl_icon_name: cc.Label = null!;
+    @property({ type: cc.Label, displayName: 'item名称' })
+    private lbl_item_name: cc.Label = null!;
+    @property({ type: cc.Label, displayName: 'item描述' })
+    private lbl_item_desc: cc.Label = null!;
+    @property({ type: cc.Button, displayName: '查看按钮' })
+    private btn_look: cc.Button = null!;
+    private item_data = {
+        pfbType: 0,
+        id: 0,
+        icon_name: '',
+        item_name: '',
+        item_desc: '',
+        /** 跳转id */
+        gotoui: 0,
+    }
     onLoad() {
-
+        XXEvent.addClickEvent(this.btn_look, this.onClickGoToUI, this);
     }
 
     start() {
@@ -22,6 +47,49 @@ export default class switch_item extends cc.Component {
      * - 自动初始化，onLoad之后，start之前
      */
     async setItemData(data: any, tableviewUtils) {
+        if (data) this.item_data = data;
+        this.initStyle();
+    }
+    /** 初始化样式 */
+    private initStyle() {
+        this.lbl_icon_name.string = this.item_data.icon_name;
+        this.lbl_item_name.string = this.item_data.item_name;
+        this.lbl_item_desc.string = this.item_data.item_desc;
+        if (this.item_data.gotoui === -1) {
+            this.btn_look.node.active = false;
+        } else {
+            this.btn_look.node.active = true;
+        }
+
+    }
+    /** 界面跳转 */
+    private onClickGoToUI() {
+        GameController.audioM.playEffect(AUDIO_TYPE.button);
+        if (this.item_data.gotoui >= 0) {
+            // GameController.uiM.openUIByUIID(this.item_data.gotoui);
+            // 自己判断id，需要优化
+            switch (this.item_data.id) {
+                case 1:
+                    // 跳投资
+                    GameController.uiM.openUI(investUI, null, ViewZorder.UI);
+                    break;
+                case 2:
+                    // 跳转盘
+                    GameController.uiM.openUI(turntableUI, null, ViewZorder.UI);
+                    break;
+                case 3:
+                    // 跳任务
+                    GameController.uiM.openUI(TaskUI, null, ViewZorder.UI)
+                    break;
+
+                default:
+                    break;
+            }
+        }
+        let compFoodMapUI = GameController.uiM.getUI(AddFoodUI);
+        if (compFoodMapUI) {
+            compFoodMapUI.close();
+        }
     }
     // update (dt) {}
 }

tower_sanguo/assets/scripts/module/main/MainNode.ts

@@ -4,113 +4,12 @@ const { ccclass } = cc._decorator;
 export default class MainNode extends cc.Component {
 	main: cc.Node;
 	fightnode: cc.Node;
-	node_barracks: cc.Node;
-	headinfo: cc.Node;
-	head_bg1: cc.Node;
-	head_bg2: cc.Node;
-	head: cc.Node;
-	mask_head: cc.Node;
-	head_icon: cc.Node;
-	hb: cc.Node;
-	lbl_money: cc.Node;
-	BACKGROUND_SPRITE: cc.Node;
-	TEXT_LABEL: cc.Node;
-	PLACEHOLDER_LABEL: cc.Node;
-	btn_tixian: cc.Node;
-	lc: cc.Node;
-	lbl_coin: cc.Node;
-	head_add: cc.Node;
-	lbl_lcadd: cc.Node;
 	missions: cc.Node;
-	node_mask: cc.Node;
-	node_items: cc.Node;
-	missionitem: cc.Node;
-	img_bg: cc.Node;
-	lbl_item: cc.Node;
 	btn_challenge: cc.Node;
-	arrow: cc.Node;
-	img_challenge: cc.Node;
-	Bottom: cc.Node;
-	menu_down: cc.Node;
-	btn1: cc.Node;
-	bg_btn: cc.Node;
-	label: cc.Node;
-	btn2: cc.Node;
-	btn3: cc.Node;
-	Bottom_1: cc.Node;
-	lbl_lv: cc.Node;
-	img: cc.Node;
-	lbl_lc: cc.Node;
-	btn4: cc.Node;
-	bg_btn4: cc.Node;
-	btn5: cc.Node;
-	qipao: cc.Node;
-	yb: cc.Node;
-	lbl_yb: cc.Node;
-	bg_btn5: cc.Node;
-	node_skill_full: cc.Node;
-	spine_1: cc.Node;
-	spine_2: cc.Node;
-	spine_general: cc.Node;
-	node_name: cc.Node;
-	lbl_1: cc.Node;
-	lbl_2: cc.Node;
-	lbl_3: cc.Node;
-	lbl_4: cc.Node;
 
     onLoad () {
 		this.main = this.node;
 		this.fightnode = this.main.getChildByName("fightnode");
-		this.node_barracks = this.main.getChildByName("node_barracks");
-		this.headinfo = this.main.getChildByName("headinfo");
-		this.head_bg1 = this.headinfo.getChildByName("head_bg1");
-		this.head_bg2 = this.headinfo.getChildByName("head_bg2");
-		this.head = this.headinfo.getChildByName("head");
-		this.mask_head = this.headinfo.getChildByName("mask_head");
-		this.head_icon = this.mask_head.getChildByName("head_icon");
-		this.hb = this.headinfo.getChildByName("hb");
-		this.lbl_money = this.headinfo.getChildByName("lbl_money");
-		this.btn_tixian = this.headinfo.getChildByName("btn_tixian");
-		this.lc = this.headinfo.getChildByName("lc");
-		this.lbl_coin = this.headinfo.getChildByName("lbl_coin");
-		this.head_add = this.headinfo.getChildByName("head_add");
-		this.lbl_lcadd = this.headinfo.getChildByName("lbl_lcadd");
 		this.missions = this.main.getChildByName("missions");
-		this.node_mask = this.missions.getChildByName("node_mask");
-		this.node_items = this.node_mask.getChildByName("node_items");
-		this.missionitem = this.node_items.getChildByName("missionitem");
-		this.img_bg = this.missionitem.getChildByName("img_bg");
-		this.lbl_item = this.missionitem.getChildByName("lbl_item");
-		this.btn_challenge = this.main.getChildByName("btn_challenge");
-		this.arrow = this.btn_challenge.getChildByName("arrow");
-		this.img_challenge = this.btn_challenge.getChildByName("img_challenge");
-		this.Bottom = this.main.getChildByName("Bottom");
-		this.menu_down = this.main.getChildByName("menu_down");
-		this.btn1 = this.menu_down.getChildByName("btn1");
-		this.bg_btn = this.btn1.getChildByName("bg_btn");
-		this.label = this.btn1.getChildByName("label");
-		this.btn2 = this.menu_down.getChildByName("btn2");
-		this.btn3 = this.menu_down.getChildByName("btn3");
-		this.Bottom_1 = this.btn3.getChildByName("Bottom_1");
-		this.lbl_lv = this.btn3.getChildByName("lbl_lv");
-		this.img = this.btn3.getChildByName("img");
-		this.lbl_lc = this.btn3.getChildByName("lbl_lc");
-		this.btn4 = this.menu_down.getChildByName("btn4");
-		this.bg_btn4 = this.btn4.getChildByName("bg_btn4");
-		this.btn5 = this.menu_down.getChildByName("btn5");
-		this.qipao = this.btn5.getChildByName("qipao");
-		this.yb = this.btn5.getChildByName("yb");
-		this.lbl_yb = this.btn5.getChildByName("lbl_yb");
-		this.bg_btn5 = this.btn5.getChildByName("bg_btn5");
-		this.node_skill_full = this.main.getChildByName("node_skill_full");
-		this.spine_1 = this.node_skill_full.getChildByName("spine_1");
-		this.spine_2 = this.node_skill_full.getChildByName("spine_2");
-		this.spine_general = this.node_skill_full.getChildByName("spine_general");
-		this.node_name = this.node_skill_full.getChildByName("node_name");
-		this.lbl_1 = this.node_name.getChildByName("lbl_1");
-		this.lbl_2 = this.node_name.getChildByName("lbl_2");
-		this.lbl_3 = this.node_name.getChildByName("lbl_3");
-		this.lbl_4 = this.node_name.getChildByName("lbl_4");
-
     }
 }

tower_sanguo/assets/scripts/module/main/MainUI.ts

@@ -29,6 +29,7 @@ import investModel from "../invest/investModel";
 import AddFoodUI from "../getLiangCao/AddFoodUI";
 import { HTTPTYPE } from "../../net/HttpCommand";
 import GeneralRewardUI from "../drawRecruit/GeneralRewardUI";
+import ProgressBarCircle from "../../component/ProgressBarCircle";
 
 const { ccclass, property } = cc._decorator;
 
@@ -50,6 +51,12 @@ export default class MainUI extends BaseUI {
     node_buff:cc.Layout = null;
     @property(cc.Label)
     lbl_redbag: cc.Label = null;
+    @property(ProgressBarCircle)
+    bar_food:ProgressBarCircle = null;
+    @property(cc.Label)
+    lbl_train_times: cc.Label = null;
+    @property(cc.Label)
+    lbl_mission:cc.Label = null;
     @property(cc.RichText)
     lbl_foodAll: cc.RichText = null;
     @property(cc.Label)
@@ -59,6 +66,8 @@ export default class MainUI extends BaseUI {
     @property(cc.Button)
     btn_gm: cc.Button = null;
     @property(cc.Button)
+    btn_challenge:cc.Button = null;
+    @property(cc.Button)
     btn_marshalstage: cc.Button = null;
     @property(cc.Button)
     btn_barracks: cc.Button = null;
@@ -68,6 +77,12 @@ export default class MainUI extends BaseUI {
     btn_getgeneral: cc.Button = null;
     @property(cc.Button)
     btn_task: cc.Button = null;
+    @property(cc.Button)
+    btn_tixian: cc.Button = null;
+    @property(cc.Label)
+    lbl_tixian_lv: cc.Label = null;
+    @property(ProgressBarCircle)
+    bar_tixian: ProgressBarCircle = null;
     @property({ type: cc.Button, displayName: '存钱罐按钮' })
     btn_piggyback: cc.Button = null;
     @property({ type: cc.Label, displayName: '存钱罐存入数量' })
@@ -118,7 +133,7 @@ export default class MainUI extends BaseUI {
 
     private current_mission: number;
 
-    private mission: MenuMission;
+    // private mission: MenuMission;
 
     private isPlayQipao_Marshal = false;
 
@@ -147,7 +162,7 @@ export default class MainUI extends BaseUI {
         GameController.gameData.player.addComponent(this, PLAYERPROP.TURNTABLE_LEFTTIMES);
         GameController.gameData.player.addComponent(this, PLAYERPROP.TURNTABLE_CARD);
 
-        this.mission = this.ui.missions.getComponent(MenuMission) as MenuMission;
+        // this.mission = this.ui.missions.getComponent(MenuMission) as MenuMission;
 
         GameController.uiM.openUI(FightUI, this.openFight.bind(this), 0, null, this.ui.fightnode);
 
@@ -176,11 +191,15 @@ export default class MainUI extends BaseUI {
     private initScheduler() {
         let count = 0;
         this.schedule(() => {
+            // 每秒加粮草 客户端行为
+            let vo: MissionVO = GameController.gameData.getMissionByID(GameController.gameData.player.current_mission);
+            GameController.gameData.player.setProp(PLAYERPROP.FOOD, Math.floor(vo.foodRecover), true);
+            // 每15s同步一次
             count++;
             if (count % 15 == 0) {
                 count = 1;
-                let vo: MissionVO = GameController.gameData.getMissionByID(GameController.gameData.player.current_mission);
-                GameController.gameData.updateProp(PLAYERPROP.FOOD, Math.floor(vo.foodRecover * 5), true);
+                let food_count = GameController.gameData.player.getProp(PLAYERPROP.FOOD);
+                GameController.gameData.updateProp(PLAYERPROP.FOOD, food_count);//
             }
             // 每秒更新
             this.showBtnExpUpOrLcBtn();
@@ -271,7 +290,7 @@ export default class MainUI extends BaseUI {
     }
 
     setChlBtnDisplay(b) {
-        this.ui.btn_challenge.active = b;
+        this.btn_challenge.node.active = b;
     }
 
     fireFsSkill(gId, sId) {
@@ -299,24 +318,25 @@ export default class MainUI extends BaseUI {
 
     updateMission() {
         this.current_mission = GameController.gameData.player.current_mission;
-
-        let arr = [];
-        let boss = [];
-        for (let i = 0; i < 7; i++) {
-            let n = this.current_mission - 3 + i;
-            let vo: MissionVO = GameController.gameData.getMissionByID(n);
-            if (vo == null) {
-                arr.push(-1);
-            }
-            else {
-                if (vo.type == 2) {
-                    boss.push(vo.id);
-                }
-                arr.push(vo.id);
-            }
-        }
-
-        this.mission.updateMission(arr, boss);
+        this.lbl_mission.string = "第" + this.current_mission + "关";
+
+        // let arr = [];
+        // let boss = [];
+        // for (let i = 0; i < 7; i++) {
+        //     let n = this.current_mission - 3 + i;
+        //     let vo: MissionVO = GameController.gameData.getMissionByID(n);
+        //     if (vo == null) {
+        //         arr.push(-1);
+        //     }
+        //     else {
+        //         if (vo.type == 2) {
+        //             boss.push(vo.id);
+        //         }
+        //         arr.push(vo.id);
+        //     }
+        // }
+
+        // this.mission.updateMission(arr, boss);
     }
 
     clickChallenge() {

tower_sanguo/assets/scripts/module/piggyBank/PiggyBankUI.ts

@@ -47,7 +47,11 @@ export default class PiggyBankUI extends BaseUI {
     /** 领取奖励 */
     private onClickReceive() {
         // 提现
-        GameController.http.getPiggyBox();
+        if (PiggyBankModel.bank_cash_value > 0) {
+            GameController.http.getPiggyBox();
+        } else {
+            this.close();
+        }
     }
     /** 提现结果 */
     private onReceiveCall(reply) {

tower_sanguo/assets/scripts/net/HttpCommand.ts

@@ -19,10 +19,10 @@ export default class HttpCommand {
     constructor() {
         this.httpM = new HttpManager();
         if (HttpCommand.serverType == 0) {
-            this.serverUrl = 'http://172.16.15.97:9092/';//李杨
+            this.serverUrl = 'https://tafang-test.duiweize.com/';//李杨
         }
         else if (HttpCommand.serverType == 1) {
-            this.serverUrl = 'http://172.16.15.91:9092/';//悍国
+            this.serverUrl = 'http://172.16.15.97:9092/';//悍国
         }
         else if (HttpCommand.serverType == 2) {
             this.serverUrl = 'https://tafang-test.duiweize.com/';//测试服
@@ -31,7 +31,7 @@ export default class HttpCommand {
 
     httpM: any;
 
-    serverUrl = 'https://xiyou-test.duiweize.com/';
+    serverUrl = 'https://tafang-test.duiweize.com/';
     isTry = '';
 
     /** 服务器地址类型 0测试服 李杨 1测试服 悍国 2测试服 */