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

assets/d3d/gunFire/zhuodan.fbx.meta

@@ -80,12 +80,12 @@
         "events": []
       }
     },
-    "adacb": {
+    "a55e7": {
       "importer": "gltf-embeded-image",
-      "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb",
+      "uuid": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7",
       "displayName": "",
-      "id": "adacb",
-      "name": "file2.image",
+      "id": "a55e7",
+      "name": "5555.png.image",
       "ver": "1.0.2",
       "imported": true,
       "files": [
@@ -118,7 +118,7 @@
         "premultiplyAlpha": false,
         "anisotropy": 1,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb"
+        "imageUuidOrDatabaseUri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7"
       }
     },
     "826f3": {
@@ -141,8 +141,8 @@
   "userData": {
     "imageMetas": [
       {
-        "name": "file2",
-        "uri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@adacb"
+        "name": "5555.png",
+        "uri": "7c735b05-1052-417a-bab4-49dbefdbb9fc@a55e7"
       }
     ],
     "animationImportSettings": [

assets/d3d/weapons/qiang1/qiang01.mtl

@@ -20,18 +20,13 @@
         ]
       },
       "depthStencilState": {},
-      "rasterizerState": {}
+      "rasterizerState": {
+        "cullMode": 0
+      }
     }
   ],
   "_props": [
     {
-      "rimLightColor": {
-        "__type__": "cc.Color",
-        "r": 253,
-        "g": 5,
-        "b": 5,
-        "a": 32
-      },
       "alphaThreshold": 0,
       "mainTexture": {
         "__uuid__": "5185236e-7939-43b1-b204-5069c5e6f48d@6c48a"

assets/d3d/weapons/qiang1/qiang02.mtl

@@ -20,7 +20,9 @@
         ]
       },
       "depthStencilState": {},
-      "rasterizerState": {}
+      "rasterizerState": {
+        "cullMode": 0
+      }
     }
   ],
   "_props": [

assets/resources/configs/Monsters.json

@@ -6,7 +6,7 @@
         "moveAnimation": "Walk",
         "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1,
+        "attackAnimationSpeed": 1.2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -26,11 +26,11 @@
     {
         "id": 20101002,
         "prefab": "d3d/monsters/guai_0101",
-        "moveSpeed": 4,
+        "moveSpeed": 1.2,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 1.2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -74,9 +74,9 @@
     {
         "id": 20201001,
         "prefab": "d3d/monsters/guai_0201",
-        "moveSpeed": 1.2,
+        "moveSpeed": 1,
         "moveAnimation": "Walk2",
-        "moveAnimationSpeed": 1.2,
+        "moveAnimationSpeed": 1,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1,
         "damageAnimation": "Damage",
@@ -98,11 +98,11 @@
     {
         "id": 20201002,
         "prefab": "d3d/monsters/guai_0201",
-        "moveSpeed": 4,
+        "moveSpeed": 1,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 1,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 1,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -146,11 +146,11 @@
     {
         "id": 20301001,
         "prefab": "d3d/monsters/guai_0301",
-        "moveSpeed": 1.2,
+        "moveSpeed": 2,
         "moveAnimation": "Walk",
-        "moveAnimationSpeed": 1.2,
+        "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1,
+        "attackAnimationSpeed": 2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -170,11 +170,11 @@
     {
         "id": 20301002,
         "prefab": "d3d/monsters/guai_0301",
-        "moveSpeed": 4,
+        "moveSpeed": 2,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -218,11 +218,11 @@
     {
         "id": 20401001,
         "prefab": "d3d/monsters/guai_0401",
-        "moveSpeed": 1.2,
+        "moveSpeed": 4,
         "moveAnimation": "Walk2",
-        "moveAnimationSpeed": 1.2,
+        "moveAnimationSpeed": 4,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1,
+        "attackAnimationSpeed": 4,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -244,9 +244,9 @@
         "prefab": "d3d/monsters/guai_0401",
         "moveSpeed": 4,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 4,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 4,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -294,7 +294,7 @@
         "moveAnimation": "Walk",
         "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1,
+        "attackAnimationSpeed": 1.2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -314,11 +314,11 @@
     {
         "id": 20501002,
         "prefab": "d3d/monsters/guai_0501",
-        "moveSpeed": 4,
+        "moveSpeed": 1.2,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 1.2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -362,11 +362,11 @@
     {
         "id": 20601001,
         "prefab": "d3d/monsters/guai_0601",
-        "moveSpeed": 1.2,
+        "moveSpeed": 2,
         "moveAnimation": "Walk2",
-        "moveAnimationSpeed": 1.2,
+        "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1,
+        "attackAnimationSpeed": 2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -386,11 +386,11 @@
     {
         "id": 20601002,
         "prefab": "d3d/monsters/guai_0601",
-        "moveSpeed": 4,
+        "moveSpeed": 2,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -434,11 +434,11 @@
     {
         "id": 20901001,
         "prefab": "d3d/monsters/guai_0901",
-        "moveSpeed": 1.2,
+        "moveSpeed": 0.8,
         "moveAnimation": "Walk",
-        "moveAnimationSpeed": 1.2,
+        "moveAnimationSpeed": 0.8,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1,
+        "attackAnimationSpeed": 0.8,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -458,11 +458,11 @@
     {
         "id": 20901002,
         "prefab": "d3d/monsters/guai_0901",
-        "moveSpeed": 4,
+        "moveSpeed": 0.8,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 0.8,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 0.8,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -506,11 +506,11 @@
     {
         "id": 21001001,
         "prefab": "d3d/monsters/guai_1001",
-        "moveSpeed": 1.2,
+        "moveSpeed": 2,
         "moveAnimation": "Walk2",
-        "moveAnimationSpeed": 1.2,
+        "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1,
+        "attackAnimationSpeed": 2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -530,11 +530,11 @@
     {
         "id": 21001002,
         "prefab": "d3d/monsters/guai_1001",
-        "moveSpeed": 4,
+        "moveSpeed": 2,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -582,7 +582,7 @@
         "moveAnimation": "Walk",
         "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1,
+        "attackAnimationSpeed": 1.2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -602,11 +602,11 @@
     {
         "id": 21101002,
         "prefab": "d3d/monsters/guai_1101",
-        "moveSpeed": 4,
+        "moveSpeed": 1.2,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 1.2,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 1.2,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -650,11 +650,11 @@
     {
         "id": 21201001,
         "prefab": "d3d/monsters/guai_1201",
-        "moveSpeed": 1.2,
+        "moveSpeed": 3,
         "moveAnimation": "Walk2",
-        "moveAnimationSpeed": 1.2,
+        "moveAnimationSpeed": 3,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1,
+        "attackAnimationSpeed": 3,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -674,11 +674,11 @@
     {
         "id": 21201002,
         "prefab": "d3d/monsters/guai_1201",
-        "moveSpeed": 4,
+        "moveSpeed": 3,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 3,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 3,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",
@@ -722,9 +722,9 @@
     {
         "id": 21401001,
         "prefab": "d3d/monsters/guai_1401",
-        "moveSpeed": 1.2,
+        "moveSpeed": 1,
         "moveAnimation": "Walk",
-        "moveAnimationSpeed": 1.2,
+        "moveAnimationSpeed": 1,
         "attackAnimation": "Attack",
         "attackAnimationSpeed": 1,
         "damageAnimation": "Damage",
@@ -746,11 +746,11 @@
     {
         "id": 21401002,
         "prefab": "d3d/monsters/guai_1401",
-        "moveSpeed": 4,
+        "moveSpeed": 1,
         "moveAnimation": "Run",
-        "moveAnimationSpeed": 1.3,
+        "moveAnimationSpeed": 1,
         "attackAnimation": "Attack",
-        "attackAnimationSpeed": 1.5,
+        "attackAnimationSpeed": 1,
         "damageAnimation": "Damage",
         "damageAnimationSpeed": 1,
         "dieAnimation": "Die",

assets/resources/configs/Weapons.json

@@ -26,6 +26,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 11,
         "consumeDiamond": 1,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -60,6 +61,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 12,
         "consumeDiamond": 3,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -94,6 +96,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 13,
         "consumeDiamond": 5,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -128,6 +131,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 14,
         "consumeDiamond": 7,
+        "desc": "超大威力 慢射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -162,6 +166,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 15,
         "consumeDiamond": 9,
+        "desc": "超快射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -196,6 +201,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 16,
         "consumeDiamond": 12,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -230,6 +236,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 17,
         "consumeDiamond": 15,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -264,6 +271,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 18,
         "consumeDiamond": 18,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -298,6 +306,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 19,
         "consumeDiamond": 21,
+        "desc": "超大威力 慢射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -332,6 +341,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 20,
         "consumeDiamond": 24,
+        "desc": "超大威力 慢射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -366,6 +376,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 21,
         "consumeDiamond": 27,
+        "desc": "超快射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -400,6 +411,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 22,
         "consumeDiamond": 30,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -434,6 +446,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 23,
         "consumeDiamond": 34,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -468,6 +481,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 24,
         "consumeDiamond": 38,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -502,6 +516,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 25,
         "consumeDiamond": 42,
+        "desc": "超大威力 穿透",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -536,6 +551,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 26,
         "consumeDiamond": 46,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -570,6 +586,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 27,
         "consumeDiamond": 50,
+        "desc": "超大威力 慢射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -604,6 +621,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 28,
         "consumeDiamond": 55,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -638,6 +656,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 29,
         "consumeDiamond": 60,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -672,6 +691,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 65,
+        "desc": "超大威力 慢射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -706,6 +726,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 70,
+        "desc": "超快射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -740,6 +761,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 75,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -774,6 +796,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 80,
+        "desc": "超大威力 慢射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -808,6 +831,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 86,
+        "desc": "超大威力 穿透",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -842,6 +866,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 92,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -876,6 +901,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 98,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -910,6 +936,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 104,
+        "desc": "超快射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -944,6 +971,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 110,
+        "desc": "超大威力 慢射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -978,6 +1006,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 117,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1012,6 +1041,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 124,
+        "desc": "超大威力 慢射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1046,6 +1076,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 131,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1080,6 +1111,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 140,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1114,6 +1146,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 149,
+        "desc": "超快射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1148,6 +1181,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 158,
+        "desc": "超大威力 穿透",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1182,6 +1216,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 167,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1216,6 +1251,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 176,
+        "desc": "超快射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1250,6 +1286,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 185,
+        "desc": "超大威力 慢射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1284,6 +1321,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 194,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1318,6 +1356,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 205,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1352,6 +1391,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 216,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1386,6 +1426,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 227,
+        "desc": "超大威力 穿透",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1420,6 +1461,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 240,
+        "desc": "超大弹夹",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1454,6 +1496,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 253,
+        "desc": "大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1488,6 +1531,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 266,
+        "desc": "超快射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1522,6 +1566,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 280,
+        "desc": "超大威力 穿透",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1556,6 +1601,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 294,
+        "desc": "超快射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1590,6 +1636,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 308,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1624,6 +1671,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 322,
+        "desc": "超大弹夹",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1658,6 +1706,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 336,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1692,6 +1741,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 350,
+        "desc": "超快射速",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1726,6 +1776,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 370,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1760,6 +1811,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 390,
+        "desc": "高射速 大威力",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1794,6 +1846,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 410,
+        "desc": "超大威力 穿透",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1828,6 +1881,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 430,
+        "desc": "超大弹夹",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1862,6 +1916,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 450,
+        "desc": "超大威力 穿透",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1896,6 +1951,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 470,
+        "desc": "超大弹夹",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1930,6 +1986,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 490,
+        "desc": "超大威力 穿透",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1964,6 +2021,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 510,
+        "desc": "超大弹夹",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -1998,6 +2056,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 550,
+        "desc": "超大威力 穿透",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,
@@ -2032,6 +2091,7 @@
         "coefficient": 1.26,
         "frequencyLimit": 30,
         "consumeDiamond": 600,
+        "desc": "超大弹夹",
         "fireAnimationEvents": [
             {
                 "frame": 0.1,

assets/resources/scenes/FightingScene.scene

@@ -150,10 +150,18 @@
       },
       {
         "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@50b81"
+      },
+      {
+        "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@67bb3"
+      },
+      {
+        "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@8c0dc"
       }
     ],
-    "_defaultClip": null,
-    "_id": "0fOXXlENFGwb2sMIx9CtL7"
+    "_defaultClip": {
+      "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@c2696"
+    },
+    "_id": "25yTsB/wFBCJYFX9FK31cT"
   },
   {
     "__type__": "cc.Node",
@@ -916,7 +924,7 @@
     },
     "_shadowCastingMode": 0,
     "_enableMorph": true,
-    "_id": "52d2aaA9ZL3a84CXSMK6Ly"
+    "_id": "dfK4Plnu5GRJjFB+9tq+P/"
   },
   {
     "__type__": "cc.ModelLightmapSettings",
@@ -1046,7 +1054,7 @@
     },
     "_shadowCastingMode": 0,
     "_enableMorph": true,
-    "_id": "7ao19WvPNKV6cuzIeVlXLo"
+    "_id": "c8URmU0ftDw7hBHejYBCvC"
   },
   {
     "__type__": "cc.ModelLightmapSettings",
@@ -1161,7 +1169,7 @@
     },
     "_shadowCastingMode": 0,
     "_enableMorph": true,
-    "_id": "ecb58oXURE3JAzp11nBcuZ"
+    "_id": "b7hLIwvFpFSaIVGK43v9Mr"
   },
   {
     "__type__": "cc.ModelLightmapSettings",
@@ -1263,10 +1271,18 @@
       },
       {
         "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@50b81"
+      },
+      {
+        "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@67bb3"
+      },
+      {
+        "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@8c0dc"
       }
     ],
-    "_defaultClip": null,
-    "_id": "197VnXU2lFeY0col8wgAVR"
+    "_defaultClip": {
+      "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@c2696"
+    },
+    "_id": "2cG+L9EnlJTZBGH8sNec0Y"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1745,7 +1761,7 @@
     },
     "_shadowCastingMode": 0,
     "_enableMorph": true,
-    "_id": "24QPkqlmtMZpdCd/foxBMj"
+    "_id": "89MUNkPoxHoLs0k9nBKMRv"
   },
   {
     "__type__": "cc.ModelLightmapSettings",
@@ -1875,7 +1891,7 @@
     },
     "_shadowCastingMode": 0,
     "_enableMorph": true,
-    "_id": "e4tFlL+/lFBY6nMB/QU9hx"
+    "_id": "f0RCQHOaFFfYNJ33eEViSk"
   },
   {
     "__type__": "cc.ModelLightmapSettings",
@@ -1990,7 +2006,7 @@
     },
     "_shadowCastingMode": 0,
     "_enableMorph": true,
-    "_id": "c6XpMfIKBAOYysJoufXFhq"
+    "_id": "63fjrONiZHdbkZs4/2yW7x"
   },
   {
     "__type__": "cc.ModelLightmapSettings",

assets/resources/ui/SpeedUpUI.prefab

@@ -4658,9 +4658,18 @@
     "timeLabel": {
       "__id__": 88
     },
-    "diamondLabel": {
+    "diamondCLabel": {
       "__id__": 56
     },
+    "glodLabel": {
+      "__id__": 119
+    },
+    "glodLabel1": {
+      "__id__": 123
+    },
+    "diamondLabel": {
+      "__id__": 141
+    },
     "_id": ""
   },
   {

assets/scripts/Platform/WeChat/WeChatPlatform.ts

@@ -154,12 +154,16 @@ export class WeChatPlatform extends BasePlatform {
      * @param num 
      */
     startBranchAnalytics(num: string): void {
-        if(this.wx){
-            this.wx.reportUserBehaviorBranchAnalytics({
-                branchId: 'BCBgAAoXHx5d0WLb_vUvr7',
-                branchDim: num,
-                eventType: 1
-            });
+        try {
+            if(this.wx){
+                this.wx.reportUserBehaviorBranchAnalytics({
+                    branchId: 'BCBgAAoXHx5d0WLb_vUvr7',
+                    branchDim: num,
+                    eventType: 1
+                });
+            }
+        } catch (error) {
+            
         }
     }
 
@@ -167,25 +171,33 @@ export class WeChatPlatform extends BasePlatform {
      * 成功
      */
     successBranchAnalytics(num: string): void {
-        if(this.wx){
-            this.wx.reportUserBehaviorBranchAnalytics({
-                branchId: 'BCBgAAoXHx5d0WLb_vUvr-',
-                branchDim: num,
-                eventType: 1
-            });
+        try {
+            if(this.wx){
+                this.wx.reportUserBehaviorBranchAnalytics({
+                    branchId: 'BCBgAAoXHx5d0WLb_vUvr-',
+                    branchDim: num,
+                    eventType: 1
+                });
+            }
+        } catch (error) {
+            
         }
     }
-
+    
     /**
      * 失败
      */
     failBranchAnalytics(num: string): void {
-        if(this.wx){
-            this.wx.reportUserBehaviorBranchAnalytics({
-                branchId: 'BCBgAAoXHx5d0WLb_vUvr9',
-                branchDim: num,
-                eventType: 1
-            });
+        try {
+            if(this.wx){
+                this.wx.reportUserBehaviorBranchAnalytics({
+                    branchId: 'BCBgAAoXHx5d0WLb_vUvr9',
+                    branchDim: num,
+                    eventType: 1
+                });
+            }
+        } catch (error) {
+            
         }
     }
 }

assets/scripts/games/ui/accelerates/AccelerateMediator.ts

@@ -3,12 +3,14 @@ import BufferManager from '../../../engines/buffers/BufferManager';
 import IBuffer from '../../../engines/buffers/IBuffer';
 import { GUIManager } from '../../../engines/gui/GUIManager';
 import { GUIMediator } from '../../../engines/gui/GUIMediator';
+import { DataModelEventType } from '../../../engines/models/DataModelEventType';
 import { NoticeManager } from '../../../engines/notices/NoticeManager';
 import StringUtils from '../../../engines/utils/StringUtils';
 import { PlatformManager } from '../../../Platform/PlatformManager';
 import AccelerateBuffer from '../../buffers/AccelerateBuffer';
 import GameConfigManager from '../../models/GameConfigManager';
 import { GameModel } from '../../models/GameModel';
+import { GamePropertys } from '../../models/GamePropertys';
 import { UIConst } from '../UIConst';
 const { ccclass, property } = _decorator;
 
@@ -28,7 +30,22 @@ export class AccelerateMediator extends GUIMediator {
     @property({
         type:LabelComponent
     })
-    diamondLabel:LabelComponent=null;
+    diamondCLabel:LabelComponent=null;
+
+    @property({
+        type: LabelComponent
+    })
+    glodLabel: LabelComponent = null;
+
+    @property({
+        type: LabelComponent
+    })
+    glodLabel1: LabelComponent = null;
+
+    @property({
+        type: LabelComponent
+    })
+    diamondLabel: LabelComponent = null;
 
     /**
      * 最大时间
@@ -44,14 +61,50 @@ export class AccelerateMediator extends GUIMediator {
 
     OnShow(data?:any):void{
         super.OnShow(data);
+
+        this.RefreshGlod();
+        this.RefreshDiamond();
         //消耗
-        this.diamondLabel.string=this.consume.toString();
+        this.diamondCLabel.string=this.consume.toString();
+
+        this.AddEvent();
     }
 
     OnHide():void{
-        
+        this.RemoveEvent();
     }
 
+    private AddEvent():void{
+        GameModel.single.AddEvent(DataModelEventType.PROPERTY_CHANGED, this, this.GameModelPropertyChanged, 0);
+    }
+
+    private RemoveEvent():void{
+        GameModel.single.RemoveEvent(DataModelEventType.PROPERTY_CHANGED, this, this.GameModelPropertyChanged);
+    }
+
+    private GameModelPropertyChanged(key: string): void {
+        switch (key) {
+            case GamePropertys.gold:
+                this.CallNextFrame(this.RefreshGlod.bind(this));
+                break;
+            case GamePropertys.diamond:
+                this.CallNextFrame(this.RefreshDiamond.bind(this));
+                break;
+        }
+    }
+
+    private RefreshGlod(): void {
+        if (this.glodLabel != null) {
+            this.glodLabel.string = StringUtils.numberUtilsEn(GameModel.single.gold);
+        }
+        this.glodLabel1.string = StringUtils.numberUtilsEn(GameModel.single.fullEarnings) + "/秒";
+    }
+
+    private RefreshDiamond(): void {
+        if (this.diamondLabel != null) {
+            this.diamondLabel.string = GameModel.single.diamond.toString();
+        }
+    }
 
     DiamondButtonClickHandler():void{
         if(GameModel.single.diamond>this.consume){

assets/scripts/games/ui/freeFences/FreeFenceMediator.ts

@@ -35,6 +35,8 @@ export class FreeFenceMediator extends GUIMediator {
     OnShow(data?:any):void{
         super.OnShow(data);
         this.AddEvent();
+        this.RefreshGlod();
+        this.RefreshDiamond();
     }
 
     OnHide():void{
@@ -92,13 +94,13 @@ export class FreeFenceMediator extends GUIMediator {
     private startGame():void{
          //隐藏
          GUIManager.single.Hide(UIConst.PREPARE_UI);
+         this.HideSelf();
          PlatformManager.hideBanner();
          SceneManager.single.Swicth("FightingScene");
          let weChat = PlatformManager.impl as WeChatPlatform
          if(weChat instanceof WeChatPlatform){
              weChat.startBranchAnalytics(String(GameModel.single.currentLevel));
          }
-         this.HideSelf();
     }
 
     start () {

assets/scripts/games/ui/prepares/PrepareMediator.ts

@@ -57,6 +57,12 @@ export class PrepareMediator extends GUIMediator {
     })
     levelLabel: LabelComponent = null;
 
+
+    @property({
+        type: LabelComponent
+    })
+    weaponInfoLabel: LabelComponent = null;
+
     /**
      * 商城按钮
      */
@@ -218,6 +224,8 @@ export class PrepareMediator extends GUIMediator {
         if (this.gunNameLabel != null) {
             this.gunNameLabel.string = weaponConfig.name;
         }
+        //描述
+        this.weaponInfoLabel.string=weaponConfig.desc;
     }
 
     OnHide(): void {

assets/ui/img_enter/img_enter_05.png.meta

@@ -52,9 +52,9 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 63,
+        "width": 75,
         "height": 76,
-        "rawWidth": 63,
+        "rawWidth": 75,
         "rawHeight": 76,
         "borderTop": 0,
         "borderBottom": 0,

tools/createQQ.bat

@@ -0,0 +1,5 @@
+@echo off
+echo "使用bat脚本来复制文件夹和文件"
+echo.
+xcopy ..\build\wechatgame\*.* ..\build\qq\ /s /e /c /y /h /r
+pause

tools/qqMove.bat

@@ -0,0 +1,5 @@
+@echo off
+echo "使用bat脚本来复制文件夹和文件"
+echo.
+xcopy qqbuild\*.* ..\build\qq\ /s /e /c /y /h /r
+pause

tools/qqbuild/main.js

@@ -0,0 +1,159 @@
+var settings = window._CCSettings;
+
+function boot () {
+    var onStart = function () {
+        window._CCSettings = undefined;
+
+        cc.loader.downloader._subpackages = settings.subpackages;
+        cc.view.enableRetina(true);
+        cc.view.resizeWithBrowserSize(true);
+
+        //在launchScene面前添加底下这句话。这样子游戏运行的时候就可以判断为QQ小游戏啦。
+        cc.sys.platform = cc.sys.QQ_PLAY;
+		
+        var launchScene = settings.launchScene;
+        // load scene
+        cc.director.loadScene(launchScene, null,
+            function () {
+                cc.view.setDesignResolutionSize(750, 1334, 4);
+                cc.loader.onProgress = null;
+                console.log('Success to load scene: ' + launchScene);
+            }
+        );
+    };
+
+    loadJsListModules(settings.jsList).then(function () {
+        (boot.systemGlobal || System)['import']('virtual:///prerequisite-imports:main').then(function () {
+            cc.game.run(onStart);
+        }).catch(function (error) {
+            console.error("Load project module error: \n" + error);
+        });
+    });
+};
+window.boot = boot;
+
+// Generate options to init cc.game
+function initOptions () {
+
+    var uuids = settings.uuids;
+    var rawAssets = settings.rawAssets;
+    var assetTypes = settings.assetTypes;
+    var realRawAssets = settings.rawAssets = {};
+    for (var mount in rawAssets) {
+        var entries = rawAssets[mount];
+        var realEntries = realRawAssets[mount] = {};
+        for (var id in entries) {
+            var entry = entries[id];
+            var type = entry[1];
+            // retrieve minified raw asset
+            if (typeof type === 'number') {
+                entry[1] = assetTypes[type];
+            }
+            // retrieve uuid
+            realEntries[uuids[id] || id] = entry;
+        }
+    }
+    var scenes = settings.scenes;
+    for (var i = 0; i < scenes.length; ++i) {
+        var scene = scenes[i];
+        if (typeof scene.uuid === 'number') {
+            scene.uuid = uuids[scene.uuid];
+        }
+    }
+    var packedAssets = settings.packedAssets;
+    for (var packId in packedAssets) {
+        var packedIds = packedAssets[packId];
+        for (var j = 0; j < packedIds.length; ++j) {
+            if (typeof packedIds[j] === 'number') {
+                packedIds[j] = uuids[packedIds[j]];
+            }
+        }
+    }
+    var subpackages = settings.subpackages;
+    for (var subId in subpackages) {
+        var uuidArray = subpackages[subId].uuids;
+        if (uuidArray) {
+            for (var k = 0, l = uuidArray.length; k < l; k++) {
+                if (typeof uuidArray[k] === 'number') {
+                    uuidArray[k] = uuids[uuidArray[k]];
+                }
+            }
+        }
+    }
+
+    // asset library options
+    const assetOptions = {
+        libraryPath: 'res/import',
+        rawAssetsBase: 'res/raw-',
+        rawAssets: settings.rawAssets,
+        packedAssets: settings.packedAssets,
+        md5AssetsMap: settings.md5AssetsMap,
+        subPackages: settings.subpackages
+    };
+    const options = {
+        scenes: settings.scenes,
+        debugMode: settings.debug ? 1 : 3, // cc.debug.DebugMode.INFO : cc.debug.DebugMode.ERROR,
+        showFPS: !false && settings.debug,
+        frameRate: 60,
+        groupList: settings.groupList,
+        collisionMatrix: settings.collisionMatrix,
+        renderPipeline: settings.renderPipeline,
+        adapter: prepare.findCanvas('GameCanvas'),
+        assetOptions,
+        customJointTextureLayouts: settings.customJointTextureLayouts || [],
+    };
+    return options;
+}
+
+// Load all project scripts (built by creator)
+function loadJsListModules(jsList) {
+    // jsList
+    var promise = Promise.resolve();
+    if (jsList) {
+        jsList.forEach(function (x) {
+            promise = promise.then(function () {
+                return prepare.loadIIFE(boot.jsListRoot + '/' + x);
+            });
+        });
+    }
+    return promise;
+}
+
+// Load all custom script bundles. Every bundle may contain one or more named registered SystemJS modules, with no module.
+function loadScriptPackages(scriptPackages) {
+    var loadBundlePromises = [];
+    if (scriptPackages) {
+        for (var iScriptPackage = 0; iScriptPackage < scriptPackages.length; ++iScriptPackage) {
+            loadBundlePromises.push(prepare.loadIIFE(scriptPackages[iScriptPackage]));
+        }
+    }
+    return Promise.all(loadBundlePromises);
+}
+
+var prepare = function() {
+    settings = window._CCSettings;
+    return Promise.resolve(prepare.engine ? prepare.engine() : void 0).then(function() {
+            return (boot.systemGlobal || System).import('cc');
+        }).then(function() {
+            var options = initOptions();
+            return new Promise(function (resolve, reject) {
+                let inited = cc.game.init(options);
+                inited ? resolve() : reject();
+            });
+        }).then(function() {
+            return loadScriptPackages(settings.scriptPackages);
+        });
+};
+
+// Define how to prepare engine so that 'cc' is valid to import.
+prepare.engine = void 0;
+// Define how to prepare IIFE modules.
+prepare.loadIIFE = void 0;
+// Adapter: find canvas
+prepare.findCanvas = void 0;
+// The root url from which we can load js list.
+boot.jsListRoot = 'src';
+// System JS global. Default to `globalThis.System`.
+boot.systemGlobal = undefined;
+boot.prepare = prepare;
+