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

tower_sanguo/assets/MOKA/net/HttpManager.ts

@@ -65,7 +65,10 @@ export default class HttpManager {
                     var responseStr = httpRequest.responseText;
                     let response = JSON.parse(responseStr);
                     response.errorcode = response.errcode;
-                    LogUtil.logAndroid("收到请求..." + response.errcode + ":" + response.errmsg)
+                    // LogUtil.logAndroid("收到请求..." + response.errcode + ":" + response.errmsg)
+                    console.log('%c收到请求：', 'color: red;', response);
+                    // console.table(response);
+                    
                     if (response.errcode == -10003) {
                         GameController.sdkM.checkLogin();
                     }

tower_sanguo/assets/resources/module/redEnvelopes/redEnvelopes.prefab

@@ -24,14 +24,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 81
       },
       {
-        "__id__": 79
+        "__id__": 82
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 83
     },
     "_opacity": 255,
     "_color": {
@@ -95,11 +95,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 80
     },
     "_opacity": 255,
     "_color": {
@@ -160,17 +160,17 @@
         "__id__": 4
       },
       {
-        "__id__": 52
+        "__id__": 55
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -234,16 +234,16 @@
         "__id__": 8
       },
       {
-        "__id__": 24
+        "__id__": 27
       },
       {
-        "__id__": 47
+        "__id__": 50
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 51
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -412,25 +412,19 @@
       },
       {
         "__id__": 12
-      },
-      {
-        "__id__": 15
-      },
-      {
-        "__id__": 18
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 24
       },
       {
-        "__id__": 22
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -588,20 +582,94 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "icon_hb",
+    "_name": "New Layout",
     "_objFlags": 0,
     "_parent": {
       "__id__": 8
     },
+    "_children": [
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 19
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 23
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 391.6,
+      "height": 150
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -256.381,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "icon_hb",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 12
+    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 15
     },
     "_opacity": 255,
     "_color": {
@@ -625,8 +693,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -167.187,
-        -256.381,
+        -163.3,
+        0,
         0,
         0,
         0,
@@ -655,7 +723,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 13
     },
     "_enabled": true,
     "_materials": [
@@ -690,7 +758,7 @@
     "asset": {
       "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
     },
-    "fileId": "1b7CuwFK1HAIe/Emv7ew1q",
+    "fileId": "e1ZNGvOhRBIIuGfJHXc8ob",
     "sync": false
   },
   {
@@ -698,17 +766,17 @@
     "_name": "lbl_xxxx",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -732,8 +800,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -96,
-        -268.118,
+        -110.08000000000001,
+        -11.737,
         0,
         0,
         0,
@@ -762,7 +830,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 16
     },
     "_enabled": true,
     "_materials": [
@@ -799,7 +867,7 @@
     "asset": {
       "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
     },
-    "fileId": "efguoAncND0oq1H7O0cDu2",
+    "fileId": "98WBwuDK5M4rOzHPw9nwU+",
     "sync": false
   },
   {
@@ -807,17 +875,17 @@
     "_name": "lbl_value",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -841,8 +909,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -75,
-        -255.106,
+        -89.36000000000001,
+        1.275,
         0,
         0,
         0,
@@ -871,7 +939,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -908,7 +976,50 @@
     "asset": {
       "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
     },
-    "fileId": "02pesn22NPhosUJnIXvHRP",
+    "fileId": "6fQV5yJrZBNqv6vd52ymBO",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 391.6,
+      "height": 150
+    },
+    "_resize": 1,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 0,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
+    },
+    "fileId": "60a8toWhFPgqXZs9PJgYSm",
     "sync": false
   },
   {
@@ -982,20 +1093,20 @@
     },
     "_children": [
       {
-        "__id__": 25
+        "__id__": 28
       },
       {
-        "__id__": 40
+        "__id__": 43
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1049,27 +1160,27 @@
     "_name": "btn_double_receive",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 27
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 29
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 39
       },
       {
-        "__id__": 37
+        "__id__": 40
       },
       {
-        "__id__": 38
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -1123,24 +1234,24 @@
     "_name": "Layout",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 28
     },
     "_children": [
       {
-        "__id__": 27
+        "__id__": 30
       },
       {
-        "__id__": 30
+        "__id__": 33
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -1194,17 +1305,17 @@
     "_name": "button_tv",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 26
+      "__id__": 29
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -1258,7 +1369,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 30
     },
     "_enabled": true,
     "_materials": [
@@ -1301,20 +1412,20 @@
     "_name": "lbl_btn_desc",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 26
+      "__id__": 29
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 34
       },
       {
-        "__id__": 32
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -1368,7 +1479,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1402,7 +1513,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 33
     },
     "_enabled": true,
     "_color": {
@@ -1431,7 +1542,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 29
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1474,7 +1585,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 28
     },
     "_enabled": true,
     "_materials": [
@@ -1506,7 +1617,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 28
     },
     "_enabled": true,
     "_normalMaterial": {
@@ -1576,7 +1687,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 28
     },
     "_enabled": true,
     "_defaultClip": {
@@ -1609,23 +1720,23 @@
     "_name": "btn_receive",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 27
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 44
       },
       {
-        "__id__": 42
+        "__id__": 45
       },
       {
-        "__id__": 43
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1679,7 +1790,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 43
     },
     "_enabled": true,
     "_materials": [
@@ -1713,7 +1824,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 43
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1781,7 +1892,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 43
     },
     "_enabled": true,
     "_defaultClip": {
@@ -1811,7 +1922,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 27
     },
     "_enabled": true,
     "_materials": [
@@ -1860,14 +1971,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 51
       },
       {
-        "__id__": 49
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -1921,7 +2032,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 50
     },
     "_enabled": true,
     "_materials": [
@@ -1953,7 +2064,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 50
     },
     "_enabled": true,
     "_defaultClip": {
@@ -1998,20 +2109,20 @@
     },
     "_children": [
       {
-        "__id__": 53
+        "__id__": 56
       },
       {
-        "__id__": 65
+        "__id__": 68
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 75
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 76
     },
     "_opacity": 255,
     "_color": {
@@ -2065,24 +2176,24 @@
     "_name": "node_close_bottom",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 52
+      "__id__": 55
     },
     "_children": [
       {
-        "__id__": 54
+        "__id__": 57
       },
       {
-        "__id__": 60
+        "__id__": 63
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 67
     },
     "_opacity": 255,
     "_color": {
@@ -2136,21 +2247,21 @@
     "_name": "hb_bg",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 53
+      "__id__": 56
     },
     "_children": [
       {
-        "__id__": 55
+        "__id__": 58
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -2204,17 +2315,17 @@
     "_name": "word1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 54
+      "__id__": 57
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 60
     },
     "_opacity": 255,
     "_color": {
@@ -2268,7 +2379,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 55
+      "__id__": 58
     },
     "_enabled": true,
     "_materials": [
@@ -2311,7 +2422,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 54
+      "__id__": 57
     },
     "_enabled": true,
     "_materials": [
@@ -2354,17 +2465,17 @@
     "_name": "lbl_desc",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 53
+      "__id__": 56
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 64
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 65
     },
     "_opacity": 255,
     "_color": {
@@ -2418,7 +2529,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 60
+      "__id__": 63
     },
     "_enabled": true,
     "_materials": [
@@ -2463,7 +2574,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 53
+      "__id__": 56
     },
     "_enabled": true,
     "_materials": [
@@ -2506,21 +2617,21 @@
     "_name": "node_close_top",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 52
+      "__id__": 55
     },
     "_children": [
       {
-        "__id__": 66
+        "__id__": 69
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 74
     },
     "_opacity": 255,
     "_color": {
@@ -2574,20 +2685,20 @@
     "_name": "btn_open_icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 65
+      "__id__": 68
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 70
       },
       {
-        "__id__": 68
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 72
     },
     "_opacity": 255,
     "_color": {
@@ -2641,7 +2752,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 69
     },
     "_enabled": true,
     "_materials": [
@@ -2673,7 +2784,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 69
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2703,7 +2814,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 65
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2746,7 +2857,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 55
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2898,34 +3009,34 @@
     "close_effect": 0,
     "close_toPoint": "",
     "btn_open_icon": {
-      "__id__": 68
+      "__id__": 71
     },
     "node_red_lid": {
-      "__id__": 72
+      "__id__": 75
     },
     "node_center": {
-      "__id__": 22
+      "__id__": 25
     },
     "anim_hbqun": {
-      "__id__": 49
+      "__id__": 52
     },
     "node_red_open": {
       "__id__": 4
     },
     "node_tv": {
-      "__id__": 27
+      "__id__": 30
     },
     "lbl_btn_desc": {
-      "__id__": 31
+      "__id__": 34
     },
     "btn_double_receive": {
-      "__id__": 37
+      "__id__": 40
     },
     "btn_receive": {
-      "__id__": 42
+      "__id__": 45
     },
     "lbl_count": {
-      "__id__": 19
+      "__id__": 20
     },
     "_id": ""
   },

tower_sanguo/assets/resources/module/task/spine/box_3.atlas

@@ -0,0 +1,90 @@
+
+box_3.png
+size: 1725,488
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bottom
+  rotate: false
+  xy: 1166, 272
+  size: 348, 214
+  orig: 350, 215
+  offset: 1, 0
+  index: -1
+dian
+  rotate: true
+  xy: 832, 145
+  size: 341, 332
+  orig: 343, 333
+  offset: 1, 0
+  index: -1
+gaoguang
+  rotate: false
+  xy: 2, 4
+  size: 477, 482
+  orig: 483, 522
+  offset: 0, 19
+  index: -1
+internal
+  rotate: true
+  xy: 1188, 2
+  size: 268, 217
+  orig: 268, 217
+  offset: 0, 0
+  index: -1
+internal_right
+  rotate: true
+  xy: 1000, 81
+  size: 62, 186
+  orig: 62, 186
+  offset: 0, 0
+  index: -1
+sijiao
+  rotate: false
+  xy: 1066, 44
+  size: 35, 35
+  orig: 37, 37
+  offset: 1, 1
+  index: -1
+star
+  rotate: true
+  xy: 1000, 13
+  size: 66, 64
+  orig: 70, 68
+  offset: 2, 2
+  index: -1
+tiao
+  rotate: true
+  xy: 481, 2
+  size: 114, 366
+  orig: 116, 373
+  offset: 1, 4
+  index: -1
+top
+  rotate: true
+  xy: 1516, 147
+  size: 339, 207
+  orig: 339, 207
+  offset: 0, 0
+  index: -1
+top_right
+  rotate: true
+  xy: 849, 21
+  size: 122, 149
+  orig: 122, 149
+  offset: 0, 0
+  index: -1
+waihuan
+  rotate: true
+  xy: 481, 118
+  size: 368, 349
+  orig: 374, 354
+  offset: 3, 1
+  index: -1
+zhubao
+  rotate: false
+  xy: 1407, 2
+  size: 239, 143
+  orig: 246, 146
+  offset: 7, 0
+  index: -1

tower_sanguo/assets/resources/module/task/spine/box_3.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "70686e57-b733-4645-abfc-983679fd53bd",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/task/spine/box_3.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "f12d600d-5490-41eb-b8dc-38e9523d5e4d",
+  "textures": [
+    "3eabdbb6-29ca-42a1-8daa-3d59692770dd"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/task/spine/box_3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "3eabdbb6-29ca-42a1-8daa-3d59692770dd",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1725,
+  "height": 488,
+  "platformSettings": {},
+  "subMetas": {
+    "box_3": {
+      "ver": "1.0.4",
+      "uuid": "0082d95c-0b85-4d69-bb4f-daa1bb6b2bff",
+      "rawTextureUuid": "3eabdbb6-29ca-42a1-8daa-3d59692770dd",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 1721,
+      "height": 484,
+      "rawWidth": 1725,
+      "rawHeight": 488,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

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

@@ -61,9 +61,10 @@ export default class CheckpointRedBagBtn extends cc.Component {
         // 数量-1
         CheckpointRedBagModle.onReciveTVRewardCall(reply);
 
-        let time = CheckpointRedBagModle.redbag_data.cur_count - this.targetProgress;
-        this.targetProgress = CheckpointRedBagModle.redbag_data.cur_count;
-        this.PlayMoneyAni(time / 2)
+        // let time = CheckpointRedBagModle.redbag_data.cur_count - this.targetProgress;
+        // this.targetProgress = CheckpointRedBagModle.redbag_data.cur_count;
+        // this.PlayMoneyAni(time / 2)
+        this.lbl_chPo_count.string = `${CheckpointRedBagModle.redbag_data.cur_count}`;
         if (CheckpointRedBagModle.redbag_data.cur_count <= 0) {
             this.lbl_chPo_count.node.parent.active = false;
         }
@@ -72,9 +73,10 @@ export default class CheckpointRedBagBtn extends cc.Component {
     private onAddRedBag() {
         this.lbl_chPo_count.node.parent.active = true;
         CheckpointRedBagModle.addCount();
-        let time = CheckpointRedBagModle.redbag_data.cur_count - this.targetProgress;
-        this.targetProgress = CheckpointRedBagModle.redbag_data.cur_count;
-        this.PlayMoneyAni(time / 2)
+        // let time = CheckpointRedBagModle.redbag_data.cur_count - this.targetProgress;
+        // this.targetProgress = CheckpointRedBagModle.redbag_data.cur_count;
+        // this.PlayMoneyAni(time / 2)
+        this.lbl_chPo_count.string = `${CheckpointRedBagModle.redbag_data.cur_count}`;
     }
     //////////////////////////////////数字滚动效果//////////////////////////////////
     /** 滚动的目标值 */

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

@@ -62,9 +62,9 @@ export default class CheckpointRedBagItem extends cc.Component {
             end_pos2.y -= this.node.height;
             end_pos3.y -= this.node.height * 1.2;
         }
-        let pos1 = cc.tween().to(0.5, { position: end_pos1 })
-        let pos2 = cc.tween().to(0.5, { position: end_pos2 })
-        let pos3 = cc.tween().to(0.5, { position: end_pos3 })
+        let pos1 = cc.tween().to(0.5, { position: end_pos1 }, { easing: 'cubicOut' })//cubicOut
+        let pos2 = cc.tween().to(0.5, { position: end_pos2 }, { easing: 'cubicOut' })
+        let pos3 = cc.tween().to(0.5, { position: end_pos3 }, { easing: 'cubicOut' })
         cc.tween(this.node).then(pos1).then(pos2).then(pos3).start();
     }
     private flyNode() {

tower_sanguo/assets/scripts/net/HttpCommand.ts

@@ -19,7 +19,7 @@ export default class HttpCommand {
     constructor() {
         this.httpM = new HttpManager();
         if (HttpCommand.serverType == 0) {
-            this.serverUrl = 'http://172.16.15.97:9092/';//李杨
+            this.serverUrl = 'http://172.16.15.231:9092/';//李杨
         }
         else if (HttpCommand.serverType == 1) {
             this.serverUrl = 'http://172.16.15.167:9092/';//悍国
@@ -226,8 +226,7 @@ export default class HttpCommand {
     }
     /** 领取宝箱 */
     exchangeTreasureChest(data = { isDouble: 0, taskId: 0 }, callback) {
-        let url = 'dailytask/exchangeTreasureChest';
-        this.sendData(url, data, callback);
+        this.sendData(HTTPTYPE.exchangeTreasureChest, data, callback);
     }
     /** 领取昨日任务红包币 */
     saveYesterDayRedBag(callback) {
@@ -379,6 +378,7 @@ export default class HttpCommand {
         let data = {
 
         };
+        //getStageRewardDemo getStageReward
         this.sendData(HTTPTYPE.getStageReward, data, (data) => {
             XXEvent.emit('http-stage-getStageReward', data)
         });
@@ -570,9 +570,10 @@ export enum HTTPTYPE {
     reduceTimeInvestProject = 'invest/reduceTimeInvestProject',
 
     updateADLog = 'updateADLog',
+    exchangeTreasureChest = 'dailytask/exchangeTreasureChestDemo',// exchangeTreasureChest exchangeTreasureChestDemo
     getPiggyBox = 'piggyBox/getPiggyBox',//提取存钱罐
-    savePiggyBox = 'piggyBox/savePiggyBox',//存钱罐进账
-    getStageReward = 'stage/getStageReward',//领取通关红包
+    savePiggyBox = 'piggyBox/savePiggyBoxDeme',//存钱罐进账 savePiggyBox savePiggyBoxDeme
+    getStageReward = 'stage/getStageReward',//领取通关红包 getStageReward getStageRewardDemo
     saveStageReward = 'stage/saveStageReward',//掉落通关红包
     //-------ZNH
     /** 武将许愿*/

tower_sanguo/塔防接口.md

@@ -1,5 +1,5 @@
 # swagger地址：
-- http://172.16.15.231:9092/swagger-ui/#/
+- 李杨：http://172.16.15.231:9092/swagger-ui/#/
 用户相关： 
 	updatePlayerProp：更新用户属性
 	入参：