Explorar el Código

测试资源替换

txq hace 6 meses
padre
commit
d0b02d0bf5
Se han modificado 44 ficheros con 1901 adiciones y 673 borrados
  1. 213 0
      assets/package/animation/ui_open.anim
  2. 13 0
      assets/package/animation/ui_open.anim.meta
  3. 210 29
      assets/package/prefab/login/LoadingUI.prefab
  4. 3 3
      assets/package/prefab/login/LoginUI.prefab
  5. 108 14
      assets/package/prefab/ui/tower/hero/npc001.prefab
  6. 106 12
      assets/package/prefab/ui/tower/hero/npc002.prefab
  7. 202 15
      assets/package/prefab/ui/tower/hero/npc003.prefab
  8. 2 2
      assets/package/prefab/ui/tower/hero/npc003.prefab.meta
  9. 0 432
      assets/package/prefab/ui/tower/hero/npc100.prefab
  10. 0 13
      assets/package/prefab/ui/tower/hero/npc122.prefab.meta
  11. 57 33
      assets/package/prefab/ui/tower/tower.prefab
  12. 33 1
      assets/package/prefab/ui/tower/zombie.prefab
  13. 258 0
      assets/package/spine/qingwa.atlas
  14. 12 0
      assets/package/spine/qingwa.atlas.meta
  15. 165 0
      assets/package/spine/qingwa.json
  16. 11 0
      assets/package/spine/qingwa.json.meta
  17. BIN
      assets/package/spine/qingwa.png
  18. 134 0
      assets/package/spine/qingwa.png.meta
  19. BIN
      assets/package/texture/tower/map3.png
  20. BIN
      assets/package/texture/tower/ui/02.png
  21. 29 29
      assets/package/texture/tower/ui/02.png.meta
  22. BIN
      assets/package/texture/tower/ui/03.png
  23. BIN
      assets/package/texture/tower/ui/底座.png
  24. 20 20
      assets/package/texture/tower/ui/底座.png.meta
  25. BIN
      assets/package/texture/tower/ui/按钮01.png
  26. 28 28
      assets/package/texture/tower/ui/按钮01.png.meta
  27. BIN
      assets/package/texture/tower/ui/点击按钮.png
  28. BIN
      assets/package/texture/tower/ui/锁.png
  29. 20 20
      assets/package/texture/tower/ui/锁.png.meta
  30. 9 0
      assets/resources/effect.meta
  31. 91 0
      assets/resources/effect/loading.effect
  32. 1 0
      assets/resources/effect/loading.effect.meta
  33. 56 0
      assets/resources/effect/loading2.effect
  34. 11 0
      assets/resources/effect/loading2.effect.meta
  35. 9 0
      assets/resources/material.meta
  36. 29 0
      assets/resources/material/loading.mtl
  37. 11 0
      assets/resources/material/loading.mtl.meta
  38. 2 2
      assets/script/framework/config/LayerConf.ts
  39. 4 1
      assets/script/framework/layer/BaseLayer.ts
  40. 18 0
      assets/script/game/config/ServergatewaylistConf.ts
  41. 9 0
      assets/script/game/config/ServergatewaylistConf.ts.meta
  42. 11 8
      assets/script/game/ui/login/LoginUI.ts
  43. 1 0
      assets/script/game/ui/login/MainUI.ts
  44. 15 11
      assets/script/game/ui/tower/node/Hero.ts

+ 213 - 0
assets/package/animation/ui_open.anim

@@ -0,0 +1,213 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "open_ui",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 60,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 1,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 11
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "scale"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0.10000000149011612,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0.10000000149011612,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      1
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

+ 13 - 0
assets/package/animation/ui_open.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "2c110a40-7fa8-4f77-a6bc-036999bd6e78",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "ui_open"
+  }
+}

+ 210 - 29
assets/package/prefab/login/LoadingUI.prefab

@@ -22,29 +22,29 @@
         "__id__": 2
       },
       {
-        "__id__": 30
+        "__id__": 38
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 46
       },
       {
-        "__id__": 40
+        "__id__": 48
       },
       {
-        "__id__": 42
+        "__id__": 50
       },
       {
-        "__id__": 44
+        "__id__": 52
       },
       {
-        "__id__": 46
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 56
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -86,22 +86,25 @@
     "_children": [
       {
         "__id__": 3
+      },
+      {
+        "__id__": 23
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 31
       },
       {
-        "__id__": 25
+        "__id__": 33
       },
       {
-        "__id__": 27
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 37
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -598,6 +601,184 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Sprite",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 28
+      }
+    ],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 25
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7dwZ2tmRpDe6BfRZ/oa+NS"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 27
+    },
+    "_customMaterial": {
+      "__uuid__": "f13ee46e-cdc1-46f6-a8f6-c43d34ac6276",
+      "__expectedType__": "cc.Material"
+    },
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "d21239c5-e6e2-4988-b8de-ee21c5ee601b@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "37R4cNQHFDtqfSx69o7CyL"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 29
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 50,
+    "_originalHeight": 50,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8ef++4CZZM1o+DZQWqVm3E"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "131ASLZsxBPKSkbfeKchle",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -608,7 +789,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 24
+      "__id__": 32
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -636,7 +817,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 26
+      "__id__": 34
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -678,7 +859,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 28
+      "__id__": 36
     },
     "_alignFlags": 0,
     "_target": null,
@@ -729,17 +910,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 39
       },
       {
-        "__id__": 33
+        "__id__": 41
       },
       {
-        "__id__": 35
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 45
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -776,11 +957,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 30
+      "__id__": 38
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 32
+      "__id__": 40
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -804,11 +985,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 30
+      "__id__": 38
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 42
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -872,11 +1053,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 30
+      "__id__": 38
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 44
     },
     "_alignFlags": 4,
     "_target": null,
@@ -925,7 +1106,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -953,7 +1134,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 49
     },
     "_alignFlags": 45,
     "_target": null,
@@ -989,7 +1170,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 51
     },
     "_opacity": 255,
     "_id": ""
@@ -1008,7 +1189,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 53
     },
     "frame_load": false,
     "load_priority": 0,
@@ -1034,7 +1215,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 55
     },
     "clickEvents": [],
     "_interactable": true,

+ 3 - 3
assets/package/prefab/login/LoginUI.prefab

@@ -734,7 +734,7 @@
         "__id__": 52
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 64
@@ -1420,8 +1420,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 244,
-      "height": 79.6
+      "width": 240,
+      "height": 75.6
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 108 - 14
assets/package/prefab/ui/tower/hero/npc001.prefab

@@ -26,19 +26,22 @@
       },
       {
         "__id__": 14
+      },
+      {
+        "__id__": 18
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 22
       },
       {
-        "__id__": 20
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -105,8 +108,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.7,
-      "y": 0.7,
+      "x": 0.5,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -133,13 +136,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 141.4600067138672,
-      "height": 186.27000427246094
+      "width": 200.88999938964844,
+      "height": 233
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.409444333521776,
-      "y": 0.08294411045734507
+      "x": 0,
+      "y": 0
     },
     "_id": ""
   },
@@ -170,11 +173,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "9b434ff8-7220-44aa-9b47-2c2732dee0c9",
+      "__uuid__": "3edda31b-9168-43f9-a212-1df27f56441d",
       "__expectedType__": "sp.SkeletonData"
     },
-    "defaultSkin": "skin_0",
-    "defaultAnimation": "fire_90",
+    "defaultSkin": "default",
+    "defaultAnimation": "stand_left",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -455,6 +458,94 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "click_box",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 19
+      }
+    ],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 20
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d0Ho8mQlJJYIeBk9qKNLVc"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "6dvWtEAqJFIpK9//FzRN4U",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -465,7 +556,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -493,7 +584,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 25
     },
     "modelSpine": {
       "__id__": 5
@@ -504,6 +595,9 @@
     "gunNode": {
       "__id__": 14
     },
+    "clickBox": {
+      "__id__": 19
+    },
     "_id": ""
   },
   {

+ 106 - 12
assets/package/prefab/ui/tower/hero/npc002.prefab

@@ -26,19 +26,22 @@
       },
       {
         "__id__": 14
+      },
+      {
+        "__id__": 18
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 22
       },
       {
-        "__id__": 20
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -133,13 +136,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 115.08000183105469,
-      "height": 143.7899932861328
+      "width": 200.88999938964844,
+      "height": 233
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.431873479076777,
-      "y": 0.05355031760758646
+      "x": 0,
+      "y": 0
     },
     "_id": ""
   },
@@ -170,11 +173,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "6926cad2-2558-4329-aba2-4ebe793b13da",
+      "__uuid__": "3edda31b-9168-43f9-a212-1df27f56441d",
       "__expectedType__": "sp.SkeletonData"
     },
-    "defaultSkin": "skin_1",
-    "defaultAnimation": "stand_0",
+    "defaultSkin": "default",
+    "defaultAnimation": "show",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -455,6 +458,94 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "click_box",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 19
+      }
+    ],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 20
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b7FCtk9WhFRY16N6JtbIF7"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "59r3T65ZJPcLbAoTmdfw50",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -465,7 +556,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -493,7 +584,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 25
     },
     "modelSpine": {
       "__id__": 5
@@ -504,6 +595,9 @@
     "gunNode": {
       "__id__": 14
     },
+    "clickBox": {
+      "__id__": 19
+    },
     "_id": ""
   },
   {

+ 202 - 15
assets/package/prefab/ui/tower/hero/npc122.prefab → assets/package/prefab/ui/tower/hero/npc003.prefab

@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "npc122",
+    "_name": "npc003",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "npc122",
+    "_name": "npc003",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -23,19 +23,25 @@
       },
       {
         "__id__": 8
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 18
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 22
       },
       {
-        "__id__": 16
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -90,7 +96,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -40,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -102,8 +108,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.3,
-      "y": 0.3,
+      "x": 0.7,
+      "y": 0.7,
       "z": 1
     },
     "_mobility": 0,
@@ -130,8 +136,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 323.9100036621094,
-      "height": 474
+      "width": 200.88999938964844,
+      "height": 233
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -167,11 +173,11 @@
       "a": 255
     },
     "_skeletonData": {
-      "__uuid__": "e467e1c9-92d1-4e68-81aa-22571424ff2a",
+      "__uuid__": "3edda31b-9168-43f9-a212-1df27f56441d",
       "__expectedType__": "sp.SkeletonData"
     },
     "defaultSkin": "default",
-    "defaultAnimation": "stand",
+    "defaultAnimation": "show",
     "_premultipliedAlpha": false,
     "_timeScale": 1,
     "_preCacheMode": 0,
@@ -364,6 +370,182 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 47.125999999999976,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1.0000000000000038,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "96cFqmKP1I1r2qUAsGp1K0"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d54T+Jwk5IUIUtK6EFRTsO",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "click_box",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 19
+      }
+    ],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 20
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "fa8bVTxolHQZKhrAY1x1BA"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "50Hixedt5JfLFR+Jfv0bEl",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -374,7 +556,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -402,15 +584,20 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 25
     },
-    "priority": 1,
     "modelSpine": {
       "__id__": 5
     },
     "levelLabel": {
       "__id__": 11
     },
+    "gunNode": {
+      "__id__": 14
+    },
+    "clickBox": {
+      "__id__": 19
+    },
     "_id": ""
   },
   {

+ 2 - 2
assets/package/prefab/ui/tower/hero/npc100.prefab.meta → assets/package/prefab/ui/tower/hero/npc003.prefab.meta

@@ -2,12 +2,12 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "b4cead43-58a8-44a6-8476-13900df4765c",
+  "uuid": "ec2ec9bf-a002-40d5-a2d8-2d2c6ec79e03",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "npc100"
+    "syncNodeName": "npc003"
   }
 }

+ 0 - 432
assets/package/prefab/ui/tower/hero/npc100.prefab

@@ -1,432 +0,0 @@
-[
-  {
-    "__type__": "cc.Prefab",
-    "_name": "npc100",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_native": "",
-    "data": {
-      "__id__": 1
-    },
-    "optimizationPolicy": 0,
-    "persistent": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "npc100",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": null,
-    "_children": [
-      {
-        "__id__": 2
-      },
-      {
-        "__id__": 8
-      }
-    ],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 14
-      },
-      {
-        "__id__": 16
-      }
-    ],
-    "_prefab": {
-      "__id__": 18
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "npc",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 3
-      },
-      {
-        "__id__": 5
-      }
-    ],
-    "_prefab": {
-      "__id__": 7
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -40,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.3,
-      "y": 0.3,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 4
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 459,
-      "height": 414.3599853515625
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "abu9ERkD1Kf47C9H4key+A"
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 6
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_skeletonData": {
-      "__uuid__": "a6ec83ce-7647-462d-9ef4-876e59062709",
-      "__expectedType__": "sp.SkeletonData"
-    },
-    "defaultSkin": "default",
-    "defaultAnimation": "stand",
-    "_premultipliedAlpha": false,
-    "_timeScale": 1,
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "_sockets": [],
-    "_useTint": false,
-    "_debugMesh": false,
-    "_debugBones": false,
-    "_debugSlots": false,
-    "_enableBatch": false,
-    "loop": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "04bd6uSKRIn4+XkSjUSSC+"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "6dy3OwKXZF5oc9HYwZXfDG",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "fightforce",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 11
-      }
-    ],
-    "_prefab": {
-      "__id__": 13
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 30,
-      "y": -30,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 10
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 18.69,
-      "height": 40
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "97DYK5Pr9I+7XxR68jW9Gg"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 12
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "1",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 26,
-    "_fontSize": 26,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": {
-      "__uuid__": "65941af8-fc7e-447d-a557-0406909c778c",
-      "__expectedType__": "cc.BitmapFont"
-    },
-    "_isSystemFontUsed": false,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "8c5c96IH9F3KEc61oeTYED"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "b6behIFntFbqqjnmWRZs74",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 15
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 90,
-      "height": 90
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0b/CNpEpBF2rfa4utARikb"
-  },
-  {
-    "__type__": "93e322oxm1M+7IXMqWiSdAA",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 17
-    },
-    "priority": 1,
-    "modelSpine": {
-      "__id__": 5
-    },
-    "levelLabel": {
-      "__id__": 11
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "e0tAfV15pHzYaO/DBx2G/g"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "7bMfkp5qVJ06eVU0ujZbqw",
-    "instance": null,
-    "targetOverrides": null
-  }
-]

+ 0 - 13
assets/package/prefab/ui/tower/hero/npc122.prefab.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.50",
-  "importer": "prefab",
-  "imported": true,
-  "uuid": "f77884f4-cd97-41f7-a51d-8b0560093bc2",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "syncNodeName": "npc122"
-  }
-}

+ 57 - 33
assets/package/prefab/ui/tower/tower.prefab

@@ -38,10 +38,13 @@
       },
       {
         "__id__": 302
+      },
+      {
+        "__id__": 304
       }
     ],
     "_prefab": {
-      "__id__": 304
+      "__id__": 306
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -514,8 +517,6 @@
       "__id__": 0
     },
     "fileId": "ddF+86LNhOFrfj0Z2yoXod",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -650,8 +651,6 @@
       "__id__": 0
     },
     "fileId": "7ewELcsCJLoL1birI+0Vye",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -786,8 +785,6 @@
       "__id__": 0
     },
     "fileId": "3cCCKDB/5CII7Iw6TMY0gi",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -922,8 +919,6 @@
       "__id__": 0
     },
     "fileId": "11cGBD46lLOrbNrwODaP6g",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1420,7 +1415,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1556,7 +1551,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1692,7 +1687,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1828,7 +1823,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1964,7 +1959,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2100,7 +2095,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2236,7 +2231,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2372,7 +2367,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2508,7 +2503,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2644,7 +2639,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2834,7 +2829,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2920,7 +2915,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3110,7 +3105,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3196,7 +3191,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3386,7 +3381,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3472,7 +3467,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3662,7 +3657,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3748,7 +3743,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3938,7 +3933,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -4024,7 +4019,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -4329,8 +4324,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 287,
-      "height": 162
+      "width": 240,
+      "height": 126
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4366,7 +4361,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "79e24201-052c-4f0c-8e9e-352c656cd333@f9941",
+      "__uuid__": "761a7044-ce44-4517-be4b-3239f76edc4d@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -5089,7 +5084,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -7064,6 +7059,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "a1v8/nhepN2YB6NiEjBXeH"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 305
+    },
+    "playOnLoad": false,
+    "_clips": [
+      {
+        "__uuid__": "2c110a40-7fa8-4f77-a6bc-036999bd6e78",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "2c110a40-7fa8-4f77-a6bc-036999bd6e78",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "42sR2lukFEQLA5kg6gSQ3z"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 33 - 1
assets/package/prefab/ui/tower/zombie.prefab

@@ -38,10 +38,13 @@
       },
       {
         "__id__": 338
+      },
+      {
+        "__id__": 340
       }
     ],
     "_prefab": {
-      "__id__": 340
+      "__id__": 342
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7898,6 +7901,35 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "deTL7Bgt9HJJwtE8IkNm4L"
   },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 341
+    },
+    "playOnLoad": false,
+    "_clips": [
+      {
+        "__uuid__": "2c110a40-7fa8-4f77-a6bc-036999bd6e78",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "2c110a40-7fa8-4f77-a6bc-036999bd6e78",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d64g8FakJHe4WYBp8m5xi7"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 258 - 0
assets/package/spine/qingwa.atlas

@@ -0,0 +1,258 @@
+
+qingwa.png
+size: 1024,256
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+arm
+  rotate: true
+  xy: 515, 25
+  size: 56, 58
+  orig: 58, 60
+  offset: 1, 1
+  index: -1
+arm2
+  rotate: false
+  xy: 450, 42
+  size: 63, 59
+  orig: 65, 61
+  offset: 1, 1
+  index: -1
+body1
+  rotate: false
+  xy: 161, 77
+  size: 156, 177
+  orig: 158, 179
+  offset: 1, 1
+  index: -1
+body_back
+  rotate: false
+  xy: 2, 73
+  size: 157, 181
+  orig: 159, 183
+  offset: 1, 1
+  index: -1
+down_28
+  rotate: false
+  xy: 319, 188
+  size: 234, 66
+  orig: 290, 113
+  offset: 27, 25
+  index: -1
+down_30
+  rotate: false
+  xy: 319, 103
+  size: 213, 83
+  orig: 290, 113
+  offset: 46, 15
+  index: -1
+down_32
+  rotate: false
+  xy: 555, 176
+  size: 213, 78
+  orig: 290, 113
+  offset: 56, 18
+  index: -1
+down_34
+  rotate: false
+  xy: 770, 200
+  size: 213, 54
+  orig: 290, 113
+  offset: 58, 32
+  index: -1
+eye
+  rotate: true
+  xy: 826, 70
+  size: 36, 25
+  orig: 42, 31
+  offset: 3, 3
+  index: -1
+eye1
+  rotate: false
+  xy: 781, 108
+  size: 67, 66
+  orig: 69, 68
+  offset: 1, 1
+  index: -1
+eye1_back
+  rotate: false
+  xy: 319, 35
+  size: 67, 66
+  orig: 77, 76
+  offset: 5, 5
+  index: -1
+eye2
+  rotate: false
+  xy: 575, 25
+  size: 55, 56
+  orig: 57, 58
+  offset: 1, 1
+  index: -1
+eye2_back
+  rotate: false
+  xy: 632, 25
+  size: 55, 56
+  orig: 65, 66
+  offset: 5, 5
+  index: -1
+face
+  rotate: false
+  xy: 677, 91
+  size: 102, 83
+  orig: 104, 85
+  offset: 1, 1
+  index: -1
+feet
+  rotate: false
+  xy: 985, 163
+  size: 33, 33
+  orig: 35, 35
+  offset: 1, 1
+  index: -1
+feet1
+  rotate: false
+  xy: 724, 2
+  size: 32, 32
+  orig: 34, 34
+  offset: 1, 1
+  index: -1
+hand
+  rotate: false
+  xy: 784, 57
+  size: 40, 49
+  orig: 46, 55
+  offset: 3, 3
+  index: -1
+hand1
+  rotate: true
+  xy: 738, 39
+  size: 50, 44
+  orig: 56, 50
+  offset: 3, 3
+  index: -1
+jian
+  rotate: false
+  xy: 534, 83
+  size: 141, 91
+  orig: 147, 97
+  offset: 3, 3
+  index: -1
+jian_back
+  rotate: true
+  xy: 2, 7
+  size: 64, 154
+  orig: 70, 160
+  offset: 3, 3
+  index: -1
+left arm_back
+  rotate: false
+  xy: 388, 35
+  size: 60, 66
+  orig: 62, 68
+  offset: 1, 1
+  index: -1
+left feet_back
+  rotate: true
+  xy: 689, 2
+  size: 32, 33
+  orig: 34, 35
+  offset: 1, 1
+  index: -1
+left hand_back
+  rotate: false
+  xy: 689, 36
+  size: 47, 53
+  orig: 53, 59
+  offset: 3, 3
+  index: -1
+meimao
+  rotate: true
+  xy: 515, 83
+  size: 18, 17
+  orig: 20, 19
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 245, 53
+  size: 30, 22
+  orig: 32, 24
+  offset: 1, 1
+  index: -1
+mouth
+  rotate: true
+  xy: 158, 35
+  size: 36, 21
+  orig: 42, 27
+  offset: 3, 3
+  index: -1
+nose
+  rotate: true
+  xy: 985, 198
+  size: 56, 34
+  orig: 58, 36
+  offset: 1, 1
+  index: -1
+right arm_back
+  rotate: false
+  xy: 872, 139
+  size: 63, 59
+  orig: 65, 61
+  offset: 1, 1
+  index: -1
+right feet_back
+  rotate: false
+  xy: 158, 2
+  size: 32, 31
+  orig: 34, 33
+  offset: 1, 1
+  index: -1
+right hand_back
+  rotate: true
+  xy: 937, 142
+  size: 56, 46
+  orig: 62, 52
+  offset: 3, 3
+  index: -1
+shadow
+  rotate: false
+  xy: 770, 176
+  size: 100, 22
+  orig: 102, 24
+  offset: 1, 1
+  index: -1
+tail
+  rotate: false
+  xy: 181, 47
+  size: 30, 28
+  orig: 36, 34
+  offset: 3, 3
+  index: -1
+tail_back
+  rotate: false
+  xy: 213, 47
+  size: 30, 28
+  orig: 36, 34
+  offset: 3, 3
+  index: -1
+yanzhu
+  rotate: false
+  xy: 534, 177
+  size: 9, 9
+  orig: 11, 11
+  offset: 1, 1
+  index: -1
+yanzhu2
+  rotate: false
+  xy: 784, 46
+  size: 9, 9
+  orig: 11, 11
+  offset: 1, 1
+  index: -1
+yanzhu3
+  rotate: false
+  xy: 545, 178
+  size: 8, 8
+  orig: 10, 10
+  offset: 1, 1
+  index: -1

+ 12 - 0
assets/package/spine/qingwa.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "508fa78a-f040-43eb-804f-99bcf0b94e21",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 165 - 0
assets/package/spine/qingwa.json


+ 11 - 0
assets/package/spine/qingwa.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "3edda31b-9168-43f9-a212-1df27f56441d",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

BIN
assets/package/spine/qingwa.png


+ 134 - 0
assets/package/spine/qingwa.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "840d900f-eb1f-4cea-a870-292ae23a367a",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "840d900f-eb1f-4cea-a870-292ae23a367a@6c48a",
+      "displayName": "qingwa",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "840d900f-eb1f-4cea-a870-292ae23a367a",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "840d900f-eb1f-4cea-a870-292ae23a367a@f9941",
+      "displayName": "qingwa",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -1.5,
+        "offsetY": 0,
+        "trimX": 2,
+        "trimY": 2,
+        "width": 1017,
+        "height": 252,
+        "rawWidth": 1024,
+        "rawHeight": 256,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -508.5,
+            -126,
+            0,
+            508.5,
+            -126,
+            0,
+            -508.5,
+            126,
+            0,
+            508.5,
+            126,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            2,
+            254,
+            1019,
+            254,
+            2,
+            2,
+            1019,
+            2
+          ],
+          "nuv": [
+            0.001953125,
+            0.0078125,
+            0.9951171875,
+            0.0078125,
+            0.001953125,
+            0.9921875,
+            0.9951171875,
+            0.9921875
+          ],
+          "minPos": [
+            -508.5,
+            -126,
+            0
+          ],
+          "maxPos": [
+            508.5,
+            126,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "840d900f-eb1f-4cea-a870-292ae23a367a@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "840d900f-eb1f-4cea-a870-292ae23a367a@6c48a"
+  }
+}

BIN
assets/package/texture/tower/map3.png


BIN
assets/package/texture/tower/ui/02.png


+ 29 - 29
assets/package/texture/tower/ui/02.png.meta

@@ -42,12 +42,12 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": -2.5,
-        "trimX": 0,
+        "offsetX": -0.5,
+        "offsetY": 3,
+        "trimX": 4,
         "trimY": 5,
-        "width": 750,
-        "height": 1329,
+        "width": 741,
+        "height": 1318,
         "rawWidth": 750,
         "rawHeight": 1334,
         "borderTop": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -375,
-            -664.5,
+            -370.5,
+            -659,
             0,
-            375,
-            -664.5,
+            370.5,
+            -659,
             0,
-            -375,
-            664.5,
+            -370.5,
+            659,
             0,
-            375,
-            664.5,
+            370.5,
+            659,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            0,
+            4,
             1329,
-            750,
+            745,
             1329,
-            0,
-            0,
-            750,
-            0
+            4,
+            11,
+            745,
+            11
           ],
           "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
+            0.005333333333333333,
+            0.008245877061469266,
+            0.9933333333333333,
+            0.008245877061469266,
+            0.005333333333333333,
             0.9962518740629686,
-            1,
+            0.9933333333333333,
             0.9962518740629686
           ],
           "minPos": [
-            -375,
-            -664.5,
+            -370.5,
+            -659,
             0
           ],
           "maxPos": [
-            375,
-            664.5,
+            370.5,
+            659,
             0
           ]
         },

BIN
assets/package/texture/tower/ui/03.png


BIN
assets/package/texture/tower/ui/底座.png


+ 20 - 20
assets/package/texture/tower/ui/底座.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 98,
-        "height": 62,
-        "rawWidth": 98,
-        "rawHeight": 62,
+        "width": 120,
+        "height": 66,
+        "rawWidth": 120,
+        "rawHeight": 66,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -49,
-            -31,
+            -60,
+            -33,
             0,
-            49,
-            -31,
+            60,
+            -33,
             0,
-            -49,
-            31,
+            -60,
+            33,
             0,
-            49,
-            31,
+            60,
+            33,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            62,
-            98,
-            62,
+            66,
+            120,
+            66,
             0,
             0,
-            98,
+            120,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -49,
-            -31,
+            -60,
+            -33,
             0
           ],
           "maxPos": [
-            49,
-            31,
+            60,
+            33,
             0
           ]
         },

BIN
assets/package/texture/tower/ui/按钮01.png


+ 28 - 28
assets/package/texture/tower/ui/点击按钮.png.meta → assets/package/texture/tower/ui/按钮01.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "79e24201-052c-4f0c-8e9e-352c656cd333",
+  "uuid": "761a7044-ce44-4517-be4b-3239f76edc4d",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "79e24201-052c-4f0c-8e9e-352c656cd333@6c48a",
-      "displayName": "点击按钮",
+      "uuid": "761a7044-ce44-4517-be4b-3239f76edc4d@6c48a",
+      "displayName": "按钮01",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "79e24201-052c-4f0c-8e9e-352c656cd333",
+        "imageUuidOrDatabaseUri": "761a7044-ce44-4517-be4b-3239f76edc4d",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "79e24201-052c-4f0c-8e9e-352c656cd333@f9941",
-      "displayName": "点击按钮",
+      "uuid": "761a7044-ce44-4517-be4b-3239f76edc4d@f9941",
+      "displayName": "按钮01",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 287,
-        "height": 162,
-        "rawWidth": 287,
-        "rawHeight": 162,
+        "width": 240,
+        "height": 126,
+        "rawWidth": 240,
+        "rawHeight": 126,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -143.5,
-            -81,
+            -120,
+            -63,
             0,
-            143.5,
-            -81,
+            120,
+            -63,
             0,
-            -143.5,
-            81,
+            -120,
+            63,
             0,
-            143.5,
-            81,
+            120,
+            63,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            162,
-            287,
-            162,
+            126,
+            240,
+            126,
             0,
             0,
-            287,
+            240,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -143.5,
-            -81,
+            -120,
+            -63,
             0
           ],
           "maxPos": [
-            143.5,
-            81,
+            120,
+            63,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "79e24201-052c-4f0c-8e9e-352c656cd333@6c48a",
+        "imageUuidOrDatabaseUri": "761a7044-ce44-4517-be4b-3239f76edc4d@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "79e24201-052c-4f0c-8e9e-352c656cd333@6c48a"
+    "redirect": "761a7044-ce44-4517-be4b-3239f76edc4d@6c48a"
   }
 }

BIN
assets/package/texture/tower/ui/点击按钮.png


BIN
assets/package/texture/tower/ui/锁.png


+ 20 - 20
assets/package/texture/tower/ui/锁.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 40,
-        "height": 49,
-        "rawWidth": 40,
-        "rawHeight": 49,
+        "width": 42,
+        "height": 51,
+        "rawWidth": 42,
+        "rawHeight": 51,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -20,
-            -24.5,
+            -21,
+            -25.5,
             0,
-            20,
-            -24.5,
+            21,
+            -25.5,
             0,
-            -20,
-            24.5,
+            -21,
+            25.5,
             0,
-            20,
-            24.5,
+            21,
+            25.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            49,
-            40,
-            49,
+            51,
+            42,
+            51,
             0,
             0,
-            40,
+            42,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -20,
-            -24.5,
+            -21,
+            -25.5,
             0
           ],
           "maxPos": [
-            20,
-            24.5,
+            21,
+            25.5,
             0
           ]
         },

+ 9 - 0
assets/resources/effect.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "91b6894f-0e20-417a-8af8-3429c59b46d7",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 91 - 0
assets/resources/effect/loading.effect

@@ -0,0 +1,91 @@
+// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.
+CCEffect %{
+  techniques:
+  - passes:
+    - vert: sprite-vs:vert
+      frag: sprite-fs:frag
+      depthStencilState:
+        depthTest: false
+        depthWrite: false
+      blendState:
+        targets:
+        - blend: true
+          blendSrc: src_alpha
+          blendDst: one_minus_src_alpha
+          blendDstAlpha: one_minus_src_alpha
+      rasterizerState:
+        cullMode: none
+      properties:
+        alphaThreshold: { value: 0.5 }
+}%
+
+CCProgram sprite-vs %{
+  precision highp float;
+  #include <builtin/uniforms/cc-global>
+  #if USE_LOCAL
+    #include <builtin/uniforms/cc-local>
+  #endif
+  #if SAMPLE_FROM_RT
+    #include <common/common-define>
+  #endif
+  in vec3 a_position;
+  in vec2 a_texCoord;
+  in vec4 a_color;
+
+  out vec4 color;
+  out vec2 uv0;
+
+  vec4 vert () {
+    vec4 pos = vec4(a_position, 1);
+
+    #if USE_LOCAL
+      pos = cc_matWorld * pos;
+    #endif
+
+    #if USE_PIXEL_ALIGNMENT
+      pos = cc_matView * pos;
+      pos.xyz = floor(pos.xyz);
+      pos = cc_matProj * pos;
+    #else
+      pos = cc_matViewProj * pos;
+    #endif
+
+    uv0 = a_texCoord;
+    #if SAMPLE_FROM_RT
+      CC_HANDLE_RT_SAMPLE_FLIP(uv0);
+    #endif
+    color = a_color;
+
+    return pos;
+  }
+}%
+
+CCProgram sprite-fs %{
+  precision highp float;
+  #include <builtin/internal/embedded-alpha>
+  #include <builtin/internal/alpha-test>
+
+  in vec4 color;
+
+  #if USE_TEXTURE
+    in vec2 uv0;
+    #pragma builtin(local)
+    layout(set = 2, binding = 12) uniform sampler2D cc_spriteTexture;
+  #endif
+
+  vec4 frag () {
+    vec4 o = vec4(1, 1, 1, 1);
+
+    #if USE_TEXTURE
+      o *= CCSampleWithAlphaSeparated(cc_spriteTexture, uv0);
+      #if IS_GRAY
+        float gray  = 0.2126 * o.r + 0.7152 * o.g + 0.0722 * o.b;
+        o.r = o.g = o.b = gray;
+      #endif
+    #endif
+
+    o *= color;
+    ALPHA_TEST(o);
+    return o;
+  }
+}%

+ 1 - 0
assets/resources/effect/loading.effect.meta

@@ -0,0 +1 @@
+{"ver":"1.7.1","importer":"effect","imported":true,"uuid":"9ca306b1-5baa-4e10-afb3-62e554730638","files":[".json"],"subMetas":{},"userData":{"combinations":[{}]}}

+ 56 - 0
assets/resources/effect/loading2.effect

@@ -0,0 +1,56 @@
+// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.
+CCEffect %{
+  techniques:
+  - name: default
+    passes:
+    - vert: spriteRender-vs:vert
+      frag: spriteRender-fs:frag
+      depthStencilState:
+        depthTest: true
+        depthWrite: false
+      blendState:
+        targets:
+        - blend: true
+          blendSrc: src_alpha
+          blendDst: one_minus_src_alpha
+          blendDstAlpha: one_minus_src_alpha
+      rasterizerState:
+        cullMode: none
+}%
+
+CCProgram spriteRender-vs %{
+  precision highp float;
+  #include <builtin/uniforms/cc-global>
+  #include <builtin/uniforms/cc-local>
+
+  in vec3 a_position;
+  in vec2 a_texCoord;
+
+  out vec2 uv0;
+
+  vec4 vert () {
+    vec4 pos = vec4(a_position, 1);
+
+    pos = cc_matViewProj * cc_matWorld * pos;
+
+    uv0 = vec2(a_texCoord.x, 1.0 - a_texCoord.y);
+
+    return pos;
+  }
+}%
+
+CCProgram spriteRender-fs %{
+  precision highp float;
+
+  in vec2 uv0;
+  #pragma builtin(local)
+  layout(set = 2, binding = 12) uniform sampler2D cc_spriteTexture;
+
+  vec4 frag () {
+    vec4 o = vec4(1, 1, 1, 1);
+
+    o *= texture(cc_spriteTexture, uv0);
+
+    return o;
+  }
+}%

+ 11 - 0
assets/resources/effect/loading2.effect.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.7.1",
+  "importer": "effect",
+  "imported": true,
+  "uuid": "82b3270a-a43c-4474-beb9-fbc8dfb4a167",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

+ 9 - 0
assets/resources/material.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "0e899cb9-8e87-4d31-8b21-271f48b050c0",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 29 - 0
assets/resources/material/loading.mtl

@@ -0,0 +1,29 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "82b3270a-a43c-4474-beb9-fbc8dfb4a167",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {}
+  ]
+}

+ 11 - 0
assets/resources/material/loading.mtl.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.0.21",
+  "importer": "material",
+  "imported": true,
+  "uuid": "f13ee46e-cdc1-46f6-a8f6-c43d34ac6276",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

+ 2 - 2
assets/script/framework/config/LayerConf.ts

@@ -25,6 +25,6 @@ export let Layer_Conf: { [key: number]: LayerConf } = {
     [ViewID.ServerList]: { bundle: "package", url: "prefab/login/ServerList", type: LayerType.UI, anim: false },
     [ViewID.GameWind]: { bundle: "package", url: "prefab/ui/GameUI", type: LayerType.UI, anim: false },
     
-    [ViewID.TowerUI]: { bundle: "package", url: "prefab/ui/tower/tower", type: LayerType.Game, anim: false },
-    [ViewID.ZombieUI]: { bundle: "package", url: "prefab/ui/tower/zombie", type: LayerType.Game, anim: false },
+    [ViewID.TowerUI]: { bundle: "package", url: "prefab/ui/tower/tower", type: LayerType.Game, anim: true },
+    [ViewID.ZombieUI]: { bundle: "package", url: "prefab/ui/tower/zombie", type: LayerType.Game, anim: true },
 };

+ 4 - 1
assets/script/framework/layer/BaseLayer.ts

@@ -186,7 +186,10 @@ export class BaseLayer extends Node {
                 anim.play(name);
                 return;
             }
-            console.error("ui:" + id + "缺少Animation组件");
+            else{
+                console.error("ui:" + id + "缺少Animation组件");
+                callback && callback();
+            }
         } else {
             callback && callback();
             callback = null;

+ 18 - 0
assets/script/game/config/ServergatewaylistConf.ts

@@ -0,0 +1,18 @@
+export namespace ServergatewaylistConf {
+    export const data = {
+        "debug": {
+                "Type": "debug",
+                "Desc": "测试地址",
+                "GateWayUrl": "http://172.31.244.30/login_new.php",
+                "Url1": "http://172.31.244.30/login_new.php",
+                "Url2": "http://172.31.244.30/login_new.php",
+                "Url3": "http://172.31.244.30/login_new.php",
+                "PlatForm": 1,
+                "NeedLvRep": 0,
+                "NeedLoginRep": 0,
+                "UseAlLogin": 0,
+                "UseObb": 0,
+                "UpdateOpen": 0
+        }
+    };
+}

+ 9 - 0
assets/script/game/config/ServergatewaylistConf.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "3bf1bf38-4ed5-4a93-b754-08d15ec92907",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 11 - 8
assets/script/game/ui/login/LoginUI.ts

@@ -32,7 +32,7 @@ export function getParameterByName(name) {
 export class LoginUI extends BaseView {
 	private _touchLogin = false;
 	private scene_back = null;
-
+	private loginData:any = null
 	protected onLoad() {
 		super.onLoad();
 		this._initPool();
@@ -60,6 +60,13 @@ export class LoginUI extends BaseView {
 		}, this);
 		Framework.audio.playMusic(AudioID.Game);
 
+		this.loginData = {
+			url:getParameterByName("url") ||"http://118.178.135.110/sdk/debug/login.php",
+			uid:getParameterByName("uid") ||"ttq3",
+			token:getParameterByName("token")
+		}
+
+		this.EditBox.box.string = this.loginData.uid
 
 		AppClue.init();
 
@@ -110,16 +117,12 @@ export class LoginUI extends BaseView {
 	onLogin() {
 		Framework.audio.playEffect(AudioID.Click);
 
-		let data = {
-			url:getParameterByName("url") ||"http://118.178.135.110/sdk/debug/login.php",
-			uid:getParameterByName("uid") ||"ttq3",
-			token:getParameterByName("token")
-		}
+		this.loginData.uid = this.EditBox.box.string
 
 		
 		Framework.layer.open(ViewID.LoadingUI, () => {
-			UserData.save_locally('UserID', data.uid)
-		}, data);
+			UserData.save_locally('UserID', this.loginData.uid)
+		}, this.loginData);
 		//
 		//登录游戏
 		// Framework.layer.close(this);

+ 1 - 0
assets/script/game/ui/login/MainUI.ts

@@ -31,6 +31,7 @@ export class MainUI extends BaseView {
 	onOpen() {
 		// this.mainRedDot();
 		Framework.layer.open(ViewID.TowerUI, null, (the) => {
+		// Framework.layer.open(ViewID.ZombieUI, null, (the) => {
 			this.GameUI[this.openGameUI] = the
 		});
 	}

+ 15 - 11
assets/script/game/ui/tower/node/Hero.ts

@@ -23,6 +23,8 @@ export class Hero extends BattleNodeBase {
     @property({ type: Node, tooltip: '枪' })
     gunNode: Node = null;
 
+    @property({ type: UITransform, tooltip: '点击框' })
+    clickBox: UITransform = null;
 
     //所属格子 -1表示暂无
     private _posID = -1;
@@ -57,6 +59,8 @@ export class Hero extends BattleNodeBase {
             this.attackBone = bone
             let rot = this.attackBone.rotation
         }
+
+        this.clickBox.setContentSize(this.modelSpine.getComponent(UITransform).contentSize)
     }
 
     start() {
@@ -128,23 +132,23 @@ export class Hero extends BattleNodeBase {
             // console.log("旋转角度:", rotationAngleDegrees);
             if(rotationAngleDegrees<67.5 || rotationAngleDegrees > 292.5){
                 this.attackBone.rotation = rotationAngleDegrees
-                if(this.modelSpine.animation != "fire_0")
-                    this.modelSpine.setAnimation(0, 'fire_0', true);
+                if(this.modelSpine.animation != "attack_right")
+                    this.modelSpine.setAnimation(0, 'attack_right', true);
             }
             else if(rotationAngleDegrees < 112.5){
                 this.attackBone.rotation = rotationAngleDegrees
-                if(this.modelSpine.animation != "fire_90")
-                    this.modelSpine.setAnimation(0, 'fire_90', true);
+                if(this.modelSpine.animation != "attack_right")
+                    this.modelSpine.setAnimation(0, 'attack_right', true);
             }
             else if(rotationAngleDegrees < 247.5){
                 this.attackBone.rotation = 180-rotationAngleDegrees
-                if(this.modelSpine.animation != "fire_180")
-                    this.modelSpine.setAnimation(0, 'fire_180', true);
+                if(this.modelSpine.animation != "attack_left")
+                    this.modelSpine.setAnimation(0, 'attack_left', true);
             }
             else if(rotationAngleDegrees < 292.5){
                 this.attackBone.rotation = rotationAngleDegrees
-                if(this.modelSpine.animation != "fire_270")
-                    this.modelSpine.setAnimation(0, 'fire_270', true);
+                if(this.modelSpine.animation != "attack_left")
+                    this.modelSpine.setAnimation(0, 'attack_left', true);
             }
         }
 
@@ -179,8 +183,8 @@ export class Hero extends BattleNodeBase {
         this.gunNode.active = true;
                 this.attackBone.rotation = 0
                 // this._attackCallback = null;
-        if(this.modelSpine.animation == "stand_0") return; 
-        this.modelSpine.setAnimation(0, 'stand_0', true);
+        if(this.modelSpine.animation == "stand_right") return; 
+        this.modelSpine.setAnimation(0, 'stand_right', true);
         // if(this.modelSpine.node.scale.x < 0)
         //     this.modelSpine.node.scale = new Vec3(-this.modelSpine.node.scale.x,this.modelSpine.node.scale.y,this.modelSpine.node.scale.z);
 
@@ -233,7 +237,7 @@ export class Hero extends BattleNodeBase {
     }
 
     hitTest(pos:Vec2){
-        return this.modelSpine.getComponent(UITransform).hitTest(pos);
+        return this.clickBox.hitTest(pos);
     }
 
     

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio