Merge branch 'master' of http://120.92.132.192:23541/TDGame/TDGameClient3D

# Conflicts:
#	assets/resources/configs/Sign.json.meta

assets/resources/configs/Sign.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.0",
   "importer": "json",
   "imported": true,
-  "uuid": "4066a6fc-5bee-4080-8c59-d4cda08c6264",
+  "uuid": "d2fa742b-d1d6-487e-b711-a105368678b5",
   "files": [
     ".json"
   ],

assets/resources/ui/FightingUI.prefab

@@ -44,23 +44,23 @@
         "__id__": 181
       },
       {
-        "__id__": 198
+        "__id__": 209
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 217
+        "__id__": 233
       },
       {
-        "__id__": 218
+        "__id__": 234
       },
       {
-        "__id__": 219
+        "__id__": 235
       }
     ],
     "_prefab": {
-      "__id__": 220
+      "__id__": 236
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -192,7 +192,7 @@
   },
   {
     "__type__": "cc.GraphicsComponent",
-    "_name": "",
+    "_name": "DrawingBoard<GraphicsComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 2
@@ -1266,8 +1266,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 3.784999999999968,
-      "y": -5.292999999999893,
+      "x": 4,
+      "y": -5,
       "z": 0
     },
     "_lrot": {
@@ -4387,8 +4387,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -315.5,
-      "y": 42.726,
+      "x": -315,
+      "y": 120,
       "z": 0
     },
     "_lrot": {
@@ -4832,9 +4832,9 @@
     "_alignFlags": 36,
     "_target": null,
     "_left": 0,
-    "_right": 640.5,
+    "_right": 640,
     "_top": 0,
-    "_bottom": 659.726,
+    "_bottom": 737,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -5090,7 +5090,7 @@
   },
   {
     "__type__": "cc.UITransformComponent",
-    "_name": "",
+    "_name": "Sprite<UITransformComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 163
@@ -5111,7 +5111,7 @@
   },
   {
     "__type__": "cc.SpriteComponent",
-    "_name": "",
+    "_name": "Sprite<SpriteComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 163
@@ -5585,19 +5585,22 @@
       },
       {
         "__id__": 191
+      },
+      {
+        "__id__": 195
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 195
+        "__id__": 206
       },
       {
-        "__id__": 196
+        "__id__": 207
       }
     ],
     "_prefab": {
-      "__id__": 197
+      "__id__": 208
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5704,7 +5707,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -304.542,
+      "x": -285,
       "y": 0,
       "z": 0
     },
@@ -5732,7 +5735,7 @@
   },
   {
     "__type__": "cc.UITransformComponent",
-    "_name": "",
+    "_name": "Bar<UITransformComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 183
@@ -5741,7 +5744,7 @@
     "_priority": 0,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 427,
+      "width": 570,
       "height": 37
     },
     "_anchorPoint": {
@@ -5753,7 +5756,7 @@
   },
   {
     "__type__": "cc.SpriteComponent",
-    "_name": "",
+    "_name": "Bar<SpriteComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 183
@@ -5804,7 +5807,7 @@
   },
   {
     "__type__": "cc.UITransformComponent",
-    "_name": "",
+    "_name": "ProgressBar<UITransformComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 182
@@ -5813,7 +5816,7 @@
     "_priority": 0,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 625,
+      "width": 585,
       "height": 52
     },
     "_anchorPoint": {
@@ -5825,7 +5828,7 @@
   },
   {
     "__type__": "cc.SpriteComponent",
-    "_name": "",
+    "_name": "ProgressBar<SpriteComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 182
@@ -5861,7 +5864,7 @@
   },
   {
     "__type__": "cc.ProgressBarComponent",
-    "_name": "",
+    "_name": "ProgressBar<ProgressBarComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 182
@@ -5871,8 +5874,8 @@
       "__id__": 185
     },
     "_mode": 0,
-    "_totalLength": 610,
-    "_progress": 0.7,
+    "_totalLength": 570,
+    "_progress": 1,
     "_reverse": false,
     "_id": ""
   },
@@ -6011,6 +6014,354 @@
       "serializable": false
     }
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "ButtonReplace",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 181
+    },
+    "_children": [
+      {
+        "__id__": 196
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 200
+      },
+      {
+        "__id__": 201
+      },
+      {
+        "__id__": 202
+      },
+      {
+        "__id__": 204
+      }
+    ],
+    "_prefab": {
+      "__id__": 205
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -368,
+      "y": -5,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1.25,
+      "y": 1,
+      "z": 1
+    },
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 195
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 197
+      },
+      {
+        "__id__": 198
+      }
+    ],
+    "_prefab": {
+      "__id__": 199
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -3,
+      "y": 5,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransformComponent",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 196
+    },
+    "_enabled": true,
+    "_priority": 0,
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 96,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelComponent",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 196
+    },
+    "_enabled": true,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_sharedMaterial": null,
+    "_useOriginalSize": true,
+    "_string": "更换栅栏",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 24,
+    "_fontSize": 24,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "bexIppphxB4YIBf3JjI2X9",
+    "sync": false,
+    "_synced": {
+      "default": false,
+      "serializable": false
+    }
+  },
+  {
+    "__type__": "cc.UITransformComponent",
+    "_name": "ButtonBackReal<UITransformComponent>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 195
+    },
+    "_enabled": true,
+    "_priority": 0,
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 130,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.SpriteComponent",
+    "_name": "ButtonBackReal<SpriteComponent>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 195
+    },
+    "_enabled": true,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_sharedMaterial": null,
+    "_spriteFrame": {
+      "__uuid__": "8e19f7f5-6397-4787-9cf7-9c1cd153edaa@f9941"
+    },
+    "_type": 1,
+    "_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.ButtonComponent",
+    "_name": "ButtonBackReal<ButtonComponent>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 195
+    },
+    "_enabled": true,
+    "clickEvents": [
+      {
+        "__id__": 203
+      }
+    ],
+    "_interactable": true,
+    "_transition": 2,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": {
+      "__uuid__": "8e19f7f5-6397-4787-9cf7-9c1cd153edaa@f9941"
+    },
+    "_hoverSprite": {
+      "__uuid__": "8e19f7f5-6397-4787-9cf7-9c1cd153edaa@f9941"
+    },
+    "_pressedSprite": {
+      "__uuid__": "8e19f7f5-6397-4787-9cf7-9c1cd153edaa@f9941"
+    },
+    "_disabledSprite": {
+      "__uuid__": "8e19f7f5-6397-4787-9cf7-9c1cd153edaa@f9941"
+    },
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 195
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "047e7uC4zVJdpjqMm8v6bej",
+    "handler": "ContinueGame",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.WidgetComponent",
+    "_name": "ButtonBackReal<WidgetComponent>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 195
+    },
+    "_enabled": true,
+    "_alignFlags": 20,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 15,
+    "_horizontalCenter": -368,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "50bftzGuBCsrufHjJYJBua",
+    "sync": false,
+    "_synced": {
+      "default": false,
+      "serializable": false
+    }
+  },
   {
     "__type__": "cc.UITransformComponent",
     "_name": "FenceUIGroup<UITransformComponent>",
@@ -6084,26 +6435,29 @@
     },
     "_children": [
       {
-        "__id__": 199
+        "__id__": 210
       },
       {
-        "__id__": 204
+        "__id__": 215
       },
       {
-        "__id__": 209
+        "__id__": 220
+      },
+      {
+        "__id__": 225
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 214
+        "__id__": 230
       },
       {
-        "__id__": 215
+        "__id__": 231
       }
     ],
     "_prefab": {
-      "__id__": 216
+      "__id__": 232
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6138,23 +6492,23 @@
     "_name": "kongtou_guang",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 198
+      "__id__": 209
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 200
+        "__id__": 211
       },
       {
-        "__id__": 201
+        "__id__": 212
       },
       {
-        "__id__": 202
+        "__id__": 213
       }
     ],
     "_prefab": {
-      "__id__": 203
+      "__id__": 214
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6189,7 +6543,7 @@
     "_name": "kongtou<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 199
+      "__id__": 210
     },
     "_enabled": true,
     "_priority": 0,
@@ -6210,7 +6564,7 @@
     "_name": "kongtou<SpriteComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 199
+      "__id__": 210
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -6246,7 +6600,7 @@
     "_name": "Bow<AnimationComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 199
+      "__id__": 210
     },
     "_enabled": true,
     "playOnLoad": true,
@@ -6274,23 +6628,23 @@
     "_name": "kongtou_san",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 198
+      "__id__": 209
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 205
+        "__id__": 216
       },
       {
-        "__id__": 206
+        "__id__": 217
       },
       {
-        "__id__": 207
+        "__id__": 218
       }
     ],
     "_prefab": {
-      "__id__": 208
+      "__id__": 219
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6325,7 +6679,7 @@
     "_name": "kongtou<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 204
+      "__id__": 215
     },
     "_enabled": true,
     "_priority": 0,
@@ -6346,7 +6700,7 @@
     "_name": "kongtou<SpriteComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 204
+      "__id__": 215
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -6382,7 +6736,7 @@
     "_name": "Bow<AnimationComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 204
+      "__id__": 215
     },
     "_enabled": true,
     "playOnLoad": true,
@@ -6410,23 +6764,23 @@
     "_name": "kongtou_bao",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 198
+      "__id__": 209
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 210
+        "__id__": 221
       },
       {
-        "__id__": 211
+        "__id__": 222
       },
       {
-        "__id__": 212
+        "__id__": 223
       }
     ],
     "_prefab": {
-      "__id__": 213
+      "__id__": 224
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6461,7 +6815,7 @@
     "_name": "kongtou<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 209
+      "__id__": 220
     },
     "_enabled": true,
     "_priority": 0,
@@ -6482,7 +6836,7 @@
     "_name": "kongtou<SpriteComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 209
+      "__id__": 220
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -6518,7 +6872,7 @@
     "_name": "Bow<AnimationComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 209
+      "__id__": 220
     },
     "_enabled": true,
     "playOnLoad": true,
@@ -6541,12 +6895,153 @@
       "serializable": false
     }
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 209
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 226
+      },
+      {
+        "__id__": 227
+      },
+      {
+        "__id__": 228
+      }
+    ],
+    "_prefab": {
+      "__id__": 229
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 5.296,
+      "y": -71.62,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransformComponent",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 225
+    },
+    "_enabled": true,
+    "_priority": 0,
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 82,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelComponent",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 225
+    },
+    "_enabled": true,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 224,
+      "b": 0,
+      "a": 255
+    },
+    "_sharedMaterial": null,
+    "_useOriginalSize": true,
+    "_string": "限时空投",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutlineComponent",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 225
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 92,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "b0uqc1y2VBx7e+RaU3e7cy",
+    "sync": false,
+    "_synced": {
+      "default": false,
+      "serializable": false
+    }
+  },
   {
     "__type__": "cc.UITransformComponent",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 198
+      "__id__": 209
     },
     "_enabled": true,
     "_priority": 0,
@@ -6567,7 +7062,7 @@
     "_name": "Kongtou<AnimationComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 198
+      "__id__": 209
     },
     "_enabled": true,
     "playOnLoad": false,

assets/resources/ui/KongtouTip.anim

@@ -8,26 +8,144 @@
     "speed": 1,
     "wrapMode": 2,
     "events": [],
-    "_duration": 1,
+    "_duration": 15.133333333333333,
     "_keys": [
       [
         0,
-        0.5,
-        1
+        3.0166666666666666,
+        15.133333333333333
       ],
       [
         0,
         0.25,
         0.5,
         0.75,
-        1
+        1,
+        1.25,
+        1.5,
+        1.75,
+        2,
+        2.25,
+        2.5,
+        2.75,
+        3.0166666666666666,
+        3.2666666666666666,
+        3.5166666666666666,
+        3.7666666666666666,
+        4.016666666666667,
+        4.266666666666667,
+        4.516666666666667,
+        4.766666666666667,
+        5.016666666666667,
+        5.266666666666667,
+        5.516666666666667,
+        5.766666666666667,
+        6.033333333333333,
+        6.283333333333333,
+        6.533333333333333,
+        6.783333333333333,
+        7.033333333333333,
+        7.283333333333333,
+        7.533333333333333,
+        7.783333333333333,
+        8.033333333333333,
+        8.283333333333333,
+        8.533333333333333,
+        8.783333333333333,
+        9.016666666666667,
+        9.266666666666667,
+        9.516666666666667,
+        9.766666666666667,
+        10.016666666666667,
+        10.266666666666667,
+        10.516666666666667,
+        10.766666666666667,
+        11.016666666666667,
+        11.266666666666667,
+        11.516666666666667,
+        11.766666666666667,
+        12,
+        12.25,
+        12.5,
+        12.75,
+        13,
+        13.25,
+        13.5,
+        13.75,
+        14,
+        14.25,
+        14.5,
+        14.75,
+        15.133333333333333
       ],
       [
         0,
         0.25,
         0.5,
         0.75,
-        1
+        1,
+        1.25,
+        1.5,
+        1.75,
+        2,
+        2.25,
+        2.5,
+        2.75,
+        3.0166666666666666,
+        3.2666666666666666,
+        3.5166666666666666,
+        3.7666666666666666,
+        4.016666666666667,
+        4.266666666666667,
+        4.516666666666667,
+        4.766666666666667,
+        5.016666666666667,
+        5.266666666666667,
+        5.516666666666667,
+        5.766666666666667,
+        6.033333333333333,
+        6.283333333333333,
+        6.533333333333333,
+        6.783333333333333,
+        7.033333333333333,
+        7.283333333333333,
+        7.533333333333333,
+        7.783333333333333,
+        8.033333333333333,
+        8.283333333333333,
+        8.533333333333333,
+        8.783333333333333,
+        9.016666666666667,
+        9.266666666666667,
+        9.516666666666667,
+        9.766666666666667,
+        10.016666666666667,
+        10.266666666666667,
+        10.516666666666667,
+        10.766666666666667,
+        11.016666666666667,
+        11.266666666666667,
+        11.516666666666667,
+        11.766666666666667,
+        12,
+        12.25,
+        12.5,
+        12.75,
+        13,
+        13.25,
+        13.5,
+        13.75,
+        14,
+        14.25,
+        14.5,
+        14.75,
+        15.133333333333333
+      ],
+      [
+        0,
+        5,
+        10.016666666666667,
+        15.133333333333333
       ]
     ],
     "_stepness": 0,
@@ -52,13 +170,13 @@
               "__type__": "cc.Vec3",
               "x": 0,
               "y": 0,
-              "z": -180
+              "z": -360
             },
             {
               "__type__": "cc.Vec3",
               "x": 0,
               "y": 0,
-              "z": -360
+              "z": -1800
             }
           ],
           "easingMethods": {}
@@ -103,49 +221,756 @@
               "x": 0,
               "y": 0,
               "z": 0
-            }
-          ],
-          "easingMethods": {}
-        }
-      },
-      {
-        "modifiers": [
-          {
-            "__id__": 3
-          },
-          "position"
-        ],
-        "data": {
-          "keys": 2,
-          "values": [
+            },
             {
               "__type__": "cc.Vec3",
               "x": 0,
-              "y": 95.03899999999999,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
               "z": 0
             },
             {
               "__type__": "cc.Vec3",
               "x": 0,
-              "y": 88.125,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
               "z": 0
             },
             {
               "__type__": "cc.Vec3",
               "x": 0,
-              "y": 95.03899999999999,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
               "z": 0
             },
             {
               "__type__": "cc.Vec3",
               "x": 0,
-              "y": 100.756,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
               "z": 0
             },
             {
               "__type__": "cc.Vec3",
               "x": 0,
-              "y": 95.03899999999999,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 3.079
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1.879
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            }
+          ],
+          "easingMethods": {}
+        }
+      },
+      {
+        "modifiers": [
+          {
+            "__id__": 3
+          },
+          "position"
+        ],
+        "data": {
+          "keys": 2,
+          "values": [
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 88.125,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 100.756,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            }
+          ],
+          "easingMethods": {}
+        }
+      },
+      {
+        "modifiers": [
+          "position"
+        ],
+        "data": {
+          "keys": 3,
+          "values": [
+            {
+              "__type__": "cc.Vec3",
+              "x": -501.326,
+              "y": 522.112,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 290.451,
+              "y": 339.195,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": -266.504,
+              "y": 156.197,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 502.4,
+              "y": -23.714,
               "z": 0
             }
           ],
@@ -154,7 +979,7 @@
       }
     ],
     "_commonTargets": [],
-    "_hash": 2931801843
+    "_hash": 1648756614
   },
   {
     "__type__": "cc.animation.HierarchyPath",

assets/scripts/games/models/GameConfigManager.ts

@@ -1,4 +1,4 @@
-import { JsonAsset } from "cc";
+import { JsonAsset, __internal } from "cc";
 
 
 export default class GameConfigManager
@@ -36,6 +36,11 @@ export default class GameConfigManager
      */
     private static ShopMap:Map<number,any>=new Map<number,any>();
 
+    /**
+     * 商城配置
+     */
+    private static SignMap:Map<number,any>=new Map<number,any>();
+
     /**
      * 商城列表
      */
@@ -66,6 +71,18 @@ export default class GameConfigManager
         this.InitSkillConfig();
         this.InitLevelConfig();
         this.initShopConfig();
+        this.InitSignConfig();
+    }
+
+    private static InitSignConfig():void{
+        if(this.jsonMap.has("Sign")==false){
+            return;
+        }
+        let jsonAsset:JsonAsset=this.GetConfig("Sign");
+        let list:any=jsonAsset.json;
+        list.forEach(element => {
+            this.SignMap.set(element.id,element);
+        });
     }
 
     private static InitGlobalConfig():void{
@@ -159,6 +176,17 @@ export default class GameConfigManager
         return null;
     }
 
+    /**
+     * 获取7日登录奖励
+     * @param id 
+     */
+    public static GetSignConfig(id:number):any{
+        if(this.SignMap.has(id)){
+            return this.SignMap.get(id);
+        }
+        return null;
+    }
+
     /**
      * 获取快速购买的武器ID
      * @param weaponId 

assets/scripts/games/models/GameModel.ts

@@ -536,6 +536,27 @@ export class GameModel extends DataModel {
         list[day-1]=1;
         this.DispatchEvent(DataModelEventType.PROPERTY_CHANGED,GamePropertys.signGetRecord);
         //发放奖励
+        let config:any=GameConfigManager.GetSignConfig(day);
+        //0.金币 1.钻石 2.枪 3.栅栏
+        switch (config.type) {
+            case 0:
+                this.gold+=config.number;
+                NoticeManager.ShowPrompt("金币+"+config.number);
+                break;
+            case 1:
+                this.diamond+=config.number;
+                NoticeManager.ShowPrompt("钻石+"+config.number);
+                break;
+            case 2:
+                let cell:WeaponCell=this.FindWeaponEmptyCell();
+                if(cell!=null){
+                    this.AddWeapon(cell.cellId,config.number);
+                }
+                break;
+            case 3:
+                this.currentFenceId=config.number;
+                break;
+        }
     }
 
     /**
@@ -555,7 +576,19 @@ export class GameModel extends DataModel {
     GetSignAwardIndex():number{
         for (let index = 0; index < this.signDay; index++) {
             if(this.GetSignAwardByDay(index+1)==0){
-                return index;
+                let config:any=GameConfigManager.GetSignConfig(index+1);
+                //0.金币 1.钻石 2.枪 3.栅栏
+                switch (config.type) {
+                    case 2:
+                        if(this.WeaponEmptyCellCount>0){
+                            return index;
+                        }else{
+                            NoticeManager.ShowPrompt("武器槽没有空位了！");
+                        }
+                        break;
+                    default:
+                        return index;
+                }
             }
         }
         return -1;