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

# Conflicts:
#	tower_sanguo/assets/resources/data/resList.json

tower_sanguo/assets/resources/data/resList.json

@@ -1,9 +1,5 @@
 [
 	{
-		"url": "font/font3",
-		"type": "font"
-	},
-	{
 		"url": "font/font1",
 		"type": "font"
 	},
@@ -16,67 +12,63 @@
 		"type": "font"
 	},
 	{
-		"url": "data/barrack_data",
-		"type": "json"
+		"url": "module/loading/loading",
+		"type": "prefab"
 	},
 	{
-		"url": "data/buff_data",
-		"type": "json"
+		"url": "module/main/main",
+		"type": "prefab"
 	},
 	{
-		"url": "data/commanderskill_data",
-		"type": "json"
+		"url": "music/Button_click",
+		"type": "mp3"
 	},
 	{
-		"url": "data/db_data",
-		"type": "json"
+		"url": "music/turntable1",
+		"type": "mp3"
 	},
 	{
-		"url": "data/fundes_data",
-		"type": "json"
+		"url": "music/victory",
+		"type": "mp3"
 	},
 	{
-		"url": "data/fetter_data",
-		"type": "json"
+		"url": "data/1",
+		"type": "bin"
 	},
 	{
-		"url": "data/item_data",
+		"url": "data/barrack_data",
 		"type": "json"
 	},
 	{
-		"url": "data/general_data",
+		"url": "data/buff_data",
 		"type": "json"
 	},
 	{
-		"url": "data/1",
-		"type": "bin"
-	},
-	{
-		"url": "data/openfun_data",
+		"url": "data/task_data",
 		"type": "json"
 	},
 	{
-		"url": "data/invest_data",
+		"url": "data/commanderskill_data",
 		"type": "json"
 	},
 	{
-		"url": "data/help_data",
+		"url": "data/db_data",
 		"type": "json"
 	},
 	{
-		"url": "data/skill_data",
+		"url": "data/fetter_data",
 		"type": "json"
 	},
 	{
-		"url": "data/resList",
+		"url": "data/general_data",
 		"type": "json"
 	},
 	{
-		"url": "data/serverConfig_data",
+		"url": "data/item_data",
 		"type": "json"
 	},
 	{
-		"url": "data/star_data",
+		"url": "data/help_data",
 		"type": "json"
 	},
 	{
@@ -84,50 +76,38 @@
 		"type": "json"
 	},
 	{
-		"url": "data/task_data",
+		"url": "data/monster_data",
 		"type": "json"
 	},
 	{
-		"url": "data/monster_data",
+		"url": "data/resList",
 		"type": "json"
 	},
 	{
-		"url": "data/turntable_data",
+		"url": "data/serverConfig_data",
 		"type": "json"
 	},
 	{
-		"url": "music/Button_click",
-		"type": "mp3"
+		"url": "data/skill_data",
+		"type": "json"
 	},
 	{
-		"url": "music/Get_gold",
-		"type": "mp3"
+		"url": "data/star_data",
+		"type": "json"
 	},
 	{
-		"url": "music/turntable_2",
-		"type": "mp3"
+		"url": "data/turntable_data",
+		"type": "json"
 	},
 	{
 		"url": "music/Sutra_PickUP",
 		"type": "wav"
 	},
 	{
-		"url": "music/turntable1",
-		"type": "mp3"
-	},
-	{
-		"url": "music/victory",
+		"url": "music/turntable_2",
 		"type": "mp3"
 	},
 	{
-		"url": "module/main/main",
-		"type": "prefab"
-	},
-	{
-		"url": "module/loading/loading",
-		"type": "prefab"
-	},
-	{
 		"url": "music/Background_music1",
 		"type": "mp3"
 	},
@@ -136,11 +116,11 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/main/texture/guan2",
-		"type": "texture"
+		"url": "module/main/prefab/headinfo",
+		"type": "prefab"
 	},
 	{
-		"url": "module/main/texture/guan1",
+		"url": "module/main/texture/guan2",
 		"type": "texture"
 	},
 	{
@@ -148,27 +128,27 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/main/prefab/headinfo",
-		"type": "prefab"
+		"url": "module/main/texture/guan4",
+		"type": "texture"
 	},
 	{
-		"url": "module/main/texture/guan4",
+		"url": "module/main/texture/guan1",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/prefab/attack_flash",
+		"url": "module/fight/prefab/attack_light",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_skill",
+		"url": "module/fight/prefab/attack_flash",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_skill_wall",
+		"url": "module/fight/prefab/attack_skill",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_light",
+		"url": "module/fight/prefab/attack_normal",
 		"type": "prefab"
 	},
 	{
@@ -176,7 +156,7 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_normal",
+		"url": "module/fight/prefab/attack_skill_wall",
 		"type": "prefab"
 	},
 	{
@@ -192,31 +172,27 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/general_game",
-		"type": "prefab"
-	},
-	{
-		"url": "module/fight/prefab/mission_over",
+		"url": "module/fight/prefab/bar_monster",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/bar_monster",
+		"url": "module/fight/prefab/hp_tips",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/monster",
+		"url": "module/fight/prefab/mission_start",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/hp_tips",
+		"url": "module/fight/prefab/node_skill",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/mission_start",
+		"url": "module/fight/prefab/general_game",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/node_skill",
+		"url": "module/fight/prefab/star_general",
 		"type": "prefab"
 	},
 	{
@@ -224,7 +200,11 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/prefab/star_general",
+		"url": "module/fight/prefab/monster",
+		"type": "prefab"
+	},
+	{
+		"url": "module/fight/prefab/mission_over",
 		"type": "prefab"
 	},
 	{
@@ -264,19 +244,19 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/texture/fight_2",
+		"url": "module/fight/texture/fight_1",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_1",
+		"url": "module/fight/texture/fight_2",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_4",
+		"url": "module/fight/texture/fight_3",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_3",
+		"url": "module/fight/texture/fight_4",
 		"type": "texture"
 	},
 	{
@@ -308,11 +288,11 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/attack_full/fight_skill_dun_2",
+		"url": "module/fight/spine/attack_full/fight_skill_dun_1",
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/attack_full/fight_skill_dun_1",
+		"url": "module/fight/spine/attack_full/fight_skill_dun_2",
 		"type": "spine"
 	},
 	{
@@ -320,11 +300,11 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/attack_full/fight_skill_shitou_2",
+		"url": "module/fight/spine/attack_full/fight_skill_shitou_1",
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/attack_full/fight_skill_shitou_1",
+		"url": "module/fight/spine/attack_full/fight_skill_shitou_2",
 		"type": "spine"
 	},
 	{
@@ -336,11 +316,11 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/texture/skill/buff1",
+		"url": "module/fight/texture/skill/buff2",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/buff2",
+		"url": "module/fight/texture/skill/buff1",
 		"type": "texture"
 	},
 	{
@@ -356,11 +336,11 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill01",
+		"url": "module/fight/texture/skill/buff6",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/buff6",
+		"url": "module/fight/texture/skill/skill01",
 		"type": "texture"
 	},
 	{
@@ -368,19 +348,19 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill04",
+		"url": "module/fight/texture/skill/skill02",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill02",
+		"url": "module/fight/texture/skill/skill04",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill06",
+		"url": "module/fight/texture/skill/skill05",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill05",
+		"url": "module/fight/texture/skill/skill06",
 		"type": "texture"
 	}
 ]

tower_sanguo/assets/resources/module/redEnvelopes/TopScale.anim

@@ -0,0 +1,49 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "TopScale",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.16666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "props": {
+      "scale": [
+        {
+          "frame": 0,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 1
+          }
+        },
+        {
+          "frame": 0.08333333333333333,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 0
+          }
+        },
+        {
+          "frame": 0.1,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": -1
+          }
+        },
+        {
+          "frame": 0.16666666666666666,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": -1
+          }
+        }
+      ]
+    }
+  },
+  "events": []
+}

tower_sanguo/assets/resources/module/redEnvelopes/TopScale.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "7212db11-a5ca-4073-8180-a5d89d3b88a8",
+  "subMetas": {}
+}

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

@@ -24,14 +24,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 59
       },
       {
-        "__id__": 47
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 61
     },
     "_opacity": 255,
     "_color": {
@@ -95,11 +95,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 58
     },
     "_opacity": 255,
     "_color": {
@@ -163,20 +163,20 @@
         "__id__": 15
       },
       {
-        "__id__": 24
+        "__id__": 37
       },
       {
-        "__id__": 35
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -718,12 +718,24 @@
       },
       {
         "__id__": 20
+      },
+      {
+        "__id__": 23
+      },
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 33
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 23
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -903,7 +915,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "spr_box",
+    "_name": "hb3",
     "_objFlags": 0,
     "_parent": {
       "__id__": 15
@@ -928,6 +940,456 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
+      "width": 578,
+      "height": 701
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        67.071,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "671f8ee9-022c-4ee0-96a7-4b8ecf3cabad"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
+    },
+    "fileId": "fbiMVvF8hI1qiKdSiDxAaI",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hb5",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 15
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 24
+      }
+    ],
+    "_prefab": {
+      "__id__": 25
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 586,
+      "height": 437
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -289,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "4a110797-9064-4e58-9b44-402d3af993b3"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
+    },
+    "fileId": "26nUlPC0NA26JwdIzPX47v",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hb1",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 15
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": {
+      "__id__": 28
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 584,
+      "height": 578
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -4.814,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 26
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "1824f01b-115d-4d1c-a30b-3d62c7798f84"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
+    },
+    "fileId": "224vu+buJOgKMWLZAWfykO",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hb2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 15
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 31
+      }
+    ],
+    "_prefab": {
+      "__id__": 32
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 602,
+      "height": 325
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 1
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        437.83,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 29
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "5f1c4259-1a08-410a-8a64-87b1fc0bf79c"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 29
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "7212db11-a5ca-4073-8180-a5d89d3b88a8"
+    },
+    "_clips": [
+      {
+        "__uuid__": "7212db11-a5ca-4073-8180-a5d89d3b88a8"
+      }
+    ],
+    "playOnLoad": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
+    },
+    "fileId": "1cJVKSUGdHQYNqjGIenfTh",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "spr_box",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 15
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 34
+      }
+    ],
+    "_prefab": {
+      "__id__": 35
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
       "width": 100,
       "height": 100
     },
@@ -970,7 +1432,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1026,19 +1488,19 @@
     },
     "_children": [
       {
-        "__id__": 25
+        "__id__": 38
       },
       {
-        "__id__": 28
+        "__id__": 41
       },
       {
-        "__id__": 31
+        "__id__": 44
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 34
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1092,17 +1554,17 @@
     "_name": "node_box",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 37
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1156,7 +1618,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1199,17 +1661,17 @@
     "_name": "spr_reward_icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 37
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1263,7 +1725,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 41
     },
     "_enabled": true,
     "_materials": [
@@ -1306,17 +1768,17 @@
     "_name": "lbl_reward_count",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 37
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 46
     },
     "_opacity": 255,
     "_color": {
@@ -1370,7 +1832,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1430,20 +1892,20 @@
     },
     "_children": [
       {
-        "__id__": 36
+        "__id__": 49
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 52
       },
       {
-        "__id__": 40
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -1476,7 +1938,7 @@
         1,
         1,
         1,
-        0
+        1
       ]
     },
     "_eulerAngles": {
@@ -1497,17 +1959,17 @@
     "_name": "lbl_desc",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 35
+      "__id__": 48
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 51
     },
     "_opacity": 255,
     "_color": {
@@ -1561,7 +2023,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 49
     },
     "_enabled": true,
     "_materials": [
@@ -1604,7 +2066,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1636,7 +2098,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 48
     },
     "_enabled": true,
     "_normalMaterial": {
@@ -1829,7 +2291,7 @@
     "_enabled": true,
     "mask_type": 1,
     "close_node": {
-      "__id__": 35
+      "__id__": 48
     },
     "design_block_node": null,
     "use_modal": true,
@@ -1848,7 +2310,7 @@
       "__id__": 16
     },
     "spr_box": {
-      "__id__": 21
+      "__id__": 34
     },
     "spr_reward_icon": null,
     "lbl_reward_count": null,

tower_sanguo/assets/resources/module/redEnvelopes/texture.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "ee3b76ef-9917-44d4-847e-3efdb77ad246",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/redEnvelopes/texture/hb1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "9148ba0a-d3eb-4f24-a38a-6c9afc1a18c0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 584,
+  "height": 578,
+  "platformSettings": {},
+  "subMetas": {
+    "hb1": {
+      "ver": "1.0.4",
+      "uuid": "1824f01b-115d-4d1c-a30b-3d62c7798f84",
+      "rawTextureUuid": "9148ba0a-d3eb-4f24-a38a-6c9afc1a18c0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 584,
+      "height": 578,
+      "rawWidth": 584,
+      "rawHeight": 578,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/redEnvelopes/texture/hb2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "784fb8a7-b529-4fca-a0b9-5eb73817db60",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 602,
+  "height": 325,
+  "platformSettings": {},
+  "subMetas": {
+    "hb2": {
+      "ver": "1.0.4",
+      "uuid": "5f1c4259-1a08-410a-8a64-87b1fc0bf79c",
+      "rawTextureUuid": "784fb8a7-b529-4fca-a0b9-5eb73817db60",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 602,
+      "height": 325,
+      "rawWidth": 602,
+      "rawHeight": 325,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/redEnvelopes/texture/hb3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "4c21182b-60d4-4f00-914c-68350f8b696c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 578,
+  "height": 701,
+  "platformSettings": {},
+  "subMetas": {
+    "hb3": {
+      "ver": "1.0.4",
+      "uuid": "671f8ee9-022c-4ee0-96a7-4b8ecf3cabad",
+      "rawTextureUuid": "4c21182b-60d4-4f00-914c-68350f8b696c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 578,
+      "height": 701,
+      "rawWidth": 578,
+      "rawHeight": 701,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/redEnvelopes/texture/hb4.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "562279cd-078d-4c5a-a416-f12f68f67080",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 533,
+  "height": 699,
+  "platformSettings": {},
+  "subMetas": {
+    "hb4": {
+      "ver": "1.0.4",
+      "uuid": "cb47d4d7-60e8-49dc-85d4-7ae23d306ab3",
+      "rawTextureUuid": "562279cd-078d-4c5a-a416-f12f68f67080",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 533,
+      "height": 699,
+      "rawWidth": 533,
+      "rawHeight": 699,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/redEnvelopes/texture/hb5.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "f44eff16-a525-443f-8ee7-16bfd25dd5ce",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 586,
+  "height": 437,
+  "platformSettings": {},
+  "subMetas": {
+    "hb5": {
+      "ver": "1.0.4",
+      "uuid": "4a110797-9064-4e58-9b44-402d3af993b3",
+      "rawTextureUuid": "f44eff16-a525-443f-8ee7-16bfd25dd5ce",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 586,
+      "height": 437,
+      "rawWidth": 586,
+      "rawHeight": 437,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/redEnvelopes/texture/hb_bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "7fde5b4c-5b5d-40f9-8706-c4343c0bdb6a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 382,
+  "height": 102,
+  "platformSettings": {},
+  "subMetas": {
+    "hb_bg": {
+      "ver": "1.0.4",
+      "uuid": "26d7e393-fc2b-4c06-899f-fab0e147b443",
+      "rawTextureUuid": "7fde5b4c-5b5d-40f9-8706-c4343c0bdb6a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 382,
+      "height": 102,
+      "rawWidth": 382,
+      "rawHeight": 102,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/redEnvelopes/texture/icon_hb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "2e437793-c797-491b-8ebf-e671353ea047",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 65,
+  "height": 83,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_hb": {
+      "ver": "1.0.4",
+      "uuid": "35765427-ec81-44f9-b169-9164dc412be3",
+      "rawTextureUuid": "2e437793-c797-491b-8ebf-e671353ea047",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 65,
+      "height": 83,
+      "rawWidth": 65,
+      "rawHeight": 83,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/redEnvelopes/texture/word1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "92ca7a62-08bf-46ce-b1cd-3ceeedf0c82f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 308,
+  "height": 66,
+  "platformSettings": {},
+  "subMetas": {
+    "word1": {
+      "ver": "1.0.4",
+      "uuid": "821a7e1c-5ec1-46a6-8d47-ab130acaa858",
+      "rawTextureUuid": "92ca7a62-08bf-46ce-b1cd-3ceeedf0c82f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 308,
+      "height": 66,
+      "rawWidth": 308,
+      "rawHeight": 66,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/redEnvelopes/texture/word2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "cf0b5c94-78fd-49aa-8b8f-efbda90415d0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 476,
+  "height": 69,
+  "platformSettings": {},
+  "subMetas": {
+    "word2": {
+      "ver": "1.0.4",
+      "uuid": "15915d7f-1f30-40a9-94d1-b58b47080f62",
+      "rawTextureUuid": "cf0b5c94-78fd-49aa-8b8f-efbda90415d0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 476,
+      "height": 69,
+      "rawWidth": 476,
+      "rawHeight": 69,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/task.prefab

@@ -2197,7 +2197,7 @@
       "y": 0
     },
     "_fillStart": 0,
-    "_fillRange": 0.4,
+    "_fillRange": 0,
     "_isTrimmedMode": true,
     "_atlas": null,
     "_id": ""
@@ -2417,7 +2417,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 45.63,
+      "width": 22.81,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -2468,8 +2468,8 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "40",
-    "_N$string": "40",
+    "_string": "0",
+    "_N$string": "0",
     "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -5835,7 +5835,7 @@
     "asset": {
       "__uuid__": "f262394b-b17a-454c-abb4-17ad1bd0abf6"
     },
-    "fileId": "82WczDFvdP2YSxoYrnIlsY",
+    "fileId": "b1j//y/gtOWa8SZ5LJThEu",
     "sync": false
   },
   {

tower_sanguo/assets/scripts/data/GameData.ts

@@ -17,6 +17,7 @@ import MonsterVO from "../vo/MonsterVO";
 import PlayerVO from "../vo/PlayerVO";
 import Prop from "../vo/Prop";
 import SkillVO from "../vo/SkillVO";
+import TaskVO from "../vo/TaskVO";
 import { GENERALPROP, GENERALSTATUS, ITEMTYPE, PLAYERPROP } from "./GameDefinition";
 
 const { ccclass } = cc._decorator;
@@ -56,6 +57,7 @@ export default class GameData {
     help_data: any;
     serverConfig_data: any;
     commanderskill_data: any;
+    private task_data: any;
 
     fullskillId: number[];
 
@@ -78,6 +80,7 @@ export default class GameData {
             this.serverConfig_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/serverConfig_data.json?v=' + new Date().getTime());
             this.help_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/help_data.json?v=' + new Date().getTime());
             this.commanderskill_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/commanderskill_data.json?v=' + new Date().getTime());
+            this.task_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/task_data.json?v=' + new Date().getTime());
             this.turntable_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/turntable_data.json?v=' + new Date().getTime());
 
             // this.db_data = cc.loader.getRes("data/db_data", cc.JsonAsset).json;
@@ -93,6 +96,7 @@ export default class GameData {
             // this.star_data = cc.loader.getRes("data/star_data", cc.JsonAsset).json;
             // this.help_data = cc.loader.getRes("data/help_data", cc.JsonAsset).json;
             // this.turntable_data = cc.loader.getRes("data/turntable_data", cc.JsonAsset).json;
+            // this.task_data = cc.loader.getRes("data/task_data", cc.JsonAsset).json;
             // this.commanderskill_data = cc.loader.getRes("data/commanderskill_data", cc.JsonAsset).json;
 
             this.initJsonData();
@@ -289,10 +293,25 @@ export default class GameData {
         }
 
         turntableModel.Instance.turntable_data = this.turntable_data;
-
+        // 任务
+        this.initTaskData();
         GameController.initSDK();
     }
-
+    /** 初始化任务 */
+    private initTaskData() {
+        for (let i in this.task_data) {
+            let o = this.task_data[i];
+            let vo = new TaskVO();
+            vo.id = o.id;
+            vo.description = o.description;
+            vo.count1 = o.count1;
+            vo.activevalue1 = o.activevalue1;
+            vo.count2 = o.count2;
+            vo.activevalue2 = o.activevalue2;
+            this.task_data[i] = vo;
+        }
+        cc.log(this.task_data)
+    }
     getAllGeneral() {
         return this.general_data;
     }

tower_sanguo/assets/scripts/vo/TaskVO.ts

@@ -0,0 +1,18 @@
+
+export default class TaskVO {
+    constructor() {
+
+    }
+
+    id: number;
+    /** 任务描述 */
+    description: number;
+    /** 任务条件1 */
+    count1: number;
+    /** 奖励的活跃值1 */
+    activevalue1: number;
+    /** 任务条件2 */
+    count2: number;
+    /** 奖励的活跃值2 */
+    activevalue2: number;
+}

tower_sanguo/assets/scripts/vo/TaskVO.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "2e35114f-26c8-4ad8-9c80-07907e119f24",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}