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

# Conflicts:
#	tower_sanguo/assets/scripts/module/fight/FightUI.ts

tower_sanguo/assets/resources/animation/ScaleShake.anim

@@ -0,0 +1,81 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "ScaleShake",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.2833333333333333,
+  "sample": 60,
+  "speed": 1.5,
+  "wrapMode": 2,
+  "curveData": {
+    "props": {
+      "scale": [
+        {
+          "frame": 0,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 1
+          }
+        },
+        {
+          "frame": 0.05,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0.95,
+            "y": 0.95
+          }
+        },
+        {
+          "frame": 0.08333333333333333,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0.85,
+            "y": 0.95
+          }
+        },
+        {
+          "frame": 0.11666666666666667,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0.95,
+            "y": 1.02
+          }
+        },
+        {
+          "frame": 0.16666666666666666,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1.05,
+            "y": 1
+          }
+        },
+        {
+          "frame": 0.21666666666666667,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 0.95
+          }
+        },
+        {
+          "frame": 0.25,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1.05,
+            "y": 0.95
+          }
+        },
+        {
+          "frame": 0.2833333333333333,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 1
+          }
+        }
+      ]
+    }
+  },
+  "events": []
+}

tower_sanguo/assets/resources/animation/ScaleShake.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "f447f707-1d73-4727-92d9-5a3cc3259338",
+  "subMetas": {}
+}

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

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "a2726129-2ff5-4e97-83d6-f0315f70c02d",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "78789e13-383f-4212-ba8c-a81fc306df71",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/boom.atlas

@@ -0,0 +1,216 @@
+
+boom.png
+size: 2029,2005
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+boom_00000
+  rotate: false
+  xy: 1113, 286
+  size: 253, 197
+  orig: 656, 590
+  offset: 197, 181
+  index: -1
+boom_00001
+  rotate: true
+  xy: 1729, 1558
+  size: 445, 296
+  orig: 656, 590
+  offset: 101, 128
+  index: -1
+boom_00002
+  rotate: false
+  xy: 645, 1583
+  size: 648, 420
+  orig: 656, 590
+  offset: 0, 92
+  index: -1
+boom_00003
+  rotate: true
+  xy: 2, 837
+  size: 645, 495
+  orig: 656, 590
+  offset: 1, 33
+  index: -1
+boom_00004
+  rotate: false
+  xy: 2, 1484
+  size: 641, 519
+  orig: 656, 590
+  offset: 3, 21
+  index: -1
+boom_00005
+  rotate: true
+  xy: 2, 247
+  size: 588, 399
+  orig: 656, 590
+  offset: 28, 92
+  index: -1
+boom_00006
+  rotate: false
+  xy: 1295, 1599
+  size: 432, 404
+  orig: 656, 590
+  offset: 108, 93
+  index: -1
+boom_00007
+  rotate: true
+  xy: 868, 1153
+  size: 428, 406
+  orig: 656, 590
+  offset: 108, 93
+  index: -1
+boom_00008
+  rotate: false
+  xy: 499, 625
+  size: 419, 414
+  orig: 656, 590
+  offset: 108, 85
+  index: -1
+boom_00009
+  rotate: true
+  xy: 403, 256
+  size: 367, 434
+  orig: 656, 590
+  offset: 133, 76
+  index: -1
+boom_00010
+  rotate: false
+  xy: 499, 1041
+  size: 367, 441
+  orig: 656, 590
+  offset: 133, 69
+  index: -1
+boom_00011
+  rotate: false
+  xy: 920, 788
+  size: 267, 363
+  orig: 656, 590
+  offset: 218, 63
+  index: -1
+boom_00012
+  rotate: false
+  xy: 839, 266
+  size: 272, 357
+  orig: 656, 590
+  offset: 213, 59
+  index: -1
+boom_00013
+  rotate: false
+  xy: 1276, 1224
+  size: 253, 357
+  orig: 656, 590
+  offset: 218, 55
+  index: -1
+boom_00014
+  rotate: false
+  xy: 1189, 786
+  size: 247, 365
+  orig: 656, 590
+  offset: 215, 50
+  index: -1
+boom_00015
+  rotate: false
+  xy: 1700, 898
+  size: 254, 324
+  orig: 656, 590
+  offset: 212, 94
+  index: -1
+boom_00016
+  rotate: false
+  xy: 1438, 890
+  size: 260, 332
+  orig: 656, 590
+  offset: 210, 91
+  index: -1
+boom_00017
+  rotate: true
+  xy: 839, 2
+  size: 262, 329
+  orig: 656, 590
+  offset: 211, 100
+  index: -1
+boom_00018
+  rotate: false
+  xy: 1531, 1224
+  size: 263, 332
+  orig: 656, 590
+  offset: 213, 101
+  index: -1
+boom_00019
+  rotate: true
+  xy: 1438, 637
+  size: 251, 308
+  orig: 656, 590
+  offset: 224, 119
+  index: -1
+boom_00020
+  rotate: false
+  xy: 1748, 602
+  size: 253, 294
+  orig: 656, 590
+  offset: 225, 118
+  index: -1
+boom_00021
+  rotate: false
+  xy: 1402, 36
+  size: 250, 298
+  orig: 656, 590
+  offset: 230, 118
+  index: -1
+boom_00022
+  rotate: false
+  xy: 1113, 485
+  size: 253, 299
+  orig: 656, 590
+  offset: 229, 119
+  index: -1
+boom_00023
+  rotate: false
+  xy: 1368, 336
+  size: 253, 299
+  orig: 656, 590
+  offset: 229, 118
+  index: -1
+boom_00024
+  rotate: true
+  xy: 554, 10
+  size: 244, 275
+  orig: 656, 590
+  offset: 229, 118
+  index: -1
+boom_00025
+  rotate: true
+  xy: 2, 2
+  size: 243, 277
+  orig: 656, 590
+  offset: 228, 118
+  index: -1
+boom_00026
+  rotate: true
+  xy: 281, 6
+  size: 239, 271
+  orig: 656, 590
+  offset: 228, 120
+  index: -1
+boom_00027
+  rotate: false
+  xy: 1796, 1300
+  size: 231, 256
+  orig: 656, 590
+  offset: 237, 120
+  index: -1
+boom_00028
+  rotate: false
+  xy: 1170, 28
+  size: 230, 256
+  orig: 656, 590
+  offset: 237, 121
+  index: -1
+boom_00029
+  rotate: false
+  xy: 1623, 355
+  size: 232, 245
+  orig: 656, 590
+  offset: 239, 131
+  index: -1

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/boom.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "7bb0c1e4-fea4-4f8e-ba58-ff089014f066",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/boom.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "0cd50f9b-1277-478e-b7d2-af81f8090ba0",
+  "textures": [
+    "f5bff485-a7ff-4230-9181-de4904f7a689"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/boom.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "f5bff485-a7ff-4230-9181-de4904f7a689",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 2029,
+  "height": 2005,
+  "platformSettings": {},
+  "subMetas": {
+    "boom": {
+      "ver": "1.0.4",
+      "uuid": "f529fd68-f884-474b-8eff-99a2129ba46b",
+      "rawTextureUuid": "f5bff485-a7ff-4230-9181-de4904f7a689",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 2025,
+      "height": 2001,
+      "rawWidth": 2029,
+      "rawHeight": 2005,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/star.atlas

@@ -0,0 +1,20 @@
+
+star.png
+size: 304,138
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+baizhezhao
+  rotate: true
+  xy: 2, 2
+  size: 134, 205
+  orig: 134, 205
+  offset: 0, 0
+  index: -1
+xingguang
+  rotate: true
+  xy: 209, 33
+  size: 103, 93
+  orig: 125, 109
+  offset: 11, 8
+  index: -1

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/star.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "9f56a73a-fccd-4745-82b2-304edcc2b06e",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/star.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "d9517168-3ecc-4368-9ef6-27a75ca6b928",
+  "textures": [
+    "e28617d1-1c86-4001-8c07-d3859ed9e625"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/star.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "e28617d1-1c86-4001-8c07-d3859ed9e625",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 304,
+  "height": 138,
+  "platformSettings": {},
+  "subMetas": {
+    "star": {
+      "ver": "1.0.4",
+      "uuid": "b5361dcd-f36e-4e94-89bb-4ace16298208",
+      "rawTextureUuid": "e28617d1-1c86-4001-8c07-d3859ed9e625",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 300,
+      "height": 134,
+      "rawWidth": 304,
+      "rawHeight": 138,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/xuneng.atlas

@@ -0,0 +1,20 @@
+
+xuneng.png
+size: 277,138
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+baizhezhao
+  rotate: true
+  xy: 2, 2
+  size: 134, 205
+  orig: 134, 205
+  offset: 0, 0
+  index: -1
+juji
+  rotate: false
+  xy: 209, 59
+  size: 66, 77
+  orig: 70, 80
+  offset: 2, 2
+  index: -1

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/xuneng.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "64c0b9be-52e5-47db-bd63-d2ab03e49f17",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/xuneng.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "97ad66c7-62ce-406a-b644-59892045a49e",
+  "textures": [
+    "7cf65c66-4f86-41be-8441-33424e0d2cbb"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/chenghong/xuneng.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "7cf65c66-4f86-41be-8441-33424e0d2cbb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 277,
+  "height": 138,
+  "platformSettings": {},
+  "subMetas": {
+    "xuneng": {
+      "ver": "1.0.4",
+      "uuid": "ea35ad7d-ac04-40d4-961a-0f91e5b56cc9",
+      "rawTextureUuid": "7cf65c66-4f86-41be-8441-33424e0d2cbb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 273,
+      "height": 134,
+      "rawWidth": 277,
+      "rawHeight": 138,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/lb_idle.atlas

@@ -0,0 +1,174 @@
+
+lb_idle.png
+size: 1417,279
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+eye1
+  rotate: false
+  xy: 853, 8
+  size: 102, 29
+  orig: 105, 31
+  offset: 1, 1
+  index: -1
+eye2
+  rotate: false
+  xy: 702, 4
+  size: 149, 33
+  orig: 151, 35
+  offset: 1, 1
+  index: -1
+eye3
+  rotate: false
+  xy: 1010, 2
+  size: 127, 40
+  orig: 129, 43
+  offset: 1, 2
+  index: -1
+head
+  rotate: false
+  xy: 498, 29
+  size: 202, 248
+  orig: 204, 251
+  offset: 1, 2
+  index: -1
+jian1
+  rotate: true
+  xy: 1238, 96
+  size: 92, 55
+  orig: 94, 57
+  offset: 1, 1
+  index: -1
+jian2
+  rotate: false
+  xy: 1159, 8
+  size: 83, 70
+  orig: 90, 73
+  offset: 2, 2
+  index: -1
+mao1
+  rotate: true
+  xy: 702, 113
+  size: 164, 279
+  orig: 164, 279
+  offset: 0, 0
+  index: -1
+mao2
+  rotate: true
+  xy: 702, 39
+  size: 72, 306
+  orig: 72, 306
+  offset: 0, 0
+  index: -1
+mei1
+  rotate: true
+  xy: 1310, 60
+  size: 66, 43
+  orig: 68, 45
+  offset: 1, 1
+  index: -1
+mei2
+  rotate: true
+  xy: 1274, 198
+  size: 79, 63
+  orig: 81, 65
+  offset: 1, 1
+  index: -1
+qun1
+  rotate: false
+  xy: 1244, 21
+  size: 64, 73
+  orig: 66, 75
+  offset: 1, 1
+  index: -1
+qun2
+  rotate: true
+  xy: 1295, 128
+  size: 68, 63
+  orig: 74, 66
+  offset: 1, 2
+  index: -1
+shou1
+  rotate: false
+  xy: 1355, 22
+  size: 57, 49
+  orig: 59, 53
+  offset: 1, 2
+  index: -1
+shou2
+  rotate: true
+  xy: 1310, 16
+  size: 42, 43
+  orig: 44, 45
+  offset: 1, 1
+  index: -1
+shoubi1
+  rotate: true
+  xy: 957, 2
+  size: 35, 37
+  orig: 37, 39
+  offset: 1, 1
+  index: -1
+shoubi2
+  rotate: true
+  xy: 1360, 73
+  size: 58, 55
+  orig: 60, 57
+  offset: 1, 1
+  index: -1
+shoubi3
+  rotate: false
+  xy: 1213, 190
+  size: 59, 87
+  orig: 59, 87
+  offset: 0, 0
+  index: -1
+shoubi4
+  rotate: false
+  xy: 1339, 226
+  size: 65, 51
+  orig: 67, 54
+  offset: 1, 2
+  index: -1
+tui1
+  rotate: true
+  xy: 1159, 80
+  size: 85, 77
+  orig: 88, 77
+  offset: 0, 0
+  index: -1
+tui2
+  rotate: false
+  xy: 1124, 167
+  size: 87, 110
+  orig: 87, 110
+  offset: 0, 0
+  index: -1
+wuqi
+  rotate: false
+  xy: 2, 2
+  size: 494, 275
+  orig: 494, 275
+  offset: 0, 0
+  index: -1
+yao
+  rotate: false
+  xy: 1010, 44
+  size: 147, 85
+  orig: 147, 85
+  offset: 0, 0
+  index: -1
+yifu
+  rotate: false
+  xy: 983, 131
+  size: 139, 146
+  orig: 139, 146
+  offset: 0, 0
+  index: -1
+zui
+  rotate: true
+  xy: 1360, 133
+  size: 91, 43
+  orig: 93, 47
+  offset: 1, 3
+  index: -1

tower_sanguo/assets/resources/module/drawRecruit/spine/lb_idle.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "1fd40b96-7f90-4b14-b473-0e4571ca8649",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/lb_idle.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "51ebbc14-ff60-4d67-bff7-1bcb4bea3356",
+  "textures": [
+    "9fd5ecac-029a-44c1-9550-621e78243db4"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/lb_idle.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "9fd5ecac-029a-44c1-9550-621e78243db4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1417,
+  "height": 279,
+  "platformSettings": {},
+  "subMetas": {
+    "lb_idle": {
+      "ver": "1.0.4",
+      "uuid": "dacaefb8-2dc6-4c1c-8ebd-387a67fafb5e",
+      "rawTextureUuid": "9fd5ecac-029a-44c1-9550-621e78243db4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 0,
+      "trimX": 3,
+      "trimY": 2,
+      "width": 1412,
+      "height": 275,
+      "rawWidth": 1417,
+      "rawHeight": 279,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/lightsweep.atlas

@@ -0,0 +1,27 @@
+
+lightsweep.png
+size: 754,320
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+guangtiao1
+  rotate: false
+  xy: 2, 196
+  size: 750, 122
+  orig: 750, 122
+  offset: 0, 0
+  index: -1
+guangtiao2
+  rotate: false
+  xy: 2, 51
+  size: 465, 143
+  orig: 469, 145
+  offset: 3, 1
+  index: -1
+touxiangkuang
+  rotate: false
+  xy: 469, 2
+  size: 195, 192
+  orig: 201, 198
+  offset: 3, 3
+  index: -1

tower_sanguo/assets/resources/module/drawRecruit/spine/lightsweep.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "f9ea1c23-3222-477f-b34a-bc3577e5749b",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/lightsweep.json

@@ -0,0 +1 @@
+{"skeleton":{"hash":"5r+8eGmZSFAuZMHZ7WxZncDxPa0","spine":"3.8.99","x":-853.57,"y":-185.77,"width":1228.22,"height":145,"images":"","audio":""},"bones":[{"name":"root"},{"name":"zhaomubg","parent":"root","x":-7.98,"y":-408.11},{"name":"guangtiao2","parent":"root","x":-474.16,"y":-109.6},{"name":"touxiangkuang","parent":"zhaomubg","x":-173.53,"y":303.36},{"name":"guangtiao1","parent":"zhaomubg","x":328.13,"y":297.63}],"slots":[{"name":"guangtiao2","bone":"guangtiao2","attachment":"guangtiao2","blend":"additive"},{"name":"touxiangkuang","bone":"touxiangkuang","color":"fbf07cca","blend":"additive"},{"name":"guangtiao1","bone":"guangtiao1","color":"fdaa0000","attachment":"guangtiao1","blend":"additive"}],"skins":[{"name":"default","attachments":{"guangtiao1":{"guangtiao1":{"x":-320.51,"y":-1.34,"width":750,"height":122}},"guangtiao2":{"guangtiao2":{"x":-144.91,"y":-3.67,"width":469,"height":145}},"touxiangkuang":{"touxiangkuang":{"x":3.16,"y":-3.87,"width":201,"height":198}}}}],"animations":{"animation":{"slots":{"guangtiao1":{"color":[{"color":"fdaa0000"},{"time":0.1333,"color":"fdaa00dc"},{"time":0.2667,"color":"fdaa0000"}]},"touxiangkuang":{"color":[{"color":"fbef7c00"},{"time":0.1333,"color":"fbef7ccb"},{"time":0.2667,"color":"fbef7c00"}],"attachment":[{"name":"touxiangkuang"}]}},"bones":{"guangtiao2":{"translate":[{},{"time":0.2667,"x":1234.72,"curve":"stepped"},{"time":0.6667,"x":1234.72}]}}}}}

tower_sanguo/assets/resources/module/drawRecruit/spine/lightsweep.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "d32c1597-66da-4aea-ac6d-af9f6fd015e0",
+  "textures": [
+    "c0b402d6-04b8-4980-ace8-95b7cb7ff642"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/lightsweep.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "c0b402d6-04b8-4980-ace8-95b7cb7ff642",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 754,
+  "height": 320,
+  "platformSettings": {},
+  "subMetas": {
+    "lightsweep": {
+      "ver": "1.0.4",
+      "uuid": "31f7063a-a313-446d-9903-b8592519ca01",
+      "rawTextureUuid": "c0b402d6-04b8-4980-ace8-95b7cb7ff642",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 750,
+      "height": 316,
+      "rawWidth": 754,
+      "rawHeight": 320,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/zi.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "b8043bd7-00a4-43d9-94c6-ea1a7e9592d5",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/zi/zise.atlas

@@ -0,0 +1,139 @@
+
+zise.png
+size: 1864,494
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+zese_00001
+  rotate: false
+  xy: 964, 220
+  size: 254, 272
+  orig: 272, 334
+  offset: 0, 46
+  index: -1
+zese_00002
+  rotate: false
+  xy: 697, 196
+  size: 265, 296
+  orig: 272, 334
+  offset: 0, 31
+  index: -1
+zese_00003
+  rotate: false
+  xy: 219, 188
+  size: 264, 304
+  orig: 272, 334
+  offset: 1, 25
+  index: -1
+zese_00004
+  rotate: false
+  xy: 2, 186
+  size: 215, 306
+  orig: 272, 334
+  offset: 25, 22
+  index: -1
+zese_00005
+  rotate: false
+  xy: 485, 189
+  size: 210, 303
+  orig: 272, 334
+  offset: 29, 21
+  index: -1
+zese_00006
+  rotate: false
+  xy: 1220, 224
+  size: 209, 268
+  orig: 272, 334
+  offset: 29, 55
+  index: -1
+zese_00007
+  rotate: true
+  xy: 996, 9
+  size: 209, 271
+  orig: 272, 334
+  offset: 28, 53
+  index: -1
+zese_00008
+  rotate: true
+  xy: 1269, 17
+  size: 205, 268
+  orig: 272, 334
+  offset: 30, 52
+  index: -1
+zese_00009
+  rotate: true
+  xy: 728, 2
+  size: 192, 266
+  orig: 272, 334
+  offset: 39, 53
+  index: -1
+zese_00010
+  rotate: false
+  xy: 1539, 18
+  size: 165, 236
+  orig: 272, 334
+  offset: 66, 83
+  index: -1
+zese_00011
+  rotate: false
+  xy: 1431, 256
+  size: 166, 236
+  orig: 272, 334
+  offset: 66, 85
+  index: -1
+zese_00012
+  rotate: false
+  xy: 1599, 257
+  size: 169, 235
+  orig: 272, 334
+  offset: 64, 87
+  index: -1
+zese_00013
+  rotate: false
+  xy: 1706, 21
+  size: 156, 234
+  orig: 272, 334
+  offset: 78, 88
+  index: -1
+zese_00014
+  rotate: true
+  xy: 167, 13
+  size: 171, 223
+  orig: 272, 334
+  offset: 62, 99
+  index: -1
+zese_00015
+  rotate: true
+  xy: 392, 15
+  size: 171, 190
+  orig: 272, 334
+  offset: 62, 132
+  index: -1
+zese_00016
+  rotate: false
+  xy: 2, 3
+  size: 163, 181
+  orig: 272, 334
+  offset: 69, 141
+  index: -1
+zese_00017
+  rotate: false
+  xy: 584, 16
+  size: 142, 171
+  orig: 272, 334
+  offset: 88, 147
+  index: -1
+zese_00018
+  rotate: true
+  xy: 1770, 427
+  size: 65, 67
+  orig: 272, 334
+  offset: 145, 179
+  index: -1
+zese_00019
+  rotate: false
+  xy: 1770, 363
+  size: 62, 62
+  orig: 272, 334
+  offset: 146, 181
+  index: -1

tower_sanguo/assets/resources/module/drawRecruit/spine/zi/zise.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "bc4ec603-9016-44f1-80fb-5cabe64f2219",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/zi/zise.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "628f3d04-87e3-48cf-873d-012bfe451db1",
+  "textures": [
+    "55b49ee0-caa1-4456-a6fc-e9e1e336bd9f"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/drawRecruit/spine/zi/zise.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "55b49ee0-caa1-4456-a6fc-e9e1e336bd9f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1864,
+  "height": 494,
+  "platformSettings": {},
+  "subMetas": {
+    "zise": {
+      "ver": "1.0.4",
+      "uuid": "a55506b3-2dc0-4637-8db6-33e94ed321e4",
+      "rawTextureUuid": "55b49ee0-caa1-4456-a6fc-e9e1e336bd9f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 1860,
+      "height": 490,
+      "rawWidth": 1864,
+      "rawHeight": 494,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/generalUpStar/UpStarUIAnim.anim

@@ -0,0 +1,101 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "UpStarUIAnim",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.16666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "paths": {
+      "general_head_1": {
+        "props": {
+          "opacity": [
+            {
+              "frame": 0,
+              "value": 0
+            },
+            {
+              "frame": 0.16666666666666666,
+              "value": 255
+            }
+          ],
+          "x": [
+            {
+              "frame": 0,
+              "value": -200
+            },
+            {
+              "frame": 0.16666666666666666,
+              "value": -160
+            }
+          ]
+        }
+      },
+      "general_head_2": {
+        "props": {
+          "opacity": [
+            {
+              "frame": 0,
+              "value": 0
+            },
+            {
+              "frame": 0.16666666666666666,
+              "value": 255
+            }
+          ],
+          "x": [
+            {
+              "frame": 0,
+              "value": 0
+            },
+            {
+              "frame": 0.16666666666666666,
+              "value": 150
+            }
+          ]
+        }
+      },
+      "jiantou_head": {
+        "props": {
+          "opacity": [
+            {
+              "frame": 0,
+              "value": 0
+            },
+            {
+              "frame": 0.16666666666666666,
+              "value": 255
+            }
+          ],
+          "x": [
+            {
+              "frame": 0,
+              "value": -50
+            },
+            {
+              "frame": 0.16666666666666666,
+              "value": -9
+            }
+          ]
+        }
+      },
+      "node_value": {
+        "props": {
+          "opacity": [
+            {
+              "frame": 0,
+              "value": 0
+            },
+            {
+              "frame": 0.16666666666666666,
+              "value": 255
+            }
+          ]
+        }
+      }
+    }
+  },
+  "events": []
+}

tower_sanguo/assets/resources/module/generalUpStar/UpStarUIAnim.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "2557924f-eef6-4cfa-a9f5-607c96fd9d3a",
+  "subMetas": {}
+}

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

@@ -1,3 +1,4 @@
+import Time from "../../../MOKA/util/Time";
 import GeneralVO from "../../vo/GeneralVO";
 
 const { ccclass, property } = cc._decorator;
@@ -43,6 +44,16 @@ export default class DrawItem extends cc.Component {
     @property({ type: cc.Material, displayName: "材质_灰色" })
     mat_gray: cc.Material = null;
 
+    @property({ type: sp.Skeleton, displayName: "动画_紫色" })
+    spine_zi: sp.Skeleton = null;
+
+    @property({ type: sp.Skeleton, displayName: "动画_高品质1" })
+    spine_best1: sp.Skeleton = null;
+    @property({ type: sp.Skeleton, displayName: "动画_高品质2" })
+    spine_best2: sp.Skeleton = null;
+    @property({ type: sp.Skeleton, displayName: "动画_高品质3" })
+    spine_best3: sp.Skeleton = null;
+
     isOpened = false;
 
     onLoad() {
@@ -58,6 +69,11 @@ export default class DrawItem extends cc.Component {
         this.node_opened.active = false;
         this.img_camp.node.active = false;
         this.node_hasHero.active = false;
+
+        this.spine_zi.node.active = false;
+        this.spine_best1.node.active = false;
+        this.spine_best2.node.active = false;
+        this.spine_best3.node.active = false;
     }
 
     /**抽卡 
@@ -77,23 +93,28 @@ export default class DrawItem extends cc.Component {
             }
             this.img_hero.spriteFrame = asset;
 
-            cc.tween(this.btn_open)
-                .to(0.2, { scaleX: 0 })
-                .call(() => {
-                    this.node_opened.active = true;
-
-                    cc.tween(this.node_opened)
-                        .to(0.2, { scaleX: 1 })
-                        .call(() => {
-                            this.img_camp.node.active = true;
+            if (general.color == 1) {
+                cc.tween(this.btn_open)
+                    .to(0.2, { scaleX: 0 })
+                    .call(() => {
+                        this.node_opened.active = true;
+
+                        cc.tween(this.node_opened)
+                            .to(0.2, { scaleX: 1 })
+                            .call(() => {
+                                this.img_camp.node.active = true;
+
+                                //碎片判断 是否已拥有该武将
+                                this.node_hasHero.active = isSlice;
+                                this.txt_slice.string = "x" + num;
+                            })
+                            .start();
+                    })
+                    .start();
+            } else {
+                this.playAni(general.color == 2 ? 1 : 2, isSlice, num);
+            }
 
-                            //碎片判断 是否已拥有该武将
-                            this.node_hasHero.active = isSlice;
-                            this.txt_slice.string = "x" + num;
-                        })
-                        .start();
-                })
-                .start();
         });
         cc.loader.loadRes("module/general/texture/icon_camp_" + general.camp, cc.SpriteFrame, (errr, asset) => {
             if (errr) { return; }
@@ -135,4 +156,75 @@ export default class DrawItem extends cc.Component {
             }
         }
     }
+
+
+    /**
+     * 播放翻牌动画
+     * @param type 1 紫色 2 橙色和红色
+     * @param isSlice 是否为碎片
+     * @param num 碎片数量
+    */
+    async playAni(type: number, isSlice: boolean, num: number) {
+        if (type == 1) {
+            this.spine_zi.node.active = true;
+            this.spine_zi.setAnimation(0, "animation", false);
+
+            cc.tween(this.btn_open)
+                .to(0.2, { scaleX: 0 })
+                .call(() => {
+                    this.node_opened.active = true;
+
+                    cc.tween(this.node_opened)
+                        .to(0.2, { scaleX: 1 })
+                        .call(() => {
+                            this.img_camp.node.active = true;
+
+                            //碎片判断 是否已拥有该武将
+                            this.node_hasHero.active = isSlice;
+                            this.txt_slice.string = "x" + num;
+                        })
+                        .start();
+                })
+                .start();
+
+            await Time.WaitForSeconds(this.spine_zi.findAnimation("animation").duration + 0.1);
+            if (cc.isValid(this.node)) {
+                this.spine_zi.node.active = false;
+            }
+        } else {
+            this.spine_best1.node.active = true;
+            this.spine_best1.setAnimation(0, "animation", true);
+            await Time.WaitForSeconds(this.spine_best1.findAnimation("animation").duration + 1);
+            this.spine_best1.node.active = false;
+            this.spine_best2.node.active = true;
+            this.spine_best2.setAnimation(0, "animation", false);
+
+            cc.tween(this.btn_open)
+                .to(0.2, { scaleX: 0 })
+                .call(() => {
+                    this.node_opened.active = true;
+
+                    cc.tween(this.node_opened)
+                        .to(0.2, { scaleX: 1 })
+                        .call(() => {
+                            this.img_camp.node.active = true;
+
+                            //碎片判断 是否已拥有该武将
+                            this.node_hasHero.active = isSlice;
+                            this.txt_slice.string = "x" + num;
+
+                            this.playAniCard();
+                        })
+                        .start();
+                })
+                .start();
+        }
+    }
+
+    async playAniCard() {
+        this.spine_best3.node.active = true;
+        this.spine_best3.setAnimation(0, "animation", false);
+        await Time.WaitForSeconds(this.spine_best3.findAnimation("animation").duration + 0.1);
+        this.spine_best3.node.active = false;
+    }
 }

tower_sanguo/assets/scripts/module/fight/FightUI.ts

@@ -24,6 +24,7 @@ import PiggyBankModel from "../piggyBank/PiggyBankModel";
 import GeneralUI from "../general/GeneralUI";
 import { ViewZorder } from "../../../MOKA/data/ViewZOrder";
 import GeneralUIModel from "../general/GeneralUIModel";
+import GameUtil from "../../../MOKA/util/GameUtil";
 import { MsgAddGeneralExp } from "../../net/HttpCommand";
 
 const { ccclass, property } = cc._decorator;
@@ -481,12 +482,15 @@ export default class FightUI extends BaseUI {
         let mission = this.missionVO.id;
         let isboss = this.missionVO.type == 2;
         this.mission_boss.node.active = isboss;
-        this.lbl_mission.string = `第${mission}关`;
+        this.lbl_mission.string = `${mission}`;
         this.lbl_mission.node.x = isboss ? 50 : 0;
         this.mission_start.node.active = true;
         //更新主界面的关卡组件
         GameController.mainui.updateMission();
         // cc.tween(this.mission_start).to(0.5, { x: 0 }).delay(0.8).to(0.3, { x: -750 }).call(this.checkGeneralBuff.bind(this)).start();
+        GameUtil.shake(this.lbl_mission.node.parent, 20, 2)// 此处Bug：后面的抖动无效
+        // GameUtil.shake(this.lbl_mission.node.parent.getChildByName('lbl_di'), 20, 2)
+        // GameUtil.shake(this.lbl_mission.node.parent.getChildByName('lbl_guan'), 20, 2)
         this.mission_start.stop();
         this.mission_start.play();
         XXEvent.emit('event-new-mission-start')// 新的一波开始了

tower_sanguo/assets/scripts/module/fight/FullSkillBtn.ts

@@ -148,11 +148,13 @@ export default class FullSkillBtn extends cc.Component {
 			this.img_cool_needle.active = true;
 			this.img_cool_needle.angle = 360 / GameController.gameData.serverConfig_data.skillCD * GameController.gameData.player.skill_cooling_time;
 
+			console.log("---1: "+GameController.gameData.player.skill_cooling_time);
 			GameController.gameData.updateProp(PLAYERPROP.USESKILL_TIME, (new Date()).getTime(), false, () => {
 				GameController.gameData.player.skill_cooling_time = GameController.gameData.serverConfig_data.skillCD;
 				console.log("Cooling Time: " + GameController.gameData.player.skill_cooling_time);
 				CommonNode.Ins.timerStartSkillCooling();
 			});
+			console.log("---2: "+GameController.gameData.player.skill_cooling_time);
 			//GameController.gameData.player.getProp(PLAYERPROP.USESKILL_TIME)
 		}
 	}

tower_sanguo/assets/scripts/module/general/GeneralInfoUI.ts

@@ -228,8 +228,6 @@ export default class GeneralInfoUI extends BaseUI {
             star: success_general.star,
             attack: new_attack,
         }
-        // 打开升星展示界面
-        GameController.uiM.openUI(GeneralUpStarUI, null, ViewZorder.UI, null, null, { old_data: old_general, new_data: new_general })
 
         // 更新背包数据
         let generals_bag = GameController.gameData.player.generals_bag
@@ -250,8 +248,15 @@ export default class GeneralInfoUI extends BaseUI {
         // 碎片进度 
         this.chipStyle();
         GameController.gameData.updateGeneral([this.general_data]);
-        //检测武将升级
-        MarshalSkillModel.Ins.checkGeneralUnlockOrLvUpData();
+        // //检测武将升级
+        // MarshalSkillModel.Ins.checkGeneralUnlockOrLvUpData();
+        let call1 = () => {
+            MarshalSkillModel.Ins.checkGeneralUnlockOrLvUpData();
+        }
+        // 打开升星展示界面
+        GameController.uiM.openUI(GeneralUpStarUI, null, ViewZorder.UI, null, null, {
+            old_data: old_general, new_data: new_general, close_call: call1
+        })
         cc.log('升星成功：%o', data)
     }
     /** 更换武将事件触发 

tower_sanguo/assets/scripts/module/general/GeneralUpStarUI.ts

@@ -1,10 +1,6 @@
-// Learn TypeScript:
-//  - https://docs.cocos.com/creator/manual/en/scripting/typescript.html
-// Learn Attribute:
-//  - https://docs.cocos.com/creator/manual/en/scripting/reference/attributes.html
-// Learn life-cycle callbacks:
-//  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
-
+/**
+ * 5s自动关闭
+ */
 import BaseUI from "../../../MOKA/component/BaseUI";
 import GameController from "../../GameController";
 const { ccclass, property } = cc._decorator;
@@ -30,6 +26,11 @@ export default class GeneralUpStarUI extends BaseUI {
     private img_box_1: cc.Sprite = null!;
     @property({ type: cc.Sprite, displayName: '头像框2' })
     private img_box_2: cc.Sprite = null!;
+    /** 自动关闭时间 */
+    @property({ displayName: '自动关闭时间' })
+    private life_time: number = 5;
+    @property({ type: cc.Label, displayName: '自动关闭描述' })
+    private txt_time: cc.Label = null!;
 
     /** 数据 */
     private my_data = {
@@ -44,15 +45,20 @@ export default class GeneralUpStarUI extends BaseUI {
             fragment: 0,
             star: 0,
             attack: 0,
-        }
+        },
+        /** 关闭回调 */
+        close_call: null
     }
+    /** 当前时间s */
+    private cur_time = 0;
     onLoad() {
-
+        this.schedule(this.upTextClose, 1);
     }
 
     start() {
         this.my_data.old_data = this.ui_data.old_data;
         this.my_data.new_data = this.ui_data.new_data;
+        this.my_data.close_call = this.ui_data.close_call;
         cc.log(this.ui_data)
         this.initStyle();
     }
@@ -100,5 +106,19 @@ export default class GeneralUpStarUI extends BaseUI {
             this.img_box_2.spriteFrame = asset;
         })
     }
+    /** 关闭倒计时显示 */
+    private upTextClose() {
+        this.cur_time++;
+        if (this.cur_time >= this.life_time) {
+            this.unschedule(this.upTextClose);
+            this.close();
+        }
+        let gap = this.life_time - this.cur_time;
+        this.txt_time.string = gap + '秒后自动关闭';
+    }
+    onDestroy() {
+        this.my_data.close_call && this.my_data.close_call();
+        super.onDestroy()
+    }
     // update (dt) {}
 }